1

branch.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# 获取远程分支信息
+git fetch --all
+
+# 获取当前仓库的所有远程分支并在本地创建相应分支
+for branch in $(git branch -r | grep -v '\->' | grep -v 'HEAD' | sed 's#origin/##'); do
+    # 检查本地是否已存在该分支
+    if [ -z "$(git branch --list $branch)" ]; then
+        echo "正在创建本地分支：$branch"
+        git checkout -b "$branch" "origin/$branch"
+    else
+        echo "本地分支已存在：$branch，跳过创建"
+    fi
+done
+
+# 切回原始分支
+git checkout -

src/App.vue

@@ -142,7 +142,7 @@ export default {
       }
       uni.setStorageSync('env', window.env);
       // 如果是支付宝小程序：初始化
-      if (isAlipayClient) {
+      if (window.isAlipayClient) {
         setToken()
         localStorageInit();
         windowSendInit()

src/api/request.js

@@ -87,7 +87,7 @@ function XUser(config) {
     userId: store.state?.kipUserId || '', // K+用户ID
     // userId: '2c9d85868652dee50186532bdbbb0001', // K+用户ID
     // sourceType: 'WECHAT',
-    sourceType: isAlipayClient ? 'ALIPAY' : 'WECHAT',
+    sourceType: window.isAlipayClient ? 'ALIPAY' : 'WECHAT',
     // phoneNumber: '18521563898',
     phoneNumber: store.state?.mobile || '', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
     // projectId: store.state.projectId || '4028e3817c2b3f79017c2b48c54c0000', // 楼盘id

src/components/wx-points-auth/wx-points-auth.vue

@@ -198,7 +198,7 @@ export default {
                  "url": "/pages/accumulatePoints/selfServicePoints?redirect=1&backUrl=pages/package-parkingFee/parkingFeeWebView" // 去 login 页面 1 去登录
                 })
             }
-            if (isAlipayClient) {
+            if (window.isAlipayClient) {
                 my?.navigateTo({
                     "url": "/pages/accumulatePoints/selfServicePoints?redirect=1" // 去 login 页面 1 去登录
                 })

src/pages/parkingFee/mixins/parkingFee.js

@@ -61,7 +61,7 @@ export default {
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
       qrCodeHistory: '',
       currentTabType: this.carType,
-      isAlipayClient: isAlipayClient,
+      isAlipayClient: window.isAlipayClient,
       licensePlateList: [],
       // custTypeId: 0,
       // 2.19新增内容

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -183,7 +183,7 @@ export default {
     },
     // 前往支付
     async toPay() {
-      if (!isAlipayClient) {
+      if (!window.isAlipayClient) {
         // 判断微信小程序与 h5 是否正常通信
         const isReload = await theCommunicationBetweenWechatAndH5IsNormal()
         if(!isReload) {
@@ -493,7 +493,7 @@ export default {
                 options: options,
               });
               window.subscribe('wxPayOver', (options) => {
-                if(isAlipayClient) {
+                if(window.isAlipayClient) {
                   options.wxPayOver = options.options.wxPayOver 
                 }
                 // this.Toastloading.clear();

src/pages/parkingFee/mixins/parkingFeePaperCoupon.js

@@ -89,7 +89,7 @@ export default {
     // 扫码
    async scanCode() {
       const runScanFn = ( res ) => {
-        if ( res.scanType == 'QR_CODE' && res.scanType || (isAlipayClient && res.scanType == 'QR')) {
+        if ( res.scanType == 'QR_CODE' && res.scanType || (window.isAlipayClient && res.scanType == 'QR')) {
           console.log(res.result);
           const url = res.result;
           if ( url.indexOf('auth/') === -1 ) {
@@ -120,7 +120,7 @@ export default {
         });
         window.subscribe('scanQRCodeOver',( options ) => {
           console.log('微信扫码结束之后的返回参数',options);
-          runScanFn(isAlipayClient ? options.options : options);
+          runScanFn(window.isAlipayClient ? options.options : options);
         });
       } else {
         this.$wx.scanQRCode({

src/pages/parkingFee/mixins/vehicleManagement.js

@@ -86,7 +86,7 @@ export default {
       this.getKipMemberVehicles();
     } else {
       wxToLoginCallback('vehicleManagement', (options) => {
-        if (isAlipayClient && options?.options?.noLoginParkingFeeWebView === 'fail' || options?.noLoginParkingFeeWebView === 'fail') {
+        if (window.isAlipayClient && options?.options?.noLoginParkingFeeWebView === 'fail' || options?.noLoginParkingFeeWebView === 'fail') {
           // 如果是用户明确拒绝登录，执行这段逻辑
           setTimeout(() => {
             Toast({

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -54,7 +54,7 @@ export default {
       tabbarActive: 'manualPayment',
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
       qrCodeHistory: '',
-      isAlipayClient: isAlipayClient,
+      isAlipayClient: window.isAlipayClient,
       // custTypeId: 0,
       // 2.19新增内容
       eligibility: {}, // 
@@ -172,7 +172,7 @@ export default {
     }
     try {
       const href = window.location.href;
-      if (!isAlipayClient && !/808[0-9]/.test(href)) {
+      if (!window.isAlipayClient && !/808[0-9]/.test(href)) {
         setTimeout(async () => {
           await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
         }, 1500)
@@ -807,7 +807,7 @@ export default {
         };
         // 微信小程序
         // const platform = getPlatform();
-        if (isAlipayClient) {
+        if (window.isAlipayClient) {
           // 判断微信小程序与 h5 是否正常通信
           // const isReload = await theCommunicationBetweenWechatAndH5IsNormal()
           // if(!isReload) {

src/pages/parkingFeeV2/mixins/parkingFeeList.js

@@ -3,7 +3,7 @@ import uni from '@/utils/uniHooks';
 // import LoginDom from '@/components/Login/Login.vue';
 import { wxToLoginCallback } from '@/utils';
 import { orders } from '@/api/parking';
-import orderMockData from '@/api/mockData/orders.json'
+// import orderMockData from '@/api/mockData/orders.json'
 import { ORDER_STATUS } from '@/common/js/BaseDictionary'
 
 let canloading = true;
@@ -34,6 +34,8 @@ export default {
   },
   // components: {LoginDom},
   mounted() {
+    this.loadData();
+    return;
     console.log(37373737, this.isLogin, this.$route.query);
     // 未登录流程
     if((this.isLogin === 'notLoggedIn' || this.isLogin === 'loginDenied') && !this.$route.query?.loginCount) {
@@ -86,7 +88,7 @@ export default {
         page: pageNum || 0,
         pageSize: 4,
       };
-      console.log(120,orderMockData);
+      // console.log(120,orderMockData);
       try {
         const res = await orders({
           page: params.page,
@@ -96,6 +98,7 @@ export default {
         // const res = orderMockData
         const records = res.content || [];
         this.numberOfElements = records.numberOfElements
+        console.log(101, records)
         if ( records.length ) {
           const list = this.list;
           this.list = [...list,...records];

src/pages/parkingFeeV2/mixins/parkingFeePaperCoupon.js

@@ -57,7 +57,7 @@ export default {
     try {
       const href = window.location.href;
       console.log('初始化扫码1');
-      if(!isAlipayClient && !/808[0-9]/.test(href)) {
+      if(!window.isAlipayClient && !/808[0-9]/.test(href)) {
         setTimeout(async () => {
           console.log('初始化扫码2');
           await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
@@ -107,7 +107,7 @@ export default {
     // this.getPaperCouponInfo(test.result);
     // return
       const runScanFn = ( res ) => {
-        if ( res.scanType == 'QR_CODE' && res.scanType || (isAlipayClient && res.scanType == 'QR')) {
+        if ( res.scanType == 'QR_CODE' && res.scanType || (window.isAlipayClient && res.scanType == 'QR')) {
           console.log(res.result);
           const url = res.result;
           if ( url.indexOf('auth/') === -1 ) {
@@ -126,7 +126,7 @@ export default {
       // 支付宝小程序
       // const platform = getPlatform();
       // console.log(110);
-      if ( isAlipayClient ) {
+      if ( window.isAlipayClient ) {
         window.toWXSendMsg({
           type: 'scanQRCode',
         });

src/pages/parkingFeeV2/mixins/parkingFindCarFirst.js

@@ -54,7 +54,7 @@ export default {
       tabbarActive: 'manualPayment',
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
       qrCodeHistory: '',
-      isAlipayClient: isAlipayClient,
+      isAlipayClient: window.isAlipayClient,
       // custTypeId: 0,
       // 2.19新增内容
       eligibility: {}, // 
@@ -760,7 +760,7 @@ export default {
         };
         // 微信小程序
         // const platform = getPlatform();
-        if (isAlipayClient) {
+        if (window.isAlipayClient) {
           // 判断微信小程序与 h5 是否正常通信
           // const isReload = await theCommunicationBetweenWechatAndH5IsNormal()
           // if(!isReload) {

src/pages/parkingFeeV2/parkingFee.vue

@@ -2,6 +2,7 @@
   <div :class="[theme, 'paekingFeeClass']">
     <scroll-view :class="['scroll-Y' ,'color-scroll-Y']">
       <div class="wrap">
+        <div>9988</div>
         <div class="parkingFee">
           <!-- <wx-points-commit ref='wxPointsCommit'></wx-points-commit> -->
           <!-- KIP菜单 -->
@@ -60,7 +61,6 @@
               <span>反向寻车</span>
             </div>
           </div>
-
           <!-- 菜单2 -->
           <div v-else-if="custTypeId >= 0 && portalsByLbsList.length > 5 && source !== 'KIP'">
             <div
@@ -107,7 +107,6 @@
           </div>
           </div>
           
-          
           <!-- 中控 -->
           <div class="parkingFee-bottom">
             <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP'"></div>

src/pages/parkingFeeV2/parkingFeeMsg.vue

@@ -141,7 +141,7 @@ export default {
       };
       // 微信小程序
       // const platform = getPlatform();
-      if (isAlipayClient) {
+      if (window.isAlipayClient) {
         // 判断微信小程序与 h5 是否正常通信
         // const isReload = await theCommunicationBetweenWechatAndH5IsNormal()
         // if(!isReload) {

src/utils/index.js

@@ -162,7 +162,7 @@ export function wxToLoginCallback( path,callback ) {
     });
     window.subscribe('callback',( options ) => {
       // console.log('登录页面的回调',JSON.stringify(options));
-      if ( options.isReload || isAlipayClient && options?.options?.isReload) {
+      if ( options.isReload || window.isAlipayClient && options?.options?.isReload) {
         // console.log('刷新页面');
         window.location.reload();
       } else {
@@ -182,7 +182,7 @@ export function wxToLoginCallback( path,callback ) {
 export function initEnv() {
   const origin = window.location.origin;
   console.log('当前页面的url地址  ',origin);
-  if ( origin.indexOf('https://dev-') > -1  || origin.indexOf('http://127.0.0.1') > -1 || origin.indexOf('http://localhost:') > -1) {
+  if ( origin.indexOf('https://dev-') > -1  || origin.indexOf('http://127.0.0.1') > -1 || origin.indexOf('http://localhost:') > -1 || origin.indexOf('192.168.') > -1) {
     window.env = 'qa';
     window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
     window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
@@ -269,7 +269,7 @@ export function getUrl() {
 export function windowSendInit() {
   const token = window.token;
   window.toWXSendMsg = function ( {type = '',funcName = '',options = {}} ) {
-    if(isAlipayClient) {
+    if(window.isAlipayClient) {
       my.postMessage({
         name:'h5',
         body: {
@@ -306,7 +306,7 @@ export function windowSendInit() {
 
   // 主动订阅事件回调
   window.subscribe = function ( type,callback ) {
-    if(isAlipayClient) {
+    if(window.isAlipayClient) {
       my.onMessage = function (response) {
         console.log('293my.onMessage', response)
         callback(response.body.data);
@@ -410,7 +410,7 @@ export function backLbsHome() {
             url: source === 'KIP' ? '/pages/tabbar/home/home' : "/pages/package-parkingFee/parkingFeeWebViewLogin?needLogin=1"  // 去 login 页面
           })
         }
-        if (isAlipayClient) {
+        if (window.isAlipayClient) {
           my?.reLaunch({
             url: "/pages/package-parkingFee/parkingFeeWebViewLogin?needLogin=1" // 去 login 页面 1 去登录
           })