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

package/src/views/component/IconifyView/index.vue

@@ -3,13 +3,10 @@ import { Icon } from '@iconify/vue'
 import {
   Cell as VanCell,
   CellGroup as VanCellGroup,
-  Col as VanCol,
   Divider as VanDivider,
-  Field as VanField,
   Grid as VanGrid,
   GridItem as VanGridItem,
   NavBar as VanNavBar,
-  Row as VanRow,
   Tab as VanTab,
   Tabs as VanTabs,
 } from 'vant'

package/src/views/component/UserDetailView/UserDetailPage.vue

@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import type { RecordEntry } from '@af-mobile-client-vue3/components/data/UserDetail/recordEntries'
+import type { BaseUser } from '@af-mobile-client-vue3/components/data/UserDetail/types'
+import UserDetail from '@af-mobile-client-vue3/components/data/UserDetail/index.vue'
+import { showToast, Dialog as VanDialog, NavBar as VanNavBar } from 'vant'
+import { useRoute, useRouter } from 'vue-router'
+
+const route = useRoute()
+const router = useRouter()
+
+// 从路由参数获取用户ID
+const userInfoId = route.params.userInfoId as string
+
+// 返回上一页
+function handleBack() {
+  router.back()
+}
+
+// 记录点击处理
+function handleRecordClick(entry: RecordEntry, user: BaseUser) {
+  showToast(`点击了${entry.title}，用户：${user.f_user_name}`)
+}
+
+// 业务办理点击处理
+function handleBusinessClick(user: BaseUser) {
+  VanDialog.alert({
+    title: '业务办理',
+    message: `为用户 ${user.f_user_name}（${user.f_userinfo_code}）办理业务`,
+  })
+}
+
+// 打印处理
+function handlePrint(user: BaseUser) {
+  showToast(`打印用户 ${user.f_user_name} 的档案`)
+}
+</script>
+
+<template>
+  <div class="user-detail-page">
+    <!-- 导航栏 -->
+    <VanNavBar
+      title="用户详情"
+      left-text="返回"
+      left-arrow
+      @click-left="handleBack"
+    />
+
+    <!-- 用户详情组件 -->
+    <UserDetail
+      :user-info-id="userInfoId"
+      :show-recent-time="true"
+      :show-bottom-buttons="true"
+      business-button-text="立即办理"
+      @record-click="handleRecordClick"
+      @business-click="handleBusinessClick"
+      @print="handlePrint"
+    />
+  </div>
+</template>
+
+<style scoped lang="less">
+.user-detail-page {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background-color: #f5f7fa;
+
+  .van-nav-bar {
+    flex-shrink: 0;
+  }
+
+  :deep(.user-detail) {
+    flex: 1;
+    overflow-y: auto;
+  }
+}
+</style>

package/src/views/component/UserDetailView/index.vue

@@ -0,0 +1,234 @@
+<script setup lang="ts">
+import type { BaseUser } from '@af-mobile-client-vue3/components/data/UserDetail/types'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { Button as VanButton } from 'vant'
+
+import { reactive } from 'vue'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+
+// 模拟用户数据
+const mockUsers = reactive<BaseUser[]>([
+  {
+    f_userinfo_id: '65836',
+    f_userinfo_code: '1166730',
+    f_user_name: '刘思聪',
+    f_user_phone: '15199996077',
+    f_address: '滨河营业厅',
+    f_user_state: '正常',
+    f_user_type: '民用',
+    f_meter_type: '气量卡表',
+    f_meternumber: '0002353',
+    f_balance: 1.61,
+    f_balance_amount: 0,
+    f_userfiles_id: '71717',
+    f_times: 11,
+    f_total_gas: 768,
+    f_valve_state: '开启',
+    f_hascard: '是',
+    f_card_id: '9400002001',
+  },
+])
+
+// 切换用户 - 现在跳转到新路由
+function switchUser() {
+  const user = mockUsers[0]
+  router.push({
+    name: 'UserDetailRoute',
+    params: { userInfoId: user.f_userinfo_id },
+  })
+}
+</script>
+
+<template>
+  <NormalDataLayout title="UserDetail 用户详情组件">
+    <template #layout_content>
+      <div class="demo-container">
+        <!-- 基础使用说明 -->
+        <div class="demo-section">
+          <h3>基础使用</h3>
+          <p>UserDetail 组件用于展示用户的详细信息，支持动态配置记录入口和交互功能。</p>
+        </div>
+
+        <!-- 用户选择器 -->
+        <div class="demo-section">
+          <h3>点击用户查看详情</h3>
+          <div class="user-selector">
+            <VanButton
+              size="small"
+              @click="switchUser()"
+            >
+              {{ mockUsers[0].f_user_name }}
+              <span class="user-status" :class="`status-${mockUsers[0].f_user_state}`">
+                {{ mockUsers[0].f_user_state }}
+              </span>
+            </VanButton>
+          </div>
+        </div>
+
+        <!-- 功能特性说明 -->
+        <div class="demo-section">
+          <h3>组件特性</h3>
+          <ul class="feature-list">
+            <li>📋 用户基本信息展示与折叠</li>
+            <li>🔗 可配置的记录入口</li>
+            <li>⏰ 支持显示最近业务时间</li>
+            <li>🖨️ 内置打印功能</li>
+            <li>⚙️ 自定义 API 接口</li>
+            <li>🎨 多种用户状态样式</li>
+          </ul>
+        </div>
+
+        <!-- Props 说明 -->
+        <div class="demo-section">
+          <h3>主要 Props</h3>
+          <div class="props-table">
+            <div class="props-row">
+              <span class="prop-name">userInfoId</span>
+              <span class="prop-type">string</span>
+              <span class="prop-desc">用户ID（必传）</span>
+            </div>
+            <div class="props-row">
+              <span class="prop-name">showRecentTime</span>
+              <span class="prop-type">boolean</span>
+              <span class="prop-desc">是否展示历史时间</span>
+            </div>
+            <div class="props-row">
+              <span class="prop-name">recordEntries</span>
+              <span class="prop-type">RecordEntry[]</span>
+              <span class="prop-desc">记录入口配置</span>
+            </div>
+            <div class="props-row">
+              <span class="prop-name">showBottomButtons</span>
+              <span class="prop-type">boolean</span>
+              <span class="prop-desc">是否显示底部按钮区域</span>
+            </div>
+            <div class="props-row">
+              <span class="prop-name">showHeader</span>
+              <span class="prop-type">boolean</span>
+              <span class="prop-desc">是否显示头部导航栏</span>
+            </div>
+            <div class="props-row">
+              <span class="prop-name">headerTitle</span>
+              <span class="prop-type">string</span>
+              <span class="prop-desc">头部标题文本</span>
+            </div>
+            <div class="props-row">
+              <span class="prop-name">#bottom</span>
+              <span class="prop-type">slot</span>
+              <span class="prop-desc">底部插槽，可自定义按钮内容</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.demo-container {
+  padding: 16px;
+}
+
+.demo-section {
+  margin-bottom: 24px;
+
+  h3 {
+    margin: 0 0 12px 0;
+    font-size: 16px;
+    font-weight: 600;
+    color: #323233;
+  }
+
+  p {
+    margin: 0 0 12px 0;
+    font-size: 14px;
+    color: #646566;
+    line-height: 1.5;
+  }
+}
+
+.user-selector {
+  display: flex;
+  gap: 8px;
+  flex-wrap: wrap;
+
+  .van-button {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+  }
+
+  .user-status {
+    font-size: 12px;
+    padding: 1px 6px;
+    border-radius: 10px;
+
+    &.status-正常 {
+      background-color: #e6ffed;
+      color: #52c41a;
+    }
+
+    &.status-欠费 {
+      background-color: #fff1f0;
+      color: #f5222d;
+    }
+
+    &.status-暂停 {
+      background-color: #fff7e6;
+      color: #fa8c16;
+    }
+  }
+}
+
+.feature-list {
+  margin: 0;
+  padding-left: 20px;
+
+  li {
+    margin-bottom: 8px;
+    font-size: 14px;
+    color: #646566;
+    line-height: 1.5;
+  }
+}
+
+.props-table {
+  background-color: #f8f9fa;
+  border-radius: 8px;
+  padding: 12px;
+
+  .props-row {
+    display: flex;
+    align-items: center;
+    padding: 8px 0;
+    border-bottom: 1px solid #ebedf0;
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .prop-name {
+    flex: 0 0 120px;
+    font-size: 13px;
+    font-weight: 600;
+    color: #1976d2;
+    font-family: 'Monaco', 'Consolas', monospace;
+  }
+
+  .prop-type {
+    flex: 0 0 80px;
+    font-size: 12px;
+    color: #e91e63;
+    font-family: 'Monaco', 'Consolas', monospace;
+  }
+
+  .prop-desc {
+    flex: 1;
+    font-size: 13px;
+    color: #646566;
+  }
+}
+</style>

package/src/views/component/XCellListView/index.vue

@@ -1,26 +1,19 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
-const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-// const configName = ref('orderCarInMobileCRUD')
-// const serviceName = ref('af-gaslink')
-// const configName = ref('lngPriceManageMobileCRUD')
-const configName = ref('测试2')
-const serviceName = ref('af-gaslink')
-// const configName = ref('mobile_liushuiQueryCRUD')
-// const serviceName = ref('af-revenue')
+const configName = ref('mobile_meterInfoManageCRUD')
+const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -55,12 +48,12 @@ const serviceName = ref('af-gaslink')
 // 跳转到表单——以表单组来渲染纯表单
 function toDetail(item) {
   router.push({
-    name: 'xformgroup222',
-    // query: {
-    //   id: item[idKey.value],
-    // id: item.rr_id,
-    // o_id: item.o_id,
-    // },
+    name: 'XFormGroupView',
+    query: {
+      id: item[idKey.value],
+      // id: item.rr_id,
+      // o_id: item.o_id,
+    },
   })
 }
 
@@ -76,36 +69,19 @@ function toDetail(item) {
 //     },
 //   })
 // }
-function addOption() {
-  console.log('用户----', userInfo)
-  router.push({
-    name: 'XFormGroupView',
-    // params: { id: totalCount.value },
-    // query: {
-    //   configName: configName.value,
-    //   serviceName: serviceName.value,
-    //   mode: '新增',
-    // },
-  })
-  // 如果存在回调函数，调用它并传递true表示已处理
-  // if (typeof callback === 'function') {
-  //   callback(true)
-  // }
-}
 
 // 修改功能
-function updateRow(result) {
-  console.log('用户----', userInfo)
-  router.push({
-    name: 'XFormView',
-    params: { id: 1, openid: 2 },
-    query: {
-      configName: configName.value,
-      serviceName: serviceName.value,
-      mode: '修改',
-    },
-  })
-}
+// function updateRow(result) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: result.o_id, openid: result.o_id },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '修改',
+//     },
+//   })
+// }
 
 // 删除功能
 function deleteRow(result) {
@@ -116,38 +92,13 @@ function deleteRow(result) {
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
-      <!--      <XCellList -->
-      <!--        :config-name="configName" -->
-      <!--        :service-name="serviceName" -->
-      <!--        :custom-add="true" -->
-      <!--        :custom-edit="true" -->
-      <!--        :id-key="idKey" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--        @update="updateRow" -->
-      <!--        @add="addOption" -->
-      <!--      /> -->
-
-      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
-
-      <!--      <XCellList -->
-      <!--        config-name="ApplyMobileSuperviseCRUD" -->
-      <!--        service-name="af-apply" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--      /> -->
-
-      <!--      <XCellList -->
-      <!--        service-name="af-revenue" -->
-      <!--        config-name="userfiles_sel_address" -->
-      <!--        @to-detail="toDetail" -->
-      <!--      /> -->
       <XCellList
-        service-name="af-apply"
-        config-name="ApplyMobileProcessCRUD"
-        :custom-add="true"
+        :config-name="configName"
+        :service-name="serviceName"
+        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
+        :id-key="idKey"
         @to-detail="toDetail"
-        @add="addOption"
+        @delete-row="deleteRow"
       />
     </template>
   </NormalDataLayout>

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

@@ -5,19 +5,16 @@ import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
-// const configName = ref('reviewFormGroup')
-// const serviceName = ref('af-revenue')
-
 // 纯表单
-// const configName = ref('form_check_test')
-// const serviceName = ref('af-system')
+const configName = ref('form_check_test')
+const serviceName = ref('af-system')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
 
 // 表单组
-const configName = ref('lngChargeAuditMobileFormGroup')
-const serviceName = ref('af-gaslink')
+// const configName = ref('lngChargeAuditMobileFormGroup')
+// const serviceName = ref('af-gaslink')
 
 const formData = ref({})
 const formGroup = ref(null)
@@ -25,8 +22,7 @@ const route = useRoute()
 const isInit = ref(false)
 function submit(_result) {
   showDialog({ message: '提交成功' }).then(() => {
-    console.log('12121')
-    // history.back()
+    history.back()
   })
 }
 
@@ -67,8 +63,8 @@ function submit(_result) {
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
-        config-name="ceshi11111FormGroup"
-        service-name="af-apply"
+        :config-name="configName"
+        :service-name="serviceName"
         :group-form-data="formData"
         mode="新增"
         @submit="submit"

package/src/views/component/XFormView/index.vue

@@ -3,8 +3,8 @@ import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { ref } from 'vue'
 
-const configName = ref('addappapplychargeForm')
-const serviceName = ref('af-apply')
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
 
 const formGroupAddConstruction = ref(null)
 </script>

package/src/views/component/XOlMapView/testData.ts

@@ -61,4 +61,4 @@ export const trackTestData: TrackData[] = [
     color: '#00FF00',
     show: true,
   },
-] 
+]

package/src/views/component/index.vue

@@ -73,6 +73,10 @@ const list = ref([
     name: 'Iconify 图标使用示例',
     to: '/Component/IconifyView',
   },
+  {
+    name: 'UserDetail 用户详情组件',
+    to: '/Component/UserDetailView',
+  },
 ])
 
 function cleanConfigCache() {

package/src/views/component/menu.vue

@@ -87,7 +87,7 @@ console.warn(appList)
 
 <style scoped lang="less">
 .menu_main {
-  margin-bottom: var(--base-interval-2)
+  margin-bottom: var(--base-interval-2);
 }
 
 .my-swipe {

package/src/views/user/login/ForgetPasswordForm.vue

@@ -90,5 +90,5 @@ function handleReset() {
 </template>
 
 <style scoped lang="less">
-@import "@af-mobile-client-vue3/styles/login.less";
+@import '@af-mobile-client-vue3/styles/login.less';
 </style>

package/src/views/user/login/LoginForm.vue

@@ -123,9 +123,9 @@ function handleSubmit() {
           await afterGeneral(data)
         else
           if (data.resources.data)
-            await afterGeneral(data.resources.data)
+            await afterGeneral(data.resources.data, data.access_token)
           else
-            await afterGeneral(data.resources)
+            await afterGeneral(data.resources, data.access_token)
 
         const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
         closeToast()
@@ -160,7 +160,7 @@ function closeWindows() {
   }
 }
 
-async function afterGeneral(result) {
+async function afterGeneral(result, token = '') {
   // 排序 functions 及其嵌套的 children
   if (result.functions && Array.isArray(result.functions)) {
     // 对顶层菜单进行排序
@@ -197,6 +197,7 @@ async function afterGeneral(result) {
         username: formData.username,
         password: formData.password,
         rememberMe: rememberMe.value,
+        token,
       },
     },
     {

package/src/views/user/login/LoginWave.vue

@@ -4,7 +4,7 @@ import { hexToRgba } from '@af-mobile-client-vue3/utils/common'
 
 <template>
   <div class="wave">
-    <div class="enter-y wave-wrapper fixed bottom-0 w-full !-z-5">
+    <div class="enter-y wave-wrapper w-full bottom-0 fixed !-z-5">
       <svg
         class="ignore-waves"
         xmlns="http://www.w3.org/2000/svg"