加气支付极速版

src/pages/index/index.vue

@@ -726,6 +726,8 @@ ay.entrance(
   async (args) => {
     /** 首次、下拉更新的内容-需要身份 */
     const refreshNeedIdentity = async () => {
+      // 有无身份都需要获取加气站列表
+      methods.getListApp({ cras: args.cras })
       if (!store.user.isLogined) return
       webapi.strategy.get_driver_balance({}).then((res) => {
         data.accountInfo = {
@@ -787,8 +789,9 @@ ay.entrance(
       refreshNeedIdentity()
     }
     if (args.loadType === enums.LoadType.refresh) {
-      methods.getListApp({ cras: args.cras })
-      if (!args.cras.isAdd) {
+      if (args.cras.isAdd) {
+        methods.getListApp({ cras: args.cras })
+      } else {
         refreshNeedIdentity()
       }
     }

src/pages/order/createOrder.vue

@@ -332,6 +332,7 @@ ay.entrance(
       cashierId: cashierId.value, // '710613333157822464', // '600021999820734464',
       longitude: location.longitude.toString(),
       latitude: location.latitude.toString(),
+      driverId: store.user.userInfo.user_id,
     })
   },
   {

src/pages/order/orderDetail.vue

@@ -172,8 +172,8 @@ const data = ay.initData({
         },
         {
           show(data) {
-            //  已支付||已退款 才显示
-            return [2, 5, 6].includes(data.settleStatus)
+            //  待支付||已支付||已退款||退款完成 才显示
+            return [1, 2, 5, 6].includes(data.settleStatus)
           },
           title: '支付方式',
           key: 'payType',
@@ -264,6 +264,10 @@ const data = ay.initData({
         {
           title: '物流公司',
           key: 'carrierOrgName',
+          // // 有值才展示
+          // show(data) {
+          //   return data.carrierOrgName
+          // },
         },
         // {
         //   roles: ['cashier', 'filler'],

src/types/schemas/allinpay.d.ts

@@ -53,6 +53,22 @@ interface BindPhoneParam {
   /** 验证码 */
   verificationCode?: string
 }
+interface ChangePhoneParam {
+  /** undefined */
+  bizUserId?: string
+  /** undefined */
+  cardNo?: string
+  /** undefined */
+  identityNo?: string
+  /** undefined */
+  name?: string
+  /** undefined */
+  newPhone?: string
+  /** undefined */
+  tranceNum?: string
+  /** undefined */
+  verificationCode?: string
+}
 interface DateParam {
   /** undefined */
   createDateFrom?: string

src/types/schemas/strategy.d.ts

@@ -2399,6 +2399,26 @@ interface ManPriceSnpAdjust对象 {
   /** 类型（1-定时生效 2-立即生效） */
   type?: number
 }
+interface ManPriceStandardAdjust对象 {
+  /** 调价类型（0-调价格 1-调加减） */
+  adjustType?: number
+  /** 预约定价凭证 */
+  certiUrlPlan?: string
+  /** 加气站id，多个逗号分隔 */
+  gasstationIds?: string
+  /** 加气站名称 */
+  gasstationName?: string
+  /** 预约挂牌价 */
+  listPricePlan?: number
+  /** 加气站简称 */
+  nickName?: string
+  /** 预约执行时间 */
+  planDate?: string
+  /** 预约平台价（元/公斤） */
+  platformPricePlan?: number
+  /** 类型（1-定时生效 2-立即生效） */
+  type?: number
+}
 interface ManPriceStandardVO对象 {
   /** 审批状态：0待审核，1已通过 */
   auditStatus?: number
@@ -4360,8 +4380,6 @@ interface manPriceStandard对象 {
   effectDate?: string
   /** 加气站id */
   gasstationId?: string
-  /** 加气站id，多个逗号分隔 */
-  gasstationIds?: string
   /** 加气站名称 */
   gasstationName?: string
   /** 挂牌价（预设定），查询时需要查询真实的 */

src/utils/config/interFaces/allinpay.ts

@@ -36,11 +36,23 @@ export default {
     resType: {} as any,
   },
   /** 充值订单退款运维接口 */
+  change_bindphone: {
+    realUrl: '/allinpay/handle/change_bindphone',
+    reqType: {} as ChangePhoneParam,
+    resType: {} as any,
+  },
+  /** 充值订单退款运维接口 */
   charge_refund: {
     realUrl: '/allinpay/handle/charge_refund',
     reqType: {} as 通用id参数,
     resType: {} as any,
   },
+  /** 充值订单退款运维接口 */
+  confirm_change_bindphone: {
+    realUrl: '/allinpay/handle/confirm_change_bindphone',
+    reqType: {} as ChangePhoneParam,
+    resType: {} as any,
+  },
   /** 长城奥扬经销退款加气站失败，继续退款逻辑 */
   continue_refund: {
     realUrl: '/allinpay/handle/continue_refund',
@@ -191,6 +203,18 @@ export default {
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
+  /** 微信支付回调成功，account处理失败，完成支付逻辑 */
+  wxpay_carrier_account_handle: {
+    realUrl: '/allinpay/handle/wxpay_carrier_account_handle',
+    reqType: {} as GasOrder对象,
+    resType: {} as any,
+  },
+  /** 微信个人支付回调成功，account处理失败，完成支付逻辑 */
+  wxpay_person_account_handle: {
+    realUrl: '/allinpay/handle/wxpay_person_account_handle',
+    reqType: {} as GasOrder对象,
+    resType: {} as any,
+  },
   /** 微信支付回调-手工 */
   wxpay_trans: {
     realUrl: '/allinpay/handle/wxpay_trans',
@@ -341,11 +365,11 @@ export default {
 
     resType: {} as ResponseEntity,
   },
-  /**  B2B充值回调 */
+  /** 微信充值通联单边账处理 */
   recharge: {
     realUrl: '/allinpay/pay/callback/recharge',
 
-
+    resType: {} as boolean,
   },
   /** 分账退款申请回调 */
   splitRefund_1: {

src/utils/config/interFaces/index.ts

@@ -1,6 +1,6 @@
-import account from './account'
-import message from './message'
 import gasdata from './gasdata'
+import message from './message'
+import account from './account'
 import settle from './settle'
 import pay from './pay'
 import allinpay from './allinpay'
@@ -8,12 +8,12 @@ import user from './user'
 import strategy from './strategy'
 
 export default {
-  /** 账户中心 */
-  account,
-  /** 消息中心 */
-  message,
   /** 加气站数据采集 */
   gasdata,
+  /** 消息中心 */
+  message,
+  /** 账户中心 */
+  account,
   /** 结算中心 */
   settle,
   /** 支付中心 */

src/utils/config/interFaces/strategy.ts

@@ -1526,7 +1526,7 @@ export default {
   /** 调价长城奥扬标准价 */
   adjust_4: {
     realUrl: '/strategy/man/standard/adjust',
-    reqType: {} as manPriceStandard对象,
+    reqType: {} as ManPriceStandardAdjust对象,
     resType: {} as any,
   },
   /** 所有站测算计算 */

src/utils/config/interFaces/user.ts

@@ -1585,6 +1585,15 @@ export default {
     reqType: {} as IPageParams<User对象>,
     resType: {} as IPage<User对象>,
   },
+  /** 查询站人员列表 */
+  list_by_gasstaion: {
+    realUrl: '/user/user/list_by_gasstaion',
+    reqType: {} as {
+      /** gasstationId */
+      gasstationId: number
+    },
+    resType: {} as Array<User对象>,
+  },
   /** 根据用户id返回用户列表，供卡车绑定的司机列表使用 */
   list_by_user_ids: {
     realUrl: '/user/user/list_by_user_ids',

vitePlugin.ts

@@ -275,13 +275,19 @@ function UnoCssMPPlugin(): Plugin {
           if (chunk.type === 'asset') {
             const tempFilePath = `${options.dir}/${filename}`
             const code = chunk.source as string
-            const allCss = code.split('/* stylelint-disable comment-empty-line-before */')
-            if (allCss.length === 2) {
-              let unoCss = allCss[0]
+            // const allCss = code.split('/* stylelint-disable comment-empty-line-before */')
+            const startIndex = code.indexOf('.h-100_a_')
+            const endIndex = code.indexOf('.chunk')
+
+            if (startIndex > -1 && endIndex > -1 && startIndex < endIndex) {
+              const unoCssBef = code.substring(0, endIndex)
+              let unoCss = code.substring(startIndex, endIndex)
+              const unoCssAft = code.substring(endIndex)
               unoCss = unoCss
                 .replaceAll('}', '}\n')
                 .replace(/(\.(?:(?!container).+))\{/g, '.container$1,.container $1{')
-              files.write(tempFilePath, unoCss + allCss[1])
+              // files.write(tempFilePath, unoCss + allCss[1])
+              files.write(tempFilePath, unoCssBef + unoCss + unoCssAft)
             }
 
             // bundle[filename] = {