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] =?UTF-8?q?=E6=96=B0=E8=83=BD=E6=BA=90=E4=BC=98=E5=8C=962.?=
 =?UTF-8?q?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
         },