From 1b3d60be47ccc687e26ad585f2453828adcd4e17 Mon Sep 17 00:00:00 2001
From: yuan <wang.yuan@joydata.com>
Date: Fri, 5 Jan 2024 19:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=95=B0=E6=8D=AE=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                  |   1 +
 src/app.ts                       |   1 -
 src/components/Auth.vue          |   2 +-
 src/components/contact/index.vue |   2 +-
 src/pages/contact/index.vue      | 155 ++++++++++++++++++++-----------
 src/utils/GQLRequest.ts          |  23 +----
 src/utils/index.ts               |   1 +
 src/utils/pinyin-helper.ts       |  21 +++++
 8 files changed, 127 insertions(+), 79 deletions(-)
 create mode 100644 src/utils/pinyin-helper.ts

diff --git a/components.d.ts b/components.d.ts
index 79c0f6f..2ade2b7 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -29,6 +29,7 @@ declare module 'vue' {
     NutNavbar: typeof import('@nutui/nutui-taro')['Navbar']
     NutRow: typeof import('@nutui/nutui-taro')['Row']
     NutSearchbar: typeof import('@nutui/nutui-taro')['Searchbar']
+    NutSkeleton: typeof import('@nutui/nutui-taro')['Skeleton']
     NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
   }
 }
diff --git a/src/app.ts b/src/app.ts
index 1909096..06562e4 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -4,7 +4,6 @@ import './app.scss'
 import '@nutui/touch-emulator'
 import 'taro-icons/scss/FontAwesome.scss'
 
-
 const App = createApp({
   onShow (options) {},
   // 入口组件不需要实现 render 方法，即使实现了也会被 taro 所覆盖
diff --git a/src/components/Auth.vue b/src/components/Auth.vue
index c38fb99..1ba59c7 100644
--- a/src/components/Auth.vue
+++ b/src/components/Auth.vue
@@ -29,8 +29,8 @@ export default {
                 if (key === 'expires_in') {
                   Session.set('expires_in_timestamp', new Date().getTime() + (value * 60 * 1000))
                 }
-                console.log(key, value);
               }
+              console.log(Session.all())
               auth.isLoggedIn = true
               if (!Session.has('access_token')) {
                 if (Taro.getCurrentPages().length > 0) {
diff --git a/src/components/contact/index.vue b/src/components/contact/index.vue
index 0f1b88f..6f8f72b 100644
--- a/src/components/contact/index.vue
+++ b/src/components/contact/index.vue
@@ -24,7 +24,7 @@ const clickItem = (key: string, item: any)  => {
 </script>
 
 <template>
-  <nut-elevator :index-list="props.items" is-sticky style="height: 100%" @click-item="clickItem">
+  <nut-elevator :index-list="props.items" is-sticky style="height: 100%" :height="100" @click-item="clickItem">
   <template #default="{ item }">
       <view class="d-flex flex-row pb-2">
         <view class="pr-4 pt-2 h6">
diff --git a/src/pages/contact/index.vue b/src/pages/contact/index.vue
index 3bd2aee..7f11d6e 100644
--- a/src/pages/contact/index.vue
+++ b/src/pages/contact/index.vue
@@ -1,62 +1,102 @@
-<script setup>
+<script lang="ts" setup>
 import Contact from "../../components/contact"
 import { Router } from 'tarojs-router-next'
-import { ref } from 'vue';
+import {reactive, ref} from 'vue';
 import './index.scss'
+import {gql} from "graphql-tag";
+import {PinyinHelper, GQLRequest} from "../../utils";
+
+interface ContactData {
+  id: number
+  name: string
+  isVIP: boolean
+  flexVisit: boolean
+  isBlock: boolean
+  nickName: string
+  avatar: string
+  phone: string
+  company: string
+  nextVisitDate?: string
+  firstCharPinyin: string
+}
+
+const state = reactive<{
+  isContactDataLoading: boolean;
+  searchQuery: string;
+  contactFullList: ContactData[]; // Using the ContactData interface
+  contactList: ContactData[]; // Generic type for now
+  contactGroupedList: any[]; // Generic type for now
+}>({
+  isContactDataLoading: true,
+  searchQuery: "",
+  contactFullList: [],
+  contactList: [],
+  contactGroupedList: [],
+})
 
 const val = ref('');
 
-const data = ref([
-  {
-    title: 'A',
-    list: [
-      { id: 1, name: '', isVIP: true, company: '阿姨公司', avatar: null },
-    ]
-  },
-  {
-    title: 'B',
-    list: [
-      { id: 2, name: '包子', isVIP: false, company: '公司', avatar: null },
-      { id: 3, name: '白老师', isVIP: true, company: '', avatar: null },
-      { id: 4, name: '八哥', isVIP: false, company: '', avatar: null },
-      { id: 5, name: '保生', isVIP: false, company: '', avatar: null },
-      { id: 6, name: '巴金', isVIP: false, company: null, avatar: null },
-    ]
-  },
-  {
-    title: 'G',
-    list: [
-      { id: 7, name: '高工', isVIP: false, company: null, avatar: null },
-      { id: 8, name: '国总', isVIP: false, company: null, avatar: null },
-      { id: 9, name: '宫崎骏', isVIP: false, company: null, avatar: null },
-    ]
-  },
-  {
-    title: 'H',
-    list: [
-      { id: 10, name: '何同学', isVIP: false, company: null, avatar: null },
-      { id: 11, name: '韩红', isVIP: false, company: null, avatar: null },
-      { id: 12, name: '洪秀权', isVIP: false, company: null, avatar: null },
-      { id: 13, name: '何同学', isVIP: false, company: null, avatar: null },
-      { id: 14, name: '韩红', isVIP: false, company: null, avatar: null },
-      { id: 15, name: '洪秀权', isVIP: false, company: null, avatar: null },
-      { id: 16, name: '何同学', isVIP: false, company: null, avatar: null },
-      { id: 17, name: '韩红', isVIP: false, company: null, avatar: null },
-      { id: 18, name: '洪秀权', isVIP: false, company: null, avatar: null },
-      { id: 19, name: '韩红', isVIP: false, company: null, avatar: null },
-      { id: 20, name: '洪秀权', isVIP: false, company: null, avatar: null },
-      { id: 21, name: '韩红', isVIP: false, company: null, avatar: null },
-      { id: 22, name: '洪秀权', isVIP: false, company: null, avatar: null },
-      { id: 23, name: '何同学', isVIP: false, company: null, avatar: null },
-      { id: 24, name: '韩红', isVIP: false, company: null, avatar: null },
-      { id: 25, name: '洪秀权', isVIP: false, company: null, avatar: null },
-      { id: 26, name: '何同学', isVIP: false, company: null, avatar: null },
-      { id: 27, name: '韩红', isVIP: false, company: null, avatar: null },
-      { id: 28, name: '洪秀权', isVIP: false, company: null, avatar: null },
-      { id: 29, name: '韩红', isVIP: false, company: null, avatar: null },
-    ]
+const GQL_QUERY_ALL_CONTACT = gql`
+    query {
+      visitors {
+        id
+        name
+        nickname
+        type
+        visitorCompany
+        avatar
+        phone
+      }
+    }
+  `
+
+GQLRequest.query(GQL_QUERY_ALL_CONTACT, {})
+    .then( result => {
+      // console.log(result)
+      for(let item of result.data.visitors) {
+        state.contactFullList.push({
+          id: item.id,
+          name: item.name,
+          nickName: item.nickname,
+          avatar: item.avatar,
+          company: item.visitorCompany,
+          phone: item.phone,
+          flexVisit: "",
+          isBlock: "",
+          isVIP: "",
+          firstCharPinyin: PinyinHelper.getPinyinGroupName(item.name)
+        } as ContactData)
+      }
+      console.log(state.contactFullList)
+      state.isContactDataLoading = false
+      state.contactList = state.contactFullList
+      generateContactGroupList()
+    })
+
+const onSearchValueChange = (value) => {
+  state.contactList = []
+  for(const item of state.contactFullList) {
+    if (item.name.match(value)) {
+      state.contactList.push(item)
+    }
   }
-]);
+  generateContactGroupList()
+  console.log(state.contactList)
+}
+const generateContactGroupList = () => {
+  let contactGroupedList = []
+  for (const item of state.contactList) {
+    const firstChar = item.firstCharPinyin;
+    if (!contactGroupedList[firstChar]) {
+      contactGroupedList[firstChar] = { title: firstChar, list: [] };
+    }
+    contactGroupedList[firstChar].list.push(item);
+  }
+
+  state.contactGroupedList = Object.values(contactGroupedList).sort((a, b) =>
+      a.title.localeCompare(b.title)
+  );
+}
 
 </script>
 
@@ -70,7 +110,7 @@ const data = ref([
       </view>
     </view>
     <View class="d-flex">
-        <nut-searchbar v-model="val" class="flex-grow-1">
+        <nut-searchbar placeholder="" confirm-type="search" clearable v-model="state.searchQuery" class="flex-grow-1" @change="onSearchValueChange">
           <template #rightin>
             <Text className="fas fa-search text-black-50"/>
           </template>
@@ -81,9 +121,14 @@ const data = ref([
     </View>
 
 
-    <view class="scroll">
-      <Contact :items="data"/>
+    <view class="scroll 100vh" v-if="!state.isContactDataLoading">
+        <Contact :items="state.contactGroupedList"/>
     </view>
+    <View v-else class="d-flex flex-column">
+      <NutSkeleton class="p-3" height="15px" animated avatar avatar-size="45px" row="1"/>
+      <NutSkeleton class="p-3" height="15px" animated avatar avatar-size="45px" row="1"/>
+      <NutSkeleton class="p-3" height="15px" animated avatar avatar-size="45px" row="1"/>
+    </View>
   </view>
 
 
diff --git a/src/utils/GQLRequest.ts b/src/utils/GQLRequest.ts
index 7986ba5..cce53fb 100644
--- a/src/utils/GQLRequest.ts
+++ b/src/utils/GQLRequest.ts
@@ -2,33 +2,14 @@ import Taro from "@tarojs/taro";
 import { Session } from "./session";
 import {DocumentNode, print} from "graphql";
 
-
 export class GQLRequest {
   static query(documentNode: DocumentNode, variable: object) {
     return new Promise((resolve, reject) => {
       Taro.request({
         method: 'POST',
-        url: SERVER_URL + '/graphql',
-        header: {
-          Authorization: 'Bearer ' + Session.get('token'),
-        },
-        data: JSON.stringify({ query: print(documentNode), variables: variable }),
-        success: result => {
-          if (result.statusCode == 200) resolve(result.data)
-          else reject(result)
-        },
-        fail: res => reject(res)
-      })
-    })
-  }
-
-  static shopQuery(documentNode: DocumentNode, variable: object) {
-    return new Promise((resolve, reject) => {
-      Taro.request({
-        method: 'POST',
-        url: SERVER_SHOP_URL + '/graphql',
+        url: SERVER_URL + '/system/graphql',
         header: {
-          Authorization: 'Bearer ' + Session.get('shop_token'),
+          Authorization: 'Bearer ' + Session.get('access_token'),
         },
         data: JSON.stringify({ query: print(documentNode), variables: variable }),
         success: result => {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 46f82a1..fe03649 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -4,3 +4,4 @@ export { GQLRequest } from './GQLRequest';
 export { Route } from './route';
 export { ScreenHelper } from './screen-helper';
 export { Session } from './session'
+export { PinyinHelper } from './pinyin-helper'
diff --git a/src/utils/pinyin-helper.ts b/src/utils/pinyin-helper.ts
new file mode 100644
index 0000000..59b7f7e
--- /dev/null
+++ b/src/utils/pinyin-helper.ts
@@ -0,0 +1,21 @@
+const convert = require('chinese2pinyin');
+
+export class PinyinHelper {
+    static getFirstCharFirstPinyin = (str) => {
+        return convert({cn: str.substring(0, 1), result: 'F'})
+    }
+
+    static getPinyinGroupName = (str) => {
+        let result: string = this.getFirstCharFirstPinyin(str)
+        if (result.length === 0) {
+            if (str.substring(0, 1).match("[a-zA-Z]")) {
+                result = str.substring(0, 1).toUpperCase()
+            }
+            else {
+                result = "@"
+            }
+        }
+        return result
+    }
+
+}