Merge remote-tracking branch 'origin/master' into 后台播报_cl

README.md

@@ -6,7 +6,13 @@
 
 - node>=18
 - pnpm>=7.30
-- 稳定版本：node = 20.7.0 pnpm = 9.4.0
+- 稳定版本：
+  node = 20.7.0
+  pnpm = 9.4.0
+  ```
+  nvu install 20.7.0
+  npm install -g pnpm@9.4.0
+  ```
 
 ## 📂 快速开始
 
@@ -59,16 +65,19 @@
 - 15.公共请求框架支持文件上传，swagger导入接口信息识别是否是上传接口，调用接口时自动唤起选择文件窗口
 - 16.公共请求方法，支持类型修饰，深度合并两个ts对象类型 √
 - 17.全局防抖函数，支持常规等待和立即执行，目标方法哈希计算，追加防抖函数细粒度标签；已应用于页面生命周期管理中心，避免init方法重复执行；页面公共跳转方法，避免页面重复跳转。√
-- 18.开发环境，通过generateBundle钩子函数实现增量修改微信小程序的js文件，以便提高小程序ide工具的编译速度。
-- 19.全局sass变量自动引入，全局sass变量、样式表定义。
-- 20.公共请求框架，根据swagger导入接口信息支持增量导入。
-- 21.页面方法公共初始化，对页面方法进行集中拦截、公共管控，已支持自动为对象内所有方法增加防重提功能（同步方法、异步方法执行中再次触发不执行）。
+- 18.开发环境，通过generateBundle钩子函数实现增量修改微信小程序的js文件，以便提高小程序ide工具的编译速度。√
+- 19.全局sass变量自动引入，全局sass变量、样式表定义。√
+- 20.公共请求框架，根据swagger导入接口信息支持增量导入。√
+- 21.页面方法公共初始化，对页面方法进行集中拦截、公共管控，已支持自动为对象内所有方法增加防重提功能（同步方法、异步方法执行中再次触发不执行）。√
 - 22.微信小程序环境支持websocket-stomp协议，收银员扫描驾驶员二维码创建订单后，驾驶员端自动跳转待支付页面。√
 - 23.构建项目时自动化上传体验版至小程序后台。√
 - 24.构建项目时可区分开发、测试、生成环境，编写对应的命令。√
-- 25.在页面跳转时支持页面预初始化。
+- 25.在页面跳转时支持页面预初始化。√
 - 26.容器组件根据页面公共配置，自动识别支持自定义头部，呈现头部区域标题、返回按钮。√
-- 27.编写公共组件：计数器、抽屉、详情页模板、流光加载效果、浮点单位、刷新、骨架屏、吸顶。
-- 28.编写业务组件：车牌号输入、拨打电话、加气站模块。
-- 29.本地调试时，通过编写unocss插件去掉unicss默认无用样式变量，提高浏览器环境样式调试性能。
+- 27.编写公共组件：计数器、抽屉、详情页模板、流光加载效果、浮点单位、刷新、骨架屏、吸顶。√
+- 28.编写业务组件：车牌号输入、拨打电话、加气站模块。√
+- 29.本地调试时，通过编写unocss插件去掉unicss默认无用样式变量，提高浏览器环境样式调试性能。√
 - 30.公共请求框架支持mock机制，支持划分mock场景。√
+- 31.公共请求框架兼容axios请求，为了与mock插件适配，调试方便。√
+- 32.vite.config.js中对scss注入$uni_platform全局变量，用于在scss文件中判断运行环境。√
+- 33.uno.config.js 通过编写classNamePreContainer插件， 拦截\_\_uno.css文件，将样式名称增加.container 前缀，提高样式权重。√

package.json

@@ -103,7 +103,7 @@
     "stompjs": "^2.3.3",
     "vant": "3.6.12",
     "vue": "3.4.30",
-    "vue-i18n": "^9.1.9",
+    "vue-i18n": "^9.14.1",
     "z-paging": "^2.7.10"
   },
   "devDependencies": {

scripts/getInterFace.js

@@ -217,7 +217,8 @@ const convert = {
         const resTypeSchema = convert.definitions(curPostInfo.responses[200].schema.$ref)
         resTypeStr = `    resType: {} as ${resTypeSchema},`
       }
-      urlsStr += `\n  /** ${curPostInfo.summary || curPostInfo.summary} */\n  ${urlName}: {\n    realUrl: '${k}' as const,${isUploadStr}\n${reqTypeStr}\n${resTypeStr}\n  },`
+      urlsStr += `\n  /** ${curPostInfo.summary || curPostInfo.summary} */\n  ${urlName}: {\n    realUrl: '${k}',${isUploadStr}\n${reqTypeStr}\n${resTypeStr}\n  },`
+      // urlsStr += `\n  /** ${curPostInfo.summary || curPostInfo.summary} */\n  ${urlName}: {\n    realUrl: '${k}' as const,${isUploadStr}\n${reqTypeStr}\n${resTypeStr}\n  },`
     }
     files.write(
       curps.webApiPath,

src/App.vue

@@ -21,8 +21,8 @@ onLaunch(async () => {
   await webapi.strategy
     .get_by_Name<null, SystemConfig对象>({
       // 三个开关轮换用
-      name: 'fake_switch',
-      // name: 'examine_switch',
+      // name: 'fake_switch',
+      name: 'examine_switch',
       // name: 'examine_switch1',
     })
     .then((res) => {

src/components/business/station/index.vue

@@ -1,45 +1,68 @@
+<!-- eslint-disable no-irregular-whitespace -->
 <template>
-  <div class="center justify-between chunk station" @click="methods.goDetail('1')">
-    <div>
-      <image class="mr-spac sta-img" :src="props.stationInfo.url" mode="scaleToFill" />
-    </div>
-    <div class="flex-1 mr-spac">
-      <div class="mb-spacd2 center justify-between">
-        <div class="ellipsis mr-spacd2">
-          {{ func.convert.nullView(props.stationInfo.nickName) }}
+  <div class="chunk p-spacd2">
+    <div class="center justify-between items-stretch mb-spacd2" @click="methods.goDetail('1')">
+      <div class="mr-spac">
+        <image
+          class="sta-img"
+          :class="['sta-img-type' + props.type]"
+          :src="props.stationInfo.url"
+          mode="scaleToFill"
+        />
+        <!-- <div class="h-0 auto-width">
+        <div class="p-fz">　</div>
+        <div class="s-fz">　</div>
+        <div class="s-fz" v-if="props.type === '1'">　</div>
+      </div> -->
+      </div>
+      <div class="flex-1 childs-fc-mbd2">
+        <div class="center justify-between">
+          <div class="ellipsis mr-spacd2 p-fz">
+            {{ func.convert.nullView(props.stationInfo.nickName) }}
+          </div>
+          <div class="whitespace-nowrap s-fz" v-if="props.type === '2'">
+            {{ func.convert.nullView(props.stationInfo.distance) }} km
+          </div>
         </div>
-        <div class="whitespace-nowrap s-fz">
-          {{ func.convert.nullView(props.stationInfo.distance) }} km
+        <div class="block mr-12 s-fz ellipsis gray-color">
+          {{
+            props.type === '1' ? func.convert.nullView(props.stationInfo.distance) + 'km | ' : ''
+          }}
+          {{ func.convert.nullView(props.stationInfo.address) }}
+        </div>
+        <div class="flex items-end" v-if="props.type === '1'">
+          <span class="font-bold mr-spacd2 price-color p-fz price">
+            {{ props.stationInfo.platformPrice }}
+          </span>
+          <span class="s-fz price">元/公斤</span>
         </div>
       </div>
-      <div class="mb-spacd2 s-fz ellipsis gray-color sta-addr">
-        {{ func.convert.nullView(props.stationInfo.address) }}
-      </div>
-      <div class="flex items-end">
-        <span class="font-bold mr-spacd2 price-color price">
-          {{ props.stationInfo.actualPrice }}
-        </span>
-        <span class="s-fz price">元/公斤</span>
+      <div>
+        <!-- <div class="s-fz distance">{{ props.stationInfo.distance }} km</div> -->
+        <div class="p-color s-fz detail" v-if="props.type === '2'" @click="methods.goDetail('2')">
+          详情
+          <uni-icons type="right" color="" size="12" />
+        </div>
+        <div
+          class="center s-fz location p-color"
+          :class="{ 'gray-color': !props.stationInfo.longitude }"
+          @click.stop="methods.openLocation"
+          v-if="props.type === '1'"
+        >
+          导航
+          <uni-icons type="paperplane" color="" size="12" />
+        </div>
       </div>
     </div>
-    <div>
-      <!-- <div class="s-fz distance">{{ props.stationInfo.distance }} km</div> -->
-      <div class="p-color s-fz detail" v-if="props.type === '2'" @click="methods.goDetail('2')">
-        详情
-        <uni-icons type="right" color="" size="12" />
-      </div>
-      <div
-        class="center s-fz location p-color"
-        :class="{ 'gray-color': !props.stationInfo.longitude }"
-        @click.stop="methods.openLocation"
-        v-if="props.type === '1'"
-      >
-        导航
-        <uni-icons type="paperplane" color="" size="12" />
-      </div>
+    <div class="s-fz" v-if="props.type === '2'">
+      平台价 {{ props.stationInfo.platformPrice }} 元/公斤
+    </div>
+    <div class="flex mr-12 ss-fz mt-spacd2" v-if="props.stationInfo.tags?.length">
+      <div class="flex-wrap tag" v-for="(t, i) in props.stationInfo.tags" :key="i">{{ t }}</div>
     </div>
   </div>
 </template>
+<script></script>
 <script lang="ts" setup>
 defineOptions({
   name: 'station',
@@ -52,7 +75,6 @@ type PropTypes = {
 const props = withDefaults(defineProps<PropTypes>(), {
   type: '1',
 })
-const data = {}
 const methods = {
   goDetail(type) {
     if (type === props.type) {
@@ -70,6 +92,17 @@ const methods = {
 }
 </script>
 <style lang="scss" scoped>
+.auto-width {
+  overflow: hidden;
+  writing-mode: vertical-lr;
+  div,
+  view {
+    margin-right: $p-spacd2;
+    &:last-child {
+      margin: 0;
+    }
+  }
+}
 .price {
   line-height: $p-fz;
 }
@@ -78,8 +111,17 @@ const methods = {
   padding: 0;
 }
 .sta-img {
-  width: 160rpx;
-  height: 160rpx;
+  width: 120rpx;
+  // height: 120rpx;
+  // width: 100%;
+  height: 100%;
+  border-radius: $p-spacd2;
+  &.sta-img-type1 {
+    width: 120rpx;
+  }
+  &.sta-img-type2 {
+    width: 80rpx;
+  }
 }
 
 .distance {
@@ -101,4 +143,10 @@ const methods = {
   background-color: rgba($p-color, 0.2);
   border-top-left-radius: $p-spacd2;
 }
+.tag {
+  padding: $p-spacd4;
+  margin-right: $p-spacd2;
+  border: 1rpx solid $border-color;
+  border-radius: $p-spacd4;
+}
 </style>

src/components/container/index.vue

@@ -1,21 +1,25 @@
 <template>
   <!-- 小程序环境 会把$attrs 解析到最外层标签（虚拟标签，导致无效），只能使用自定义参数 -->
-  <div class="container" :class="props.cusClass" :style="props.cusStyle">
-    <ay-sticky top="0px" v-if="data.isCustom">
-      <div class="page-top" :style="{ height: props.topHeight, ...props.pageTopStyle }">
-        <div class="center page-title" :class="{ 'justify-start': data.titleAlginStart }">
-          <uni-icons
-            class="mr-spacd4"
-            v-if="data.showBackIcon"
-            type="left"
-            color=""
-            size="24"
-            @click="ay.navigateBack()"
-          />
-          <div class="font-bold bs-fz">{{ title }}</div>
-        </div>
+  <div class="container" :class="props.cusClass" :style="cusStyle" id="container">
+    <!-- <ay-sticky top="0px" v-if="data.isCustom">
+    </ay-sticky> -->
+    <div
+      class="page-top"
+      :style="{ height: props.topHeight, ...props.pageTopStyle }"
+      v-if="data.isCustom"
+    >
+      <div class="center page-title" :class="{ 'justify-start': data.titleAlginStart }">
+        <uni-icons
+          class="mr-spacd4"
+          v-if="data.showBackIcon"
+          type="left"
+          color=""
+          size="24"
+          @click="ay.navigateBack()"
+        />
+        <div class="font-bold bs-fz">{{ title }}</div>
       </div>
-    </ay-sticky>
+    </div>
     <div class="pt-spac" v-if="props.showSpac" />
     <!-- 小程序内只能用v-if移除组件，如果用v-show条件false时，整个页面不显示。。 -->
     <ay-pull v-if="store.curPage.pageConfig?.isPager">
@@ -50,6 +54,16 @@ const data = reactive({
   isCustom: false,
 })
 const title = computed(() => props.title || data.title)
+const cusStyle = computed(() => {
+  const rv = {}
+  if (data.isCustom) {
+    rv['padding-top'] = props.topHeight
+  }
+  return {
+    ...rv,
+    ...props.cusStyle,
+  }
+})
 onMounted(() => {
   data.title = store.curPage.pageConfig.title
   data.showBackIcon = ![config.pages.index_index._url, config.pages.login_index._url].includes(
@@ -58,6 +72,8 @@ onMounted(() => {
   data.titleAlginStart = store.curPage.pageConfig._url !== config.pages.login_index._url
   data.isCustom = store.curPage.pageConfig.style?.navigationStyle === 'custom'
 })
+
+const methods = {}
 </script>
 <style lang="scss" scoped>
 .container {
@@ -69,8 +85,13 @@ onMounted(() => {
 }
 
 .page-top {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  width: 100%;
   padding: 0 $p-spac;
-  margin: 0 calc($p-spac / -1);
+  // margin: 0 calc($p-spac / -1);
   // margin-bottom: $p-spac;
   background-color: #f8f8f8;
   @apply flex;

src/components/numer/index.vue

@@ -2,16 +2,15 @@
   <div>
     <template v-if="props.isSimple">
       <div v-if="props.pre">{{ props.pre }}</div>
-      <div v-if="func.isnull(props.value)">
-        {{ props.value }}
+      <div class="font-bold mr-spacd4" :class="props.valueClass">
+        {{ func.convert.nullView(props.value) }}
       </div>
-      <div class="font-bold mr-spacd4" v-else>{{ props.value }}</div>
-      <div v-if="numer.unit">{{ numer.unit }}</div>
+      <div v-if="props.unit">{{ props.unit }}</div>
     </template>
     <template v-else>
-      <div v-if="props.pre">{{ props.pre }}</div>
+      <div class="mr-spacd4" v-if="props.pre">{{ props.pre }}</div>
       <div v-if="func.isnull(props.value)">
-        {{ props.value }}
+        {{ func.convert.nullView(props.value) }}
       </div>
       <div class="mr-spacd4" v-else>
         <div class="font-bold b-fz" v-if="numer.integer">{{ numer.integer }}</div>
@@ -24,13 +23,20 @@
 <script lang="ts" setup>
 type Numer = { integer?: string; decimal?: string; unit: string }
 const props = withDefaults(
-  defineProps<{ isSimple?: boolean; value?: number | string; pre?: string; unit?: string }>(),
+  defineProps<{
+    isSimple?: boolean
+    value?: number | string
+    pre?: string
+    unit?: string
+    valueClass: string[]
+  }>(),
   {
     value: '',
     unit: '',
   },
 )
 const numer = computed(() => {
+  if (props.isSimple) return
   const arr = props.value.toString().split('.')
   return {
     integer: arr[0],

src/components/pull/index.vue

@@ -8,6 +8,14 @@
       <slot />
     </van-list>
     <!-- #endif -->
+    <!-- <z-paging
+      ref="paging"
+      refresher-only
+      @onRefresh="methods.onRefresh"
+      :paging-style="{ top: '98px' }"
+    >
+      <slot />
+    </z-paging> -->
     <!-- <uni-load-more :status="status" :content-text="contentText" /> -->
     <div class="center s-fz">
       <uni-load-more :status="status" :content-text="contentText" />
@@ -21,10 +29,17 @@
   </div>
 </template>
 <script lang="ts" setup>
+const paging = ref()
 defineOptions({
   name: 'pull',
 })
-let methods: AyContainerPullMethods = {}
+const props = defineProps<{ pagingStyle?: object }>()
+const methods: AyContainerPullMethods = {
+  // onRefresh() {
+  //   console.log(arguments)
+  //   paging.value.complete()
+  // },
+}
 // 小程序环境内，多次创建本组件时data不会被清理，computed始终监听是第一页本组件的data，造成后续列表页面无uni-load-more状态的问题，改为将在store内computed
 const status = computed(() => store.curPage.loadMoreStatus)
 const contentText = computed(() => store.curPage.loadMoreContentText)
@@ -62,6 +77,6 @@ const contentText = computed(() => store.curPage.loadMoreContentText)
 //     contentnomore: data.finishedText,
 //   }
 // })
-methods = store.curPage.pagerMethods
+// methods = store.curPage.pagerMethods
 </script>
 <style lang="scss" scoped></style>

src/manifest.json

@@ -83,7 +83,7 @@
   },
   "quickapp": {},
   "mp-weixin": {
-    "appid": "wxf69daeba7aec5be4",
+    "appid": "wx72ba78af2cf68cf0",
     "setting": {
       "urlCheck": false,
       "minified": true

src/pages.json

@@ -115,27 +115,5 @@
       "type": "page"
     }
   ],
-  "subPackages": [
-    {
-      "root": "pagesSubExample",
-      "pages": [
-        {
-          "path": "index",
-          "type": "page"
-        },
-        {
-          "path": "list/index",
-          "type": "page"
-        },
-        {
-          "path": "login/index",
-          "type": "page"
-        },
-        {
-          "path": "webview/index",
-          "type": "page"
-        }
-      ]
-    }
-  ]
+  "subPackages": []
 }

src/pages/account/index.vue

@@ -6,7 +6,12 @@
     <div class="chunk relative s-fz">
       <div class="yebz absolute" v-if="data.accountInfo.flag === 0">[余额不足]</div>
       <div class="flex items-baseline mb-spacd2">
-        <ay-numer :value="data.accountInfo.showBalance" :unit="data.accountInfo.unit" />
+        <ay-numer
+          :value="data.accountInfo.showBalance"
+          :unit="data.accountInfo.unit"
+          v-if="data.accountInfo.showBalance"
+        />
+        <div v-else>{{ data.accountInfo.unit }}</div>
         <span v-if="data.accountInfo.showDet">
           （直销 {{ data.accountInfo.carrierDirectBalance }} | 经销
           {{ data.accountInfo.carrierBalance }}）

src/pages/cards/index.vue

@@ -1,5 +1,11 @@
 <template>
   <ay-container>
+    <div class="p-color mb-spac pb-spacd2 bottom-line">
+      <div class="inline" @click="ay.goPage(config.pages.order_index)">
+        <ay-numer :value="data.driverRebateTotal" pre="已节省" unit="元" />
+        <uni-icons type="right" color="" class="p-fz" />
+      </div>
+    </div>
     <div class="flex justify-around mb-spac">
       <div
         class="card-top-item"
@@ -59,6 +65,7 @@ const data = ay.initData({
   ],
   truckInfo: {} as 司机车辆管理信息,
   truckCard: {} as 车辆购车加气优惠卡信息VO类,
+  driverRebateTotal: 0,
 })
 const methods = {
   tabClick(t) {
@@ -71,6 +78,9 @@ const methods = {
 }
 
 ay.entrance(async (args) => {
+  webapi.settle.driver_rebate_total().then((res) => {
+    data.driverRebateTotal = res
+  })
   await webapi.strategy
     .get_truck_info()
     .then((res) => {

src/pages/index/index.vue

@@ -66,7 +66,12 @@
               [余额不足]
             </div>
           </div>
-          <ay-numer :value="data.accountInfo.showBalance" :unit="data.accountInfo.unit" />
+          <ay-numer
+            :value="data.accountInfo.showBalance"
+            :unit="data.accountInfo.unit"
+            v-if="data.accountInfo.showBalance"
+          />
+          <div v-else>{{ data.accountInfo.unit }}</div>
         </div>
       </ay-flowLine>
       <ay-flowLine class="flex-1" :loading="store.webapi.strategy.get_truck_info.ing">
@@ -245,7 +250,7 @@ const data = ay.initData({
     },
     {
       id: 3,
-      name: '优惠卡/券',
+      name: '优惠省钱',
       icon: card,
     },
   ],
@@ -269,9 +274,6 @@ const showcm = computed(() => {
 })
 const methods = ay.initMethods(
   {
-    onRefresh() {
-      console.log(arguments)
-    },
     hiddenDoorb() {
       data.hiddenDoor[data.hiddenDoor.length - 1]++
     },

src/pages/order/components/payType.vue

@@ -0,0 +1,68 @@
+<template>
+  <div class="flex chunk s-fz" v-if="props.payselData" :class="{ checked: props.checked }">
+    <span
+      class="mr-spacd2 radio"
+      :class="{ checked: props.checked }"
+      @click="methods.choose()"
+    ></span>
+    <div class="flex-1">
+      <div class="font-bold inline" @click="methods.choose()">
+        {{ props.type === 0 ? '个人支付' : '所属物流支付' }}
+      </div>
+      <div class="childs-fc-mbd2 ml-spacd2 mt-spacd2">
+        <div>
+          结算金额
+          <ay-numer class="ml-spacd4" :value="props.payselData?.amount" pre="" unit="元" />
+          （结算价
+          {{ props.payselData.actualPrice }} 元/公斤）
+        </div>
+        <rebateDetail
+          :allAmount="props.payselData.allAmount"
+          :carrierRebate="props.payselData.carrierRebate"
+          :rebateDetail="props.payselData.rebateDetail"
+        />
+        <template v-if="props.type === 1">
+          <div class="pt-spacd2 top-line">{{ props.payselData.carrierOrgName }}</div>
+          <div>[{{ props.payselData.carNumber }}]</div>
+          <div class="justify-start" v-if="props.payselData.balanceEnable">
+            <div>
+              可用余额
+              <span class="font-bold">{{ props.payselData.balanceStr }}</span>
+              元
+            </div>
+            <ay-refresh
+              :loading="store.webapi.strategy.paysel.ing"
+              @refresh="emits('reData')"
+            ></ay-refresh>
+          </div>
+        </template>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import rebateDetail from './rebateDetail.vue'
+defineOptions({
+  name: '',
+})
+const props = withDefaults(
+  defineProps<{
+    type: 0 | 1
+    payselData: 待支付订单_可选支付方式物流支付实体类
+    checked: boolean
+  }>(),
+  {
+    checked: false,
+  },
+)
+const emits = defineEmits(['reData', 'choose'])
+const data = reactive({
+  showRebateDetail: false,
+})
+const methods = {
+  choose() {
+    emits('choose', props.type)
+  },
+}
+</script>
+<style lang="scss" scoped></style>

src/pages/order/components/rebateDetail.vue

@@ -0,0 +1,52 @@
+<template>
+  <div class="inline-block" v-if="props.carrierRebate">
+    <div :class="{ 'text-right': props.type === 1 }">
+      <div class="inline" @click="data.showRebateDetail = !data.showRebateDetail">
+        优惠金额
+        <span class="price-color font-bold">{{ props.carrierRebate }}</span>
+        元
+        <uni-icons
+          :type="data.showRebateDetail ? 'up' : 'down'"
+          color=""
+          class="p-color p-fz"
+          v-if="props.rebateDetail?.length"
+        />
+      </div>
+    </div>
+    <div
+      v-if="props.rebateDetail?.length && data.showRebateDetail"
+      class="chunk m-b-0 mt-spacd2 childs-fcjb-mbd2 rebate-detail money-bg"
+    >
+      <div class="mb-spac">
+        <div>订单总金额</div>
+        <ay-numer :isSimple="true" :value="props.allAmount" pre="" unit="元" />
+      </div>
+      <div v-for="(rd, i) in props.rebateDetail" :key="i">
+        <div>{{ config.common.interestType[rd.rebateType] }}</div>
+        <ay-numer :isSimple="true" :value="rd.rebate" pre="" unit="元" valueClass="price-color" />
+        <div class="w100% ss-fz gray-color ml-spacd2">"{{ rd.rebateString }}"</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+defineOptions({
+  name: '',
+})
+const props = withDefaults(
+  defineProps<{
+    /** 0:待支付页面 1:订单详情页面 */
+    type: 0 | 1
+    carrierRebate: number
+    allAmount: number
+    rebateDetail: 待支付订单_可选支付方式优惠明细实体类[]
+  }>(),
+  {
+    type: 0,
+  },
+)
+const data = reactive({
+  showRebateDetail: false,
+})
+</script>
+<style lang="scss" scoped></style>

src/pages/order/index.vue

@@ -8,7 +8,16 @@
           :clearIcon="false"
           @change="methods.changeDate"
         />
-        <uni-badge type="primary" :text="data.checkCount" absolute="rightTop" :offset="[-3, 3]">
+        <button
+          type="primary"
+          plain="true"
+          size="mini"
+          class="ml-spac"
+          @click="methods.showFilters"
+        >
+          筛选{{ data.checkCount ? ` · ${data.checkCount}` : '' }}
+        </button>
+        <!-- <uni-badge type="primary" :text="data.checkCount" absolute="rightTop" :offset="[-3, 3]">
           <uni-icons
             class="ml-spacd2"
             type="settings"
@@ -16,9 +25,24 @@
             size="24"
             @click="methods.showFilters"
           />
-        </uni-badge>
+        </uni-badge> -->
       </div>
     </ay-sticky>
+    <div class="center justify-between s-fz tags">
+      <div
+        class="text-center chunk tag"
+        v-for="(t, i) in data.tags"
+        :key="i"
+        :class="{ odd: i % 2 === 0 }"
+      >
+        <div>{{ t.title }}</div>
+        <div>{{ t.unit }}</div>
+        <div class="font-bold p-fz">
+          {{ func.convert.nullView(t.value, 1) }}
+          <!-- <ay-numer :value="func.convert.nullView(t.value, 1)" /> -->
+        </div>
+      </div>
+    </div>
     <div id="orderList">
       <div
         class="chunk childs-fcjb-mbd2"
@@ -35,8 +59,8 @@
           <div>{{ o.gasQty }}</div>
         </div>
         <div>
-          <div>小计（元）</div>
-          <div class="font-bold bs-fz">￥{{ o.allAmount }}</div>
+          <div>结算金额（元）</div>
+          <div class="font-bold bs-fz">{{ o.amount }}</div>
         </div>
         <div>
           <div class="gray-color">{{ func.getDate(o.createDate).format() }}</div>
@@ -102,7 +126,7 @@
           </div>
         </div>
         <div class="btns">
-          <button @click="methods.clearFilters">清空</button>
+          <button @click="methods.clearFilters">清除</button>
           <button type="primary" @click="methods.saveFilters">确定</button>
         </div>
       </div>
@@ -145,6 +169,32 @@ const data = ay.initData({
   ] as any[],
   range: [],
   orderList: [] as 订单详情[],
+  tags: [
+    {
+      field: 'allValue',
+      title: '加气总额',
+      unit: '（元）',
+      value: '',
+    },
+    {
+      field: 'allQty',
+      title: '加气总量',
+      unit: '（公斤）',
+      value: '',
+    },
+    {
+      field: 'count',
+      title: '订单总数',
+      unit: '（笔）',
+      value: '',
+    },
+    {
+      field: 'allPrefer',
+      title: '优惠总额',
+      unit: '（元）',
+      value: '',
+    },
+  ],
 })
 const filtersView = computed(() => {
   const rv = [...data.filters]
@@ -278,6 +328,9 @@ const methods = {
         { showLoading: !cras.isAdd },
       )
       .then((res) => {
+        data.tags.forEach((f) => {
+          f.value = res[f.field]
+        })
         if (cras.isAdd) {
           data.orderList.push(...res.page.records)
         } else {
@@ -323,4 +376,21 @@ ay.entrance((args) => {
     color: $p-color;
   }
 }
+.tags {
+  > .tag {
+    min-width: 20%;
+    max-width: 25%;
+    padding: $p-spacd2 0;
+    background-color: #d5f8e9;
+  }
+  .odd {
+    background-color: #d5e9fa;
+  }
+  // > div:nth-child(odd) {
+  //   background-color: #d5e9fa;
+  // }
+  // > div:nth-child(even) {
+  //   background-color: #d5f8e9;
+  // }
+}
 </style>

src/pages/order/orderDetail.vue

@@ -24,25 +24,18 @@
           <div>
             <div>
               结算金额
-              <ay-numer :value="data.orderDetail.amount" pre="￥" unit="元" :isSimple="true" />
+              <ay-numer :value="data.orderDetail.amount" pre="" unit="元" :isSimple="true" />
             </div>
           </div>
         </div>
         <div v-if="data.orderDetail.carrierRebate">
           <div></div>
-          <div @click="data.switchPriceDet = !data.switchPriceDet">
-            优惠金额￥{{ data.orderDetail.carrierRebate }}元
-            <uni-icons :type="data.switchPriceDet ? 'up' : 'down'" color="" class="p-color p-fz" />
-          </div>
-        </div>
-        <div v-if="data.switchPriceDet">
-          <div></div>
-          <div class="chunk childs-fcjb-mbd2 rebate-detail money-bg">
-            <div v-for="(rd, i) in data.orderDetail.rebateDetail" :key="i">
-              <div>{{ config.common.interestType[rd.interestType] }}</div>
-              <div>￥{{ rd.rebateAmount }}元</div>
-            </div>
-          </div>
+          <rebateDetail
+            :type="1"
+            :allAmount="data.orderDetail.allAmount"
+            :carrierRebate="data.orderDetail.carrierRebate"
+            :rebateDetail="data.orderDetail.rebateDetailV2"
+          />
         </div>
       </div>
       <div>
@@ -54,7 +47,7 @@
 </template>
 
 <script lang="ts" setup>
-const staticData = {}
+import rebateDetail from './components/rebateDetail.vue'
 const data = ay.initData({
   title: '',
   rowList: [
@@ -93,7 +86,6 @@ const data = ay.initData({
         {
           title: '订单编号',
           key: 'orderId',
-          status: 'settleStatus',
         },
       ],
     },
@@ -104,13 +96,13 @@ const data = ay.initData({
           title: '平台价',
           key: 'platformPrice',
           unit: '元/公斤',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
         {
           title: '结算价',
           key: 'actualPrice',
           unit: '元/公斤',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
         {
           title: '创建时间',
@@ -136,7 +128,7 @@ const data = ay.initData({
             return data.settleStatus === 3
           },
           title: '取消时间',
-          key: 'updateDate',
+          key: 'cancelDate',
           view(data) {
             return func.getDate(data).format()
           },
@@ -166,7 +158,6 @@ const data = ay.initData({
         {
           title: '订单编号',
           key: 'orderId',
-          status: 'settleStatus',
         },
       ],
     },
@@ -177,7 +168,7 @@ const data = ay.initData({
           title: '结算金额',
           key: 'amount',
           unit: '元',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
       ],
     },
@@ -193,7 +184,7 @@ const data = ay.initData({
           title: '订单总金额',
           key: 'allAmount',
           unit: '元',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
         {
           title: '优惠金额',
@@ -206,13 +197,13 @@ const data = ay.initData({
           title: '平台价',
           key: 'platformPrice',
           unit: '元/公斤',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
         {
           title: '结算价',
           key: 'actualPrice',
           unit: '元/公斤',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
       ],
     },
@@ -301,13 +292,13 @@ const data = ay.initData({
           title: '站清分额',
           key: 'serviceFee',
           unit: '元',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
         {
           title: '站清分单价',
           key: 'gasstationFee',
           unit: '元/公斤',
-          preInfo: '￥',
+          // preInfo: '￥',
         },
       ],
     },
@@ -338,7 +329,7 @@ const data = ay.initData({
             return data.settleStatus === 3
           },
           title: '取消时间',
-          key: 'updateDate',
+          key: 'cancelDate',
           view(data) {
             return func.getDate(data).format()
           },
@@ -364,9 +355,18 @@ const curFieldGroups = computed(() =>
 const methods = {}
 ay.entrance((args) => {
   webapi.strategy
-    .get_order_detail({ orderId: store.curPage.pageConfig.params.orderId, orderType: 1 })
+    .get_order_detail({
+      orderId: store.curPage.pageConfig.params.orderId,
+      orderType: 1,
+      // orderId: '-100636820576534528',
+    })
     .then((res) => {
-      data.title = '加气订单 · ' + func.convert.getOrderStatusStr(res.settleStatus)
+      // data.title = '加气订单 · ' + func.convert.getOrderStatusStr(res.settleStatus)
+      const title = '加气订单'
+      const settleStatusStr = func.convert.getOrderStatusStr(res.settleStatus)
+      if (func.convert.unNull(settleStatusStr)) {
+        data.title = title + ' · ' + settleStatusStr
+      }
       // store.curPage.pageConfig.title = '加气订单 · ' + config.common.settleStatus[res.settleStatus]
       // uni.setNavigationBarTitle({ title: store.curPage.pageConfig.title })
 

src/pages/order/prePay.vue

@@ -1,9 +1,7 @@
 <template>
-  <ay-container>
+  <ay-container :cusStyle="{ 'padding-bottom': '200rpx' }">
     <ay-skeletons :rowList="data.rowList" :loading="data.firstUnload">
-      <div class="station">
-        <ayb-station type="2" :stationInfo="data.stationInfo" />
-      </div>
+      <ayb-station type="2" :stationInfo="computedStationInfo" />
       <div class="chunk1">
         <div>
           <span class="mr-spacd4">加气量</span>
@@ -11,71 +9,19 @@
         </div>
       </div>
       <div class="section s-fz">选择支付方式</div>
-      <div class="flex chunk s-fz" :class="{ checked: data.fpayType === 0 }">
-        <span
-          class="mr-spacd2 radio"
-          :class="{ checked: data.fpayType === 0 }"
-          @click="methods.choose(0)"
-        ></span>
-        <div>
-          <div class="font-bold inline" @click="methods.choose(0)">个人支付</div>
-          <div class="ml-spacd2 mt-spacd2">
-            结算金额
-            <ay-numer :value="personPay?.amount" pre="￥" unit="元" />
-            （结算价 ¥ {{ personPay?.actualPrice }} 元/公斤）
-          </div>
-        </div>
-      </div>
-      <div class="flex chunk s-fz" v-if="carrierPay" :class="{ checked: data.fpayType === 1 }">
-        <span
-          class="mr-spacd2 radio"
-          :class="{ checked: data.fpayType === 1 }"
-          @click="methods.choose(1)"
-        ></span>
-        <div class="flex-1">
-          <div class="font-bold inline" @click="methods.choose(1)">所属物流支付</div>
-          <div class="childs-fc-mbd2 ml-spacd2 mt-spacd2">
-            <div @click="methods.switchRebateDetail">
-              结算金额
-              <ay-numer :value="carrierPay?.amount" pre="￥" unit="元" />
-              （结算价 ¥
-              {{ carrierPay.actualPrice }} 元/公斤）
-            </div>
-            <span v-if="carrierPay.carrierRebate">
-              优惠金额{{ carrierPay.carrierRebate }}元
-              <uni-icons
-                :type="data.showRebateDetail ? 'up' : 'down'"
-                color=""
-                class="p-color p-fz"
-                v-if="carrierPay.rebateNum"
-                @click="methods.switchRebateDetail"
-              />
-            </span>
-            <span
-              v-if="carrierPay.rebateNum && data.showRebateDetail"
-              class="chunk childs-fcjb-mbd2 rebate-detail money-bg"
-            >
-              <div v-for="(rd, i) in carrierPay.rebateDetail" :key="i">
-                <div>{{ config.common.interestType[rd.interestType] }}</div>
-                <div>￥{{ rd.rebateAmount }}元</div>
-              </div>
-            </span>
-            <div class="pt-spacd2 top-line">{{ carrierPay.carrierOrgName }}</div>
-            <div>[{{ carrierPay.carNumber }}]</div>
-            <div class="justify-start" v-if="carrierPay.balanceEnable">
-              <div>
-                可用余额
-                <span class="font-bold">{{ carrierPay.balanceStr }}</span>
-                元
-              </div>
-              <ay-refresh
-                :loading="store.webapi.strategy.paysel.ing"
-                @refresh="methods.paysel"
-              ></ay-refresh>
-            </div>
-          </div>
-        </div>
-      </div>
+      <pay-type
+        :type="0"
+        :paysel-data="personPay"
+        :checked="data.fpayType === 0"
+        @choose="methods.choose"
+      />
+      <pay-type
+        :type="1"
+        :paysel-data="carrierPay"
+        :checked="data.fpayType === 1"
+        @choose="methods.choose"
+        @re-data="methods.paysel"
+      />
       <div class="chunk2">
         <div>
           <span>创建订单</span>
@@ -110,6 +56,7 @@
 </template>
 
 <script lang="ts" setup>
+import payType from './components/payType.vue'
 const data = ay.initData({
   /** 数据未加载完毕 */
   firstUnload: true,
@@ -118,8 +65,10 @@ const data = ay.initData({
   orderDetail: {} as 订单详情,
   stationInfo: {} as GasstationVO对象,
   paysel: {} as 待支付订单_可选支付方式获取实体类,
-  /** 展示优惠详情 */
-  showRebateDetail: false,
+  /** 展示个人优惠详情 */
+  showPerRebateDetail: false,
+  /** 展示物流优惠详情 */
+  showCarRebateDetail: false,
   /** 原生支付状态 */
   nativePayState: enums.ReqState.unasked,
 
@@ -205,10 +154,34 @@ const curPay = computed<待支付订单_可选支付方式物流支付实体类>
   }
   return rv
 })
+const computedStationInfo = computed(() => {
+  const stationVo = {
+    platformPrice: 0,
+    tags: [],
+  }
+  // 这个对象肯定有值，站价格相关信息显示创建订单时的快照信息
+  if (data.paysel.stationVo) {
+    stationVo.platformPrice = data.paysel.stationVo.platformPrice
+    if (data.paysel.stationVo.reduceRebateStr) {
+      stationVo.tags.push(data.paysel.stationVo.reduceRebateStr)
+    }
+    if (data.paysel.stationVo.specialRebateStr) {
+      stationVo.tags.push(data.paysel.stationVo.specialRebateStr)
+    }
+  }
+  return {
+    ...data.stationInfo,
+    ...stationVo,
+  }
+})
 
 const methods = {
-  switchRebateDetail() {
-    data.showRebateDetail = !data.showRebateDetail
+  switchRebateDetail(type = 0) {
+    if (type === 1) {
+      data.showCarRebateDetail = !data.showCarRebateDetail
+    } else {
+      data.showPerRebateDetail = !data.showPerRebateDetail
+    }
   },
   choose(fpayType) {
     data.fpayType = fpayType
@@ -315,7 +288,7 @@ onUnload(() => {
 
 <style lang="scss" scoped>
 .rebate-detail {
-  width: 50%;
+  // width: 50%;
   padding: $p-spacd2;
 }
 .carrier-rebate {

src/pages/station/detail.vue

@@ -42,11 +42,14 @@
           <div class="lng bs-fz">LNG</div>
           <div>
             <span class="font-bold mr-spacd2 price-color bs-fz">
-              {{ data.detail.actualPrice }}
+              {{ data.detail.platformPrice }}
             </span>
             <span class="s-fz price">元/公斤</span>
           </div>
         </div>
+        <div class="flex ss-fz mr-12 justify-start">
+          <div class="flex-wrap tag" v-for="(t, i) in data.detail.tags" :key="i">{{ t }}</div>
+        </div>
       </div>
       <div class="chunk">
         <div class="font-bold bs-fz mb-spacd2">简介</div>
@@ -130,4 +133,10 @@ ay.entrance(async (args) => {
   background-color: #00c48c;
   border-radius: $p-spacd4;
 }
+.tag {
+  padding: $p-spacd4;
+  margin-right: $p-spacd2;
+  border: 1rpx solid $border-color;
+  border-radius: $p-spacd4;
+}
 </style>

src/style/_variables.scss

@@ -1,3 +1,5 @@
+$container: '.container ';
+
 // 主题色
 // $p-color: #f40018;
 $p-color: #0084f4;
@@ -32,15 +34,15 @@ $green-color: #00ad65;
 $yellow-color: #b8741a;
 $bg-color: #fff;
 
-// 修改uni-ui 样式
-$uni-primary: $p-color;
-$uni-spacing-sm: 10rpx;
-$uni-spacing-base: 10rpx;
-
 %box-shadow {
     box-shadow: 0 0 1rpx 0 hsla(210, 34%, 80%, 0.4);
 }
 
+/* 颜色变量 */
+$uni-primary: $p-color;
+$uni-spacing-sm: 10rpx;
+$uni-spacing-base: 10rpx;
+
 /* 携带参数 */
 @mixin spacing($multiple) {
     width: $width;

src/style/index.scss

@@ -2,14 +2,7 @@
 /* stylelint-disable scss/at-extend-no-missing-placeholder */
 /* stylelint-disable prettier/prettier */
 /* stylelint-disable scss/no-global-function-names */
-.test {
-  // 可以通过 @apply 多个样式封装整体样式
-  @apply mt-4 ml-4;
-
-  padding-top: 4px;
-  color: red;
-}
-
+$H5Container: if($uni_platform =='h5', $container, '');
 
 .s-fz,
 .ss-fz {
@@ -69,6 +62,10 @@
   border: 1rpx solid $border-color;
   border-radius: $p-spacd2;
 
+  // &:last-child {
+  //   margin-bottom: 0;
+  // }
+
   &.checked {
     border-color: $p-color;
   }
@@ -119,7 +116,7 @@
 
   >span,
   >label {
-    display: block;
+    display: inline-block;
   }
 }
 
@@ -134,6 +131,7 @@
   >div,
   >view {
     @apply center justify-between;
+    flex-wrap: wrap;
   }
 }
 
@@ -189,22 +187,22 @@ $spac-map: (
   $suffixm: if($j ==1, '', 'm' + $j);
 
   // margin $p-spac除数
-  .m-spac#{$suffix} {
+  #{$container}.m-spac#{$suffix} {
     margin:calc($p-spac / #{$j});
   }
 
   // margin $p-spac除数 负值
-  .nm-spac#{$suffix} {
+  #{$container}.nm-spac#{$suffix} {
     margin:calc($p-spac / -#{$j});
   }
 
   // padding $p-spac除数
-  .p-spac#{$suffix} {
+  #{$container}.p-spac#{$suffix} {
     padding:calc($p-spac / #{$j});
   }
 
   // padding $p-spac倍数
-  .p-spac#{$suffixm} {
+  #{$container}.p-spac#{$suffixm} {
     padding:calc($p-spac * #{$j});
   }
 
@@ -213,27 +211,29 @@ $spac-map: (
     $t: map-get($spac-map, $i);
 
     // 4方向 $p-spac除数
-    .#{map-get($t,0)}-spac#{ $suffix} {
+    #{$container}.#{map-get($t,0)}-spac#{ $suffix} {
       #{map-get($t,1)}: calc($p-spac / #{$j});
     }
 
     // margin 4方向 $p-spac倍数
-    .m#{map-get($t,0)}-spac#{ $suffixm} {
+    #{$container}.m#{map-get($t,0)}-spac#{ $suffixm} {
       margin-#{map-get($t,1)}: calc($p-spac * #{$j});
     }
 
     // margin 4方向 $p-spac除数 
-    .m#{map-get($t,0)}-spac#{ $suffix} {
-      margin-#{map-get($t,1)}: calc($p-spac / #{$j});
+    @if($j>1) {
+      #{$container}.m#{map-get($t,0)}-spac#{ $suffix} {
+        margin-#{map-get($t,1)}: calc($p-spac / #{$j});
+      }
     }
 
     // margin 4方向 $p-spac除数 负值
-    .nm#{map-get($t,0)}-spac#{ $suffix} {
+    #{$container}.nm#{map-get($t,0)}-spac#{ $suffix} {
       margin-#{map-get($t,1)}: calc($p-spac / -#{$j});
     }
 
     // padding 4方向 $p-spac除数
-    .p#{map-get($t,0)}-spac#{ $suffix} {
+    #{$container}.p#{map-get($t,0)}-spac#{ $suffix} {
       padding-#{map-get($t,1)}: calc($p-spac / #{$j});
     }
   }
@@ -283,14 +283,30 @@ $spac-map: (
 
 
 // 主按钮
-button[type=primary],
-button[type=primary]:active,
-button[type=primary]:hover,
-button[type=primary]:focus {
+#{$H5Container}button[type=primary],
+#{$H5Container}button[type=primary]:active,
+#{$H5Container}button[type=primary]:hover,
+#{$H5Container}button[type=primary]:focus {
   // margin: 0;
-  background-color: $p-color !important;
+  background-color: $p-color ;
+}
+
+#{$H5Container}button[type=primary][plain],
+#{$H5Container}button[type=primary][plain]:active,
+#{$H5Container}button[type=primary][plain]:hover,
+#{$H5Container}button[type=primary][plain]:focus {
+  color: $p-color;
+  background-color: transparent;
+  border: 1rpx solid $p-color;
+}
+
+
+
+#{$H5Container}button[size='mini'] {
+  padding: 0 $p-spacd2;
 }
 
+
 button[disabled][type=primary] {
   background-color: rgba($p-color, .6);
 }
@@ -423,7 +439,7 @@ image {
 
 .radio {
   display: inline-block;
-  width: $p-fz;
+  min-width: $p-fz;
   height: $p-fz;
   border: solid $p-color 2rpx;
   border-radius: $p-fz;
@@ -438,6 +454,22 @@ image {
   }
 }
 
+// #{$container}.justify-between {
+//   @apply justify-between;
+// }
+
+// #{$container}.justify-start {
+//   @apply justify-start;
+// }
+
+// #{$container}.inline-block {
+//   @apply inline-block;
+// }
+
+// #{$container}.m-b-0 {
+//   @apply m-b-0;
+// }
+
 // #region 穿透到组件内样式，以pass-com 开头
 .pass-com-rotater {
   display: inline-block;

src/types/api.d.ts

@@ -129,7 +129,7 @@ type IRequestOption = {
 }
 
 /** UniApp请求入参合集 */
-interface UUR extends UniApp.UploadFileOption, UniApp.RequestOptions {
+interface UUR extends UniApp.RequestOptions, UniApp.UploadFileOption {
   url?: string
 }
 

src/types/schemas/allinpay.d.ts

@@ -190,12 +190,14 @@ interface GasOrder对象 {
   gasQty?: number
   /** 加气站采购金额=长城奥扬销售金额 */
   gasamount?: number
-  /** 加气站服务费(加气站利润价)=strategy.gasstation.profit */
+  /** 加气站服务费结算清分单价(元/公斤)=service_fee/gas_qty */
   gasstationFee?: number
   /** 加气站id */
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站标准服务费金额（元） */
+  gasstationSettleValue?: number
   /** 长城奥扬付大象平台服务费=大象加气平台服务费 */
   gwayamount?: number
   /** 长城奥扬付大象平台服务价=大象加气平台服务价 */
@@ -216,9 +218,21 @@ interface GasOrder对象 {
   payType?: number
   /** 平台挂牌价 */
   platformPrice?: number
+  /** 优惠叠加 */
+  rebateconfig?: string
+  /** 满减阈值（公斤） */
+  reduceFullQty?: number
+  /** 站满减（元/公斤），3位小数 */
+  reduceGasstationRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  reduceGwayRebate?: number
+  /** 满减优惠参与标识：0-未参加 1-参加 */
+  reduceRebateEnable?: number
+  /** 满减关联id（man_price_reduce_rebate_log.id） */
+  reduceRebateId?: number
   /** 退款日期时间 */
   refundDate?: string
-  /** 加气站服务费金额（元）=gas_qty * gasstation_fee */
+  /** 加气站服务费结算清分金额（元）=gasstation_settle_value-special_gasstation_rebate*gas_qty-reduce_gway_rebate*gas_qty */
   serviceFee?: number
   /** 订单结算状态（1.待支付 2.已支付 3.取消 4.支付中 5.退款中 6.退款完成） */
   settleStatus?: number
@@ -226,6 +240,12 @@ interface GasOrder对象 {
   snpCostPrice?: number
   /** 中石化零售价 */
   snpPrice?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  specialGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  specialGwayRebate?: number
+  /** 物流特价关联id（man_price_carrier_rebate_log.id） */
+  specialRebateId?: number
   /** 站服务费清分方式（1线上实时，2 线下月度） */
   splitType?: number
   /** 长城标准价 */

src/types/schemas/message.d.ts

@@ -447,6 +447,8 @@ interface ocr识别参数 {
   fileUrl?: string
 }
 interface 发送短信_图形验证码辅助验证 {
+  /** 用户注册的角色 */
+  baseRole?: string
   /** 验证码位数,默认6位（例：四位验证码则传参4） */
   digit?: number
   /** 图形验证码文本值 */

src/types/schemas/pay.d.ts

@@ -92,6 +92,8 @@ interface GasOrderRebate对象 {
   benefitedType?: number
   /** 操作时间 */
   createDate?: string
+  /** 满减值（公斤） */
+  fullQty?: number
   /** id主键 */
   id?: number
   /** 让利方id */
@@ -106,13 +108,13 @@ interface GasOrderRebate对象 {
   multiple?: string
   /** 订单编号（调用API生成） */
   orderId?: string
-  /** 物流公司专项优惠，按公斤配置（元/公斤） */
+  /** 物流公司专项优惠，按公斤配置（元/公斤），3位小数 */
   rebate?: number
   /** 优惠额 */
   rebateAmount?: number
   /** 车辆经营类型：0=自营车辆 1=其他[挂靠车辆] 2=全部 */
   truckType?: number
-  /** 优惠类型：1 物流专享优惠 */
+  /** 优惠类型：1-物流专享优惠 2-满减优惠 */
   type?: number
 }
 interface GasOrderRes {
@@ -180,12 +182,14 @@ interface GasOrder对象 {
   gasQty?: number
   /** 长城奥扬销售金额=订单总额-加气站服务费 */
   gasamount?: number
-  /** 加气站服务费(加气站利润价)=strategy.gasstation.profit */
+  /** 加气站服务费结算清分单价(元/公斤)=gasstation_settle_value/gas_qty */
   gasstationFee?: number
   /** 加气站id */
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站标准服务费金额（元） */
+  gasstationSettleValue?: number
   /** 大象加气平台服务费总额 */
   gwayamount?: number
   /** 大象加气平台服务费单价 */
@@ -216,9 +220,21 @@ interface GasOrder对象 {
   rebateNum?: number
   /** 优惠共多少项（站、司机、收银员、物流显示的，处理了加价的） */
   rebateNumHand?: number
+  /** 优惠叠加 */
+  rebateconfig?: string
+  /** 满减阈值（公斤） */
+  reduceFullQty?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  reduceGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  reduceGwayRebate?: number
+  /** 满减优惠参与标识：0-未参加 1-参加 */
+  reduceRebateEnable?: number
+  /** 物流特价关联id（man_price_reduce_rebate_log.id） */
+  reduceRebateId?: number
   /** 退款日期时间 */
   refundDate?: string
-  /** 服务费(加气站利润)=gas_qty * gasstation_fee */
+  /** 加气站服务费结算清分金额（元）=service_fee-special_gasstation_rebate*gas_qty-reduce_gway_rebate*gas_qty */
   serviceFee?: number
   /** 订单结算状态（1.待支付 2.已支付 3.取消 4.支付中 5.退款中 6.退款完成 7.支付异常） */
   settleStatus?: number
@@ -228,6 +244,12 @@ interface GasOrder对象 {
   snpCostPrice?: number
   /** 中石化零售价 */
   snpPrice?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  specialGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  specialGwayRebate?: number
+  /** 物流特价关联id（man_price_carrier_rebate_log.id） */
+  specialRebateId?: number
   /** 站服务费清分方式（1线上实时，2 线下月度） */
   splitType?: number
   /** 长城标准价 */

src/types/schemas/settle.d.ts

@@ -47,6 +47,18 @@ interface CarrierGasstation对象 {
   /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
   tradeType?: number
 }
+interface CarrierListTotal {
+  /** 立减金额 */
+  comAmountTotal?: string
+  /** 优惠总金额 */
+  discountTotal?: number
+  /** 加气总金额 */
+  gasAmountTotal?: number
+  /** 加气量总额 */
+  gasQtyTotal?: number
+  /** 充值总金额 */
+  rechargeTotal?: number
+}
 interface CarrierOrderParam {
   /** undefined */
   carrierOrder?: RechargeOrder对象
@@ -54,10 +66,14 @@ interface CarrierOrderParam {
   dateParam?: DateParam
 }
 interface CarrierParam {
-  /** undefined */
+  /** 查询参数 */
   carrier?: Carrier对象
-  /** undefined */
+  /** 时间筛选条件 */
   dataParam?: DateParam
+  /** 排序字段：对应字段值如：specialGwayRebate 长城奥扬特价优惠额、reduceGwayRebate 长城奥扬满减优惠额 */
+  orderBy?: string
+  /** 排序方式：0-升序(默认) 1-降序 */
+  sort?: number
 }
 interface CarrierTruckParam {
   /** undefined */
@@ -120,6 +136,14 @@ interface Carrier对象 {
   periodYear?: number
   /** 充值金额汇总 */
   rechargeTotal?: string
+  /** 站满减优惠额（元） */
+  reduceGasstationRebate?: number
+  /** 长城奥扬满减优惠额（元） */
+  reduceGwayRebate?: number
+  /** 站特价优惠额（元） */
+  specialGasstationRebate?: number
+  /** 长城奥扬特价优惠额（元） */
+  specialGwayRebate?: number
   /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
   tradeType?: number
 }
@@ -464,8 +488,6 @@ interface GasOrder对象 {
   actualPrice?: number
   /** 实际加气金额(物流公司实付金额=加气站销售金额)=gas_qty * actual_price */
   amount?: string
-  /** 区域优惠（单价公斤/元） */
-  benefit?: number
   /** 取消日期时间 */
   cancelDate?: string
   /** 取消人id */
@@ -484,8 +506,6 @@ interface GasOrder对象 {
   cashierId?: string
   /** 收银员名称（user.user.user_name） */
   cashierName?: string
-  /** 组合支付-立减金额 */
-  comAmount?: number
   /** 创建日期时间 */
   createDate?: string
   /** 创建订单角色  4 收银员 6 司机 */
@@ -504,8 +524,6 @@ interface GasOrder对象 {
   driverId?: string
   /** 司机名称（user.user.user_name） */
   driverName?: string
-  /** 运费（单价公斤/元） */
-  freight?: number
   /** 加气量 */
   gasQty?: string
   /** 加气站采购金额=长城奥扬销售金额 */
@@ -518,12 +536,12 @@ interface GasOrder对象 {
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站标准服务费金额（元） */
+  gasstationSettleValue?: number
   /** 长城奥扬付大象平台服务费=大象加气平台服务费 */
   gwayamount?: number
   /** 长城奥扬付大象平台服务价=大象加气平台服务价 */
   gwayprice?: number
-  /** 出港价（公斤/元） */
-  harbourPrice?: number
   /** 开票状态(0未开票;1开票申请中;2已开票，默认未开票0) */
   kaipiaoStatus?: number
   /** 关键字 */
@@ -538,24 +556,42 @@ interface GasOrder对象 {
   orderStatus?: number
   /** 支付渠道 */
   payChannelId?: string
-  /** 支付方式（0:余额 1:微信 2:微信+余额 11:组合支付 ） */
+  /** 支付方式（0:所属物流/大象余额 1:所属物流/微信 2:所属物流/大象余额+微信 3:个人支付/微信 11:组合支付 ） */
   payType?: number
-  /** 平台服务费(加气站利润价限额)=strategy.gasstation.profit_quota */
-  platformFee?: number
   /** 平台挂牌价 */
   platformPrice?: number
   /** 定价模式(0-默认策略 1-长城奥扬调价 2-LNG新营销) */
   priceType?: number
-  /** 专项优惠=carrier.gas_total>15000 ? 0.35 : 0.3 */
-  rebate?: number
+  /** 满减阈值（公斤） */
+  reduceFullQty?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  reduceGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  reduceGwayRebate?: number
+  /** 物流特价关联id（man_price_reduce_rebate_log.id） */
+  reduceRebateId?: number
   /** 退款日期时间 */
   refundDate?: string
   /** 服务费(加气站利润)=gas_qty * gasstation_fee */
   serviceFee?: number
   /** 结算状态（1.待支付 2.已支付 3.取消 4.支付中 5.退款中 6.退款完成） */
   settleStatus?: number
+  /** 中石化零售价 */
+  snpCostPrice?: number
+  /** 中石化零售价 */
+  snpPrice?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  specialGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  specialGwayRebate?: number
+  /** 物流特价关联id（man_price_carrier_rebate_log.id） */
+  specialRebateId?: number
   /** 站服务费清分方式（1线上实时，2 线下月度） */
   splitType?: number
+  /** 长城标准价 */
+  standardPrice?: number
+  /** 交易结构(1 散户;2 自营车直销，3 自营车经销，4 挂靠车经销，默认1散户) */
+  tradeStruct?: number
   /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
   tradeType?: number
   /** 卡车id */
@@ -563,6 +599,18 @@ interface GasOrder对象 {
   /** 支付日期时间 */
   updateDate?: string
 }
+interface GasStationListTotal {
+  /** 加气量总额 */
+  gasQtyTotal?: number
+  /** 平台结算总金额 */
+  profitTotal?: number
+  /** 站优惠总额 */
+  rebateTotal?: number
+  /** 站结算清分总额 */
+  serviceFeeTotal?: number
+  /** 站标准清分总额 */
+  settleValueTotal?: number
+}
 interface GasstationCarrierParam {
   /** undefined */
   dataParam?: DateParam
@@ -626,6 +674,10 @@ interface GasstationGway对象 {
   periodYear?: number
   /** 本期加气站利润总金额（账期利润总额,账期内加气站服务费） */
   profitTotal?: string
+  /** 站优惠总额 */
+  rebateTotal?: string
+  /** 站标准清分总额 */
+  settleValueTotal?: string
   /** 账期内入库总量 */
   storeTotal?: string
   /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
@@ -643,6 +695,60 @@ interface GasstationMonitorParam {
   /** 查询时刻 yyyy-MM-dd HH:mm:ss 或者查询日期yyyy-MM-dd */
   queryDateTime?: string
 }
+interface GasstationRebateOrder {
+  /** 实际加气金额(物流公司实付金额=加气站销售金额)=gas_qty * actual_price */
+  amount?: string
+  /** 车牌号 */
+  carNumber?: string
+  /** 物流公司名称(user.org.org_name) */
+  carrierOrgName?: string
+  /** 物流公司专享优惠总金额（元） */
+  carrierRebate?: number
+  /** 加气量 */
+  gasQty?: string
+  /** 加气站采购金额=长城奥扬销售金额 */
+  gasamount?: number
+  /** 加气站服务费(加气站利润价)=strategy.gasstation.profit */
+  gasstationFee?: number
+  /** 加气站名称 */
+  gasstationName?: string
+  /** 站优惠金额（元） */
+  gasstationRebate?: number
+  /** 加气站标准服务费金额（元） */
+  gasstationSettleValue?: number
+  /** 加气站简称 */
+  nickName?: string
+  /** 订单编号（调用API生成） */
+  orderId?: string
+  /** 支付方式（0:所属物流/大象余额 1:所属物流/微信 2:所属物流/大象余额+微信 3:个人支付/微信 11:组合支付 ） */
+  payType?: number
+  /** 满减阈值（公斤） */
+  reduceFullQty?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  reduceGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  reduceGwayRebate?: number
+  /** 物流特价关联id（man_price_reduce_rebate_log.id） */
+  reduceRebateId?: number
+  /** 服务费(加气站利润)=gas_qty * gasstation_fee */
+  serviceFee?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  specialGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  specialGwayRebate?: number
+  /** 物流特价关联id（man_price_carrier_rebate_log.id） */
+  specialRebateId?: number
+  /** 站服务费清分方式（1线上实时，2 线下月度） */
+  splitType?: number
+  /** 应收加气站金额（元） */
+  toReceiveFee?: number
+  /** 交易结构(1 散户;2 自营车直销，3 自营车经销，4 挂靠车经销，默认1散户) */
+  tradeStruct?: number
+  /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
+  tradeType?: number
+  /** 支付日期时间 */
+  updateDate?: string
+}
 interface GasstationWeekAverageQty对象 {
   /** 年月日，格式如yyyy-mm-dd */
   curDate?: string
@@ -974,6 +1080,12 @@ interface NeweastGasOrderParam {
   /** 最近多少秒数据 */
   seconds?: number
 }
+interface OrderItem {
+  /** undefined */
+  asc?: boolean
+  /** undefined */
+  column?: string
+}
 interface RechargeOrderListParam {
   /** undefined */
   dateParam?: DateParam

src/types/schemas/strategy.d.ts

@@ -274,6 +274,10 @@ interface CarrierLog对象 {
 interface CarrierRebateAdjust对象 {
   /** 物流公司id */
   carrierOrgId?: number
+  /** 站优惠，按公斤配置（元/公斤） */
+  gasstationRebatePlan?: number
+  /** 长城优惠，按公斤配置（元/公斤） */
+  gwayRebatePlan?: number
   /** 物流公司专项优惠，按公斤配置（元/公斤） */
   rebatePlan?: number
   /** 车辆经营类型：0=自营车辆 1=其他[挂靠车辆] 2=全部 */
@@ -356,6 +360,10 @@ interface Carrier对象 {
   orgName?: string
   /** 组织简称 */
   orgShortName?: string
+  /** 优惠叠加 */
+  rebateconfig?: string
+  /** 满减优惠参与标识：0-未参加 1-参加 */
+  reduceRebateEnable?: number
   /** 状态（0：启用 1：停用） */
   status?: number
   /** 月累计加气量 */
@@ -816,12 +824,14 @@ interface GasLimitConfigLog对象 {
 interface GasOrderRebate对象 {
   /** 受益方id */
   benefited?: number
-  /** 让利方名 */
+  /** 受益方名 */
   benefitedName?: string
   /** 受益方类型:1 物流，2 车辆，3 人员 */
   benefitedType?: number
   /** 操作时间 */
   createDate?: string
+  /** 满减值（公斤） */
+  fullQty?: number
   /** id主键 */
   id?: number
   /** 让利方id */
@@ -836,13 +846,15 @@ interface GasOrderRebate对象 {
   multiple?: string
   /** 订单编号（调用API生成） */
   orderId?: string
-  /** 物流公司专项优惠，按公斤配置（元/公斤） */
+  /** 优惠单价，按公斤配置（元/公斤） */
   rebate?: number
   /** 优惠额 */
   rebateAmount?: number
+  /** 优惠展示的说明字符串 */
+  rebateStr?: string
   /** 车辆经营类型：0=自营车辆 1=其他[挂靠车辆] 2=全部 */
   truckType?: number
-  /** 优惠类型：1 物流专享优惠 */
+  /** 优惠类型：1 物流特价优惠,2 满减优惠 */
   type?: number
 }
 interface GasOrderVo {
@@ -1008,6 +1020,8 @@ interface GasOrder对象 {
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站标准服务费金额（元） */
+  gasstationSettleValue?: number
   /** 长城奥扬付大象平台服务费=大象加气平台服务费 */
   gwayamount?: number
   /** 长城奥扬付大象平台服务价=大象加气平台服务价 */
@@ -1036,6 +1050,18 @@ interface GasOrder对象 {
   rebateNum?: number
   /** 优惠共多少项（站、司机、收银员、物流显示的，处理了加价的） */
   rebateNumHand?: number
+  /** 优惠叠加 */
+  rebateconfig?: string
+  /** 满减阈值（公斤） */
+  reduceFullQty?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  reduceGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  reduceGwayRebate?: number
+  /** 满减优惠参与标识：0-未参加 1-参加 */
+  reduceRebateEnable?: number
+  /** 物流特价关联id（man_price_reduce_rebate_log.id） */
+  reduceRebateId?: number
   /** 退款日期时间 */
   refundDate?: string
   /** 加气站服务费（站清分额） */
@@ -1048,6 +1074,12 @@ interface GasOrder对象 {
   snpCostPrice?: number
   /** 中石化零售价 */
   snpPrice?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  specialGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  specialGwayRebate?: number
+  /** 物流特价关联id（man_price_carrier_rebate_log.id） */
+  specialRebateId?: number
   /** 站服务费清分方式（1线上实时，2 线下月度） */
   splitType?: number
   /** 长城标准价 */
@@ -1061,6 +1093,16 @@ interface GasOrder对象 {
   /** 支付日期时间 */
   updateDate?: string
 }
+interface GassDetailParam对象 {
+  /** 加气站id */
+  gasstationId?: number
+  /** 纬度 */
+  latitude?: string
+  /** 经度 */
+  longitude?: string
+  /** 卡车id */
+  truckId?: number
+}
 interface GasstaionLngfrom对象 {
   /** 加气站id */
   gasstationId?: string
@@ -1280,6 +1322,8 @@ interface GasstationVO对象 {
   actualPrice?: number
   /** 地址 */
   address?: string
+  /** 审核类型(0-平台审核 1-站点自主) */
+  auditType?: number
   /** 收银员数量 */
   cashierNum?: number
   /** 城市 */
@@ -1306,10 +1350,14 @@ interface GasstationVO对象 {
   listPrice?: number
   /** 经度 */
   longitude?: string
+  /** 定价模式（0一体化 1-新营销） */
+  marketType?: number
   /** 手机号 */
   mobile?: string
   /** 加气站名称 */
   nickName?: string
+  /** 营业状态（0-在营 1-停业） */
+  openStatus?: number
   /** 加气站形象图列表 */
   orgPics?: array
   /** 平台挂牌价 */
@@ -1322,10 +1370,16 @@ interface GasstationVO对象 {
   region?: string
   /** 库存量 */
   stock?: number
+  /** 优惠标签 */
+  tags?: array
+  /** 成丰对接状态：0可以查询对接，1禁止查询对接 */
+  thirdStatus?: number
   /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
   tradeType?: string
   /** 头像 */
   url?: string
+  /** 提现到账时间设置D+n */
+  withdrawDays?: number
 }
 interface GasstationVO查询对象 {
   /** 地址 */
@@ -1864,6 +1918,10 @@ interface ManPriceCarrierRebateLogVO对象 {
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebate?: number
   /** undefined */
   id?: string
   /** 加气站简称 */
@@ -1904,6 +1962,14 @@ interface ManPriceCarrierRebateVO对象 {
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebate?: number
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebatePlan?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebatePlan?: number
   /** id主键 */
   id?: number
   /** 加气站简称 */
@@ -1950,6 +2016,14 @@ interface ManPriceCarrierRebate对象 {
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebate?: number
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebatePlan?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebatePlan?: number
   /** id主键 */
   id?: number
   /** 加气站简称 */
@@ -1973,6 +2047,194 @@ interface ManPriceCarrierRebate对象 {
   /** 类型（1-定时生效 2-立即生效） */
   type?: number
 }
+interface ManPriceReduceRebateAdjust对象 {
+  /** 定价凭证 */
+  certiUrlPlan?: string
+  /** 满减值（公斤） */
+  fullQty?: number
+  /** 加气站id，多个逗号分隔 */
+  gasstationIds?: string
+  /** 站优惠，按公斤配置（元/公斤） */
+  gasstationRebatePlan?: number
+  /** 长城优惠，按公斤配置（元/公斤） */
+  gwayRebatePlan?: number
+  /** （预约时间）计划生效时间 */
+  planDate?: string
+  /** 物流公司专项优惠，按公斤配置（元/公斤） */
+  rebatePlan?: number
+  /** 类型（1-定时生效 2-立即生效） */
+  type?: number
+}
+interface ManPriceReduceRebateLogVO对象 {
+  /** 物流公司专项优惠，按公斤配置（元/公斤） */
+  allRebate?: number
+  /** 审批状态：0待审核，1已通过 */
+  auditStatus?: number
+  /** 作废时间 */
+  cancelDate?: string
+  /** 定价凭证 */
+  certiUrl?: string
+  /** 操作时间 */
+  createDate?: string
+  /** 实际执行时间 */
+  effectDate?: string
+  /** 状态(0-初始 2-生效) */
+  flag?: number
+  /** 满减值（公斤） */
+  fullQty?: number
+  /** 加气站id */
+  gasstationId?: string
+  /** 加气站名称 */
+  gasstationName?: string
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebate?: number
+  /** id主键 */
+  id?: string
+  /** 加气站简称 */
+  nickName?: string
+  /** 操作人 */
+  operator?: number
+  /** 操作人姓名 */
+  operatorName?: string
+  /** （预约时间）计划生效时间 */
+  planDate?: string
+  /** 平台价集合 */
+  platformPriceList?: DatePriceVO对象[]
+  /** 状态(0-待执行 1-限制执行 2-执行中 3-已作废) */
+  status?: number
+  /** 类型（1-定时生效 2-立即生效） */
+  type?: number
+}
+interface ManPriceReduceRebateLog对象 {
+  /** 物流公司专项优惠，按公斤配置（元/公斤） */
+  allRebate?: number
+  /** 审批状态：0待审核，1已通过 */
+  auditStatus?: number
+  /** 作废时间 */
+  cancelDate?: string
+  /** 定价凭证 */
+  certiUrl?: string
+  /** 操作时间 */
+  createDate?: string
+  /** 实际执行时间 */
+  effectDate?: string
+  /** 状态(0-初始 2-生效) */
+  flag?: number
+  /** 满减值（公斤） */
+  fullQty?: number
+  /** 加气站id */
+  gasstationId?: string
+  /** 加气站名称 */
+  gasstationName?: string
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebate?: number
+  /** id主键 */
+  id?: string
+  /** 加气站简称 */
+  nickName?: string
+  /** 操作人 */
+  operator?: number
+  /** 操作人姓名 */
+  operatorName?: string
+  /** （预约时间）计划生效时间 */
+  planDate?: string
+  /** 状态(0-待执行 1-限制执行 2-执行中 3-已作废) */
+  status?: number
+  /** 类型（1-定时生效 2-立即生效） */
+  type?: number
+}
+interface ManPriceReduceRebateVO对象 {
+  /** 整单共减（元/公斤） */
+  allRebate?: number
+  /** 整单共减（元/公斤） */
+  allRebatePlan?: number
+  /** 定价凭证 */
+  certiUrl?: string
+  /** 定价凭证 */
+  certiUrlPlan?: string
+  /** 操作时间 */
+  createDate?: string
+  /** 实际执行时间 */
+  effectDate?: string
+  /** 满减值（公斤） */
+  fullQty?: number
+  /** 满减值（公斤） */
+  fullQtyPlan?: number
+  /** 加气站id */
+  gasstationId?: string
+  /** 加气站名称 */
+  gasstationName?: string
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebate?: number
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebatePlan?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebatePlan?: number
+  /** 加气站简称 */
+  nickName?: string
+  /** 操作人 */
+  operator?: number
+  /** 操作人姓名 */
+  operatorName?: string
+  /** （预约时间）计划生效时间 */
+  planDate?: string
+  /** 平台价（元/公斤） */
+  platformPrice?: number
+  /** 待执行 平台价（元/公斤） */
+  platformPricePlan?: number
+  /** 平台价（预约时间）计划生效时间 */
+  platformPricePlanDate?: string
+  /** 状态(0-初始 1-待执行 2-已执行 3-已作废) */
+  status?: number
+  /** 价格执行状态：1-定时生效 2-立即生效（默认） */
+  type?: number
+}
+interface ManPriceReduceRebate对象 {
+  /** 物流公司专项优惠，按公斤配置（元/公斤） */
+  allRebate?: number
+  /** 物流公司专项优惠，按公斤配置（元/公斤） */
+  allRebatePlan?: number
+  /** 定价凭证 */
+  certiUrl?: string
+  /** 定价凭证 */
+  certiUrlPlan?: string
+  /** 操作时间 */
+  createDate?: string
+  /** 实际执行时间 */
+  effectDate?: string
+  /** 满减值（公斤） */
+  fullQty?: number
+  /** 满减值（公斤） */
+  fullQtyPlan?: number
+  /** 加气站id */
+  gasstationId?: string
+  /** 加气站名称 */
+  gasstationName?: string
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebate?: number
+  /** 加气站满减（元/公斤），3位小数 */
+  gasstationRebatePlan?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebate?: number
+  /** 长城满减（元/公斤），3位小数 */
+  gwayRebatePlan?: number
+  /** 加气站简称 */
+  nickName?: string
+  /** 操作人 */
+  operator?: number
+  /** 操作人姓名 */
+  operatorName?: string
+  /** （预约时间）计划生效时间 */
+  planDate?: string
+  /** 状态(0-待执行 1-限制执行 2-已执行 3-已作废) */
+  status?: number
+}
 interface ManPriceSnpAdjust对象 {
   /** 预约采购价（元/公斤） */
   buyPricePlan?: number
@@ -2995,6 +3257,14 @@ interface Purchase对象 {
   lngFromCode?: string
   /** 液源地 */
   lngFromName?: string
+  /** 订单生成时间 */
+  mockDate?: string
+  /** 测试标识：0-非模拟 1-模拟测试 导入 2-模拟测试 导出 */
+  mockFlag?: number
+  /** 订单生成散列小时时间 */
+  mockHour?: number
+  /** 模拟计划计划id集合 */
+  mockTrace?: string
   /** 变更申请标识,1修改申请，2取消申请;3异常申请 */
   modifyApplyType?: number
   /** 加气站名称 */
@@ -3122,6 +3392,42 @@ interface SnpPriceVO对象 {
   /** 中石化零售价（元/公斤） */
   snpPrice?: number
 }
+interface StationMap对象 {
+  /** 地址 */
+  address?: string
+  /** 城市 */
+  city?: string
+  /** 联系人 */
+  contacts?: string
+  /** 加气站名称 */
+  gasstationName?: string
+  /** undefined */
+  groad?: string
+  /** 主键id */
+  id?: string
+  /** 合作意向 */
+  intention?: string
+  /** 纬度 */
+  latitude?: string
+  /** 经度 */
+  longitude?: string
+  /** 业务经理姓名 */
+  managerName?: string
+  /** 手机号 */
+  mobile?: string
+  /** 省份 */
+  province?: string
+  /** 地区 */
+  region?: string
+  /** 备注 */
+  remark?: string
+  /** 所在路段及位置 */
+  road?: string
+  /** 站点类型：中石化站，社会站，中石油站，中海油站，合作经营站 */
+  stationType?: string
+  /** 车流量 */
+  truckFlow?: string
+}
 interface StatisticsGasstationParam {
   /** 日期 */
   date?: string
@@ -3765,6 +4071,18 @@ interface manPriceStandard对象 {
   /** 类型（1-定时生效 2-立即生效） */
   type?: number
 }
+interface 三方对接_关停或者重启站推送_参数实体类 {
+  /** 物流公司id（推送的三方id） */
+  orgId?: number
+  /** 推送加气站id列表 */
+  stations?: 三方对接_关停或者重启站推送_站状态[]
+}
+interface 三方对接_关停或者重启站推送_站状态 {
+  /** 加气站id */
+  gasstationId?: number
+  /** 状态（0：启用 1：停用） */
+  status?: number
+}
 interface 三方线上数据查询参数 {
   /** 查询结束时间,格式：yyyy-MM-dd HH:mm:ss */
   endTime?: string
@@ -3807,6 +4125,12 @@ interface 个人车主管理员绑定的车辆 {
   /** 个人车主管理员绑定的车辆 */
   truck?: Truck对象
 }
+interface 优惠差价详情实体类 {
+  /** 优惠差价类型:1贸易商（长城奥扬优惠差价）2 站优惠差价 */
+  interestType?: number
+  /** 优惠单价（元/公斤） */
+  rebate?: number
+}
 interface 修改_有限字段_车辆信息参数 {
   /** 0=账户消费[手动圈存] 1=自动圈存 */
   autoAccount?: number
@@ -3873,6 +4197,14 @@ interface 加气站交班信息管理表实体类 {
   /** 更新人姓名 */
   updaterName?: string
 }
+interface 加气站运营管理查询实体类 {
+  /** 查询结束日期 */
+  end?: string
+  /** 站id */
+  gasstationId?: number
+  /** 查询开始日期 */
+  start?: string
+}
 interface 加注机全量数据查询参数 {
   /** 加注机卡号 */
   cardNo?: string
@@ -4160,12 +4492,14 @@ interface 大象线上订单数据表实体类 {
   gasQty?: number
   /** 加气站采购金额=长城奥扬销售金额 */
   gasamount?: number
-  /** 加气站服务费单价(站清分单价) */
+  /** 加气站服务费结算清分单价(元/公斤)=gasstation_settle_value/gas_qty */
   gasstationFee?: number
   /** 加气站id */
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站标准服务费金额（元） */
+  gasstationSettleValue?: number
   /** 长城奥扬付大象平台服务费=大象加气平台服务费 */
   gwayamount?: number
   /** 长城奥扬付大象平台服务价=大象加气平台服务价 */
@@ -4194,9 +4528,21 @@ interface 大象线上订单数据表实体类 {
   rebateNum?: number
   /** 优惠共多少项（站、司机、收银员、物流显示的，处理了加价的） */
   rebateNumHand?: number
+  /** 优惠叠加 */
+  rebateconfig?: string
+  /** 满减阈值（公斤） */
+  reduceFullQty?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  reduceGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  reduceGwayRebate?: number
+  /** 满减优惠参与标识：0-未参加 1-参加 */
+  reduceRebateEnable?: number
+  /** 物流特价关联id（man_price_reduce_rebate_log.id） */
+  reduceRebateId?: number
   /** 退款日期时间 */
   refundDate?: string
-  /** 加气站服务费（站清分额） */
+  /** 加气站服务费结算清分金额（元）=service_fee-special_gasstation_rebate*gas_qty-reduce_gway_rebate*gas_qty */
   serviceFee?: number
   /** 订单结算状态数组，用于前端同时查询多个状态订单时使用（旗舰站） */
   settleStatusList?: array
@@ -4204,6 +4550,12 @@ interface 大象线上订单数据表实体类 {
   snpCostPrice?: number
   /** 中石化零售价 */
   snpPrice?: number
+  /** 物流特价-站（元/公斤），3位小数 */
+  specialGasstationRebate?: number
+  /** 物流特价-长城（元/公斤），3位小数 */
+  specialGwayRebate?: number
+  /** 物流特价关联id（man_price_carrier_rebate_log.id） */
+  specialRebateId?: number
   /** 站服务费清分方式（1线上实时，2 线下月度） */
   splitType?: number
   /** 长城标准价 */
@@ -4220,14 +4572,30 @@ interface 大象线上订单数据表实体类 {
 interface 待支付订单_可选支付方式个人支付实体类 {
   /** 结算价 */
   actualPrice?: number
+  /** 订单总金额 */
+  allAmount?: number
   /** 结算金额 */
   amount?: number
   /** 按钮状态 */
   buttonEnable?: boolean
   /** 按钮提示文字 */
   buttonMsg?: string
+  /** 总优惠额 */
+  carrierRebate?: number
   /** 支付方式（0:所属物流/大象余额 1:所属物流/微信 2:所属物流/大象余额+微信 3:个人支付/微信 11:组合支付 ） */
   payType?: number
+  /** 优惠明细 */
+  rebateDetail?: 待支付订单_可选支付方式优惠明细实体类[]
+  /** 微信支付金额 */
+  wxAmount?: number
+}
+interface 待支付订单_可选支付方式优惠明细实体类 {
+  /** 优惠金额 */
+  rebate?: number
+  /** 优惠明细文字提示 */
+  rebateString?: string
+  /** 优惠类型：1-大象特价优惠 2-大象满减优惠 3-长城奥扬特价优惠 4-长城奥扬满减优惠 5-站特价优惠 6-站满减优惠 */
+  rebateType?: number
 }
 interface 待支付订单_可选支付方式物流支付实体类 {
   /** 结算价 */
@@ -4254,16 +4622,14 @@ interface 待支付订单_可选支付方式物流支付实体类 {
   carrierOrgId?: string
   /** 所属物流公司名称 */
   carrierOrgName?: string
-  /** 总优惠额（目前只有物流专享优惠）(优惠差额) */
+  /** 总优惠额 */
   carrierRebate?: number
   /** 所属物流车辆类型：0=自营车辆 1=挂靠车辆 */
   linked?: number
   /** 支付方式（0:所属物流/大象余额 1:所属物流/微信 2:所属物流/大象余额+微信 3:个人支付/微信 11:组合支付 ） */
   payType?: number
   /** 优惠明细 */
-  rebateDetail?: GasOrderRebate对象[]
-  /** 优惠共多少项 */
-  rebateNum?: number
+  rebateDetail?: 待支付订单_可选支付方式优惠明细实体类[]
   /** 交易模式(1经销模式;2直销模式，默认经销模式1) */
   tradeType?: number
   /** 卡车id */
@@ -4271,11 +4637,21 @@ interface 待支付订单_可选支付方式物流支付实体类 {
   /** 所属物流支付微信支付金额 */
   wxAmount?: number
 }
+interface 待支付订单_可选支付方式站价格和优惠的快照信息 {
+  /** 平台挂牌价 */
+  platformPrice?: number
+  /** 满减优惠明细文字提示 */
+  reduceRebateStr?: string
+  /** 特价优惠明细文字提示 */
+  specialRebateStr?: string
+}
 interface 待支付订单_可选支付方式获取实体类 {
   /** 物流支付 */
   carrierPay?: 待支付订单_可选支付方式物流支付实体类
   /** 个人支付 */
   personPay?: 待支付订单_可选支付方式个人支付实体类
+  /** 站价格和优惠快照信息 */
+  stationVo?: 待支付订单_可选支付方式站价格和优惠的快照信息
 }
 interface 成丰三方对接对象 {
   /** 组织名称 */
@@ -4968,7 +5344,7 @@ interface 订单中石化查询参数实体类 {
 interface 订单列表返回实体类 {
   /** 总返利积分 */
   allPoint?: number
-  /** 加气总优惠（元） */
+  /** 大象线上优惠总额（元） */
   allPrefer?: number
   /** 加气总量（公斤） */
   allQty?: number
@@ -4980,6 +5356,16 @@ interface 订单列表返回实体类 {
   allValue?: number
   /** 加气总额（万元） */
   allValueWan?: number
+  /** 订单总数 */
+  count?: number
+  /** 加气站满减（元） */
+  gasstationReduce?: number
+  /** 加气站特价（元） */
+  gasstationSpecial?: number
+  /** 长城奥扬满减（元） */
+  gwayReduce?: number
+  /** 长城奥扬特价（元） */
+  gwaySpecial?: number
   /** 分页信息 */
   page?: IPage<订单详情>
 }
@@ -5052,7 +5438,7 @@ interface 订单详情 {
   carrierOrgId?: string
   /** 物流公司名称(user.org.org_name) */
   carrierOrgName?: string
-  /** 总优惠额（目前只有物流专享优惠）(优惠差额) */
+  /** 总优惠额(优惠金额) */
   carrierRebate?: number
   /** 总优惠金额（站、司机、收银员、物流显示的，处理了加价的） */
   carrierRebateHand?: number
@@ -5082,12 +5468,14 @@ interface 订单详情 {
   gasQty?: number
   /** 加气站采购金额=长城奥扬销售金额 */
   gasamount?: number
-  /** 加气站服务费单价(站清分单价) */
+  /** 加气站结算服务费单价(站结算清分价) */
   gasstationFee?: number
   /** 加气站id */
   gasstationId?: string
   /** 加气站名称 */
   gasstationName?: string
+  /** 加气站标准服务费金额（标准清分额）（元） */
+  gasstationSettleValue?: number
   /** 长城奥扬付大象平台服务费=大象加气平台服务费 */
   gwayamount?: number
   /** 长城奥扬付大象平台服务价=大象加气平台服务价 */
@@ -5118,13 +5506,21 @@ interface 订单详情 {
   rebateDetail?: GasOrderRebate对象[]
   /** 优惠明细（站、司机、收银员、物流显示的，处理了加价的） */
   rebateDetailHand?: GasOrderRebate对象[]
+  /** 优惠明细 */
+  rebateDetailV2?: 待支付订单_可选支付方式优惠明细实体类[]
   /** 优惠共多少项 */
   rebateNum?: number
   /** 优惠共多少项（站、司机、收银员、物流显示的，处理了加价的） */
   rebateNumHand?: number
+  /** 优惠共多少项 */
+  rebateNumV2?: number
+  /** 优惠差价明细 */
+  rebatePriceDetail?: 优惠差价详情实体类[]
+  /** 优惠差价共多少项 */
+  rebatePriceNum?: number
   /** 退款日期时间 */
   refundDate?: string
-  /** 加气站服务费（站清分额） */
+  /** 加气站结算服务费（站结算清分额） */
   serviceFee?: number
   /** 订单结算状态（1.待支付 2.已支付 3.取消 4.支付中 5.退款中 6.退款完成） */
   settleStatus?: number
@@ -5136,6 +5532,8 @@ interface 订单详情 {
   splitType?: number
   /** 长城标准价 */
   standardPrice?: number
+  /** 站优惠差价 */
+  stationDiffPrice?: number
   /** 站联系方式 */
   stationMobile?: string
   /** 交易模式(1经销模式;2直销模式，默认经销模式1) */

src/types/schemas/user.d.ts

@@ -1362,6 +1362,10 @@ interface TokenReq {
   /** undefined */
   userId?: string
 }
+interface TokenUpdateParam参数 {
+  /** userId参数 */
+  userid?: string
+}
 interface Token认证用户实体 {
   /** authorities */
   authorities?: AuthUserRole对象[]
@@ -1694,7 +1698,7 @@ interface User对象 {
   keyWord?: string
   /** 最后登录时间 */
   lastLoginDate?: string
-  /** 用户登录类型（0 账号/手机号  1 微信快捷加气 */
+  /** 用户注册类型（0-账号/手机号注册 ，1微信授权，2小程序授权 */
   loginType?: number
   /** 手机号 */
   mobile?: string
@@ -2107,7 +2111,7 @@ interface 注册信息 {
   headUrl?: string
   /** 邀请人id */
   inviterId?: number
-  /** 登录方式 */
+  /** 用户注册类型（0-账号/手机号注册 ，1微信授权，2小程序授权 */
   loginType?: number
   /** 用户注册用的手机号 */
   mobile?: string
@@ -2370,6 +2374,8 @@ interface 预添加司机详情 {
 interface 驾驶员管理信息VO {
   /** 所属物流车 */
   carNumber?: string
+  /** 物流驾驶员 标识：0-否 1-是 */
+  carrierFlag?: number
   /** 最后登录时间 */
   lastLoginDate?: string
   /** 手机号 */
@@ -2378,8 +2384,12 @@ interface 驾驶员管理信息VO {
   orgId?: string
   /** 所属物流name */
   orgName?: string
+  /** 个人（散户）标识：0-否 1-是 */
+  personFlag?: number
   /** 状态（0：启用 1：停用） */
   status?: number
+  /** 协作驾驶员 标识：0-否 1-是 */
+  tempFlag?: number
   /** 用户id */
   userId?: string
   /** 用户名 */

src/uni.scss

@@ -16,7 +16,7 @@
 /* 颜色变量 */
 
 /* 行为相关颜色 */
-$uni-color-primary: #007aff;
+$uni-color-primary: #0084f4;
 $uni-color-success: #4cd964;
 $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
@@ -74,4 +74,4 @@ $uni-font-size-title: 20px;
 $uni-color-subtitle: #555; // 二级标题颜色
 $uni-font-size-subtitle: 18px;
 $uni-color-paragraph: #3f536e; // 文章段落颜色
-$uni-font-size-paragraph: 15px;
+$uni-font-size-paragraph: 15px;

src/utils/api/web/request/afterReturning.ts

@@ -1,4 +1,3 @@
-import common from '@/utils/store/common'
 import com from './com'
 export default {
   /**

src/utils/api/web/request/afterThrowing.ts

@@ -60,6 +60,13 @@ export default {
         options: args.options,
         res: args.res,
       }
+      if (config.common.isH5) {
+        console.log('%c失败', 'color:red', {
+          url: args.options.uur.url,
+          req: args.options.uur.data,
+          res: args.errInfo.data,
+        })
+      }
       rv = Promise.reject(pcr)
       // 分页接口自动通知容器，数据加载失败
       if (store.curPage?.pageConfig?.isPager) {

src/utils/api/web/request/index.ts

@@ -1,6 +1,14 @@
 import before from '@/utils/api/web/request/before'
 import afterReturning from './afterReturning'
 import afterThrowing from './afterThrowing'
+// #ifdef H5
+import axios, { AxiosStatic, AxiosRequestConfig, AxiosResponse } from 'axios'
+// #endif
+// let axios: AxiosStatic = null
+// if (config.common.isH5) {
+//   const Axios = await import('axios')
+//   axios = Axios.default
+// }
 const setRequestResult = ({ options, resolve, reject }) => {
   const rv = {
     // 响应成功
@@ -43,7 +51,21 @@ const http = async <T>(options: IRequestOption) => {
     if (options.urlObj.isUpload) {
       uni.uploadFile(options.uur as UniApp.UploadFileOption)
     } else {
+      // #ifdef H5
+      axios<any, UniApp.RequestSuccessCallbackResult & AxiosResponse>({
+        ...options.uur,
+        headers: options.uur.header,
+      } as AxiosRequestConfig<any>)
+        .then((res) => {
+          res.statusCode = res.status
+          options.uur.success(res)
+        })
+        .catch(options.uur.fail)
+      // #endif
+      // #ifndef H5
+
       uni.request(options.uur as UniApp.RequestOptions)
+      // #endif
     }
   }).then((res) => {
     // 接口请求正常

src/utils/config/index.ts

@@ -26,13 +26,13 @@ const common = {
       ],
     },
   ],
-  /** 驾驶员申请状态
-   * 1.无任何信息 2.显示物流公司信息 3.显示退出申请 4.显示加入申请 5.显示预添加信息
-   */
   get safeAreaTopHeight() {
     return (config.common.SystemInfo?.statusBarHeight || 40) + 44
     // return config.common.SystemInfo.safeArea.top + 44
   },
+  /** 驾驶员申请状态
+   * 1.无任何信息 2.显示物流公司信息 3.显示退出申请 4.显示加入申请 5.显示预添加信息
+   */
   get orgDetailType() {
     return { 3: '申请退出', 4: '申请加入' }
   },
@@ -59,11 +59,15 @@ const common = {
   /** 让利方类型 */
   get interestType() {
     return {
-      1: '长城奥扬优惠',
-      2: '加气站优惠',
-      3: '大象服务费优惠',
-      4: '大象优惠',
+      1: '大象特价优惠',
+      2: '大象满减优惠',
     }
+    // return {
+    //   1: '长城奥扬优惠',
+    //   2: '加气站优惠',
+    //   3: '大象服务费优惠',
+    //   4: '大象优惠',
+    // }
   },
   /** 结算状态 */
   get settleStatus() {

src/utils/config/interFaces/allinpay.ts

@@ -1,541 +1,547 @@
 export default {
   /** 模拟生成网关充值订单 */
   gen_b2b_recharge: {
-    realUrl: '/allinpay/gen_gas_order/gen_b2b_recharge' as const,
+    realUrl: '/allinpay/gen_gas_order/gen_b2b_recharge',
     reqType: {} as RechargeOrder对象,
     resType: {} as any,
   },
   /** 模拟生成直销消费订单 */
   gen_direct_gasorder: {
-    realUrl: '/allinpay/gen_gas_order/gen_direct_gasorder' as const,
+    realUrl: '/allinpay/gen_gas_order/gen_direct_gasorder',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 模拟生成经销消费订单 */
   gen_gasorder: {
-    realUrl: '/allinpay/gen_gas_order/gen_gasorder' as const,
+    realUrl: '/allinpay/gen_gas_order/gen_gasorder',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 模拟生成提现订单 */
   gen_withdraw: {
-    realUrl: '/allinpay/gen_gas_order/gen_withdraw' as const,
+    realUrl: '/allinpay/gen_gas_order/gen_withdraw',
     reqType: {} as WithdrawOrder对象,
     resType: {} as any,
   },
   /** 模拟生成微信充值订单 */
   gen_wx_recharge: {
-    realUrl: '/allinpay/gen_gas_order/gen_wx_recharge' as const,
+    realUrl: '/allinpay/gen_gas_order/gen_wx_recharge',
     reqType: {} as RechargeOrder对象,
     resType: {} as any,
   },
   /** 模拟生成微信充值订单并完成消费，消费订单必传 */
   recharge_gasorder: {
-    realUrl: '/allinpay/gen_gas_order/recharge_gasorder' as const,
+    realUrl: '/allinpay/gen_gas_order/recharge_gasorder',
     reqType: {} as RechargeOrder对象,
     resType: {} as any,
   },
   /** 充值订单退款运维接口 */
   charge_refund: {
-    realUrl: '/allinpay/handle/charge_refund' as const,
+    realUrl: '/allinpay/handle/charge_refund',
     reqType: {} as 通用id参数,
     resType: {} as any,
   },
   /** 长城奥扬经销退款加气站失败，继续退款逻辑 */
   continue_refund: {
-    realUrl: '/allinpay/handle/continue_refund' as const,
+    realUrl: '/allinpay/handle/continue_refund',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 卡车优惠账户余额处理 */
   coupons: {
-    realUrl: '/allinpay/handle/coupons' as const,
+    realUrl: '/allinpay/handle/coupons',
     reqType: {} as DateParam,
     resType: {} as any,
   },
   /** 拿指定订单在大象平台做消费 */
   daxiang_gasOrder: {
-    realUrl: '/allinpay/handle/daxiang_gasOrder' as const,
+    realUrl: '/allinpay/handle/daxiang_gasOrder',
     reqType: {} as HandleConsumeParam,
     resType: {} as any,
   },
   /** 物流公司直销充值成功，转账长城奥扬失败，继续转账业务逻辑 */
   direct_pay_continue: {
-    realUrl: '/allinpay/handle/direct_pay_continue' as const,
+    realUrl: '/allinpay/handle/direct_pay_continue',
     reqType: {} as RechargeOrder对象,
     resType: {} as any,
   },
   /** 直销订单加气站服务费分账成功，分账平台服务费失败，继续支付逻辑 */
   direct_split_continue: {
-    realUrl: '/allinpay/handle/direct_split_continue' as const,
+    realUrl: '/allinpay/handle/direct_split_continue',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 直销加气订单加气站通联服务费退回,平台无操作 */
   directsales_gasstation_fee_back: {
-    realUrl: '/allinpay/handle/directsales_gasstation_fee_back' as const,
+    realUrl: '/allinpay/handle/directsales_gasstation_fee_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 直销充值订单回调成功处理异常，继续平台充值逻辑 */
   directsales_recharge_order_continue: {
-    realUrl: '/allinpay/handle/directsales_recharge_order_continue' as const,
+    realUrl: '/allinpay/handle/directsales_recharge_order_continue',
     reqType: {} as RechargeOrder对象,
     resType: {} as any,
   },
   /** 手动下载提现电子回单 */
   download_withdrawReceipt: {
-    realUrl: '/allinpay/handle/download_withdrawReceipt' as const,
+    realUrl: '/allinpay/handle/download_withdrawReceipt',
     reqType: {} as WithdrawOrder对象,
     resType: {} as any,
   },
   /** 平台退款，通联不操作 */
   dx_gas_order_back: {
-    realUrl: '/allinpay/handle/dx_gas_order_back' as const,
+    realUrl: '/allinpay/handle/dx_gas_order_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 直销-冲红订单（通联+平台） */
   gas_directsales_order_back: {
-    realUrl: '/allinpay/handle/gas_directsales_order_back' as const,
+    realUrl: '/allinpay/handle/gas_directsales_order_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 经销-冲红订单（通联+平台） */
   gas_order_back: {
-    realUrl: '/allinpay/handle/gas_order_back' as const,
+    realUrl: '/allinpay/handle/gas_order_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 经销-冲红订单（通联+平台）加气退款异常情况 */
   gas_order_back_continue: {
-    realUrl: '/allinpay/handle/gas_order_back_continue' as const,
+    realUrl: '/allinpay/handle/gas_order_back_continue',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 获取通联会员账户余额，返回单位分 */
   get_balance: {
-    realUrl: '/allinpay/handle/get_balance' as const,
+    realUrl: '/allinpay/handle/get_balance',
     reqType: {} as GetBalanceParam,
     resType: {} as any,
   },
   /** 获取通联平台会员信息 */
   get_memberInfo: {
-    realUrl: '/allinpay/handle/get_memberInfo' as const,
+    realUrl: '/allinpay/handle/get_memberInfo',
     reqType: {} as TsyParam,
     resType: {} as any,
   },
   /** 直销加气通联侧大象平台分账退回到长城奥扬（单边账） */
   gwayamount_back: {
-    realUrl: '/allinpay/handle/gwayamount_back' as const,
+    realUrl: '/allinpay/handle/gwayamount_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 单边账问题，处理消费订单，通联消费成功，但是大象平台没有获取到同步信息，需将整个流程跑完 */
   handle_tsy_success_gasOrder: {
-    realUrl: '/allinpay/handle/handle_tsy_success_gasOrder' as const,
+    realUrl: '/allinpay/handle/handle_tsy_success_gasOrder',
     reqType: {} as HandleConsumeParam,
     resType: {} as any,
   },
   /** 新营销加气通联侧加气站购气款退回到长城奥扬（单边账） */
   market_gasamount_back: {
-    realUrl: '/allinpay/handle/market_gasamount_back' as const,
+    realUrl: '/allinpay/handle/market_gasamount_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 通联点对点消费，即一方付款至另外一方 */
   p2p_pay: {
-    realUrl: '/allinpay/handle/p2p_pay' as const,
+    realUrl: '/allinpay/handle/p2p_pay',
     reqType: {} as P2PPayParam,
     resType: {} as any,
   },
   /** 加气站清分服务费退回到长城奥扬（站服务费清分方式错误） */
   profit_back: {
-    realUrl: '/allinpay/handle/profit_back' as const,
+    realUrl: '/allinpay/handle/profit_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 挂靠充值成功，但是消费失败，需在通联和大象平台重新消费 */
   rely_consume: {
-    realUrl: '/allinpay/handle/rely_consume' as const,
+    realUrl: '/allinpay/handle/rely_consume',
     reqType: {} as TsyParam,
     resType: {} as any,
   },
   /** 直销加气通联侧加气站分账退回到长城奥扬（单边账） */
   servicefee_back: {
-    realUrl: '/allinpay/handle/servicefee_back' as const,
+    realUrl: '/allinpay/handle/servicefee_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 单边账问题，分账退款申请 */
   splitRefund: {
-    realUrl: '/allinpay/handle/splitRefund' as const,
+    realUrl: '/allinpay/handle/splitRefund',
     reqType: {} as SplitRefundParam,
     resType: {} as any,
   },
   /** 卡车圈出到物流公司 */
   transfer_carrier: {
-    realUrl: '/allinpay/handle/transfer_carrier' as const,
+    realUrl: '/allinpay/handle/transfer_carrier',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 拿指定订单在通联平台做消费 */
   tsy_daxiang_gasOrder: {
-    realUrl: '/allinpay/handle/tsy_daxiang_gasOrder' as const,
+    realUrl: '/allinpay/handle/tsy_daxiang_gasOrder',
     reqType: {} as HandleConsumeParam,
     resType: {} as any,
   },
   /** 订单通联退账，单边账问题，大象业务逻辑不操作，只做通联退款 */
   tsy_gas_order_back: {
-    realUrl: '/allinpay/handle/tsy_gas_order_back' as const,
+    realUrl: '/allinpay/handle/tsy_gas_order_back',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 微信支付回调-手工 */
   wxpay_trans: {
-    realUrl: '/allinpay/handle/wxpay_trans' as const,
+    realUrl: '/allinpay/handle/wxpay_trans',
     reqType: {} as RechargeOrder对象,
     resType: {} as any,
   },
   /** 请求绑定银行卡 */
   bind_bankCard: {
-    realUrl: '/allinpay/member/bind_bankCard' as const,
+    realUrl: '/allinpay/member/bind_bankCard',
     reqType: {} as BindCardParam,
     resType: {} as any,
   },
   /** 绑定手机 */
   bind_phone: {
-    realUrl: '/allinpay/member/bind_phone' as const,
+    realUrl: '/allinpay/member/bind_phone',
     reqType: {} as BindPhoneParam,
     resType: {} as any,
   },
   /**  身份证上传回调接口 */
   idcardCollect: {
-    realUrl: '/allinpay/member/callback/idcardCollect' as const,
+    realUrl: '/allinpay/member/callback/idcardCollect',
 
 
   },
   /** 创建会员回调 */
   memberCallBack: {
-    realUrl: '/allinpay/member/callback/memberCallBack' as const,
+    realUrl: '/allinpay/member/callback/memberCallBack',
 
 
   },
   /**  营业执照上传回调接口 */
   regnumCollect: {
-    realUrl: '/allinpay/member/callback/regnumCollect' as const,
+    realUrl: '/allinpay/member/callback/regnumCollect',
 
 
   },
   /** 电子签约（余额转账）更新回填字段 */
   signBalanceProtocol: {
-    realUrl: '/allinpay/member/callback/signBalanceProtocol' as const,
+    realUrl: '/allinpay/member/callback/signBalanceProtocol',
 
     resType: {} as ResponseEntity,
   },
   /** 电子签约更新回填字段 */
   signCallBack: {
-    realUrl: '/allinpay/member/callback/signCallBack' as const,
+    realUrl: '/allinpay/member/callback/signCallBack',
 
 
   },
   /** 合作协议签约更新回填字段 */
   signContract: {
-    realUrl: '/allinpay/member/callback/signContract' as const,
+    realUrl: '/allinpay/member/callback/signContract',
 
     resType: {} as ResponseEntity,
   },
   /** 自动发起平行加气站企业认证 */
   child_filler_auto_auth: {
-    realUrl: '/allinpay/member/child_filler_auto_auth' as const,
+    realUrl: '/allinpay/member/child_filler_auto_auth',
     reqType: {} as Org对象,
     resType: {} as boolean,
   },
   /** 查询卡 bin */
   get_bankCardBin: {
-    realUrl: '/allinpay/member/get_bankCardBin' as const,
+    realUrl: '/allinpay/member/get_bankCardBin',
     reqType: {} as GetBankCardBinParam,
     resType: {} as any,
   },
   /** getMemberInfo */
   get_memberInfo_1: {
-    realUrl: '/allinpay/member/get_memberInfo' as const,
+    realUrl: '/allinpay/member/get_memberInfo',
     reqType: {} as GetMemberInfoParam,
     resType: {} as any,
   },
   /** 普通用户个人身份证二要素认证，在个人中心（实名认证功能） */
   idcard: {
-    realUrl: '/allinpay/member/idcard' as const,
+    realUrl: '/allinpay/member/idcard',
     reqType: {} as 身份证二要素认证参数,
     resType: {} as boolean,
   },
   /** 个人车主（组织身份）身份证二要素认证 */
   idcard_auth: {
-    realUrl: '/allinpay/member/idcard_auth' as const,
+    realUrl: '/allinpay/member/idcard_auth',
     reqType: {} as 身份证二要素认证参数,
     resType: {} as boolean,
   },
   /** 渠道开户 */
   open_account: {
-    realUrl: '/allinpay/member/open_account' as const,
+    realUrl: '/allinpay/member/open_account',
     reqType: {} as OpenAccountParam,
     resType: {} as any,
   },
   /** 查询绑定银行卡状态 */
   query_bankCard: {
-    realUrl: '/allinpay/member/query_bankCard' as const,
+    realUrl: '/allinpay/member/query_bankCard',
     reqType: {} as QueryBankCardParam,
     resType: {} as any,
   },
   /** 提现协议查询 */
   query_withdraw_protocol: {
-    realUrl: '/allinpay/member/query_withdraw_protocol' as const,
+    realUrl: '/allinpay/member/query_withdraw_protocol',
     reqType: {} as QuerySignContractParam,
     resType: {} as any,
   },
   /** 发送验证码 */
   send_sms_code: {
-    realUrl: '/allinpay/member/send_sms_code' as const,
+    realUrl: '/allinpay/member/send_sms_code',
     reqType: {} as SendVerificationCodeParam,
     resType: {} as any,
   },
   /** 转账授权 */
   sign_balance_protocol: {
-    realUrl: '/allinpay/member/sign_balance_protocol' as const,
+    realUrl: '/allinpay/member/sign_balance_protocol',
     reqType: {} as SignBalanceProtocolParam,
     resType: {} as any,
   },
   /** 提现授权 */
   sign_withdraw_protocol: {
-    realUrl: '/allinpay/member/sign_withdraw_protocol' as const,
+    realUrl: '/allinpay/member/sign_withdraw_protocol',
     reqType: {} as SignContractProtocolParam,
     resType: {} as any,
   },
   /** 解除绑定银行卡 */
   unbind_bankCard: {
-    realUrl: '/allinpay/member/unbind_bankCard' as const,
+    realUrl: '/allinpay/member/unbind_bankCard',
     reqType: {} as UnBindCardParam,
     resType: {} as any,
   },
   /** 解除绑定手机 */
   unbind_phone: {
-    realUrl: '/allinpay/member/unbind_phone' as const,
+    realUrl: '/allinpay/member/unbind_phone',
     reqType: {} as UnBindPhoneParam,
     resType: {} as any,
   },
   /** 上传企业营业执照、身份证图片到通联 */
   upload_org_pic: {
-    realUrl: '/allinpay/member/upload_org_pic' as const,
+    realUrl: '/allinpay/member/upload_org_pic',
     reqType: {} as IdcardCollectParam,
     resType: {} as any,
   },
   /** 消费回调 */
   consumeCallBack: {
-    realUrl: '/allinpay/pay/callback/consumeCallBack' as const,
+    realUrl: '/allinpay/pay/callback/consumeCallBack',
 
 
   },
   /** 气瓶检测微信支付回调 */
   gctwxpay: {
-    realUrl: '/allinpay/pay/callback/gctwxpay' as const,
+    realUrl: '/allinpay/pay/callback/gctwxpay',
 
     resType: {} as ResponseEntity,
   },
-  /**  B2B充值回调 */
+  /** 微信充值通联单边账处理 */
   recharge: {
-    realUrl: '/allinpay/pay/callback/recharge' as const,
-
+    realUrl: '/allinpay/pay/callback/recharge',
 
+    resType: {} as boolean,
   },
   /** 分账退款申请回调 */
   splitRefund_1: {
-    realUrl: '/allinpay/pay/callback/splitRefund' as const,
+    realUrl: '/allinpay/pay/callback/splitRefund',
 
 
   },
   /** 提现回调 */
   withdraw: {
-    realUrl: '/allinpay/pay/callback/withdraw' as const,
+    realUrl: '/allinpay/pay/callback/withdraw',
 
 
   },
   /** 微信支付回调 */
   wxpay: {
-    realUrl: '/allinpay/pay/callback/wxpay' as const,
+    realUrl: '/allinpay/pay/callback/wxpay',
 
     resType: {} as ResponseEntity,
   },
   /** 微信所属物流支付回调 */
   wxpay_carrier: {
-    realUrl: '/allinpay/pay/callback/wxpay_carrier' as const,
+    realUrl: '/allinpay/pay/callback/wxpay_carrier',
 
     resType: {} as ResponseEntity,
   },
   /** 微信个人支付回调 */
   wxpay_person: {
-    realUrl: '/allinpay/pay/callback/wxpay_person' as const,
+    realUrl: '/allinpay/pay/callback/wxpay_person',
 
     resType: {} as ResponseEntity,
   },
   /** 订单返现(strategy使用) */
   cashback: {
-    realUrl: '/allinpay/pay/cashback' as const,
+    realUrl: '/allinpay/pay/cashback',
     reqType: {} as 返现微信模板消息参数,
     resType: {} as any,
   },
   /** 物流公司B2B充值 */
   deposit_apply: {
-    realUrl: '/allinpay/pay/deposit_apply' as const,
+    realUrl: '/allinpay/pay/deposit_apply',
     reqType: {} as B2BDepositParam,
     resType: {} as any,
   },
   /** 物流公司B2B充值，弹出银联页面 */
   deposit_apply_confirm: {
-    realUrl: '/allinpay/pay/deposit_apply_confirm' as const,
+    realUrl: '/allinpay/pay/deposit_apply_confirm',
     reqType: {} as B2BDepositConfirmParam,
     resType: {} as any,
   },
   /** 加气站直销服务费用提现申请 */
   direct_gasstation_withdraw_apply: {
-    realUrl: '/allinpay/pay/direct_gasstation_withdraw_apply' as const,
+    realUrl: '/allinpay/pay/direct_gasstation_withdraw_apply',
     reqType: {} as WithdrawParam,
     resType: {} as any,
   },
   /** 气瓶检测微信支付 */
   gct_wxpay: {
-    realUrl: '/allinpay/pay/gct_wxpay' as const,
+    realUrl: '/allinpay/pay/gct_wxpay',
     reqType: {} as 气瓶检测订单微信支付参数,
     resType: {} as any,
   },
   /** 查询订单状态 */
   get_orderStatus: {
-    realUrl: '/allinpay/pay/get_orderStatus' as const,
+    realUrl: '/allinpay/pay/get_orderStatus',
 
     resType: {} as any,
   },
   /** 长城代物流公司B2B充值 */
   gway_deposit_apply: {
-    realUrl: '/allinpay/pay/gway_deposit_apply' as const,
+    realUrl: '/allinpay/pay/gway_deposit_apply',
     reqType: {} as B2BDepositParam,
     resType: {} as any,
   },
   /** 发起向物流公司B2B充值 */
   gway_deposit_start: {
-    realUrl: '/allinpay/pay/gway_deposit_start' as const,
+    realUrl: '/allinpay/pay/gway_deposit_start',
     reqType: {} as B2BDepositParam,
     resType: {} as any,
   },
   /** 小程序支付 */
   minapay: {
-    realUrl: '/allinpay/pay/minapay' as const,
+    realUrl: '/allinpay/pay/minapay',
     reqType: {} as WxpayParam,
     resType: {} as any,
   },
   /** 所属物流挂靠车微信支付（小程序支付） */
   minapay_carrier: {
-    realUrl: '/allinpay/pay/minapay_carrier' as const,
+    realUrl: '/allinpay/pay/minapay_carrier',
     reqType: {} as WxpayParam,
     resType: {} as any,
   },
   /** 驾驶员个人微信支付（小程序支付） */
   minapay_person: {
-    realUrl: '/allinpay/pay/minapay_person' as const,
+    realUrl: '/allinpay/pay/minapay_person',
     reqType: {} as WxpayParam,
     resType: {} as any,
   },
   /** 查询账户收支明细 */
   query_bankIn_expDetail: {
-    realUrl: '/allinpay/pay/query_bankIn_expDetail' as const,
+    realUrl: '/allinpay/pay/query_bankIn_expDetail',
     reqType: {} as QueryBankInExpDetailParam,
     resType: {} as any,
   },
   /** 查询账户资金流水分页列表 */
   query_cash_flow: {
-    realUrl: '/allinpay/pay/query_cash_flow' as const,
+    realUrl: '/allinpay/pay/query_cash_flow',
     reqType: {} as IPageParams<QueryCashFlowParam>,
     resType: {} as any,
   },
   /** 挂靠车余额消费 */
   rely_consume_1: {
-    realUrl: '/allinpay/pay/rely_consume' as const,
+    realUrl: '/allinpay/pay/rely_consume',
     reqType: {} as SelfConsumeParam,
     resType: {} as any,
   },
   /** 挂靠车余额消费 */
   rely_consume_v2: {
-    realUrl: '/allinpay/pay/rely_consume_v2' as const,
+    realUrl: '/allinpay/pay/rely_consume_v2',
     reqType: {} as RelyConsumeParam,
     resType: {} as any,
   },
   /** 自营车消费 */
   self_consume: {
-    realUrl: '/allinpay/pay/self_consume' as const,
+    realUrl: '/allinpay/pay/self_consume',
     reqType: {} as SelfConsumeParam,
     resType: {} as any,
   },
   /** 自营车直销消费 */
   self_consume_direct_v2: {
-    realUrl: '/allinpay/pay/self_consume_direct_v2' as const,
+    realUrl: '/allinpay/pay/self_consume_direct_v2',
     reqType: {} as SelfConsumeParam,
     resType: {} as any,
   },
   /** 直销模式自营车消费 */
   self_consume_directsales: {
-    realUrl: '/allinpay/pay/self_consume_directsales' as const,
+    realUrl: '/allinpay/pay/self_consume_directsales',
     reqType: {} as SelfConsumeParam,
     resType: {} as any,
   },
   /** 自营车经销消费 */
   self_consume_v2: {
-    realUrl: '/allinpay/pay/self_consume_v2' as const,
+    realUrl: '/allinpay/pay/self_consume_v2',
     reqType: {} as SelfConsumeParam,
     resType: {} as any,
   },
   /** 提现申请 */
   withdraw_apply: {
-    realUrl: '/allinpay/pay/withdraw_apply' as const,
+    realUrl: '/allinpay/pay/withdraw_apply',
     reqType: {} as WithdrawParam,
     resType: {} as any,
   },
   /** 服务号微信支付 */
   wxpay_1: {
-    realUrl: '/allinpay/pay/wxpay' as const,
+    realUrl: '/allinpay/pay/wxpay',
     reqType: {} as WxpayParam,
     resType: {} as any,
   },
   /** 个人微信支付退款分账退款回调 */
   split_person_refund: {
-    realUrl: '/allinpay/refund/callback/split_person_refund' as const,
+    realUrl: '/allinpay/refund/callback/split_person_refund',
 
     resType: {} as ResponseEntity,
   },
   /** 微信退款回调 */
   wxRefund: {
-    realUrl: '/allinpay/refund/callback/wxRefund' as const,
+    realUrl: '/allinpay/refund/callback/wxRefund',
 
     resType: {} as ResponseEntity,
   },
   /** 个人微信支付退款回调 */
   wx_person_refund: {
-    realUrl: '/allinpay/refund/callback/wx_person_refund' as const,
+    realUrl: '/allinpay/refund/callback/wx_person_refund',
 
     resType: {} as ResponseEntity,
   },
   /** 加气退款 */
   execute: {
-    realUrl: '/allinpay/refund/execute' as const,
+    realUrl: '/allinpay/refund/execute',
+    reqType: {} as 订单退款参数,
+    resType: {} as any,
+  },
+  /** 加气退款 */
+  execute_yw: {
+    realUrl: '/allinpay/refund/execute_yw',
     reqType: {} as 订单退款参数,
     resType: {} as any,
   },
   /** 操作记录 */
   log: {
-    realUrl: '/allinpay/refund/log' as const,
+    realUrl: '/allinpay/refund/log',
     reqType: {} as GasOrder对象,
     resType: {} as 订单退款参数,
   },
   /** 操作记录(智慧单站) */
   log_snp: {
-    realUrl: '/allinpay/refund/log_snp' as const,
+    realUrl: '/allinpay/refund/log_snp',
     reqType: {} as GasOrder对象,
     resType: {} as 订单退款参数,
   },

src/utils/config/interFaces/index.ts

@@ -1,33 +1,30 @@
+import account from './account'
 import websocket from './websocket'
-import allinpay from './allinpay'
 import tms from './tms'
-import account from './account'
 import message from './message'
-import gasdata from './gasdata'
+import pay from './pay'
+import allinpay from './allinpay'
 import settle from './settle'
 import user from './user'
 import strategy from './strategy'
-import pay from './pay'
 
 export default {
+  /** 账户中心 */
+  account,
   /** websocket打印中心 */
   websocket,
-  /** 通联支付 */
-  allinpay,
   /** 运力中心 */
   tms,
-  /** 账户中心 */
-  account,
   /** 消息中心 */
   message,
-  /** 加气站数据采集 */
-  gasdata,
+  /** 支付中心 */
+  pay,
+  /** 通联支付 */
+  allinpay,
   /** 结算中心 */
   settle,
   /** 用户中心 */
   user,
   /** 运营策略中心 */
   strategy,
-  /** 支付中心 */
-  pay,
 }

src/utils/config/interFaces/message.ts

@@ -1,394 +1,394 @@
 export default {
   /** 模拟收到加气订单-调用三个接口 */
   mockReceiveGasOrder: {
-    realUrl: '/message/Test/mockReceiveGasOrder' as const,
+    realUrl: '/message/Test/mockReceiveGasOrder',
     reqType: {} as GasOrder,
     resType: {} as string,
   },
   /** 小票机access_token伪刷新 */
   printerAccessTokenRefresh: {
-    realUrl: '/message/Test/printerAccessTokenRefresh' as const,
+    realUrl: '/message/Test/printerAccessTokenRefresh',
 
     resType: {} as string,
   },
   /** 小票打印机打印测试 */
   sendPrinterMessage: {
-    realUrl: '/message/Test/sendPrinterMessage' as const,
+    realUrl: '/message/Test/sendPrinterMessage',
     reqType: {} as GasOrder,
     resType: {} as string,
   },
   /** 微信模板消息测试 */
   sendTemplateMessage: {
-    realUrl: '/message/Test/sendTemplateMessage' as const,
+    realUrl: '/message/Test/sendTemplateMessage',
     reqType: {} as GasOrder,
     resType: {} as string,
   },
   /** 微信模板消息测试 */
   sendWxMessage: {
-    realUrl: '/message/Test/sendWxMessage' as const,
+    realUrl: '/message/Test/sendWxMessage',
     reqType: {} as GasOrder,
     resType: {} as string,
   },
   /** 微信access_token伪刷新 */
   wxAccessTokenRefresh: {
-    realUrl: '/message/Test/wxAccessTokenRefresh' as const,
+    realUrl: '/message/Test/wxAccessTokenRefresh',
 
     resType: {} as string,
   },
   /** 获取file_upload_log列表 */
   list: {
-    realUrl: '/message/file_upload_log/list' as const,
+    realUrl: '/message/file_upload_log/list',
     reqType: {} as IPageParams<FileUploadLog对象>,
     resType: {} as IPage<FileUploadLog对象>,
   },
   /** 添加消息 */
   add: {
-    realUrl: '/message/mc_message/add' as const,
+    realUrl: '/message/mc_message/add',
     reqType: {} as McMessageParam,
     resType: {} as boolean,
   },
   /** 删除消息 */
   del_batch: {
-    realUrl: '/message/mc_message/del_batch' as const,
+    realUrl: '/message/mc_message/del_batch',
     reqType: {} as IdsParam,
     resType: {} as boolean,
   },
   /** 管理后台查询消息详情 */
   find: {
-    realUrl: '/message/mc_message/find' as const,
+    realUrl: '/message/mc_message/find',
     reqType: {} as McMessage对象,
     resType: {} as McMessageResult,
   },
   /** 用户查询消息详情 */
   find_with_unread2read: {
-    realUrl: '/message/mc_message/find_with_unread2read' as const,
+    realUrl: '/message/mc_message/find_with_unread2read',
     reqType: {} as McMessage对象,
     resType: {} as McMessageResult,
   },
   /** 消息管理分页列表 */
   page_list: {
-    realUrl: '/message/mc_message/page_list' as const,
+    realUrl: '/message/mc_message/page_list',
     reqType: {} as IPageParams<McMessageQueryParam>,
     resType: {} as IPage<McMessageResult>,
   },
   /** 批量保存已读状态 */
   unread2read_batch: {
-    realUrl: '/message/mc_message/unread2read_batch' as const,
+    realUrl: '/message/mc_message/unread2read_batch',
     reqType: {} as IdsParam,
     resType: {} as boolean,
   },
   /** 修改消息 */
   update: {
-    realUrl: '/message/mc_message/update' as const,
+    realUrl: '/message/mc_message/update',
     reqType: {} as McMessageParam,
     resType: {} as boolean,
   },
   /** 用户消息中心分页列表 */
   user_page_list: {
-    realUrl: '/message/mc_message/user_page_list' as const,
+    realUrl: '/message/mc_message/user_page_list',
     reqType: {} as IPageParams<McMessageQueryParam>,
     resType: {} as IPage<McUserMessageResult>,
   },
   /** 用户未读消息提示 */
   user_unread_list: {
-    realUrl: '/message/mc_message/user_unread_list' as const,
+    realUrl: '/message/mc_message/user_unread_list',
 
     resType: {} as McUserMessageNoticeResult,
   },
   /** 用户未读消息提示 */
   user_unread_mails: {
-    realUrl: '/message/mc_message/user_unread_mails' as const,
+    realUrl: '/message/mc_message/user_unread_mails',
 
     resType: {} as McUserMessageNoticeResult,
   },
   /** 添加msg */
   add_1: {
-    realUrl: '/message/msg/add' as const,
+    realUrl: '/message/msg/add',
     reqType: {} as Msg对象,
     resType: {} as any,
   },
   /** 查找消息,(id必传) */
   find_1: {
-    realUrl: '/message/msg/find' as const,
+    realUrl: '/message/msg/find',
     reqType: {} as Msg对象,
     resType: {} as any,
   },
   /** 获取msg列表,toUserId必传 */
   list_1: {
-    realUrl: '/message/msg/list' as const,
+    realUrl: '/message/msg/list',
     reqType: {} as IPageParams<Msg对象>,
     resType: {} as any,
   },
   /** 添加msg_group */
   add_2: {
-    realUrl: '/message/msg_group/add' as const,
+    realUrl: '/message/msg_group/add',
     reqType: {} as MsgGroup对象,
     resType: {} as any,
   },
   /** 获取msg_group列表 */
   list_2: {
-    realUrl: '/message/msg_group/list' as const,
+    realUrl: '/message/msg_group/list',
     reqType: {} as IPageParams<MsgGroup对象>,
     resType: {} as any,
   },
   /** 修改msg_group */
   update_1: {
-    realUrl: '/message/msg_group/update' as const,
+    realUrl: '/message/msg_group/update',
     reqType: {} as MsgGroup对象,
     resType: {} as any,
   },
   /** 添加msg_id_gen */
   add_3: {
-    realUrl: '/message/msg_id_gen/add' as const,
+    realUrl: '/message/msg_id_gen/add',
     reqType: {} as MsgIdGen对象,
     resType: {} as any,
   },
   /** 获取msg_id_gen列表 */
   list_3: {
-    realUrl: '/message/msg_id_gen/list' as const,
+    realUrl: '/message/msg_id_gen/list',
     reqType: {} as IPageParams<MsgIdGen对象>,
     resType: {} as any,
   },
   /** 修改msg_id_gen */
   update_2: {
-    realUrl: '/message/msg_id_gen/update' as const,
+    realUrl: '/message/msg_id_gen/update',
     reqType: {} as MsgIdGen对象,
     resType: {} as any,
   },
   /** 发送sms通知 */
   send: {
-    realUrl: '/message/notify/send' as const,
+    realUrl: '/message/notify/send',
     reqType: {} as SmsSendLog对象,
     resType: {} as boolean,
   },
   /** 营业执照识别 */
   business_license: {
-    realUrl: '/message/ocr/business_license' as const,
+    realUrl: '/message/ocr/business_license',
     reqType: {} as ocr文字识别参数,
     resType: {} as 营业执照信息,
   },
   /** 驾驶证识别 */
   driver_license: {
-    realUrl: '/message/ocr/driver_license' as const,
+    realUrl: '/message/ocr/driver_license',
     reqType: {} as ocr文字识别参数,
     resType: {} as 驾驶证信息,
   },
   /** OCR识别身份证信息 */
   idcard: {
-    realUrl: '/message/ocr/idcard' as const,
+    realUrl: '/message/ocr/idcard',
     reqType: {} as ocr文字识别参数,
     resType: {} as 身份证信息,
   },
   /** 增值税发票识别 */
   receipt_license: {
-    realUrl: '/message/ocr/receipt_license' as const,
+    realUrl: '/message/ocr/receipt_license',
     reqType: {} as ocr识别参数,
     resType: {} as 增值税发票信息,
   },
   /** 增值税发票识别(上传文件) */
   receipt_license_file: {
-    realUrl: '/message/ocr/receipt_license_file' as const,
+    realUrl: '/message/ocr/receipt_license_file',
     isUpload: true,
 
     resType: {} as 增值税发票信息,
   },
   /** 行驶证识别 */
   vehicle_license: {
-    realUrl: '/message/ocr/vehicle_license' as const,
+    realUrl: '/message/ocr/vehicle_license',
     reqType: {} as ocr文字识别参数,
     resType: {} as 行驶证识别信息,
   },
   /** add */
   add_4: {
-    realUrl: '/message/printer/add' as const,
+    realUrl: '/message/printer/add',
     reqType: {} as Printer对象,
     resType: {} as string,
   },
   /** del */
   del: {
-    realUrl: '/message/printer/del' as const,
+    realUrl: '/message/printer/del',
     reqType: {} as Printer对象,
     resType: {} as string,
   },
   /** list */
   list_4: {
-    realUrl: '/message/printer/list' as const,
+    realUrl: '/message/printer/list',
     reqType: {} as Printer对象,
     resType: {} as Array<Printer对象>,
   },
   /** status */
   status: {
-    realUrl: '/message/printer/status' as const,
+    realUrl: '/message/printer/status',
     reqType: {} as Printer对象,
     resType: {} as AnyObject,
   },
   /** update */
   update_3: {
-    realUrl: '/message/printer/update' as const,
+    realUrl: '/message/printer/update',
     reqType: {} as Printer对象,
     resType: {} as boolean,
   },
   /** 添加栏目 */
   add_5: {
-    realUrl: '/message/qa_catalogs/add' as const,
+    realUrl: '/message/qa_catalogs/add',
     reqType: {} as QaCatalogs对象,
     resType: {} as any,
   },
   /** 删除栏目 */
   delete: {
-    realUrl: '/message/qa_catalogs/delete' as const,
+    realUrl: '/message/qa_catalogs/delete',
     reqType: {} as QaCatalogs对象,
     resType: {} as any,
   },
   /** 根据栏目id获取一级二级栏目信息 */
   get_parent_catalogs: {
-    realUrl: '/message/qa_catalogs/get_parent_catalogs' as const,
+    realUrl: '/message/qa_catalogs/get_parent_catalogs',
     reqType: {} as QaCatalogs对象,
     resType: {} as any,
   },
   /** 获取栏目列表 */
   list_5: {
-    realUrl: '/message/qa_catalogs/list' as const,
+    realUrl: '/message/qa_catalogs/list',
     reqType: {} as QaCatalogs对象,
     resType: {} as any,
   },
   /** 获取栏目分页列表 */
   page: {
-    realUrl: '/message/qa_catalogs/page' as const,
+    realUrl: '/message/qa_catalogs/page',
     reqType: {} as IPageParams<QaCatalogs对象>,
     resType: {} as any,
   },
   /** 修改栏目 */
   update_4: {
-    realUrl: '/message/qa_catalogs/update' as const,
+    realUrl: '/message/qa_catalogs/update',
     reqType: {} as QaCatalogs对象,
     resType: {} as any,
   },
   /** 添加qa_client */
   add_6: {
-    realUrl: '/message/qa_client/add' as const,
+    realUrl: '/message/qa_client/add',
     reqType: {} as QaClient对象,
     resType: {} as any,
   },
   /** 根据客户端id获取客户端名字 */
   get_client: {
-    realUrl: '/message/qa_client/get_client' as const,
+    realUrl: '/message/qa_client/get_client',
     reqType: {} as QaClient对象,
     resType: {} as any,
   },
   /** 获取客户端列表 */
   list_6: {
-    realUrl: '/message/qa_client/list' as const,
+    realUrl: '/message/qa_client/list',
     reqType: {} as QaClient对象,
     resType: {} as any,
   },
   /** 修改qa_client */
   update_5: {
-    realUrl: '/message/qa_client/update' as const,
+    realUrl: '/message/qa_client/update',
     reqType: {} as QaClient对象,
     resType: {} as any,
   },
   /** 添加问答 */
   add_7: {
-    realUrl: '/message/qa_content/add' as const,
+    realUrl: '/message/qa_content/add',
     reqType: {} as QaContentSaveParam,
     resType: {} as any,
   },
   /** 删除问答 */
   delete_1: {
-    realUrl: '/message/qa_content/delete' as const,
+    realUrl: '/message/qa_content/delete',
     reqType: {} as QaContent对象,
     resType: {} as any,
   },
   /** 查找一个问答 */
   find_2: {
-    realUrl: '/message/qa_content/find' as const,
+    realUrl: '/message/qa_content/find',
     reqType: {} as QaContent对象,
     resType: {} as any,
   },
   /** 查找一个问答配置的客户端ids */
   find_client_ids: {
-    realUrl: '/message/qa_content/find_client_ids' as const,
+    realUrl: '/message/qa_content/find_client_ids',
     reqType: {} as QaContent对象,
     resType: {} as any,
   },
   /** 根据条件获取问答分页列表 */
   page_1: {
-    realUrl: '/message/qa_content/page' as const,
+    realUrl: '/message/qa_content/page',
     reqType: {} as IPageParams<QaContentParam>,
     resType: {} as any,
   },
   /** 修改问答 */
   update_6: {
-    realUrl: '/message/qa_content/update' as const,
+    realUrl: '/message/qa_content/update',
     reqType: {} as QaContentSaveParam,
     resType: {} as any,
   },
   /** 问答是否有帮助 */
   use_or_no: {
-    realUrl: '/message/qa_content/use_or_no' as const,
+    realUrl: '/message/qa_content/use_or_no',
     reqType: {} as UseParam,
     resType: {} as any,
   },
   /** 添加问答客户端 */
   add_8: {
-    realUrl: '/message/qa_content_client/add' as const,
+    realUrl: '/message/qa_content_client/add',
     reqType: {} as QaContentClientParam,
     resType: {} as any,
   },
   /** 修改问答客户端 */
   update_7: {
-    realUrl: '/message/qa_content_client/update' as const,
+    realUrl: '/message/qa_content_client/update',
     reqType: {} as QaContentClientParam,
     resType: {} as any,
   },
   /** 根据手机号获取短信验证码发送日志 */
   find_sms_code_log: {
-    realUrl: '/message/sms_send_log/find_sms_code_log' as const,
+    realUrl: '/message/sms_send_log/find_sms_code_log',
     reqType: {} as MobileParam,
     resType: {} as SmsSendLog对象,
   },
   /** 获取sms_send_log列表 */
   list_7: {
-    realUrl: '/message/sms_send_log/list' as const,
+    realUrl: '/message/sms_send_log/list',
     reqType: {} as IPageParams<SmsSendLog对象>,
     resType: {} as IPage<SmsSendLog对象>,
   },
   /** 添加sms_template */
   add_9: {
-    realUrl: '/message/sms_template/add' as const,
+    realUrl: '/message/sms_template/add',
     reqType: {} as SmsTemplate对象,
     resType: {} as any,
   },
   /** 获取sms_template列表 */
   list_8: {
-    realUrl: '/message/sms_template/list' as const,
+    realUrl: '/message/sms_template/list',
     reqType: {} as IPageParams<SmsTemplate对象>,
     resType: {} as any,
   },
   /** 修改sms_template */
   update_8: {
-    realUrl: '/message/sms_template/update' as const,
+    realUrl: '/message/sms_template/update',
     reqType: {} as SmsTemplate对象,
     resType: {} as any,
   },
   /** 上传一个文件或图像 */
   file: {
-    realUrl: '/message/upload/file' as const,
+    realUrl: '/message/upload/file',
     isUpload: true,
 
     resType: {} as string,
   },
   /** 上传图像生成默认尺寸缩略图 */
   image: {
-    realUrl: '/message/upload/image' as const,
+    realUrl: '/message/upload/image',
     isUpload: true,
 
     resType: {} as string,
   },
   /** 上传图像生成指定尺寸缩略图 */
   thumb: {
-    realUrl: '/message/upload/thumb' as const,
+    realUrl: '/message/upload/thumb',
     isUpload: true,
     reqType: {} as {
       /** 缩略图的高度 */
@@ -400,67 +400,67 @@ export default {
   },
   /** 验证用户验证码 */
   code: {
-    realUrl: '/message/verify/code' as const,
+    realUrl: '/message/verify/code',
 
     resType: {} as boolean,
   },
   /** 获取验证码图片 */
   get_image: {
-    realUrl: '/message/verify_code/get_image' as const,
+    realUrl: '/message/verify_code/get_image',
 
     resType: {} as 图片验证码返回值,
   },
   /** 发送sms验证码 */
   send_1: {
-    realUrl: '/message/verify_code/send' as const,
+    realUrl: '/message/verify_code/send',
     reqType: {} as SmsSendLog对象,
     resType: {} as boolean,
   },
   /** 发送注册短信 */
   send_sms: {
-    realUrl: '/message/verify_code/send_sms' as const,
+    realUrl: '/message/verify_code/send_sms',
     reqType: {} as 发送短信_图形验证码辅助验证,
     resType: {} as boolean,
   },
   /** 验证用户验证码 */
   verify: {
-    realUrl: '/message/verify_code/verify' as const,
+    realUrl: '/message/verify_code/verify',
 
     resType: {} as boolean,
   },
   /** 发送物流账户余额不足的的微信模板消息 */
   send_carrierbalance_msg: {
-    realUrl: '/message/wx_template_message/send_carrierbalance_msg' as const,
+    realUrl: '/message/wx_template_message/send_carrierbalance_msg',
     reqType: {} as 返现微信模板消息参数,
     resType: {} as string,
   },
   /** 发送返现完成的微信模板消息 */
   send_cashback_msg: {
-    realUrl: '/message/wx_template_message/send_cashback_msg' as const,
+    realUrl: '/message/wx_template_message/send_cashback_msg',
     reqType: {} as 返现微信模板消息参数,
     resType: {} as string,
   },
   /** allUserinfo */
   all_userinfo: {
-    realUrl: '/message/wx_userinfo/all_userinfo' as const,
+    realUrl: '/message/wx_userinfo/all_userinfo',
     reqType: {} as 微信openid,
     resType: {} as WxUserinfo,
   },
   /** snsapi_base */
   snsapi_base: {
-    realUrl: '/message/wx_userinfo/snsapi_base' as const,
+    realUrl: '/message/wx_userinfo/snsapi_base',
     reqType: {} as 微信网页授权获取用户信息参数_授权后重定向参数,
     resType: {} as string,
   },
   /** snsapi_userinfo */
   snsapi_userinfo: {
-    realUrl: '/message/wx_userinfo/snsapi_userinfo' as const,
+    realUrl: '/message/wx_userinfo/snsapi_userinfo',
     reqType: {} as 微信网页授权获取用户信息参数_授权后重定向参数,
     resType: {} as WxWebPageUserinfo,
   },
   /** sendMsg */
   send_2: {
-    realUrl: '/test/msg/send' as const,
+    realUrl: '/test/msg/send',
 
     resType: {} as any,
   },

src/utils/config/interFaces/pay.ts

@@ -1,673 +1,673 @@
 export default {
   /** 创建加气订单 */
   add: {
-    realUrl: '/pay/gas_order/add' as const,
+    realUrl: '/pay/gas_order/add',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 创建加气订单 */
   add_v2: {
-    realUrl: '/pay/gas_order/add_v2' as const,
+    realUrl: '/pay/gas_order/add_v2',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 取消订单for收银员 */
   cancel_forcashier: {
-    realUrl: '/pay/gas_order/cancel_forcashier' as const,
+    realUrl: '/pay/gas_order/cancel_forcashier',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 物流客户订单查询接口，带时间 */
   list_withtime: {
-    realUrl: '/pay/gas_order/carrier/list_withtime' as const,
+    realUrl: '/pay/gas_order/carrier/list_withtime',
     reqType: {} as IPageParams<GasOrderListParam>,
     resType: {} as any,
   },
   /** 物流公司专享优惠订单查询接口，带时间 */
   list_withtime_1: {
-    realUrl: '/pay/gas_order/carrier_rebate/list_withtime' as const,
+    realUrl: '/pay/gas_order/carrier_rebate/list_withtime',
     reqType: {} as IPageParams<GasOrderListParam>,
     resType: {} as any,
   },
   /** 查询指定司机是否有待支付的订单 */
   driver_order_check: {
-    realUrl: '/pay/gas_order/driver_order_check' as const,
+    realUrl: '/pay/gas_order/driver_order_check',
     reqType: {} as 通用id参数,
     resType: {} as boolean,
   },
   /** 导出订单列表 */
   export: {
-    realUrl: '/pay/gas_order/export' as const,
+    realUrl: '/pay/gas_order/export',
     reqType: {} as ExcelExportParam,
 
   },
   /** 查找gas_order */
   find: {
-    realUrl: '/pay/gas_order/find' as const,
+    realUrl: '/pay/gas_order/find',
 
     resType: {} as any,
   },
   /** 统计日物流公司订单数 */
   find_carrier_order_total: {
-    realUrl: '/pay/gas_order/find_carrier_order_total' as const,
+    realUrl: '/pay/gas_order/find_carrier_order_total',
     reqType: {} as SumOrgOrderNumParam,
     resType: {} as any,
   },
   /** 查询加气站待支付订单数量,今日的 */
   find_gasstation_nopayorder_number: {
-    realUrl: '/pay/gas_order/find_gasstation_nopayorder_number' as const,
+    realUrl: '/pay/gas_order/find_gasstation_nopayorder_number',
     reqType: {} as GasstationIdParam,
     resType: {} as any,
   },
   /** 统计日加气站订单数 */
   find_gasstation_order_total: {
-    realUrl: '/pay/gas_order/find_gasstation_order_total' as const,
+    realUrl: '/pay/gas_order/find_gasstation_order_total',
     reqType: {} as SumOrgOrderNumParam,
     resType: {} as any,
   },
   /** 查找最新的一条订单for司机 */
   find_latest: {
-    realUrl: '/pay/gas_order/find_latest' as const,
+    realUrl: '/pay/gas_order/find_latest',
     reqType: {} as FindLatestParam,
     resType: {} as any,
   },
   /** 待支付订单详情for司机 */
   find_nopayfordriver: {
-    realUrl: '/pay/gas_order/find_nopayfordriver' as const,
+    realUrl: '/pay/gas_order/find_nopayfordriver',
     reqType: {} as Record<any, any>,
     resType: {} as any,
   },
   /** 待支付订单详情for司机 */
   find_unpayfordriver: {
-    realUrl: '/pay/gas_order/find_unpayfordriver' as const,
+    realUrl: '/pay/gas_order/find_unpayfordriver',
 
     resType: {} as GasOrder对象,
   },
   /** 根据司机id查询当前司机是否首次下单支付完成 */
   first_finished_order_check: {
-    realUrl: '/pay/gas_order/first_finished_order_check' as const,
+    realUrl: '/pay/gas_order/first_finished_order_check',
     reqType: {} as 通用id参数,
     resType: {} as boolean,
   },
   /** 加气站订单查询接口，带时间 */
   list_withtime_2: {
-    realUrl: '/pay/gas_order/gas/list_withtime' as const,
+    realUrl: '/pay/gas_order/gas/list_withtime',
     reqType: {} as IPageParams<GasOrderListParam>,
     resType: {} as any,
   },
   /** 查询加气站日订单数 */
   get_gasstation_order_total: {
-    realUrl: '/pay/gas_order/get_gasstation_order_total' as const,
+    realUrl: '/pay/gas_order/get_gasstation_order_total',
     reqType: {} as SumGasstationOrderNumParam,
     resType: {} as any,
   },
   /** 查询订单列表 */
   get_order_list: {
-    realUrl: '/pay/gas_order/get_order_list' as const,
+    realUrl: '/pay/gas_order/get_order_list',
     reqType: {} as IPageParams<GasOrderListParam>,
     resType: {} as GasOrderRes,
   },
   /** 查询订单优惠列表 */
   get_order_rebates: {
-    realUrl: '/pay/gas_order/get_order_rebates' as const,
+    realUrl: '/pay/gas_order/get_order_rebates',
     reqType: {} as 通用id参数,
     resType: {} as Array<GasOrderRebate对象>,
   },
   /** 查询订单 */
   get_orders: {
-    realUrl: '/pay/gas_order/get_orders' as const,
+    realUrl: '/pay/gas_order/get_orders',
     reqType: {} as IPageParams<订单查询参数实体类>,
     resType: {} as any,
   },
   /** 获取gas_order列表 */
   list: {
-    realUrl: '/pay/gas_order/list' as const,
+    realUrl: '/pay/gas_order/list',
     reqType: {} as IPageParams<GasOrder对象>,
     resType: {} as any,
   },
   /** 收银员管理端-查询加气订单 */
   list_for_gasstation: {
-    realUrl: '/pay/gas_order/list_for_gasstation' as const,
+    realUrl: '/pay/gas_order/list_for_gasstation',
     reqType: {} as IPageParams<GasOrderListParam>,
     resType: {} as any,
   },
   /** 通用订单查询接口，带时间 */
   list_withtime_3: {
-    realUrl: '/pay/gas_order/list_withtime' as const,
+    realUrl: '/pay/gas_order/list_withtime',
     reqType: {} as IPageParams<GasOrderListParam>,
     resType: {} as any,
   },
   /** 查询指定车辆是否有待支付的订单 */
   truck_order_check: {
-    realUrl: '/pay/gas_order/truck_order_check' as const,
+    realUrl: '/pay/gas_order/truck_order_check',
     reqType: {} as 通用id参数,
     resType: {} as boolean,
   },
   /** 修改gas_order */
   update: {
-    realUrl: '/pay/gas_order/update' as const,
+    realUrl: '/pay/gas_order/update',
     reqType: {} as GasOrder对象,
     resType: {} as any,
   },
   /** 司机创建气瓶检测预约订单 */
   add_1: {
-    realUrl: '/pay/gct_order/add' as const,
+    realUrl: '/pay/gct_order/add',
     reqType: {} as 气瓶检测订单查询参数,
     resType: {} as GctOrder对象,
   },
   /** 根据id取消气瓶检测订单 */
   cancel: {
-    realUrl: '/pay/gct_order/cancel' as const,
+    realUrl: '/pay/gct_order/cancel',
     reqType: {} as GctOrder对象,
     resType: {} as boolean,
   },
   /** 根据id查询气瓶检测订单详情 */
   get_by_id: {
-    realUrl: '/pay/gct_order/get_by_id' as const,
+    realUrl: '/pay/gct_order/get_by_id',
     reqType: {} as 通用id参数,
     resType: {} as GctOrder对象,
   },
   /** getDriverOrders */
   get_driver_appointed_order: {
-    realUrl: '/pay/gct_order/get_driver_appointed_order' as const,
+    realUrl: '/pay/gct_order/get_driver_appointed_order',
     reqType: {} as 司机预约检测订单查询参数,
     resType: {} as Array<GctOrder对象>,
   },
   /** 运营管理后台气瓶检测订单分页查询 */
   page_list: {
-    realUrl: '/pay/gct_order/page_list' as const,
+    realUrl: '/pay/gct_order/page_list',
     reqType: {} as IPageParams<气瓶检测订单查询参数>,
     resType: {} as IPage<GctOrder对象>,
   },
   /** 分页查询司机自己的气瓶检测订单 */
   page_list_for_driver: {
-    realUrl: '/pay/gct_order/page_list_for_driver' as const,
+    realUrl: '/pay/gct_order/page_list_for_driver',
     reqType: {} as IPageParams<气瓶检测订单查询参数>,
     resType: {} as IPage<GctOrder对象>,
   },
   /** 加气站的气瓶检测订单分页查询 */
   page_list_for_gasstation: {
-    realUrl: '/pay/gct_order/page_list_for_gasstation' as const,
+    realUrl: '/pay/gct_order/page_list_for_gasstation',
     reqType: {} as IPageParams<气瓶检测订单查询参数>,
     resType: {} as IPage<GctOrder对象>,
   },
   /** 加气站确认返还资料 */
   confirm_returned: {
-    realUrl: '/pay/gct_order_attach/confirm_returned' as const,
+    realUrl: '/pay/gct_order_attach/confirm_returned',
     reqType: {} as 气瓶检测订单附件信息,
     resType: {} as boolean,
   },
   /** 加气站确认签收资料 */
   confirm_signed: {
-    realUrl: '/pay/gct_order_attach/confirm_signed' as const,
+    realUrl: '/pay/gct_order_attach/confirm_signed',
     reqType: {} as 气瓶检测订单附件信息,
     resType: {} as boolean,
   },
   /** 根据订单id查询订单所有的资料 */
   list_1: {
-    realUrl: '/pay/gct_order_attach/list' as const,
+    realUrl: '/pay/gct_order_attach/list',
     reqType: {} as 通用id参数,
     resType: {} as Array<GctOrderAttach对象>,
   },
   /** 请求绑定银行卡 */
   bind_bankCard: {
-    realUrl: '/pay/member/bind_bankCard' as const,
+    realUrl: '/pay/member/bind_bankCard',
     reqType: {} as BindCardParam,
     resType: {} as any,
   },
   /** 绑定手机 */
   bind_phone: {
-    realUrl: '/pay/member/bind_phone' as const,
+    realUrl: '/pay/member/bind_phone',
     reqType: {} as BindPhoneParam,
     resType: {} as any,
   },
   /** childFillerAutoAuth */
   child_filler_auto_auth: {
-    realUrl: '/pay/member/child_filler_auto_auth' as const,
+    realUrl: '/pay/member/child_filler_auto_auth',
     reqType: {} as Org,
     resType: {} as boolean,
   },
   /** getBankCardBin */
   get_bankCardBin: {
-    realUrl: '/pay/member/get_bankCardBin' as const,
+    realUrl: '/pay/member/get_bankCardBin',
     reqType: {} as GetBankCardBinParam,
     resType: {} as any,
   },
   /** getMemberInfo */
   get_memberInfo: {
-    realUrl: '/pay/member/get_memberInfo' as const,
+    realUrl: '/pay/member/get_memberInfo',
     reqType: {} as GetMemberInfoParam,
     resType: {} as any,
   },
   /** 获取企业认证相关状态 */
   get_org_auth_info: {
-    realUrl: '/pay/member/get_org_auth_info' as const,
+    realUrl: '/pay/member/get_org_auth_info',
 
     resType: {} as any,
   },
   /** idcard */
   idcard: {
-    realUrl: '/pay/member/idcard' as const,
+    realUrl: '/pay/member/idcard',
     reqType: {} as 身份证二要素认证参数,
     resType: {} as boolean,
   },
   /** 渠道开户 */
   open_account: {
-    realUrl: '/pay/member/open_account' as const,
+    realUrl: '/pay/member/open_account',
     reqType: {} as OpenAccountParam,
     resType: {} as any,
   },
   /** 查询绑定银行卡状态 */
   query_bankCard: {
-    realUrl: '/pay/member/query_bankCard' as const,
+    realUrl: '/pay/member/query_bankCard',
     reqType: {} as QueryBankCardParam,
     resType: {} as any,
   },
   /** 提现协议查询 */
   query_withdraw_protocol: {
-    realUrl: '/pay/member/query_withdraw_protocol' as const,
+    realUrl: '/pay/member/query_withdraw_protocol',
     reqType: {} as QuerySignContractParam,
     resType: {} as any,
   },
   /** 发送验证码 */
   send_sms_code: {
-    realUrl: '/pay/member/send_sms_code' as const,
+    realUrl: '/pay/member/send_sms_code',
     reqType: {} as SendVerificationCodeParam,
     resType: {} as any,
   },
   /** 转账授权 */
   sign_balance_protocol: {
-    realUrl: '/pay/member/sign_balance_protocol' as const,
+    realUrl: '/pay/member/sign_balance_protocol',
     reqType: {} as SignBalanceProtocolParam,
     resType: {} as any,
   },
   /** 提现授权 */
   sign_withdraw_protocol: {
-    realUrl: '/pay/member/sign_withdraw_protocol' as const,
+    realUrl: '/pay/member/sign_withdraw_protocol',
     reqType: {} as SignContractProtocolParam,
     resType: {} as any,
   },
   /** 解除绑定银行卡 */
   unbind_bankCard: {
-    realUrl: '/pay/member/unbind_bankCard' as const,
+    realUrl: '/pay/member/unbind_bankCard',
     reqType: {} as UnbindBankCardParam,
     resType: {} as any,
   },
   /** 解除绑定手机 */
   unbind_phone: {
-    realUrl: '/pay/member/unbind_phone' as const,
+    realUrl: '/pay/member/unbind_phone',
     reqType: {} as UnBindPhoneParam,
     resType: {} as any,
   },
   /** 上传企业营业执照、身份证图片到通联 */
   upload_org_pic: {
-    realUrl: '/pay/member/upload_org_pic' as const,
+    realUrl: '/pay/member/upload_org_pic',
     reqType: {} as IdcardCollectParam,
     resType: {} as any,
   },
   /** idcardAuth */
   idcard_auth: {
-    realUrl: '/pay/member/vehicle_owner/idcard_auth' as const,
+    realUrl: '/pay/member/vehicle_owner/idcard_auth',
     reqType: {} as 身份证二要素认证参数,
     resType: {} as boolean,
   },
   /** 物流公司B2B充值 */
   deposit_apply: {
-    realUrl: '/pay/pay/deposit_apply' as const,
+    realUrl: '/pay/pay/deposit_apply',
     reqType: {} as B2BDepositParam,
     resType: {} as any,
   },
   /** 物流公司B2B充值，弹出银联页面 */
   deposit_apply_confirm: {
-    realUrl: '/pay/pay/deposit_apply_confirm' as const,
+    realUrl: '/pay/pay/deposit_apply_confirm',
     reqType: {} as B2BDepositConfirmParam,
     resType: {} as any,
   },
   /** 气瓶检测微信支付 */
   gct_wxpay: {
-    realUrl: '/pay/pay/gct_wxpay' as const,
+    realUrl: '/pay/pay/gct_wxpay',
     reqType: {} as 气瓶检测订单微信支付参数,
     resType: {} as any,
   },
   /** 长城奥扬代物流公司B2B充值(直销) */
   gway_deposit_apply: {
-    realUrl: '/pay/pay/gway_deposit_apply' as const,
+    realUrl: '/pay/pay/gway_deposit_apply',
     reqType: {} as B2BDepositParam,
     resType: {} as any,
   },
   /** 长城奥扬发起向物流公司B2B充值(直销) */
   gway_deposit_start: {
-    realUrl: '/pay/pay/gway_deposit_start' as const,
+    realUrl: '/pay/pay/gway_deposit_start',
     reqType: {} as B2BDepositParam,
     resType: {} as any,
   },
   /** 小程序支付 */
   minapay: {
-    realUrl: '/pay/pay/minapay' as const,
+    realUrl: '/pay/pay/minapay',
     reqType: {} as WxpayParam,
     resType: {} as any,
   },
   /** 订单支付 */
   order_pay: {
-    realUrl: '/pay/pay/order_pay' as const,
+    realUrl: '/pay/pay/order_pay',
     reqType: {} as OrderPayParam,
     resType: {} as any,
   },
   /** 查询账户收支明细 */
   query_bankIn_expDetail: {
-    realUrl: '/pay/pay/query_bankIn_expDetail' as const,
+    realUrl: '/pay/pay/query_bankIn_expDetail',
     reqType: {} as QueryBankInExpDetailParam,
     resType: {} as any,
   },
   /** 查询账户资金流水分页列表 */
   query_cash_flow: {
-    realUrl: '/pay/pay/query_cash_flow' as const,
+    realUrl: '/pay/pay/query_cash_flow',
     reqType: {} as IPageParams<QueryCashFlowParam>,
     resType: {} as any,
   },
   /** 挂靠车消费 */
   rely_consume: {
-    realUrl: '/pay/pay/rely_consume' as const,
+    realUrl: '/pay/pay/rely_consume',
     reqType: {} as SelfConsumeParam,
     resType: {} as any,
   },
   /** 自营车消费 */
   self_consume: {
-    realUrl: '/pay/pay/self_consume' as const,
+    realUrl: '/pay/pay/self_consume',
     reqType: {} as SelfConsumeParam,
     resType: {} as any,
   },
   /** 提现申请 */
   withdraw_apply: {
-    realUrl: '/pay/pay/withdraw_apply' as const,
+    realUrl: '/pay/pay/withdraw_apply',
     reqType: {} as WithdrawParam,
     resType: {} as any,
   },
   /** 微信支付 */
   wxpay: {
-    realUrl: '/pay/pay/wxpay' as const,
+    realUrl: '/pay/pay/wxpay',
     reqType: {} as WxpayParam,
     resType: {} as any,
   },
   /** 根据渠道id获取渠道信息 */
   find_1: {
-    realUrl: '/pay/pay_channel/find' as const,
+    realUrl: '/pay/pay_channel/find',
     reqType: {} as PayChannel对象,
     resType: {} as any,
   },
   /** 新增充值订单（物流商充值） */
   add_2: {
-    realUrl: '/pay/recharge_order/add' as const,
+    realUrl: '/pay/recharge_order/add',
     reqType: {} as RechargeOrder对象,
     resType: {} as any,
   },
   /** 查找recharge_order */
   find_2: {
-    realUrl: '/pay/recharge_order/find' as const,
+    realUrl: '/pay/recharge_order/find',
 
     resType: {} as any,
   },
   /** 根据车牌号查询该车辆的充值流水 */
   find_by_car_number: {
-    realUrl: '/pay/recharge_order/find_by_car_number' as const,
+    realUrl: '/pay/recharge_order/find_by_car_number',
     reqType: {} as IPageParams<RechargeOrderParam>,
     resType: {} as any,
   },
   /** 获取recharge_order列表 */
   list_2: {
-    realUrl: '/pay/recharge_order/list' as const,
+    realUrl: '/pay/recharge_order/list',
     reqType: {} as IPageParams<RechargeOrderParam>,
     resType: {} as any,
   },
   /** 根据日期获取recharge_order列表 */
   list_withtime_4: {
-    realUrl: '/pay/recharge_order/list_withtime' as const,
+    realUrl: '/pay/recharge_order/list_withtime',
     reqType: {} as IPageParams<RechargeOrderParam>,
     resType: {} as any,
   },
   /** 添加register_log */
   add_3: {
-    realUrl: '/pay/register_log/add' as const,
+    realUrl: '/pay/register_log/add',
     reqType: {} as RegisterLog对象,
     resType: {} as any,
   },
   /** 最新一条-异步回调审核结果 */
   find_failReason: {
-    realUrl: '/pay/register_log/find_failReason' as const,
+    realUrl: '/pay/register_log/find_failReason',
     reqType: {} as RegisterLog对象,
     resType: {} as any,
   },
   /** 最新一条-异步回调返回信息日志详情 */
   find_latest_1: {
-    realUrl: '/pay/register_log/find_latest' as const,
+    realUrl: '/pay/register_log/find_latest',
     reqType: {} as RegisterLog对象,
     resType: {} as any,
   },
   /** 获取register_log列表 */
   list_3: {
-    realUrl: '/pay/register_log/list' as const,
+    realUrl: '/pay/register_log/list',
     reqType: {} as IPageParams<RegisterLog对象>,
     resType: {} as any,
   },
   /** 修改register_log */
   update_1: {
-    realUrl: '/pay/register_log/update' as const,
+    realUrl: '/pay/register_log/update',
     reqType: {} as RegisterLog对象,
     resType: {} as any,
   },
   /** 创建加气订单 */
   add_gasorder: {
-    realUrl: '/pay/third_party/add_gasorder' as const,
+    realUrl: '/pay/third_party/add_gasorder',
     reqType: {} as TpGasOrderParam,
     resType: {} as any,
   },
   /** 取消订单 */
   cancel_gasorder: {
-    realUrl: '/pay/third_party/cancel_gasorder' as const,
+    realUrl: '/pay/third_party/cancel_gasorder',
     reqType: {} as TpGasOrderParam,
     resType: {} as any,
   },
   /** 加气订单消费接口 */
   consume: {
-    realUrl: '/pay/third_party/consume' as const,
+    realUrl: '/pay/third_party/consume',
     reqType: {} as TpGasOrderParam,
     resType: {} as any,
   },
   /** 物流司机信息分页查询接口 */
   page_driver: {
-    realUrl: '/pay/third_party/page_driver' as const,
+    realUrl: '/pay/third_party/page_driver',
     reqType: {} as IPageParams<成丰对接_站全量查询参数>,
     resType: {} as any,
   },
   /** 物流订单信息分页查询接口 */
   page_gasorder: {
-    realUrl: '/pay/third_party/page_gasorder' as const,
+    realUrl: '/pay/third_party/page_gasorder',
     reqType: {} as IPageParams<成丰对接_站全量查询参数>,
     resType: {} as any,
   },
   /** 查找gas_order */
   qry_gasorder: {
-    realUrl: '/pay/third_party/qry_gasorder' as const,
+    realUrl: '/pay/third_party/qry_gasorder',
     reqType: {} as TpGasOrderParam,
     resType: {} as 外部对接加气订单VO,
   },
   /** 提现审核,通过：status=1，驳回：status=5 */
   check: {
-    realUrl: '/pay/withdraw_check_log/check' as const,
+    realUrl: '/pay/withdraw_check_log/check',
     reqType: {} as WithdrawCheckLog对象,
     resType: {} as any,
   },
   /** 通过withdraw_order_id，查询最新的审核记录 */
   find_3: {
-    realUrl: '/pay/withdraw_check_log/find' as const,
+    realUrl: '/pay/withdraw_check_log/find',
     reqType: {} as WithdrawCheckLog对象,
     resType: {} as any,
   },
   /** 查询审核记录日志 */
   list_4: {
-    realUrl: '/pay/withdraw_check_log/list' as const,
+    realUrl: '/pay/withdraw_check_log/list',
     reqType: {} as IPageParams<WithdrawCheckLog对象>,
     resType: {} as any,
   },
   /** 添加 */
   add_4: {
-    realUrl: '/pay/withdraw_config/add' as const,
+    realUrl: '/pay/withdraw_config/add',
     reqType: {} as WithdrawConfig对象,
     resType: {} as any,
   },
   /** 批量添加 */
   batch_add: {
-    realUrl: '/pay/withdraw_config/batch_add' as const,
+    realUrl: '/pay/withdraw_config/batch_add',
 
     resType: {} as any,
   },
   /** 根据组织名称+限制状态，获取withdraw_config列表 */
   list_by_param: {
-    realUrl: '/pay/withdraw_config/list_by_param' as const,
+    realUrl: '/pay/withdraw_config/list_by_param',
     reqType: {} as IPageParams<WithdrawConfig对象>,
     resType: {} as any,
   },
   /** 修改限制状态 */
   update_limitstatus: {
-    realUrl: '/pay/withdraw_config/update_limitstatus' as const,
+    realUrl: '/pay/withdraw_config/update_limitstatus',
     reqType: {} as WithdrawConfig对象,
     resType: {} as any,
   },
   /** 添加withdraw_order */
   add_5: {
-    realUrl: '/pay/withdraw_order/add' as const,
+    realUrl: '/pay/withdraw_order/add',
     reqType: {} as WithdrawOrder对象,
     resType: {} as any,
   },
   /** 获取待审核列表，status=0 */
   check_list: {
-    realUrl: '/pay/withdraw_order/check_list' as const,
+    realUrl: '/pay/withdraw_order/check_list',
     reqType: {} as IPageParams<WithdrawOrder对象>,
     resType: {} as any,
   },
   /** 提现电子回单下载 */
   eleReceiptDownload: {
-    realUrl: '/pay/withdraw_order/eleReceiptDownload' as const,
+    realUrl: '/pay/withdraw_order/eleReceiptDownload',
     reqType: {} as WithdrawOrder对象,
     resType: {} as any,
   },
   /** 根据订单号查询订单 */
   find_4: {
-    realUrl: '/pay/withdraw_order/find' as const,
+    realUrl: '/pay/withdraw_order/find',
     reqType: {} as WithdrawOrder对象,
     resType: {} as any,
   },
   /** 获取机构提现总金额 */
   find_total_amount: {
-    realUrl: '/pay/withdraw_order/find_total_amount' as const,
+    realUrl: '/pay/withdraw_order/find_total_amount',
     reqType: {} as WithdrawOrderParam,
     resType: {} as any,
   },
   /** 获取提现列表 */
   list_5: {
-    realUrl: '/pay/withdraw_order/list' as const,
+    realUrl: '/pay/withdraw_order/list',
     reqType: {} as IPageParams<WithdrawOrderListParam>,
     resType: {} as any,
   },
   /** 修改withdraw_order */
   update_2: {
-    realUrl: '/pay/withdraw_order/update' as const,
+    realUrl: '/pay/withdraw_order/update',
     reqType: {} as WithdrawOrder对象,
     resType: {} as any,
   },
   /** 添加withdraw_order_log */
   add_6: {
-    realUrl: '/pay/withdraw_order_log/add' as const,
+    realUrl: '/pay/withdraw_order_log/add',
     reqType: {} as WithdrawOrderLog对象,
     resType: {} as any,
   },
   /** 根据提现订单id查询订单日志 */
   get: {
-    realUrl: '/pay/withdraw_order_log/get' as const,
+    realUrl: '/pay/withdraw_order_log/get',
     reqType: {} as WithdrawOrderLogParam,
     resType: {} as any,
   },
   /** 获取withdraw_order_log列表 */
   list_6: {
-    realUrl: '/pay/withdraw_order_log/list' as const,
+    realUrl: '/pay/withdraw_order_log/list',
     reqType: {} as IPageParams<WithdrawOrderLog对象>,
     resType: {} as any,
   },
   /** 修改withdraw_order_log */
   update_3: {
-    realUrl: '/pay/withdraw_order_log/update' as const,
+    realUrl: '/pay/withdraw_order_log/update',
     reqType: {} as WithdrawOrderLog对象,
     resType: {} as any,
   },
   /** 添加 */
   add_7: {
-    realUrl: '/pay/withdraw_quota_config/add' as const,
+    realUrl: '/pay/withdraw_quota_config/add',
     reqType: {} as WithdrawQuotaConfig对象,
     resType: {} as any,
   },
   /** 根据ID查找余额限定 */
   find_5: {
-    realUrl: '/pay/withdraw_quota_config/find' as const,
+    realUrl: '/pay/withdraw_quota_config/find',
     reqType: {} as WithdrawQuotaConfig对象,
     resType: {} as any,
   },
   /** 根据账户类型查询余额限定 */
   find_by_orgType: {
-    realUrl: '/pay/withdraw_quota_config/find_by_orgType' as const,
+    realUrl: '/pay/withdraw_quota_config/find_by_orgType',
     reqType: {} as WithdrawQuotaConfig对象,
     resType: {} as any,
   },
   /** 获取账户余额限定列表 */
   list_7: {
-    realUrl: '/pay/withdraw_quota_config/list' as const,
+    realUrl: '/pay/withdraw_quota_config/list',
     reqType: {} as IPageParams<WithdrawQuotaConfig对象>,
     resType: {} as any,
   },
   /** 修改账户余额限定 */
   update_4: {
-    realUrl: '/pay/withdraw_quota_config/update' as const,
+    realUrl: '/pay/withdraw_quota_config/update',
     reqType: {} as 修改提现账户余额限定参数,
     resType: {} as any,
   },
   /** 根据账户类型获取账户余额限定修改记录列表 */
   list_by_orgType: {
-    realUrl: '/pay/withdraw_quota_log/list_by_orgType' as const,
+    realUrl: '/pay/withdraw_quota_log/list_by_orgType',
     reqType: {} as IPageParams<WithdrawQuotaLog对象>,
     resType: {} as any,
   },
   /** 获取微信AccessToken */
   access_token: {
-    realUrl: '/pay/wx/access_token' as const,
+    realUrl: '/pay/wx/access_token',
 
     resType: {} as string,
   },
   /** 获取微信openid */
   get_open_id: {
-    realUrl: '/pay/wx/get_open_id' as const,
+    realUrl: '/pay/wx/get_open_id',
     reqType: {} as WxpayParam,
     resType: {} as string,
   },
   /** 获取jsapi签名 */
   js_sign: {
-    realUrl: '/pay/wx/js_sign' as const,
+    realUrl: '/pay/wx/js_sign',
     reqType: {} as JsSignParam,
     resType: {} as any,
   },
   /** 获取微信小程序用户信息 */
   mini_user_info: {
-    realUrl: '/pay/wx/mini_user_info' as const,
+    realUrl: '/pay/wx/mini_user_info',
     reqType: {} as WxpayParam,
     resType: {} as User对象,
   },
   /** 获取并更新微信openid */
   open_id: {
-    realUrl: '/pay/wx/open_id' as const,
+    realUrl: '/pay/wx/open_id',
     reqType: {} as WxpayParam,
     resType: {} as string,
   },
   /** 获取微信用户信息 */
   user_info: {
-    realUrl: '/pay/wx/user_info' as const,
+    realUrl: '/pay/wx/user_info',
     reqType: {} as WxpayParam,
     resType: {} as User对象,
   },

src/utils/config/interFaces/tms.ts

@@ -1,97 +1,97 @@
 export default {
   /** 添加truck_driver */
   add: {
-    realUrl: '/strategy/truck_driver/add' as const,
+    realUrl: '/strategy/truck_driver/add',
     reqType: {} as TruckDriver对象,
     resType: {} as any,
   },
   /** 获取truck_driver列表 */
   list: {
-    realUrl: '/strategy/truck_driver/list' as const,
+    realUrl: '/strategy/truck_driver/list',
     reqType: {} as IPageParams<TruckDriver对象>,
     resType: {} as any,
   },
   /** 修改truck_driver */
   update: {
-    realUrl: '/strategy/truck_driver/update' as const,
+    realUrl: '/strategy/truck_driver/update',
     reqType: {} as TruckDriver对象,
     resType: {} as any,
   },
   /** 下载行车日志,导出专用 */
   download_test: {
-    realUrl: '/tms/jxls_export/download_test' as const,
+    realUrl: '/tms/jxls_export/download_test',
     reqType: {} as WorkOrder对象,
     resType: {} as StreamingResponseBody,
   },
   /** 获取行车日志导出类 */
   get_get_work_log_tpl_vo: {
-    realUrl: '/tms/jxls_export/get_get_work_log_tpl_vo' as const,
+    realUrl: '/tms/jxls_export/get_get_work_log_tpl_vo',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 获取卡车距时间相近的位置信息 */
   get_by_date: {
-    realUrl: '/tms/location/get_by_date' as const,
+    realUrl: '/tms/location/get_by_date',
     reqType: {} as LocationQueryParam对象,
     resType: {} as LocationVO对象,
   },
   /** 获取卡车位置信息 */
   get_by_truck: {
-    realUrl: '/tms/location/get_by_truck' as const,
+    realUrl: '/tms/location/get_by_truck',
     reqType: {} as LocationQueryParam对象,
     resType: {} as LocationVO对象,
   },
   /** 获取卡车位置信息list */
   get_truck_trip: {
-    realUrl: '/tms/location/get_truck_trip' as const,
+    realUrl: '/tms/location/get_truck_trip',
     reqType: {} as LocationQueryParam对象,
     resType: {} as Array<LocationVO对象>,
   },
   /** 获取途中休息信息列表 */
   list_1: {
-    realUrl: '/tms/rest_info/list' as const,
+    realUrl: '/tms/rest_info/list',
     reqType: {} as IPageParams<RestInfo对象>,
     resType: {} as any,
   },
   /** 修改途中休息信息 */
   update_1: {
-    realUrl: '/tms/rest_info/update' as const,
+    realUrl: '/tms/rest_info/update',
     reqType: {} as RestInfo对象,
     resType: {} as any,
   },
   /** 添加托运方 */
   add_1: {
-    realUrl: '/tms/shipper/add' as const,
+    realUrl: '/tms/shipper/add',
     reqType: {} as Shipper对象,
     resType: {} as any,
   },
   /** 删除托运方 */
   delete: {
-    realUrl: '/tms/shipper/delete' as const,
+    realUrl: '/tms/shipper/delete',
     reqType: {} as Shipper对象,
     resType: {} as any,
   },
   /** 根据id获取托运方详情 */
   get_one: {
-    realUrl: '/tms/shipper/get_one' as const,
+    realUrl: '/tms/shipper/get_one',
     reqType: {} as Shipper对象,
     resType: {} as any,
   },
   /** 获取托运方分页列表 */
   page_list: {
-    realUrl: '/tms/shipper/page_list' as const,
+    realUrl: '/tms/shipper/page_list',
     reqType: {} as IPageParams<Shipper对象>,
     resType: {} as any,
   },
   /** 修改托运方 */
   update_2: {
-    realUrl: '/tms/shipper/update' as const,
+    realUrl: '/tms/shipper/update',
     reqType: {} as Shipper对象,
     resType: {} as any,
   },
   /** 根据经纬度查询位置 */
   baiduapi: {
-    realUrl: '/tms/test/baiduapi' as const,
+    realUrl: '/tms/test/baiduapi',
     reqType: {} as {
       /** lat */
       lat: string
@@ -102,7 +102,7 @@ export default {
   },
   /** mongo查询测试接口 */
   mongoCheck: {
-    realUrl: '/tms/test/mongoCheck' as const,
+    realUrl: '/tms/test/mongoCheck',
     reqType: {} as {
       /** clientId */
       clientId: string
@@ -113,7 +113,7 @@ export default {
   },
   /** mongo查询车辆最新位置 */
   query_truck: {
-    realUrl: '/tms/test/query_truck' as const,
+    realUrl: '/tms/test/query_truck',
     reqType: {} as {
       /** truckId */
       truckId: number
@@ -122,7 +122,7 @@ export default {
   },
   /** mongo查询车辆最新位置 */
   query_truck_trip: {
-    realUrl: '/tms/test/query_truck_trip' as const,
+    realUrl: '/tms/test/query_truck_trip',
     reqType: {} as {
       /** truckId */
       truckId: number
@@ -131,7 +131,7 @@ export default {
   },
   /** 测试发送运单短信 */
   testSms: {
-    realUrl: '/tms/test/testSms' as const,
+    realUrl: '/tms/test/testSms',
     reqType: {} as {
       /** truckId */
       truckId: number
@@ -140,7 +140,7 @@ export default {
   },
   /** 测试运单短信模板 */
   testSmsTemp: {
-    realUrl: '/tms/test/testSmsTemp' as const,
+    realUrl: '/tms/test/testSmsTemp',
     reqType: {} as {
       /** monbiles */
       monbiles: string
@@ -149,7 +149,7 @@ export default {
   },
   /** 工具类测试 */
   testUtil: {
-    realUrl: '/tms/test/testUtil' as const,
+    realUrl: '/tms/test/testUtil',
     reqType: {} as {
       /** lat */
       lat: number
@@ -162,7 +162,7 @@ export default {
   },
   /** mongo聚合查询测试 */
   test_mongo_group: {
-    realUrl: '/tms/test/test_mongo_group' as const,
+    realUrl: '/tms/test/test_mongo_group',
     reqType: {} as {
       /** truckIds */
       truckIds: string
@@ -171,553 +171,553 @@ export default {
   },
   /** 添加燃气费用 */
   add_2: {
-    realUrl: '/tms/tms_gas_fee/add' as const,
+    realUrl: '/tms/tms_gas_fee/add',
     reqType: {} as TmsGasFee对象,
     resType: {} as any,
   },
   /** 删除燃气费用 */
   delete_1: {
-    realUrl: '/tms/tms_gas_fee/delete' as const,
+    realUrl: '/tms/tms_gas_fee/delete',
     reqType: {} as TmsGasFee对象,
     resType: {} as any,
   },
   /** 根据id获取燃气费用详情 */
   get_one_1: {
-    realUrl: '/tms/tms_gas_fee/get_one' as const,
+    realUrl: '/tms/tms_gas_fee/get_one',
     reqType: {} as TmsGasFee对象,
     resType: {} as any,
   },
   /** 获取燃气费用列表 */
   list_2: {
-    realUrl: '/tms/tms_gas_fee/list' as const,
+    realUrl: '/tms/tms_gas_fee/list',
     reqType: {} as TmsGasFee对象,
     resType: {} as any,
   },
   /** 获取tms_gas_fee分页列表 */
   page_list_1: {
-    realUrl: '/tms/tms_gas_fee/page_list' as const,
+    realUrl: '/tms/tms_gas_fee/page_list',
     reqType: {} as IPageParams<TmsGasFee对象>,
     resType: {} as any,
   },
   /** 修改燃气费用 */
   update_3: {
-    realUrl: '/tms/tms_gas_fee/update' as const,
+    realUrl: '/tms/tms_gas_fee/update',
     reqType: {} as TmsGasFee对象,
     resType: {} as any,
   },
   /** 添加线路费用 */
   add_3: {
-    realUrl: '/tms/tms_line_cost/add' as const,
+    realUrl: '/tms/tms_line_cost/add',
     reqType: {} as TmsLineCost对象,
     resType: {} as any,
   },
   /** 删除线路费用 */
   delete_2: {
-    realUrl: '/tms/tms_line_cost/delete' as const,
+    realUrl: '/tms/tms_line_cost/delete',
     reqType: {} as TmsLineCost对象,
     resType: {} as any,
   },
   /** 根据id获取线路费用详情 */
   get_one_2: {
-    realUrl: '/tms/tms_line_cost/get_one' as const,
+    realUrl: '/tms/tms_line_cost/get_one',
     reqType: {} as TmsLineCost对象,
     resType: {} as any,
   },
   /** 获取线路费用列表 */
   list_3: {
-    realUrl: '/tms/tms_line_cost/list' as const,
+    realUrl: '/tms/tms_line_cost/list',
     reqType: {} as TmsLineCost对象,
     resType: {} as any,
   },
   /** 获取tms_line_cost分页列表 */
   page_list_2: {
-    realUrl: '/tms/tms_line_cost/page_list' as const,
+    realUrl: '/tms/tms_line_cost/page_list',
     reqType: {} as IPageParams<TmsLineCost对象>,
     resType: {} as any,
   },
   /** 修改线路费用 */
   update_4: {
-    realUrl: '/tms/tms_line_cost/update' as const,
+    realUrl: '/tms/tms_line_cost/update',
     reqType: {} as TmsLineCost对象,
     resType: {} as any,
   },
   /** 添加tms_line_cost_other */
   add_4: {
-    realUrl: '/tms/tms_line_cost_other/add' as const,
+    realUrl: '/tms/tms_line_cost_other/add',
     reqType: {} as TmsLineCostOther对象,
     resType: {} as any,
   },
   /** 获取tms_line_cost_other列表 */
   list_4: {
-    realUrl: '/tms/tms_line_cost_other/list' as const,
+    realUrl: '/tms/tms_line_cost_other/list',
     reqType: {} as IPageParams<TmsLineCostOther对象>,
     resType: {} as any,
   },
   /** 修改tms_line_cost_other */
   update_5: {
-    realUrl: '/tms/tms_line_cost_other/update' as const,
+    realUrl: '/tms/tms_line_cost_other/update',
     reqType: {} as TmsLineCostOther对象,
     resType: {} as any,
   },
   /** 添加其他费用 */
   add_5: {
-    realUrl: '/tms/tms_other_fee/add' as const,
+    realUrl: '/tms/tms_other_fee/add',
     reqType: {} as TmsOtherFee对象,
     resType: {} as any,
   },
   /** 删除其他费用 */
   delete_3: {
-    realUrl: '/tms/tms_other_fee/delete' as const,
+    realUrl: '/tms/tms_other_fee/delete',
     reqType: {} as TmsOtherFee对象,
     resType: {} as any,
   },
   /** 根据id获取其他费用详情 */
   get_one_3: {
-    realUrl: '/tms/tms_other_fee/get_one' as const,
+    realUrl: '/tms/tms_other_fee/get_one',
     reqType: {} as TmsOtherFee对象,
     resType: {} as any,
   },
   /** 获取其他费用列表(供行车费用列表展示用) */
   list_5: {
-    realUrl: '/tms/tms_other_fee/list' as const,
+    realUrl: '/tms/tms_other_fee/list',
     reqType: {} as TmsOtherFee对象,
     resType: {} as any,
   },
   /** 获取tms_other_fee分页列表 */
   page_list_3: {
-    realUrl: '/tms/tms_other_fee/page_list' as const,
+    realUrl: '/tms/tms_other_fee/page_list',
     reqType: {} as IPageParams<TmsOtherFee对象>,
     resType: {} as any,
   },
   /** 修改其他费用 */
   update_6: {
-    realUrl: '/tms/tms_other_fee/update' as const,
+    realUrl: '/tms/tms_other_fee/update',
     reqType: {} as TmsOtherFee对象,
     resType: {} as any,
   },
   /** 添加truck */
   add_6: {
-    realUrl: '/tms/truck/add' as const,
+    realUrl: '/tms/truck/add',
     reqType: {} as Truck对象,
     resType: {} as any,
   },
   /** 取车牌号 */
   get_car_number: {
-    realUrl: '/tms/truck/get_car_number' as const,
+    realUrl: '/tms/truck/get_car_number',
 
     resType: {} as Truck对象,
   },
   /** 获取truck列表 */
   list_6: {
-    realUrl: '/tms/truck/list' as const,
+    realUrl: '/tms/truck/list',
     reqType: {} as IPageParams<Truck对象>,
     resType: {} as any,
   },
   /** 修改truck */
   update_7: {
-    realUrl: '/tms/truck/update' as const,
+    realUrl: '/tms/truck/update',
     reqType: {} as Truck对象,
     resType: {} as any,
   },
   /** 查找车辆检查信息 */
   find: {
-    realUrl: '/tms/truck_check_info/find' as const,
+    realUrl: '/tms/truck_check_info/find',
     reqType: {} as TruckCheckInfo对象,
     resType: {} as TruckCheckInfo对象,
   },
   /** 获取truck_check_info列表 */
   list_7: {
-    realUrl: '/tms/truck_check_info/list' as const,
+    realUrl: '/tms/truck_check_info/list',
     reqType: {} as IPageParams<TruckCheckInfo对象>,
     resType: {} as any,
   },
   /** 修改truck_check_info */
   update_8: {
-    realUrl: '/tms/truck_check_info/update' as const,
+    realUrl: '/tms/truck_check_info/update',
     reqType: {} as TruckCheckInfo对象,
     resType: {} as any,
   },
   /** 新增运力部门 */
   add_7: {
-    realUrl: '/tms/truck_dept/add' as const,
+    realUrl: '/tms/truck_dept/add',
     reqType: {} as TruckDept对象,
     resType: {} as any,
   },
   /** 删除运力部门 */
   delete_4: {
-    realUrl: '/tms/truck_dept/delete' as const,
+    realUrl: '/tms/truck_dept/delete',
     reqType: {} as TruckDept对象,
     resType: {} as any,
   },
   /** 根据id获取运力部门详情 */
   get_one_4: {
-    realUrl: '/tms/truck_dept/get_one' as const,
+    realUrl: '/tms/truck_dept/get_one',
     reqType: {} as TruckDept对象,
     resType: {} as any,
   },
   /** 获取运力部门管理分页列表 */
   page_list_4: {
-    realUrl: '/tms/truck_dept/page_list' as const,
+    realUrl: '/tms/truck_dept/page_list',
     reqType: {} as IPageParams<TruckDept对象>,
     resType: {} as any,
   },
   /** 修改运力部门信息 */
   update_9: {
-    realUrl: '/tms/truck_dept/update' as const,
+    realUrl: '/tms/truck_dept/update',
     reqType: {} as TruckDept对象,
     resType: {} as any,
   },
   /** 添加车辆押运员 */
   add_8: {
-    realUrl: '/tms/truck_escort/add' as const,
+    realUrl: '/tms/truck_escort/add',
     reqType: {} as TruckEscortAddParam,
     resType: {} as any,
   },
   /** 车辆绑定/解绑押运员 */
   bind_truck: {
-    realUrl: '/tms/truck_escort/bind_truck' as const,
+    realUrl: '/tms/truck_escort/bind_truck',
     reqType: {} as TruckEscort对象,
     resType: {} as any,
   },
   /** 删除车辆押运员 */
   delete_5: {
-    realUrl: '/tms/truck_escort/delete' as const,
+    realUrl: '/tms/truck_escort/delete',
     reqType: {} as TruckEscort对象,
     resType: {} as any,
   },
   /** 获取单个车辆押运员详情 */
   get_one_5: {
-    realUrl: '/tms/truck_escort/get_one' as const,
+    realUrl: '/tms/truck_escort/get_one',
     reqType: {} as TruckEscort对象,
     resType: {} as any,
   },
   /** 根据条件获取车辆押运员列表 */
   list_8: {
-    realUrl: '/tms/truck_escort/list' as const,
+    realUrl: '/tms/truck_escort/list',
     reqType: {} as TruckEscort对象,
     resType: {} as any,
   },
   /** 获取没有绑定卡车的押运员列表 */
   no_truck_list: {
-    realUrl: '/tms/truck_escort/no_truck_list' as const,
+    realUrl: '/tms/truck_escort/no_truck_list',
     reqType: {} as TruckEscort对象,
     resType: {} as any,
   },
   /** 获取车辆押运员分页列表 */
   page_list_5: {
-    realUrl: '/tms/truck_escort/page_list' as const,
+    realUrl: '/tms/truck_escort/page_list',
     reqType: {} as IPageParams<TruckEscort对象>,
     resType: {} as any,
   },
   /** 修改车辆押运员 */
   update_10: {
-    realUrl: '/tms/truck_escort/update' as const,
+    realUrl: '/tms/truck_escort/update',
     reqType: {} as TruckEscort对象,
     resType: {} as any,
   },
   /** 查找车辆途中维修信息 */
   find_1: {
-    realUrl: '/tms/truck_repair_info/find' as const,
+    realUrl: '/tms/truck_repair_info/find',
     reqType: {} as TruckRepairInfo对象,
     resType: {} as TruckRepairInfo对象,
   },
   /** 获取truck_repair_info列表 */
   list_9: {
-    realUrl: '/tms/truck_repair_info/list' as const,
+    realUrl: '/tms/truck_repair_info/list',
     reqType: {} as IPageParams<TruckRepairInfo对象>,
     resType: {} as any,
   },
   /** 添加truck_sim_card */
   add_9: {
-    realUrl: '/tms/truck_sim_card/add' as const,
+    realUrl: '/tms/truck_sim_card/add',
     reqType: {} as TruckSimCard对象,
     resType: {} as any,
   },
   /** 获取truck_sim_card列表 */
   list_10: {
-    realUrl: '/tms/truck_sim_card/list' as const,
+    realUrl: '/tms/truck_sim_card/list',
     reqType: {} as IPageParams<TruckSimCard对象>,
     resType: {} as any,
   },
   /** 修改truck_sim_card */
   update_11: {
-    realUrl: '/tms/truck_sim_card/update' as const,
+    realUrl: '/tms/truck_sim_card/update',
     reqType: {} as TruckSimCard对象,
     resType: {} as any,
   },
   /** 查询当前行程周期 */
   find_2: {
-    realUrl: '/tms/work_cycle/find' as const,
+    realUrl: '/tms/work_cycle/find',
     reqType: {} as WorkCycle对象,
     resType: {} as any,
   },
   /** 获取历史行车列表 */
   list_11: {
-    realUrl: '/tms/work_cycle/list' as const,
+    realUrl: '/tms/work_cycle/list',
     reqType: {} as IPageParams<WorkCycle对象>,
     resType: {} as any,
   },
   /** 更新前行程周期天气 */
   update_weather: {
-    realUrl: '/tms/work_cycle/update_weather' as const,
+    realUrl: '/tms/work_cycle/update_weather',
     reqType: {} as WorkCycle对象,
     resType: {} as any,
   },
   /** 获取行车日志列表 */
   list_12: {
-    realUrl: '/tms/work_log/list' as const,
+    realUrl: '/tms/work_log/list',
     reqType: {} as IPageParams<WorkLog对象>,
     resType: {} as any,
   },
   /** 修改work_log */
   update_12: {
-    realUrl: '/tms/work_log/update' as const,
+    realUrl: '/tms/work_log/update',
     reqType: {} as WorkLog对象,
     resType: {} as any,
   },
   /** 根据id关闭运单(运单分页列表PC端) */
   close: {
-    realUrl: '/tms/work_order/close' as const,
+    realUrl: '/tms/work_order/close',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 运单详情 */
   find_work_order_info: {
-    realUrl: '/tms/work_order/find_work_order_info' as const,
+    realUrl: '/tms/work_order/find_work_order_info',
     reqType: {} as WorkOrder对象,
     resType: {} as WorkOrder对象,
   },
   /** 根据id获取运单详情，PC端 */
   get_one_6: {
-    realUrl: '/tms/work_order/get_one' as const,
+    realUrl: '/tms/work_order/get_one',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 获取运单分页列表PC端 */
   page_list_6: {
-    realUrl: '/tms/work_order/page_list' as const,
+    realUrl: '/tms/work_order/page_list',
     reqType: {} as IPageParams<WorkOrderPageParam>,
     resType: {} as any,
   },
   /** 根据id修改运单(运单分页列表PC端，待执行0已完成40已关闭50运单可改) */
   pc_update: {
-    realUrl: '/tms/work_order/pc_update' as const,
+    realUrl: '/tms/work_order/pc_update',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 根据id中止运单(运单分页列表PC端) */
   stop: {
-    realUrl: '/tms/work_order/stop' as const,
+    realUrl: '/tms/work_order/stop',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 新增装车派单 */
   add_load_order: {
-    realUrl: '/tms/work_order_manage/add_load_order' as const,
+    realUrl: '/tms/work_order_manage/add_load_order',
     reqType: {} as AddWorkOrderVO对象,
     resType: {} as any,
   },
   /** 新增卸车派单 */
   add_unload_order: {
-    realUrl: '/tms/work_order_manage/add_unload_order' as const,
+    realUrl: '/tms/work_order_manage/add_unload_order',
     reqType: {} as AddWorkOrderVO对象,
     resType: {} as any,
   },
   /** 当前车辆行车日志详情 */
   current_trip_detail: {
-    realUrl: '/tms/work_order_manage/current_trip_detail' as const,
+    realUrl: '/tms/work_order_manage/current_trip_detail',
     reqType: {} as 通用id参数,
     resType: {} as Array<WorkLog对象>,
   },
   /** 车辆历史行程 */
   history_trip: {
-    realUrl: '/tms/work_order_manage/history_trip' as const,
+    realUrl: '/tms/work_order_manage/history_trip',
     reqType: {} as Truck对象,
     resType: {} as Array<TruckHistoryTripVO对象>,
   },
   /** 车辆行车详情 */
   history_trip_detail: {
-    realUrl: '/tms/work_order_manage/history_trip_detail' as const,
+    realUrl: '/tms/work_order_manage/history_trip_detail',
     reqType: {} as 通用id参数,
     resType: {} as Array<WorkLog对象>,
   },
   /** 获取运力调度列表 */
   list_13: {
-    realUrl: '/tms/work_order_manage/list' as const,
+    realUrl: '/tms/work_order_manage/list',
     reqType: {} as IPageParams<WorkManagePageParam对象>,
     resType: {} as IPage<TruckOrderManageVO对象>,
   },
   /** 运力调度统计汇总信息 */
   statistics: {
-    realUrl: '/tms/work_order_manage/statistics' as const,
+    realUrl: '/tms/work_order_manage/statistics',
     reqType: {} as WorkManagePageParam对象,
     resType: {} as TruckOrderStatisticsVO对象,
   },
   /** 添加作业点 */
   add_10: {
-    realUrl: '/tms/work_spot/add' as const,
+    realUrl: '/tms/work_spot/add',
     reqType: {} as WorkSpot对象,
     resType: {} as any,
   },
   /** 删除作业点 */
   delete_6: {
-    realUrl: '/tms/work_spot/delete' as const,
+    realUrl: '/tms/work_spot/delete',
     reqType: {} as WorkSpot对象,
     resType: {} as any,
   },
   /** 根据id获取作业点详情 */
   find_by_name: {
-    realUrl: '/tms/work_spot/find_by_name' as const,
+    realUrl: '/tms/work_spot/find_by_name',
     reqType: {} as WorkSpot对象,
     resType: {} as any,
   },
   /** 根据id获取作业点详情 */
   get_one_7: {
-    realUrl: '/tms/work_spot/get_one' as const,
+    realUrl: '/tms/work_spot/get_one',
     reqType: {} as WorkSpot对象,
     resType: {} as any,
   },
   /** 获取作业点分页列表 */
   page_list_7: {
-    realUrl: '/tms/work_spot/page_list' as const,
+    realUrl: '/tms/work_spot/page_list',
     reqType: {} as IPageParams<WorkSpot对象>,
     resType: {} as any,
   },
   /** 修改作业点 */
   update_13: {
-    realUrl: '/tms/work_spot/update' as const,
+    realUrl: '/tms/work_spot/update',
     reqType: {} as WorkSpot对象,
     resType: {} as any,
   },
   /** 上报途中休息信息 */
   add_rest_info: {
-    realUrl: '/tms/worker/add_rest_info' as const,
+    realUrl: '/tms/worker/add_rest_info',
     reqType: {} as RestInfo对象,
     resType: {} as any,
   },
   /** 装卸车成果上报 */
   add_result: {
-    realUrl: '/tms/worker/add_result' as const,
+    realUrl: '/tms/worker/add_result',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 上报车辆检查信息 */
   add_truck_check_info: {
-    realUrl: '/tms/worker/add_truck_check_info' as const,
+    realUrl: '/tms/worker/add_truck_check_info',
     reqType: {} as TruckCheckInfo对象,
     resType: {} as any,
   },
   /** 上报车辆途中维修信息 */
   add_truck_repair_info: {
-    realUrl: '/tms/worker/add_truck_repair_info' as const,
+    realUrl: '/tms/worker/add_truck_repair_info',
     reqType: {} as TruckRepairInfo对象,
     resType: {} as any,
   },
   /** 装些车等待上报 */
   add_wait: {
-    realUrl: '/tms/worker/add_wait' as const,
+    realUrl: '/tms/worker/add_wait',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 点击待执行运单，变成已读 */
   add_work_order_readinfo: {
-    realUrl: '/tms/worker/add_work_order_readinfo' as const,
+    realUrl: '/tms/worker/add_work_order_readinfo',
     reqType: {} as WorkOrderReadinfo对象,
     resType: {} as any,
   },
   /** 6.上报已到达收车点 */
   arrive_terminal: {
-    realUrl: '/tms/worker/arrive_terminal' as const,
+    realUrl: '/tms/worker/arrive_terminal',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 当前周期所有订单列表 */
   find_cycle_order_list: {
-    realUrl: '/tms/worker/find_cycle_order_list' as const,
+    realUrl: '/tms/worker/find_cycle_order_list',
     reqType: {} as WorkOrder对象,
     resType: {} as Array<WorkOrder对象>,
   },
   /** 首页订单列表 */
   find_index_order_list: {
-    realUrl: '/tms/worker/find_index_order_list' as const,
+    realUrl: '/tms/worker/find_index_order_list',
     reqType: {} as WorkOrder对象,
     resType: {} as Array<WorkOrder对象>,
   },
   /** 运单详情 */
   find_order_info: {
-    realUrl: '/tms/worker/find_order_info' as const,
+    realUrl: '/tms/worker/find_order_info',
     reqType: {} as WorkOrder对象,
     resType: {} as WorkOrder对象,
   },
   /** 查询车辆检查信息 */
   find_truck_check_info: {
-    realUrl: '/tms/worker/find_truck_check_info' as const,
+    realUrl: '/tms/worker/find_truck_check_info',
     reqType: {} as TruckCheckInfo对象,
     resType: {} as any,
   },
   /** 运力详情 */
   find_truck_info: {
-    realUrl: '/tms/worker/find_truck_info' as const,
+    realUrl: '/tms/worker/find_truck_info',
     reqType: {} as WorkerInfo,
     resType: {} as WorkerInfo,
   },
   /** 查询作业点位置信息 */
   find_work_spot_info: {
-    realUrl: '/tms/worker/find_work_spot_info' as const,
+    realUrl: '/tms/worker/find_work_spot_info',
     reqType: {} as WorkSpot对象,
     resType: {} as any,
   },
   /** 8.上传签名，完成本行车周期，收车 */
   finish_cycle: {
-    realUrl: '/tms/worker/finish_cycle' as const,
+    realUrl: '/tms/worker/finish_cycle',
     reqType: {} as UpSignParam,
     resType: {} as any,
   },
   /** 4.确认完成运单 */
   finish_order: {
-    realUrl: '/tms/worker/finish_order' as const,
+    realUrl: '/tms/worker/finish_order',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 7.完成检查，结束此次行程 */
   finish_work: {
-    realUrl: '/tms/worker/finish_work' as const,
+    realUrl: '/tms/worker/finish_work',
     reqType: {} as TruckCheckInfo对象,
     resType: {} as any,
   },
   /** 1.开始执行装卸车运单 */
   start_order: {
-    realUrl: '/tms/worker/start_order' as const,
+    realUrl: '/tms/worker/start_order',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 3.上报已到达装卸车点 */
   start_wait: {
-    realUrl: '/tms/worker/start_wait' as const,
+    realUrl: '/tms/worker/start_wait',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 2.完成出车前检查，开始装卸车作业 */
   start_work: {
-    realUrl: '/tms/worker/start_work' as const,
+    realUrl: '/tms/worker/start_work',
     reqType: {} as TruckCheckInfo对象,
     resType: {} as any,
   },
   /** 4.结束等待,开始上传磅单 */
   submit_result: {
-    realUrl: '/tms/worker/submit_result' as const,
+    realUrl: '/tms/worker/submit_result',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 每个作业上报单独小按钮使用 */
   update_order: {
-    realUrl: '/tms/worker/update_order' as const,
+    realUrl: '/tms/worker/update_order',
     reqType: {} as WorkOrder对象,
     resType: {} as any,
   },
   /** 获取行车日志列表 */
   work_log_list: {
-    realUrl: '/tms/worker/work_log_list' as const,
+    realUrl: '/tms/worker/work_log_list',
     reqType: {} as IPageParams<WorkLog对象>,
     resType: {} as any,
   },

src/utils/config/interFaces/websocket.ts

@@ -1,55 +1,55 @@
 export default {
   /** 添加ws_send_log */
   add: {
-    realUrl: '/message/ws_send_log/add' as const,
+    realUrl: '/message/ws_send_log/add',
     reqType: {} as WsSendLog对象,
     resType: {} as boolean,
   },
   /** 获取ws_send_log列表 */
   list: {
-    realUrl: '/message/ws_send_log/list' as const,
+    realUrl: '/message/ws_send_log/list',
     reqType: {} as WsSendLog对象,
     resType: {} as Array<WsSendLog对象>,
   },
   /** 修改ws_send_log */
   update: {
-    realUrl: '/message/ws_send_log/update' as const,
+    realUrl: '/message/ws_send_log/update',
     reqType: {} as WsSendLog对象,
     resType: {} as boolean,
   },
   /** send */
   send: {
-    realUrl: '/websocket/message/send' as const,
+    realUrl: '/websocket/message/send',
     reqType: {} as WsSendLog对象,
     resType: {} as boolean,
   },
   /** add */
   add_1: {
-    realUrl: '/websocket/printer/add' as const,
+    realUrl: '/websocket/printer/add',
     reqType: {} as Printer对象,
     resType: {} as string,
   },
   /** del */
   del: {
-    realUrl: '/websocket/printer/del' as const,
+    realUrl: '/websocket/printer/del',
     reqType: {} as Printer对象,
     resType: {} as string,
   },
   /** list */
   list_1: {
-    realUrl: '/websocket/printer/list' as const,
+    realUrl: '/websocket/printer/list',
     reqType: {} as Printer对象,
     resType: {} as Array<Printer对象>,
   },
   /** status */
   status: {
-    realUrl: '/websocket/printer/status' as const,
+    realUrl: '/websocket/printer/status',
     reqType: {} as Printer对象,
     resType: {} as AnyObject,
   },
   /** update */
   update_1: {
-    realUrl: '/websocket/printer/update' as const,
+    realUrl: '/websocket/printer/update',
     reqType: {} as Printer对象,
     resType: {} as boolean,
   },

src/utils/config/pages.ts

@@ -58,7 +58,7 @@ export default {
   order_index: {
     _url: '/pages/order/index',
     _type: 'page',
-    title: '订单列表',
+    title: '加气订单',
     identity: true,
     isPager: true,
     style: {
@@ -137,7 +137,7 @@ export default {
   cards_index: {
     _url: '/pages/cards/index',
     _type: 'page',
-    title: '优惠卡/券',
+    title: '优惠省钱',
     identity: true,
     isPager: false
   } as ayPage,

src/utils/func/convert.ts

@@ -1,10 +1,28 @@
-export default {
+const maps = {
+  nullView: {
+    0: '--',
+    1: '0',
+  },
+}
+const convert = {
+  transformFromBaiduToGCJ(latitude, longitude) {
+    const xPi = (3.14159265358979323846264338327950288 * 3000.0) / 180.0
+    const x = longitude - 0.0065
+    const y = latitude - 0.006
+    const z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * xPi)
+    const theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * xPi)
+    const aLatitude = z * Math.sin(theta)
+    const aLongitude = z * Math.cos(theta)
+
+    return { latitude: aLatitude, longitude: aLongitude }
+  },
   /** 手机号脱敏 */
   mobileDes(mobile) {
     return mobile && mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
   },
-  nullView(data) {
-    return !data && data !== 0 ? '--' : data
+  nullView(data, type = 0) {
+    const rv = !data && data !== 0 ? maps.nullView[type] : data
+    return rv
   },
   getOrderStatusStr(settleStatus) {
     const map = config.common.settleStatus
@@ -34,4 +52,22 @@ export default {
     })
     return arr.filter(filterFunc)
   },
+  /** 空 */
+  isNull(val) {
+    return false
+  },
+  /** 非空 */
+  unNull(val) {
+    return false
+  },
+}
+
+// 空
+convert.isNull = (val) => {
+  return convert.nullView(val) === '--'
+}
+// 非空
+convert.unNull = (val) => {
+  return convert.nullView(val) !== '--'
 }
+export default convert

src/utils/func/index.ts

@@ -2,7 +2,17 @@ import native from './native'
 import convert from './convert'
 import validate from './validate'
 import dayjs from 'dayjs'
-
+const dayjsAllowNull = (date) => {
+  if (func.convert.isNull(date)) {
+    return new Proxy({} as ReturnType<typeof dayjs>, {
+      get(target, p) {
+        return () => func.convert.nullView(date)
+      },
+    })
+  } else {
+    return dayjs(date)
+  }
+}
 export default {
   native,
   convert,
@@ -18,7 +28,7 @@ export default {
     })
   },
   getDate(date) {
-    const day = dayjs(date)
+    const day = dayjsAllowNull(date)
     return day
     // return new Proxy(dayjs(date), {
     //   get(target, p) {

src/utils/func/native.ts

@@ -109,7 +109,8 @@ export default {
    */
   openLocation(args: UniApp.OpenLocationOptions) {
     if (args.latitude && args.longitude) {
-      uni.openLocation(args)
+      const location = func.convert.transformFromBaiduToGCJ(args.latitude, args.longitude)
+      uni.openLocation({ ...args, ...location })
     }
   },
 

uno.config.ts

@@ -53,6 +53,20 @@ function optimization(): SourceCodeTransformer {
     },
   }
 }
+/** __uno.css中的样式名称增加.container 前缀，提高样式权重 */
+function classNamePreContainer(): SourceCodeTransformer {
+  return {
+    name: 'classNamePreContainer',
+    enforce: 'pre', // enforce before other transformers
+    idFilter(id) {
+      // __uno.css
+      return id.includes('__uno.css')
+    },
+    async transform(code, id, { uno }) {
+      code.replace(/(\.(?:(?!container).+))\{/g, '.container $1{')
+    },
+  }
+}
 export default defineConfig({
   presets: [
     ...presets,
@@ -79,6 +93,7 @@ export default defineConfig({
    */
   shortcuts: [['center', 'flex justify-center items-center']],
   transformers: [
+    classNamePreContainer(),
     optimization(),
     // 启用 @apply 功能
     transformerDirectives(),

vite.config.ts

@@ -140,7 +140,8 @@ export default ({ command, mode }) => {
     css: {
       preprocessorOptions: {
         scss: {
-          additionalData: `@import '/src/style/variables.scss';`,
+          additionalData: `@import '/src/style/variables.scss';
+          $uni_platform: '${UNI_PLATFORM}';`,
         },
       },
       postcss: {