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] =?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;