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] =?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
         },