af-mobile-client-vue3 1.2.59 → 1.3.2-2.1

package/src/views/userRecords/operateRecordDetail/operateRecordDetails/WechatPayDetail.vue

@@ -0,0 +1,192 @@
+<script setup lang="ts">
+import { Col, Row } from 'vant'
+
+const props = defineProps<{
+  data: Record<any, any>
+}>()
+</script>
+
+<template>
+  <div class="detail-container">
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            客户名称
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_user_name }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            上期底数
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_last_tablebase }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            本期底数
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_tablebase }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            用气量
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_pregas }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            用气金额
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_preamount }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            本期剩余气量
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_surplus_gas }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            本期扣减气量
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_haircut_gas }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            上期结余
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_user_balance }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            本期结余
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_curbalance }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            操作人
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_operator }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+
+    <Row>
+      <Col span="24">
+        <div class="detail-item">
+          <p class="detail-label">
+            操作时间
+          </p>
+          <p class="detail-value">
+            {{ props.data.f_operate_date }}
+          </p>
+        </div>
+      </Col>
+    </Row>
+  </div>
+</template>
+
+<style scoped lang="less">
+.detail-container {
+  padding: 8px;
+  background: #ffffff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(100, 101, 102, 0.08);
+
+  :deep(.van-row) {
+    margin-bottom: 2px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
+
+.detail-item {
+  padding: 4px 8px;
+  display: flex;
+  align-items: center;
+
+  .detail-label {
+    font-size: 13px;
+    color: #969799;
+    margin: 0;
+    min-width: 70px;
+  }
+
+  .detail-value {
+    font-size: 13px;
+    color: #323233;
+    margin: 0 0 0 8px;
+    flex: 1;
+    word-break: break-all;
+  }
+}
+</style>

package/src/views/userRecords/types.ts

@@ -0,0 +1,66 @@
+export interface RecordBaseInfo {
+  id: string
+  date: string
+  status?: string
+}
+
+export interface PaymentRecord extends RecordBaseInfo {
+  type: string
+  amount: string
+  gas: string
+  paymentMethod: string
+}
+
+export interface MeterRecord extends RecordBaseInfo {
+  lastReading: string
+  currentReading: string
+  usage: string
+  reader: string
+}
+
+export interface TransferRecord extends RecordBaseInfo {
+  oldUser: string
+  newUser: string
+  reason: string
+  operator: string
+}
+
+export interface SafetyRecord extends RecordBaseInfo {
+  inspector: string
+  type: string
+  issues: string
+  suggestions: string
+}
+
+export interface ReplacementRecord extends RecordBaseInfo {
+  oldMeterNumber: string
+  newMeterNumber: string
+  reason: string
+  operator: string
+  remark: string
+}
+
+export interface OtherChargeRecord extends RecordBaseInfo {
+  type: string
+  item: string
+  amount: string
+  operator: string
+  paymentMethod: string
+  remark: string
+}
+
+export interface TransactionRecord extends RecordBaseInfo {
+  type: string
+  amount: string
+  status: string
+  remark: string
+}
+
+// 记录查询通用请求参数
+export interface RecordQueryParams {
+  userId: string
+  pageNo?: number
+  pageSize?: number
+  startDate?: string
+  endDate?: string
+}

package/tsconfig.json

@@ -8,11 +8,11 @@
     "module": "esnext",
     "moduleResolution": "Bundler",
     "paths": {
-      "@af-mobile-client-vue3/*": ["src/*"]
+      "@af-mobile-client-vue3/*": ["src/*"],
+      "~root/*": ["./*"]
     },
     "types": [
       "node",
-      "unplugin-vue-router/client",
       "vite-plugin-pwa/client"
     ],
     "allowJs": true,
@@ -32,11 +32,8 @@
     "src/**/*.ts",
     "src/**/*.tsx",
     "src/**/*.vue",
-    "tests/**/*.ts",
-    "tests/**/*.tsx",
-    "src/components.d.ts",
-    "src/auto-imports.d.ts",
-    "src/typed-router.d.ts",
-    "tests/*.ts"
+    "src/types/components.d.ts",
+    "src/types/auto-imports.d.ts",
+    "src/types/typed-router.d.ts"
   ]
 }

package/uno.config.ts

@@ -1,5 +1,7 @@
-import { createRemToPxProcessor } from '@unocss/preset-wind4/utils'
+import * as fs from 'node:fs'
 
+import { FileSystemIconLoader } from '@iconify/utils/lib/loader/node-loaders'
+import { createRemToPxProcessor } from '@unocss/preset-wind4/utils'
 import {
   defineConfig,
   presetAttributify,
@@ -8,9 +10,27 @@ import {
   transformerDirectives,
   transformerVariantGroup,
 } from 'unocss'
+import collectUsedIcons from './src/plugins/collectIcons'
+
+// 本地 SVG 图标存放目录
+const iconsDir = './src/icons/svg'
 
 const BASE_FONT_SIZE = 4
 
+// 读取本地 SVG 目录，自动生成 `safelist`
+function generateSafeList() {
+  try {
+    return fs
+      .readdirSync(iconsDir)
+      .filter(file => file.endsWith('.svg'))
+      .map(file => `i-svg:${file.replace('.svg', '')}`)
+  }
+  catch (error) {
+    console.error('无法读取图标目录:', error)
+    return []
+  }
+}
+
 export default defineConfig({
   shortcuts: [
     ['btn', 'px-6 py-3 rounded-4 border-none inline-block bg-green-400 text-white cursor-pointer outline-hidden hover:bg-green-600 disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
@@ -34,9 +54,24 @@ export default defineConfig({
           'width': 'var(--van-font-size-md)',
           'height': 'var(--van-font-size-md)',
         },
+        // 注册本地 SVG 图标
+        collections: {
+          // svg 是图标集合名称，使用 `i-svg:图标名` 调用
+          svg: FileSystemIconLoader(iconsDir, (svg) => {
+            // 如果 SVG 文件未定义 `fill` 属性，则默认填充 `currentColor`
+            // 这样图标颜色会继承文本颜色，方便在不同场景下适配
+            return svg.includes('fill="')
+              ? svg
+              : svg.replace(/^<svg /, '<svg fill="currentColor" ')
+          }),
+        },
       },
     ),
   ],
+  safelist: [
+    ...generateSafeList(),
+    ...collectUsedIcons,
+  ], // 动态生成 `safelist`
   postprocess: [
     createRemToPxProcessor(BASE_FONT_SIZE),
   ],

package/vite.config.ts

@@ -11,8 +11,8 @@ export default ({ mode }: ConfigEnv): UserConfig => {
 
   const appProxys = {}
 
-  const v4Server = 'http://aote-office.8866.org:31567'
-  const v3Server = 'http://aote-office.8866.org:31567'
+  const v4Server = 'http://192.168.50.67:31567'
+  const v3Server = 'http://192.168.50.67:31567'
   const OSSServerDev = 'http://192.168.50.67:30351'
   const geoserver = 'http://39.104.49.8:30372'
   // const OSSServerProd = 'http://192.168.50.67:31351'
@@ -68,6 +68,13 @@ export default ({ mode }: ConfigEnv): UserConfig => {
           changeOrigin: true,
           rewrite: path => path.replace(/^\/linepatrol\/geoserver/, '/geoserver'),
         },
+        '/api/af-revenue': {
+          // target: v4Server,
+          rewrite: (path: string) => path.replace(/^\/api\/af-revenue\//, '/'),
+          target: 'http://127.0.0.1:9026',
+          ws: false,
+          changeOrigin: true,
+        },
         '/api': {
           // v3用
           // rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/rs/'),
@@ -95,7 +102,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
     build: {
       cssCodeSplit: false,
       chunkSizeWarningLimit: 2048,
-      outDir: env.VITE_APP_OUT_DIR || 'dist',
+      outDir: `./dist/${env.VITE_APP_OUT_DIR}`,
       rollupOptions: {
         output: {
           // 打包时分割资源

package/.env.envoiceShow

@@ -1,7 +0,0 @@
-VITE_APP_PUBLIC_PATH=/invoiceShow
-VITE_APP_PREVIEW=true
-VITE_APP_API_BASE_URL=/api
-VITE_APP_WEB_CONFIG_KEY=admin.webconfig
-VITE_APP_SYSTEM_NAME=af-system
-# 最低兼容性 V4（最新产品）V3(V3产品) OA(公司OA)
-VITE_APP_COMPATIBLE=V4

package/src/components/core/App/MicroAppView.vue

@@ -1,59 +0,0 @@
-<script setup lang="ts">
-import router from '@af-mobile-client-vue3/router'
-import { getAppStatus } from '@micro-zoe/micro-app'
-import { ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const origin = window.location.origin
-
-const route = useRoute()
-
-const href = `${origin}/${route.params.module}`
-
-const state = ref('beforeLoad')
-
-function created() {
-  const appStatus = getAppStatus(route.params.module as string)
-  console.warn('created')
-  console.warn(appStatus)
-  // afterhidden代表已经通过keep-alive缓存了，直接显示
-  if (appStatus === 'afterhidden')
-    state.value = 'ready'
-  else if (appStatus === 'unmount' || appStatus === 'error')
-    router.replace('/404')
-}
-
-function error() {
-  router.replace('/404')
-  console.warn('error')
-  state.value = 'error'
-}
-
-function mounted() {
-  console.warn('mounted')
-  state.value = 'ready'
-}
-</script>
-
-<template>
-  <div class="app-wrapper">
-    <div v-show="state === 'beforeLoad'">
-      <BeautifulLoading />
-    </div>
-    <div v-show="state === 'ready'">
-      <micro-app
-        :name="route.params.module" :url="href" iframe keep-alive @created="created"
-        @mounted="mounted"
-        @error="error"
-      />
-    </div>
-  </div>
-</template>
-
-<style lang="less" scoped>
-.app-wrapper {
-  position: relative;
-  height: 100%;
-  width: 100%;
-}
-</style>

package/src/components/core/SvgIcon/index.vue

@@ -1,61 +0,0 @@
-<script setup lang="ts">
-import { isExternal } from '@af-mobile-client-vue3/utils/validate'
-import { computed } from 'vue'
-
-interface Props {
-  name: string
-  className?: string
-}
-const props = withDefaults(defineProps<Props>(), {
-  name: '',
-  className: '',
-})
-
-const isExternalIcon = computed(() => isExternal(props.name))
-const iconName = computed(() => `#icon-${props.name}`)
-const svgClass = computed(() => {
-  if (props.className)
-    return `svg-icon ${props.className}`
-  else
-    return 'svg-icon'
-})
-// 外链 icon
-const styleExternalIcon = computed(() => {
-  return {
-    'mask': `url(${props.name}) no-repeat 50% 50%`,
-    '-webkit-mask': `url(${props.name}) no-repeat 50% 50%`,
-  }
-})
-</script>
-
-<template>
-  <div
-    v-if="isExternalIcon"
-    :style="styleExternalIcon"
-    class="svg-external-icon svg-icon"
-    v-bind="$attrs"
-  />
-  <svg v-else :class="svgClass" aria-hidden="true" v-bind="$attrs">
-    <use :xlink:href="iconName" />
-  </svg>
-</template>
-
-<style scoped>
-.svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-
-.svg-external-icon {
-  background-color: currentColor;
-  mask-size: cover !important;
-  display: inline-block;
-}
-
-.svg-icon-active-blue {
-  color: #1989fa;
-}
-</style>

package/src/utils/local-storage.ts

@@ -1,9 +0,0 @@
-import store from 'store'
-import expirePlugin from 'store/plugins/expire'
-
-// plugin usage:
-store.addPlugin(expirePlugin)
-
-export { store as localStorage }
-
-export default store

package/src/views/component/XFormGroupView/xformgroup222.vue

@@ -1,97 +0,0 @@
-<script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import { runLogic } from '@af-mobile-client-vue3/services/api/common'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import dayjs from 'dayjs/esm/index'
-import { showToast } from 'vant'
-import { onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const configName = ref('appapplyuserinfoFormGroup')
-const serviceName = ref('af-apply')
-const route = useRoute()
-const userInfo = useUserStore().getUserInfo()
-const workflowId = ref('3045')
-const userinfoid = ref('93116')
-const model = ref('编辑')
-const groupFormData = ref({})
-
-function submit(res) {
-  if (model.value === '新增') {
-    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userinfo.f_orgid = userInfo.f_orgid
-    res.t_userinfo.f_orgname = userInfo.f_orgname
-    res.t_userinfo.f_depid = userInfo.f_depid
-    res.t_userinfo.f_depname = userInfo.f_depname
-    res.t_userinfo.f_operatorid = userInfo.f_operatorid
-    res.t_userinfo.f_operator = userInfo.f_operator
-    res.t_userinfo.f_workflow_id = this.f_workflow_id
-    res.t_userinfo.f_user_state = '预备'
-
-    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userfiles.f_orgid = userInfo.f_orgid
-    res.t_userfiles.f_orgname = userInfo.f_orgname
-    res.t_userfiles.f_depid = userInfo.f_depid
-    res.t_userfiles.f_depname = userInfo.f_depname
-    res.t_userfiles.f_operatorid = userInfo.f_operatorid
-    res.t_userfiles.f_operator = userInfo.f_operator
-    res.t_userfiles.f_workflow_id = this.f_workflow_id
-    res.t_userfiles.f_table_state = '待开通'
-  }
-  let saveData = res
-  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
-    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
-  }
-  if (saveData.t_userfiles.f_price_id.length > 0) {
-    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
-  }
-  if (model.value === '编辑') {
-    saveData = Object.assign(saveData, {
-      f_operator_record: userInfo.f_operator,
-      f_operatorid_record: userInfo.f_operatorid,
-      f_orgid_record: userInfo.f_orgid,
-      f_orgname_record: userInfo.f_orgname,
-      f_depid_record: userInfo.f_depid,
-      f_depname_record: userInfo.f_depname,
-    })
-  }
-  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
-    showToast('操作成功！')
-    history.back()
-  })
-}
-const isInit = ref(false)
-function init() {
-  if (model.value === '编辑') {
-    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
-      // if (res.t_userfiles.f_gasmodel_id) {
-      //   res.t_userfiles.f_gasmodel_id = 76
-      // }
-      // if (res.t_userfiles.f_price_id) {
-      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
-      // }
-      console.log('1111111----,', res)
-      groupFormData.value = res
-      isInit.value = true
-    })
-  }
-}
-onMounted(() => {
-  init()
-})
-</script>
-
-<template>
-  <XFormGroup
-    v-if="isInit"
-    mode="修改"
-    :config-name="configName"
-    :service-name="serviceName"
-    :group-form-data="groupFormData"
-    @submit="submit"
-  />
-</template>
-
-<style scoped lang="less">
-
-</style>