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

package/src/locales/zh-CN.json

@@ -1,29 +1,46 @@
 {
-  "menus": {
-    "home": "主页",
-    "profile": "个人中心",
-    "darkMode": "🌗 暗黑模式",
-    "mockGuide": "💿 Mock 指南",
-    "language": "📚 语言",
-    "echartsDemo": "📊 Echarts 演示",
-    "persistPiniaState": "🍍 持久化 Pinia 状态",
-    "404Demo": "🙅 404页 演示",
-    "unocssExample": "🎨 Unocss 示例",
-    "keepAlive": "🧡 KeepAlive 演示",
-    "scrollCache": "📜 滚动缓存 演示",
-    "login": "🔒 用户登录",
-    "register": "用户注册",
+  "navbar": {
+    "Home": "主页",
+    "Profile": "我的",
+    "Mock": "🗂️ Mock",
+    "Charts": "📊 图表",
+    "UnoCSS": "⚡ UnoCSS",
+    "Counter": "🍍 状态持久化",
+    "KeepAlive": "♻️ 页面缓存",
+    "ScrollCache": "📍 滚动缓存",
+    "Login": "🧑‍💻 登录",
+    "Register": "🧑‍💻 注册",
+    "ForgotPassword": "❓ 忘记密码",
+    "Settings": "⚙️ 设置",
+    "404": "⚠️ 404 页面",
+    "Undefined": "🤷 未定义标题"
+  },
+
+  "tabbar": {
+    "home": "首页",
+    "profile": "我的"
+  },
+
+  "home": {
+    "darkMode": "🌗 深色模式",
+    "language": "📚 多语言",
+    "settings": "设置",
+    "examples": "示例"
+  },
+
+  "profile": {
+    "login": "登录",
     "settings": "设置",
-    "basicSettings": "基本设置",
-    "exampleComponents": "示例组件",
-    "forgot-password": "忘记密码"
+    "docs": "文档"
   },
+
   "mock": {
     "fromAsyncData": "来自异步请求的数据",
+    "noData": "暂无数据",
     "pull": "请求",
-    "reset": "清空",
-    "noData": "暂无数据"
+    "reset": "清空"
   },
+
   "charts": {
     "January": "1月",
     "February": "2月",
@@ -32,39 +49,44 @@
     "May": "5月",
     "June": "6月"
   },
-  "layouts": {
-    "home": "首页",
-    "profile": "我的"
+
+  "counter": {
+    "description": "该计数器的状态通过 Pinia 持久化。刷新页面试试看！"
   },
-  "profile": {
-    "login": "登录",
-    "settings": "设置",
-    "docs": "文档"
+
+  "unocss": {
+    "title": "你好, Unocss!",
+    "description": "这是一个简单的 Unocss 使用示例。",
+    "button": "按钮"
   },
+
   "keepAlive": {
     "label": "当前组件将会被缓存"
   },
+
   "scrollCache": {
     "sectionTitle": "段落标题",
     "sectionText": "段落内容段落内容段落内容段落内容段落内容段落内容",
     "finished": "已经到底啦 ~",
     "loading": "加载中..."
   },
+
   "login": {
     "login": "登录",
-    "logout": "退出",
+    "logout": "退出登录",
     "email": "邮箱",
     "password": "密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterPassword": "请输入密码",
-    "sign-up": "还没有账号？点击注册",
-    "forgot-password": "忘记密码？"
+    "signUp": "还没有账号？点击注册",
+    "forgotPassword": "忘记密码？"
   },
-  "forgot-password": {
+
+  "forgotPassword": {
     "email": "邮箱",
     "code": "验证码",
     "password": "密码",
-    "comfirmPassword": "再次输入密码",
+    "confirmPassword": "再次输入密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterCode": "请输入验证码",
     "pleaseEnterPassword": "请输入密码",
@@ -77,12 +99,13 @@
     "sendCodeSuccess": "已发送，验证码为",
     "passwordResetSuccess": "密码重置成功"
   },
+
   "register": {
     "email": "邮箱",
     "code": "验证码",
     "nickname": "昵称",
     "password": "密码",
-    "comfirmPassword": "再次输入密码",
+    "confirmPassword": "再次输入密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterCode": "请输入验证码",
     "pleaseEnterNickname": "请输入昵称",
@@ -96,9 +119,10 @@
     "sendCodeSuccess": "已发送，验证码为",
     "registerSuccess": "注册成功"
   },
+
   "settings": {
     "logout": "退出登录",
     "currentVersion": "当前版本",
-    "comfirmTitle": "确认退出？"
+    "confirmTitle": "确认退出？"
   }
 }

package/src/main.ts

@@ -10,8 +10,6 @@ import 'virtual:uno.css'
 import '@af-mobile-client-vue3/styles/app.less'
 import '@af-mobile-client-vue3/styles/var.less'
 
-// svg icon
-import 'virtual:svg-icons-register'
 // Vant 桌面端适配
 import '@vant/touch-emulator'
 

package/src/plugins/collectIcons.ts

@@ -0,0 +1,10 @@
+import { defaultRecordEntries } from '../components/data/UserDetail/recordEntries'
+
+const collectUsedIcons = [
+  ...defaultRecordEntries.map(entry => entry.icon),
+  ...defaultRecordEntries.map(entry => entry.bgColor),
+  ...defaultRecordEntries.map(entry => entry.textColor),
+]
+
+// 默认导出
+export default collectUsedIcons

package/src/router/README.md

@@ -1,6 +1,6 @@
 # `File-based Routing`
 
-Routes will be auto-generated for Vue files in the  **src/views** dir with the same file structure.
+Routes will be auto-generated for Vue files in the **src/views** dir with the same file structure.
 Check out [`unplugin-vue-router`](https://github.com/posva/unplugin-vue-router) for more details.
 
 在 **src/views** 目录下的 Vue 文件会自动生成相同结构的路由。

package/src/router/guards.ts

@@ -5,7 +5,7 @@ import { showToast } from 'vant'
 // 不需要登录拦截的路由配置
 const loginIgnore = {
   names: ['404', '403', 'user-appointment', 'appointment-form', 'appointment-history'], // 根据路由名称匹配
-  paths: ['/login', '/XReportFormIframeView', '/invoiceShow'], // 根据路由fullPath匹配
+  paths: ['/login', '/XReportFormIframeView', '/invoiceShow', '/register'], // 根据路由fullPath匹配
   /**
    * 判断路由是否包含在该配置中
    * @param route vue-router 的 route 对象

package/src/router/index.ts

@@ -24,7 +24,7 @@ router.beforeEach((to: EnhancedRouteLocation) => {
   routeCacheStore.addRoute(to)
 
   // 页面 title
-  setPageTitle(to.meta.title)
+  setPageTitle(to.meta.title as string)
 })
 
 router.afterEach(() => {

package/src/router/routes.ts

@@ -6,11 +6,12 @@ import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
 import EvaluateRecordView from '@af-mobile-client-vue3/views/component/EvaluateRecordView/index.vue'
 import IconifyView from '@af-mobile-client-vue3/views/component/IconifyView/index.vue'
 import ComponentView from '@af-mobile-client-vue3/views/component/index.vue'
+import UserDetailView from '@af-mobile-client-vue3/views/component/UserDetailView/index.vue'
+import UserDetailPage from '@af-mobile-client-vue3/views/component/UserDetailView/UserDetailPage.vue'
 import XCellDetailView from '@af-mobile-client-vue3/views/component/XCellDetailView/index.vue'
 import XCellListView from '@af-mobile-client-vue3/views/component/XCellListView/index.vue'
 import XFormAppraiseView from '@af-mobile-client-vue3/views/component/XFormAppraiseView/index.vue'
 import XFormGroupView from '@af-mobile-client-vue3/views/component/XFormGroupView/index.vue'
-import xformgroup222 from '@af-mobile-client-vue3/views/component/XFormGroupView/xformgroup222.vue'
 import XFormView from '@af-mobile-client-vue3/views/component/XFormView/index.vue'
 import XOlMapView from '@af-mobile-client-vue3/views/component/XOlMapView/index.vue'
 import XLocationPicker from '@af-mobile-client-vue3/views/component/XOlMapView/XLocationPicker/index.vue'
@@ -21,6 +22,22 @@ import XRequestView from '@af-mobile-client-vue3/views/component/XRequestView/in
 import XSignatureView from '@af-mobile-client-vue3/views/component/XSignatureView/index.vue'
 import login from '@af-mobile-client-vue3/views/user/login/index.vue'
 import my from '@af-mobile-client-vue3/views/user/my/index.vue'
+import register from '@af-mobile-client-vue3/views/user/register/index.vue'
+import AbnormalAlarmRecords from '@af-mobile-client-vue3/views/userRecords/AbnormalAlarmRecords.vue'
+import CardReplacementRecords from '@af-mobile-client-vue3/views/userRecords/CardReplacementRecords.vue'
+import ChangeRecords from '@af-mobile-client-vue3/views/userRecords/ChangeRecords.vue'
+import CommandViewRecords from '@af-mobile-client-vue3/views/userRecords/CommandViewRecords.vue'
+import GasCompensationRecords from '@af-mobile-client-vue3/views/userRecords/GasCompensationRecords.vue'
+import InstrumentCollectionRecords from '@af-mobile-client-vue3/views/userRecords/InstrumentCollectionRecords.vue'
+import MeterRecords from '@af-mobile-client-vue3/views/userRecords/MeterRecords.vue'
+import OperateRecords from '@af-mobile-client-vue3/views/userRecords/OperateRecords.vue'
+import OtherChargeRecords from '@af-mobile-client-vue3/views/userRecords/OtherChargeRecords.vue'
+import PaymentRecords from '@af-mobile-client-vue3/views/userRecords/PaymentRecords.vue'
+import PriceAdjustmentRecords from '@af-mobile-client-vue3/views/userRecords/PriceAdjustmentRecords.vue'
+import ReplacementRecords from '@af-mobile-client-vue3/views/userRecords/ReplacementRecords.vue'
+import SafetyRecords from '@af-mobile-client-vue3/views/userRecords/SafetyRecords.vue'
+import TransactionRecords from '@af-mobile-client-vue3/views/userRecords/TransactionRecords.vue'
+import TransferRecords from '@af-mobile-client-vue3/views/userRecords/TransferRecords.vue'
 
 const routes: Array<RouteRecordRaw> = [
   {
@@ -67,11 +84,6 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XCellDetailView',
         component: XCellDetailView,
       },
-      {
-        path: '/xformgroup222',
-        name: 'xformgroup222',
-        component: xformgroup222,
-      },
       {
         path: '/Component/XFormGroupView',
         name: 'XFormGroupView',
@@ -149,6 +161,159 @@ const routes: Array<RouteRecordRaw> = [
         name: 'IconifyView',
         component: IconifyView,
       },
+      {
+        path: '/Component/UserDetailView',
+        name: 'UserDetailView',
+        component: UserDetailView,
+      },
+      {
+        path: '/Component/UserDetail/:userInfoId',
+        name: 'UserDetailRoute',
+        component: UserDetailPage,
+        meta: { title: '用户详情' },
+      },
+    ],
+  },
+  {
+    path: '/userRecords',
+    name: 'userRecords',
+    children: [
+      // 用户记录相关路由
+      {
+        path: '/records',
+        name: 'OperateRecords',
+        component: OperateRecords,
+        meta: {
+          title: '操作记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/payment',
+        name: 'PaymentRecords',
+        component: PaymentRecords,
+        meta: {
+          title: '缴费记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/meter',
+        name: 'MeterRecords',
+        component: MeterRecords,
+        meta: {
+          title: '抄表记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/transfer',
+        name: 'TransferRecords',
+        component: TransferRecords,
+        meta: {
+          title: '过户记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/safety',
+        name: 'SafetyRecords',
+        component: SafetyRecords,
+        meta: {
+          title: '安检记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/replacement',
+        name: 'ReplacementRecords',
+        component: ReplacementRecords,
+        meta: {
+          title: '换表记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/otherCharge',
+        name: 'OtherChargeRecords',
+        component: OtherChargeRecords,
+        meta: {
+          title: '其他收费记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/transaction',
+        name: 'TransactionRecords',
+        component: TransactionRecords,
+        meta: {
+          title: '流水记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/abnormalAlarm',
+        name: 'AbnormalAlarmRecords',
+        component: AbnormalAlarmRecords,
+        meta: {
+          title: '异常报警记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/cardReplacement',
+        name: 'CardReplacementRecords',
+        component: CardReplacementRecords,
+        meta: {
+          title: '补卡记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/change',
+        name: 'ChangeRecords',
+        component: ChangeRecords,
+        meta: {
+          title: '变更记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/commandView',
+        name: 'CommandViewRecords',
+        component: CommandViewRecords,
+        meta: {
+          title: '指令查看记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/gasCompensation',
+        name: 'GasCompensationRecords',
+        component: GasCompensationRecords,
+        meta: {
+          title: '补气记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/instrumentCollection',
+        name: 'InstrumentCollectionRecords',
+        component: InstrumentCollectionRecords,
+        meta: {
+          title: '表具采集记录',
+          keepAlive: false,
+        },
+      },
+      {
+        path: '/priceAdjustment',
+        name: 'PriceAdjustmentRecords',
+        component: PriceAdjustmentRecords,
+        meta: {
+          title: '价格调整记录',
+          keepAlive: false,
+        },
+      },
     ],
   },
   {
@@ -161,6 +326,11 @@ const routes: Array<RouteRecordRaw> = [
     name: 'userProfile',
     component: my,
   },
+  {
+    path: '/register/:strategyId?/:openId?',
+    name: 'register',
+    component: register,
+  },
   {
     path: '/404',
     name: '404',

package/src/router/types.ts

@@ -2,8 +2,6 @@ import type { RouteLocationNormalized } from 'vue-router'
 
 export type EnhancedRouteLocation = RouteLocationNormalized & {
   meta: {
-    level?: number | unknown
-    name?: string
     keepAlive?: boolean
   }
 }

package/src/services/api/user.ts

@@ -0,0 +1,17 @@
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+const userApi = {
+  // 修改密码
+  modifyPassword: '/af-system/user/modifypwd',
+}
+
+/**
+ * 修改密码
+ * @param data 修改密码参数
+ * @returns Promise
+ */
+export function modifyPassword(data: any) {
+  return post(userApi.modifyPassword, JSON.stringify(data))
+}
+
+export { userApi }

package/src/stores/modules/setting.ts

@@ -10,7 +10,7 @@ export interface WebConfig {
   systemName: string
   routerName: string
   systemDesc: string
-  homePage: string
+  homePage: any
   defaultAvatarUrl: string
   wechatLogin: boolean
   wxLoginAge: boolean
@@ -19,6 +19,7 @@ export interface WebConfig {
   systemLogo: string
   homeAppList: Array<any>
   slideshowList: Array<any>
+  registerRequire: boolean
 }
 
 //  存放 webConfig 中的 setting 配置

package/src/styles/var.less

@@ -14,3 +14,12 @@
   --base-interval-1: 14px;
   --base-interval-2: 28px;
 }
+// 全局弹出框样式覆盖 - 最强优先级
+.van-popover,
+.van-popover.van-popover--light,
+.van-popover.van-popover--dark {
+  background-color: #ffffff !important;
+  border: none !important;
+  outline: none !important;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15) !important;
+}

package/src/types/vue-router.d.ts

@@ -2,8 +2,6 @@ declare module 'vue-router' {
   interface RouteMeta {
     /** page title */
     title?: string
-    /** i18n key */
-    i18n?: string
     /** keepalive */
     keepAlive?: boolean
   }

package/src/utils/mobileUtil.ts

@@ -21,9 +21,9 @@ export class mobileUtil {
   static execute(locationParam: Param): any {
     locationParam.callBackMethodName = `mobile_func_${Math.random().toString(36).substring(7)}`
     if (window.__MICRO_APP_ENVIRONMENT__) {
-      console.warn('我在微前端环境中')
+      console.warn('我在微前端环境中');
       // 微前端应用中需要绑定函数到真实的window中
-      window.rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
+      (window as any).rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
     }
     else {
       console.warn('我不在微前端环境中')

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

package/src/utils/set-page-title.ts

@@ -1,7 +1,5 @@
-import { pageDefaultTitle } from '@af-mobile-client-vue3/types/settings'
+import { appName } from '../constants'
 
-export default function setPageTitle(routerTitle?: any): void {
-  window.document.title = routerTitle
-    ? `${routerTitle} | ${pageDefaultTitle}`
-    : `${pageDefaultTitle}`
+export default function setPageTitle(title?: string): void {
+  window.document.title = title ? `${title} - ${appName}` : appName
 }

package/src/views/common/LoadError.vue

@@ -1,11 +1,10 @@
 <script setup>
-import SvgIcon from '@af-mobile-client-vue3/components/core/SvgIcon/index.vue'
 </script>
 
 <template>
   <div class="load_error_main">
     <div class="container">
-      <SvgIcon name="loadError" class="loadError" />
+      <div class="loadError i-svg:loadError" />
     </div>
     <div class="text">
       似乎出了点问题，下拉再试试

package/src/views/common/NotFound.vue

@@ -1,18 +1,17 @@
 <script setup>
-import SvgIcon from '@af-mobile-client-vue3/components/core/SvgIcon/index.vue'
 import { Button as VanButton } from 'vant'
 </script>
 
 <template>
   <div class="not_found_main">
     <div class="container">
-      <SvgIcon name="notFound" class="notFound" />
+      <div class="notFound i-svg:notFound" />
     </div>
     <div class="text">
       本来无一物，何处惹尘埃
     </div>
     <div class="button_group">
-      <VanButton type="primary" size="small" @click="$router.replace('/home')">
+      <VanButton type="primary" size="small" @click="$router.replace('/')">
         返回首页
       </VanButton>
     </div>