update

src/packages/mobile/router/animateRouter.ts

@@ -133,7 +133,7 @@ export default new (class {
             } else {
                 // 忽略重定向的页面
                 if (route.redirectedFrom) {
-                    //transitionName.value = 'route-in'; // 前进动画
+                    transitionName.value = 'route-in'; // 前进动画
                 } else {
                     history.value.push(route);
                     if (history.value.length > 1) {

src/packages/pc/views/auth/login/index.vue

@@ -8,9 +8,9 @@
         <el-input type="password" placeholder="请输入您的登录密码" v-model="user.LoginPWD">
         </el-input>
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         <el-checkbox label="记住账号" v-model="remember"></el-checkbox>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button class="submit" type="primary" :loading="loading" @click="formSubmit">
           <span v-if="loading">正在登录</span>

src/packages/pc/views/member/index.vue

@@ -48,7 +48,7 @@ import { ElMessage, ElTree } from 'element-plus'
 import { formatDate } from '@/filters'
 import { useDataTable, useDataFilter } from '@/hooks/datatable'
 import { queryTHJFriends, queryInvestorLevelGroup } from '@/services/api/common'
-import { useLoginStore } from '@/stores'
+import { useLoginStore, useUserStore } from '@/stores'
 import { decryptAES } from '@/utils/websocket/crypto'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
@@ -56,10 +56,12 @@ import AppPagination from '@pc/components/base/pagination/index.vue'
 
 interface TreeData {
     label: string;
+    userid: number;
     children?: TreeData[];
 }
 
 const { getUserId } = useLoginStore()
+const { getAccountName } = useUserStore()
 const { dataList, total, pageIndex, pageSize } = useDataTable<Model.THJFriendsRsp>()
 const { filterOptons, getQueryParams } = useDataFilter<Model.THJFriendsReq>()
 const loading = shallowRef(false)
@@ -68,7 +70,8 @@ const filterText = shallowRef('')
 const userId = shallowRef(getUserId()) // 当前用户ID
 
 const treeList = reactive<TreeData[]>([{
-    label: '登录用户',
+    label: getAccountName() ?? '登录用户',
+    userid: userId.value,
     children: []
 }])
 
@@ -91,7 +94,6 @@ filterOptons.selectList = [
 
 filterOptons.inputList = [
     { label: '名称', keys: ['customername'] },
-    { label: '手机号', keys: ['mobile'] },
 ]
 
 filterOptons.buttonList = [
@@ -120,7 +122,11 @@ const getAuthStatusName = (status: number) => {
 // 获取手机号码
 const getPhoneNumber = (value: string) => {
     const phoneNumber = decryptAES(value)
-    return phoneNumber
+    if (userId.value == getUserId()) {
+        return phoneNumber
+    }
+    const reg = /^(\d{3})\d{4}(\d{4})$/
+    return phoneNumber?.replace(reg, '$1****$2')
 }
 
 const getTHJFriends = (params: Partial<Model.THJFriendsReq> = {}) => {
@@ -138,7 +144,8 @@ const getTHJFriends = (params: Partial<Model.THJFriendsReq> = {}) => {
 
             if (treeList[0].children?.length === 0) {
                 treeList[0].children = res.data.map((e) => ({
-                    label: e.customername
+                    label: e.customername,
+                    userid: e.frienduserid,
                 }))
             }
         },
@@ -149,9 +156,11 @@ const getTHJFriends = (params: Partial<Model.THJFriendsReq> = {}) => {
 }
 
 // 当节点被点击的时候触发
-const onNodeClick = (data: TreeData) => {
-    console.log(data)
-    onSearch()
+const onNodeClick = ({ userid }: TreeData) => {
+    if (userId.value !== userid) {
+        userId.value = userid
+        onSearch()
+    }
 }
 
 // 过滤树节点

src/packages/pc/views/profit/index.vue

@@ -60,7 +60,7 @@ filterOptons.selectList = [
     },
     {
         label: '角色',
-        key: 'userid',
+        key: 'profitroletype',
         options: [
             { label: getTHJProfitRoleTypeName(3), value: 3 },
             { label: getTHJProfitRoleTypeName(4), value: 4 }

src/types/model/common.d.ts

@@ -182,6 +182,7 @@ declare global {
             accoutstatus: string; // 状态
             createtime: string; // 创建时间
             customername: string; // 客户名称(企业名称)，模糊查询
+            frienduserid: number; // 用户UserID
             groupname: string; // 分级名称
             hasauth: number; // 是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝
             mobile: string; // 手机号码(加密存储)，加密串精确查询
@@ -193,6 +194,7 @@ declare global {
             marketid?: number; // 市场ID
             accountname?: string; // 好友名称，模糊查询
             goods?: string; // 商品代码或商品名称，模糊查询
+            profitroletype?: number;
             page?: number; // 页码
             pagesize: number?; // 每页条数
         }