更新下

app.json

@@ -113,7 +113,9 @@
     "pages/activity/year2020/index",
     "pages/activity/suyear/index",
     "pages/activity/spring2021/index",
-    "pages/activity/springten/index"
+    "pages/activity/springten/list/index",
+    "pages/activity/springten/index",
+    "pages/activity/newarrival/index"
   ],
   "permission": {
     "scope.userLocation": {

pages/activity/newarrival/index.js

@@ -0,0 +1,122 @@
+// pages/activity/newarrival/index.js
+import commonApi from "../../../utils/https/common"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list1:[],
+    list2:[],
+    list3:[],
+    list4:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let tag_id=43;
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: tag_id,
+      offset: 0,
+      limit: 100,
+    }).then(res=>{
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags.split(",") || [];
+        item.display_tags = item.display_tags.splice(0,2)
+      })
+      this.setData({
+        list1:res.data.list
+      })
+    })
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: tag_id+1,
+      offset: 0,
+      limit: 100,
+    }).then(res=>{
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags.split(",") || [];
+        item.display_tags = item.display_tags.splice(0,2)
+      })
+      this.setData({
+        list2:res.data.list
+      })
+    })
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: tag_id+2,
+      offset: 0,
+      limit: 100,
+    }).then(res=>{
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags.split(",") || [];
+        item.display_tags = item.display_tags.splice(0,2)
+      })
+      this.setData({
+        list3:res.data.list
+      })
+    })
+    commonApi._post('product/get_product_by_tag',{
+      tag_id: tag_id+3,
+      offset: 0,
+      limit: 100,
+    }).then(res=>{
+      res.data.list.map(item=>{
+        item.display_tags = item.display_tags.split(",") || [];
+        item.display_tags = item.display_tags.splice(0,2)
+      })
+      this.setData({
+        list4:res.data.list
+      })
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/activity/newarrival/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/activity/newarrival/index.wxml

@@ -0,0 +1,67 @@
+<!--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>
+<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>
+    <view class="product-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">{{item.price?item.price/100:0}}</view>
+      <view class="btn">点击预定</view>
+    </view>
+  </view>
+</view>
+
+<view class="title">文创特产</view>
+<view class="subtitle">甄选好货 口碑之选</view>
+<view class="list" wx:if="{{list2.length}}">
+  <view class="item" wx:for="{{list2}}">
+    <image 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>
+    </view>
+    <view class="product-bottom">
+      <view class="price">{{item.price?item.price/100:0}}</view>
+      <view class="btn">点击预定</view>
+    </view>
+  </view>
+</view>
+
+<view class="title">演出精选</view>
+<view class="subtitle">精湛演出 生动体验</view>
+<view class="list" wx:if="{{list3.length}}">
+  <view class="item" wx:for="{{list3}}">
+    <image 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>
+    </view>
+    <view class="product-bottom">
+      <view class="price">{{item.price?item.price/100:0}}</view>
+      <view class="btn">点击预定</view>
+    </view>
+  </view>
+</view>
+
+<view class="title">更多精选</view>
+<view class="subtitle">精挑细选 好物推荐</view>
+<view class="list" wx:if="{{list4.length}}">
+  <view class="item" wx:for="{{list4}}">
+    <image 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>
+    </view>
+    <view class="product-bottom">
+      <view class="price">{{item.price?item.price/100:0}}</view>
+      <view class="btn">点击预定</view>
+    </view>
+  </view>
+</view>
+<image class="logo" src="https://m.cloud.sz-trip.com/static/images/activity/newarrival/botLogo.png" mode="widthFix"></image>
+<view style="height:1rpx"></view>

pages/activity/newarrival/index.wxss

@@ -0,0 +1,95 @@
+/* pages/activity/newarrival/index.wxss */
+.main-img {
+  display: block;
+  width: 100%;
+}
+page {
+  background: #d4effc;
+  color: #5a8db9;
+}
+.title,.subtitle {
+  text-align: center;
+}
+.title {
+  font-size: 43rpx;
+  font-weight: bold;
+}
+.subtitle {
+  font-size: 32rpx;
+  line-height: 60rpx;
+}
+.list {
+  background: linear-gradient(to bottom,#e0f6f2,#b0e6e2);
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding: 20rpx;
+  margin: 20rpx 13rpx;
+  border-radius: 7rpx;
+  padding-bottom: 8rpx;
+}
+.item {
+  margin-bottom: 12rpx;
+  width: 330rpx;
+}
+.item image {
+  width: 330rpx;
+  height: 272rpx;
+  display: block;
+  border-radius: 7rpx;
+}
+.product-title {
+  color: #4a4a4a;
+  font-size: 23rpx;
+  text-align: center;
+  line-height: 50rpx;
+}
+.product-tags {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  font-size: 16rpx;
+  height: 23rpx;
+  line-height: 23rpx;
+}
+.product-tag {
+  padding: 0 12rpx;
+  margin-right: 10rpx;
+  background-color: #5da980;
+  border-radius: 7rpx;
+}
+.product-tags .product-tag:nth-child(2){
+  background: #c39f70;
+}
+.product-tags .product-tag:last-child {
+  margin-right: 0;
+}
+.product-bottom {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.price {
+  color: #d60000;
+  font-size: 38rpx;
+  flex-shrink: 0;
+}
+.price::before {
+  content: "￥";
+  font-size: 16rpx;
+}
+.btn {
+  width: 83rpx;
+  line-height: 29rpx;
+  text-align: center;
+  color: #fff;
+  font-size: 17rpx;
+  margin-left: 10rpx;
+  background:#d60000;
+}
+.logo {
+  width: 132rpx;
+  margin: 60rpx auto;
+  display: block;
+}

pages/activity/springten/index.js

@@ -53,7 +53,7 @@ Page({
     if(this.data.total<=this.data.list.length) return;
     commonApi._post("scene/get_scene_by_tag",{
       offset:this.data.list.length,
-      limit:10,
+      limit:30,
       tag_id:this.data.type!=0?17+Number(this.data.type):27,
       area_id:this.data.areaIndex>-1?this.data.areas[this.data.areaIndex].area_id:null
     }).then(res=>{
@@ -139,7 +139,7 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    this.getList()
+    // this.getList()
   },
 
   /**

pages/activity/springten/index.wxml

@@ -24,10 +24,10 @@
         <view class="item-address textOver">地址：{{item.address}}</view>
       </view>
     </view>
-    
-    <view class="item-btn" bindtap="gotoLocation" data-item="{{item}}" wx:if="{{item.is_nav || item.ext_link}}">打开导航</view>
+    <view class="item-btn" bindtap="gotoLocation" data-item="{{item}}" wx:if="{{item.is_nav}}">打开导航</view>
     <view class="item-btn" bindtap="gotoFoodInfo" data-item="{{item}}" wx:elif="{{item.isYunHe}}">查看详情</view>
     <view bindtap="gotoDetail" data-item="{{item}}" class="item-btn" wx:else>立即预订</view>
   </view>
-  <view class="nomore" wx:if="{{list.length>=total || list.length==0}}">—— 没有更多了 ——</view>
+  <!-- <view class="nomore" wx:if="{{list.length>=total || list.length==0}}">—— 没有更多了 ——</view> -->
 </view>
+<navigator wx:if="{{total>30}}" class="btn" url="list/index?type={{type}}&area_id={{areas[areaIndex].area_id}}">查看更多</navigator>

pages/activity/springten/index.wxss

@@ -146,3 +146,14 @@
 }
 .areatext {
 }
+.btn {
+  width: 220rpx;
+  line-height: 57rpx;
+  text-align: center;
+  background: #FFFFFF;
+  border: 1rpx solid #999999;
+  border-radius: 29rpx;
+  color: #333;
+  font-size: 23rpx;
+  margin: 40rpx auto;
+}

pages/activity/springten/list/index.js

@@ -0,0 +1,138 @@
+// pages/activity/springten/list/index.js
+import commonApi from "../../../../utils/https/common"
+import util from "../../../../utils/util"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    types:['必赏','必吃','必游','必玩','必购','必住','赏夜戏','品夜饮','尝夜宴','逛夜市'],
+    type:0,
+    list:[],
+    area_id:""
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      type:options.type,
+      area_id:options.area_id
+    })
+    this.getList();
+  },
+  getList:function(){
+    if(this.data.total<=this.data.list.length) return;
+    commonApi._post("scene/get_scene_by_tag",{
+      offset:this.data.list.length,
+      limit:30,
+      tag_id:this.data.type!=0?17+Number(this.data.type):27,
+      area_id:this.data.area_id
+    }).then(res=>{
+      res.data.list.map(item=>{
+        if(item.type && item.type.indexOf('tenscenic')!=-1){
+          item.isYunHe = true;
+        }
+        else {
+          item.isYunHe = false;
+        }
+        item.brief_intro = item.brief_intro.replace(/<\/?.+?>/g,"");
+        item.display_tags = item.display_tags?item.display_tags.split(","):[];
+        item.display_tags = item.display_tags.splice(0,2);
+      })
+      this.setData({
+        list:this.data.list.concat(res.data.list),
+        total:res.data.count
+      })
+    })
+  },
+  detail:function(e){
+    let item = e.currentTarget.dataset.item;
+    if(item.is_nav){
+      this.gotoLocation(e);
+    }
+    else if(item.type && item.type.indexOf('tenscenic')!=-1){
+      this.gotoFoodInfo(e)
+    }
+    else {
+      this.gotoDetail(e)
+    }
+  },
+  gotoWeb:function(e){
+    let item = e.currentTarget.dataset.item;
+    app.globalData.weburl = item.ext_link;
+    wx.navigateTo({
+      url: '/pages/pbService/web/index',
+    })
+  },
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    util.gotoDetail(item)
+  },
+  gotoLocation:function(e){
+    let item = e.currentTarget.dataset.item;
+    wx.openLocation({
+      latitude: item.lat,
+      longitude: item.lon,
+      name:item.title,
+      address:item.address
+    })
+  },
+  gotoFoodInfo:function(e){
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/info/foodInfo/index?id='+item.id,
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/activity/springten/list/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}

pages/activity/springten/list/index.wxml

@@ -0,0 +1,9 @@
+<!--pages/activity/springten/list/index.wxml-->
+<title title="{{types[type]}}榜单"></title>
+<view class="item" wx:for="{{list}}" bindtap="detail" data-item="{{item}}">
+  <view style="flex:1;width:500rpx">
+    <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>
+</view>

pages/activity/springten/list/index.wxss

@@ -0,0 +1,30 @@
+/* pages/activity/springten/list/index.wxss */
+.item {
+  margin: 26rpx;
+  display: flex;
+  background:url(https://static.ticket.sz-trip.com/uploads/20210401/09b3cdf766827f3194a021511cf33030.png);
+  height: 116rpx;
+  padding: 0 30rpx;
+  align-items: center;
+  justify-content: space-between;
+  background-size: 100% 100%;
+}
+.item image {
+  width: 86rpx;
+  height: 86rpx;
+  display: block;
+  flex-shrink: 0;
+}
+.item .title {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+.item .address {
+  color: #666;
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+.item .iconfont {
+  font-size: 24rpx;
+  margin-right: 4rpx;
+}

pages/list/activitynew/index.js

@@ -171,6 +171,22 @@ Page({
       area_key:this.data.areas[this.data.area].area_code,
       page_num:10
     }).then(res=>{
+      let now = new Date().getTime();
+      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";
+          }
+         end_date = new Date(end_date.replace(/-/g,'/')).getTime();
+          if(end_date<now){
+            item.is_end = true;
+          }
+          else {
+            item.is_end = false;
+          }
+        }
+      })
       this.setData({
         total:res.data.total,
         list:list.concat(res.data.rows),

pages/list/activitynew/index.wxml

@@ -42,7 +42,7 @@
     <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 class="date-item {{item.times==selectDay?'active':''}}" wx:for="{{weeks}}" bindtap="changeDate" data-times="{{item.times}}">
       <view>{{item.date}}</view>
       <view>周{{item.day}}</view>
@@ -75,10 +75,12 @@
           </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>
       <view class="new-tip">{{item.from_platform}}</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}}">
       <common-image width="180rpx" height='180rpx' src="{{item.headimg}}" mode="aspectFill"></common-image>

pages/list/activitynew/index.wxss

@@ -134,6 +134,20 @@ page {
   align-items: center;
   justify-content: space-between;
   padding: 27rpx 22rpx;
+  position: relative;
+}
+.end-mask {
+  position: absolute;
+  right: 22rpx;
+  top: 27rpx;
+  text-align: center;
+  width: 320rpx;
+  height: 220rpx;
+  line-height: 220rpx;
+  z-index: 1;
+  background:rgba(0, 0, 0, 0.5);
+  color:#fff;
+  border-radius: 10rpx;
 }
 .activity-item-out {
   box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);

pages/list/sale/index.js

@@ -38,7 +38,6 @@ Page({
         list:this.data.list.concat(res.data)
       })
       this.daojishi()
-      console.log(res)
     })
   },
   daojishi:function(){

pages/list/sale/index.wxml

@@ -1,8 +1,7 @@
 <title title="限时特惠"></title>
 <view class="sale-types">
   <view class="sale-type{{type==0?' active':''}}" bindtap="changeType" data-type="0">正在疯抢</view>
-  <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==1?' active':''}}" bindtap="changeType" data-type="1">活动预告</view>
 </view>
 <view style="height:87rpx"></view>
 <view class="list" wx:for="{{list}}" wx:for-item="activity">

pages/user/bindtel/index.js

@@ -25,7 +25,7 @@ Page({
   onLoad: function (options) {
     this.changeImgCode();
     this.setData({
-      regToken: decodeURIComponent(options.regToken) || null
+      regToken: options.regToken?decodeURIComponent(options.regToken):null
     })
   },
   cancel:function(){

project.private.config.json

@@ -20,14 +20,14 @@
           "scene": null
         },
         {
-          "name": "春天十大必游",
-          "pathName": "pages/activity/springten/index",
+          "name": "新品专题",
+          "pathName": "pages/activity/newarrival/index",
           "query": "",
           "scene": null
         },
         {
-          "name": "pages/activity/suyear/index",
-          "pathName": "pages/activity/suyear/index",
+          "name": "pages/list/activitynew/index",
+          "pathName": "pages/list/activitynew/index",
           "query": "id=0000000000LINELINEINFO18082257199008",
           "scene": null
         },