From ec93571fd03afe396a88035d690378ffe7ef4c1c Mon Sep 17 00:00:00 2001
From: lipenggao <lpg0158@163.com>
Date: Fri, 12 Jul 2024 14:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/customerService/customerService.ts |  5 ++-
 .../customerService/customerService.ttml      |  3 +-
 pages/pay/pay.json                            |  4 ++-
 pages/pay/pay.ts                              |  5 +--
 pages/pay/pay.ttml                            | 15 ++++++++
 pages/pay/pay.ttss                            | 16 +++++++++
 pages/videoDetail/videoDetail.ts              | 12 +++++--
 pages/videoDetail/videoDetail.ttml            | 36 ++++++++++---------
 pages/videoDetail/videoDetail.ttss            | 16 ++++++++-
 9 files changed, 88 insertions(+), 24 deletions(-)

diff --git a/components/customerService/customerService.ts b/components/customerService/customerService.ts
index dc702bd..2a8bce3 100644
--- a/components/customerService/customerService.ts
+++ b/components/customerService/customerService.ts
@@ -5,7 +5,10 @@ Component({
     userInfo: {}
   },
   properties: {
-
+    bottom: {
+      type: Number,
+      value: 100
+    }
   },
   attached() {
     httpRequest('/user', 'POST').then((res: any) => {
diff --git a/components/customerService/customerService.ttml b/components/customerService/customerService.ttml
index 7d42fef..512feae 100644
--- a/components/customerService/customerService.ttml
+++ b/components/customerService/customerService.ttml
@@ -1,4 +1,5 @@
-<button open-type="im" data-im-id="{{userInfo.im}}" class="contact_customer_service">
+<button open-type="im" data-im-id="{{userInfo.im}}" class="contact_customer_service"
+    style="bottom:{{bottom}}rpx">
     <view class="contact_custo_ser_icon">
         <image src="/static/customer_service.png" class="__wa_img_no_radius"></image>
     </view>
diff --git a/pages/pay/pay.json b/pages/pay/pay.json
index 3928faa..3f9c476 100644
--- a/pages/pay/pay.json
+++ b/pages/pay/pay.json
@@ -1,3 +1,5 @@
 {
-    "usingComponents": {}
+    "usingComponents": {
+        "customer-service": "/components/customerService/customerService"
+    }
 }
\ No newline at end of file
diff --git a/pages/pay/pay.ts b/pages/pay/pay.ts
index 6e6104a..b571124 100644
--- a/pages/pay/pay.ts
+++ b/pages/pay/pay.ts
@@ -8,7 +8,7 @@ Page({
     platform: '',
     otherInfo: {},
     iosIm: '',
-
+    effectiveTime: ''
   },
   onLoad(options) {
     console.log(options, "options")
@@ -33,7 +33,8 @@ Page({
       if (res.status == 1) {
         this.setData({
           payList: res.data.list,
-          iosIm: res.iosIm
+          iosIm: res.iosIm,
+          effectiveTime: res.data.time
         })
       }
     })
diff --git a/pages/pay/pay.ttml b/pages/pay/pay.ttml
index 0973b59..a9f4777 100644
--- a/pages/pay/pay.ttml
+++ b/pages/pay/pay.ttml
@@ -124,6 +124,20 @@
             </view>
         </view>
 
+        <view class="_pay_notice">
+            <view class="_pay_notice_item">
+                <text class="_pay_notice_item_text">1、1元=100K币，k币和会员属于虚拟产品，一经购买不可退换 </text>
+            </view>
+            <view class="_pay_notice_item">
+                <text class="_pay_notice_item_text">2、未满18岁的未成年人需要在监护人主导、同意下进行相关付费操作。</text>
+            </view>
+            <view class="_pay_notice_item">
+                <text class="_pay_notice_item_text">3、购买时获得的看点仅{{effectiveTime}}有效 </text>
+            </view>
+            <text class="_pay_notice_item_text">4、充值看点一般在10分钟内到账，如未到账请点击，页面客服按钮，联系客服</text>
+        </view>
+        </view>
+
         <view class="_pay_b_footer">
             <view class="_pay_b_foo_bug_btn" bindtap="handelRechargeNow">
                 <text class="_pay_b_foo_bug_bt_text">立即购买</text>
@@ -131,4 +145,5 @@
         </view>
 
     </view>
+    <customer-service bottom="{{200}}" />
 </view>
\ No newline at end of file
diff --git a/pages/pay/pay.ttss b/pages/pay/pay.ttss
index 5c8763b..ccae608 100644
--- a/pages/pay/pay.ttss
+++ b/pages/pay/pay.ttss
@@ -313,6 +313,7 @@
     width: 100%;
     padding: 32rpx 32rpx 60rpx;
     background-color: #080B16;
+    z-index: 2;
 }
 
 ._pay_b_foo_bug_btn {
@@ -329,4 +330,19 @@
 ._pay_b_foo_bug_bt_text {
     font-size: 28rpx;
     color: #fff;
+}
+
+._pay_notice {
+    padding: 32rpx;
+}
+
+._pay_notice_item {
+    display: flex;
+    margin-top: 10rpx;
+}
+
+._pay_notice_item_text {
+    font-size: 24rpx;
+    color: #fff;
+    line-height: 1.5;
 }
\ No newline at end of file
diff --git a/pages/videoDetail/videoDetail.ts b/pages/videoDetail/videoDetail.ts
index 2a4e9e4..c6aecf7 100644
--- a/pages/videoDetail/videoDetail.ts
+++ b/pages/videoDetail/videoDetail.ts
@@ -21,7 +21,8 @@ Page({
     collectionItem: {},
     nextbatchList: [],
     selectedId: '',
-    adBanner: null
+    adBanner: null,
+    unlockFlag: true
   },
   onLoad(options: any) {
     const videoCanIUse = tt.canIUse('video-player');
@@ -85,6 +86,7 @@ Page({
       selectionTabs: ol.tabList,
       selectionConList: ol.orderDataList,
       nextbatchList,
+      unlockFlag: true
     })
     //  第${videoInfo?.order}集
     tt.setNavigationBarTitle({
@@ -152,7 +154,8 @@ Page({
       anthologyFlag: false,
       collectionItem: collectionItem,
       videoErrorText: '',
-      selectionConList: lk
+      selectionConList: lk,
+      unlockFlag: true
     })
 
 
@@ -457,5 +460,10 @@ Page({
     this.setData({
       roderCurrent: current
     })
+  },
+  hideUnlock() {
+    this.setData({
+      unlockFlag: false
+    })
   }
 })
\ No newline at end of file
diff --git a/pages/videoDetail/videoDetail.ttml b/pages/videoDetail/videoDetail.ttml
index f49592e..6e88af8 100644
--- a/pages/videoDetail/videoDetail.ttml
+++ b/pages/videoDetail/videoDetail.ttml
@@ -41,8 +41,8 @@
                                 <video class="_m_v_w_video_player" vslide-gesture="{{true}}"
                                     src="{{videoInfo.video_url}}" version="1" enable-progress-gesture="{{true}}"
                                     autoplay="{{ videoPlayerCurrent == index}}" id="{{item.id}}"
-                                    enable-dark-water-mark="{{true}}" bindended="videoPlayerEnded"
-                                    binderror="videError" show-fullscreen-btn="{{false}}">
+                                    enable-dark-water-mark="{{true}}" bindended="videoPlayerEnded" binderror="videError"
+                                    show-fullscreen-btn="{{false}}">
                                     <block tt:if="{{videoPlayerCurrent == index}}">
                                         <block tt:if="{{videoErrorText}}">
                                             <view class="_iii_video_content">
@@ -70,26 +70,30 @@
                                     <image src="{{videoInfo.cover}}" mode="aspectFill" class="__wa_img_no_radius">
                                     </image>
                                 </view>
-                                <view class="_k_l_unlo_mask">
-                                    <block tt:if="{{platform != 'ios'}}">
-                                        <view class="_k_l_unlo_ma_pay" catchtap="toPathPay">
+                                <view class="_k_l_unlo_mask" tt:if="{{unlockFlag}}">
+                                    <view class="_k_l_unlo_btn_warp">
+                                        <icon class="_k_l_unlo_btn_warp_icon" size="{{28}}" type="cancel" color="#fff"
+                                            catchtap="hideUnlock"></icon>
+                                        <block tt:if="{{platform != 'ios'}}">
+                                            <view class="_k_l_unlo_ma_pay" catchtap="toPathPay">
+                                                <view class="_k_l_unlo_ma_p_icon">
+                                                    <image src="/static//unlock_icon.png" class="__wa_img_no_radius">
+                                                    </image>
+                                                </view>
+                                                <view class="_k_l_unlo_ma_name">
+                                                    <text class="_k_l_unlo_ma_na_text">充值解锁</text>
+                                                </view>
+                                            </view>
+                                        </block>
+                                        <view class="_k_l_unlo_ma_ad" catchtap="watchAdvertisement">
                                             <view class="_k_l_unlo_ma_p_icon">
                                                 <image src="/static//unlock_icon.png" class="__wa_img_no_radius">
                                                 </image>
                                             </view>
                                             <view class="_k_l_unlo_ma_name">
-                                                <text class="_k_l_unlo_ma_na_text">充值解锁</text>
+                                                <text class="_k_l_unlo_ma_na_text">观看广告解锁</text>
                                             </view>
                                         </view>
-                                    </block>
-                                    <view class="_k_l_unlo_ma_ad" catchtap="watchAdvertisement">
-                                        <view class="_k_l_unlo_ma_p_icon">
-                                            <image src="/static//unlock_icon.png" class="__wa_img_no_radius">
-                                            </image>
-                                        </view>
-                                        <view class="_k_l_unlo_ma_name">
-                                            <text class="_k_l_unlo_ma_na_text">观看广告解锁</text>
-                                        </view>
                                     </view>
                                 </view>
                             </view>
@@ -183,7 +187,7 @@
 
     </swiper>
 
-    <view class="" >
+    <view class="">
         <view class="_vv_det_anthology_mask" tt:if="{{anthologyFlag}}">
         </view>
         <view class="_vv_det_anthology_dialog {{anthologyFlag ? 'ac_dis_blo' : ''}}">
diff --git a/pages/videoDetail/videoDetail.ttss b/pages/videoDetail/videoDetail.ttss
index 12e8dbf..667b158 100644
--- a/pages/videoDetail/videoDetail.ttss
+++ b/pages/videoDetail/videoDetail.ttss
@@ -179,11 +179,25 @@ page {
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    padding: 90rpx;
+    padding: 90rpx 32rpx;
     background-color: rgba(0, 0, 0, 0.45);
     z-index: 99;
 }
 
+._k_l_unlo_btn_warp {
+    position: relative;
+    width: 100%;
+    padding: 110rpx 58rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    border-radius: 16rpx;
+}
+
+._k_l_unlo_btn_warp_icon {
+    position: absolute;
+    top: 10rpx;
+    right: 10rpx;
+}
+
 ._k_l_unlo_ma_pay {
     display: flex;
     justify-content: center;