From 9b080e37f9c3e784deac5d3666e8291e12be1be0 Mon Sep 17 00:00:00 2001
From: Wayne <wwayne.hsu@gmail.com>
Date: Fri, 9 Aug 2024 19:07:00 +0800
Subject: [PATCH] fix20240809

---
 src/api/index.js            |   4 +-
 src/views/Address/index.vue | 135 ++++++++++++++++++++++++++++++++----
 src/views/Member/index.vue  |   2 -
 3 files changed, 125 insertions(+), 16 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 703d947..19a1344 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -82,8 +82,8 @@ export const getFlexcard = async () =>
   ajax(`/ads/getFlexcard`);
 
 //通訊錄
-export const getUserFaviList = async (cate_id) =>
-  ajax(`/UserFavi/getUserFaviList`, { cate_id }, "GET");
+export const getUserFaviList = async (params) =>
+  ajax(`/UserFavi/getUserFaviList`, params, "POST");
 
 export const addUserFavi = async (params) =>
   ajax(`/UserFavi/addUserFavi`, params, "POST");
diff --git a/src/views/Address/index.vue b/src/views/Address/index.vue
index b5f4e3e..6f84e57 100644
--- a/src/views/Address/index.vue
+++ b/src/views/Address/index.vue
@@ -1,7 +1,9 @@
 <script setup>
 import _ from 'lodash';
-
+import { onMounted, onBeforeMount, ref } from 'vue'
+import { toClipboard } from "@soerenmartius/vue3-clipboard";
 import { showToast, showSuccessToast, showConfirmDialog } from 'vant';
+import { useRoute } from 'vue-router';
 
 import {
   getUserFaviList
@@ -12,8 +14,8 @@ import {
   , deleteUserFavi
 } from '@/api'
 
-import { onMounted, onBeforeMount, ref } from 'vue'
-import { useRoute } from 'vue-router';
+import { getAreaList } from '@/api/system';
+
 
 const route = useRoute();
 
@@ -35,7 +37,7 @@ onMounted(async () => {
 });
 
 const initData = async () => {
-  let res = await getUserFaviList(0);
+  let res = await getUserFaviList(search.value);
   if (res.code === 200) {
     addressList.value = res.data;
   }
@@ -54,6 +56,12 @@ const getCateList = async () => {
   }
 }
 
+// 複製連結
+const doCopy = (text) => {
+  toClipboard(text);
+  showToast("已放入剪貼簿");
+};
+
 const handleDeleteFavi = async (id) => {
   // vant 詢問是否刪除
   showConfirmDialog({
@@ -105,12 +113,8 @@ const columns = ref([
 ]);
 
 const onCateConfirm = async (value) => {
-  let res = await getUserFaviList(value.selectedValues[1]);
-  if (res.code === 200) {
-    addressList.value = res.data;
-  }
-
-  showCatePicker.value = false;
+  search.value.cate = value.selectedValues[1]
+  showCatePicker.value = false
 };
 
 const onCateChange = (value) => {
@@ -274,6 +278,77 @@ const onSubmit = async () => {
   }
 };
 
+const search = ref({
+  cate: 0,
+  area: 0,
+  sex: 2,
+  keyword: ''
+});
+
+const tab2showPicker = ref(false);
+
+const tab3showPicker = ref(false)
+const tab3columns = ref([])
+const areaName = ref('')
+
+//取得區域資料
+let areaRes = await getAreaList()
+if (areaRes.code === 200) {
+    tab3columns.value = areaRes.data
+    // tab3columns加上第一項為全部
+    tab3columns.value.unshift({
+      text: '全部',
+      value: 0
+    })
+
+    //取得區域名稱
+    // if (areaRes.data.length > 0) {
+    //   const findRes = _.find(areaRes.data, { value: form.value.area })
+    //   if (findRes) {
+    //     areaName.value = findRes.text
+    //   }
+    // }
+}
+
+const tab3OnConfirm = (value) => {
+  areaName.value = value.selectedOptions[0].text
+  search.value.area = value.selectedOptions[0].value
+  tab3showPicker.value = false
+}
+
+const tab4showPicker = ref(false);
+const tab4columns = ref([
+  {
+    text: '全部',
+    value: 2
+  },
+  {
+    text: '男',
+    value: 1
+  },
+  {
+    text: '女',
+    value: 0
+  }
+]);
+const sexName = ref('')
+
+const tab4OnConfirm = (value) => {
+  sexName.value = value.selectedOptions[0].text
+  search.value.sex = value.selectedOptions[0].value
+  tab4showPicker.value = false
+}
+
+
+const handleSearch = async () => {
+  let res = await getUserFaviList(search.value);
+  if (res.code === 200) {
+    addressList.value = res.data;
+  }
+
+}
+  
+
 </script>
 
 <template>
@@ -300,6 +375,42 @@ const onSubmit = async () => {
           <van-picker :columns="columns" :columns-field-names="customFieldName" confirm-button-text="確認"
             cancel-button-text="取消" @cancel="showCatePicker = false" @confirm="onCateConfirm" @change="onCateChange" />
         </van-popup>
+      </van-cell-group>      
+      <van-cell-group inset>
+        <van-row gutter="0" align="center">
+          <van-col span="5">
+            <van-field v-model="areaName" is-link readonly name="picker" 
+              :border="false" 
+              placeholder="縣市"
+              @click="tab3showPicker = true" />
+            <van-popup v-model:show="tab3showPicker" position="bottom">
+              <van-picker confirm-button-text="確認" cancel-button-text="取消" :columns="tab3columns" @confirm="tab3OnConfirm"
+                @cancel="tab3showPicker = false" />
+            </van-popup>
+          </van-col>
+          <van-col span="5">
+            <van-field v-model="sexName" 
+              is-link 
+              readonly 
+              name="picker"
+              :border="false"
+              placeholder="性別"
+              @click="tab4showPicker = true" />
+            <van-popup v-model:show="tab4showPicker" position="bottom">
+              <van-picker confirm-button-text="確認" cancel-button-text="取消" :columns="tab4columns" @confirm="tab4OnConfirm"
+                @cancel="tab4showPicker = false" />
+            </van-popup>
+          </van-col>
+          <van-col span="14">
+            <van-search v-model="search.keyword" show-action placeholder="請輸入搜尋關鍵字" @search="handleSearch">
+              <template #action>
+                <van-button class="btn-darkBlue" @click="handleSearch">
+                  搜索
+                </van-button>
+              </template>
+            </van-search>
+          </van-col>
+        </van-row>
       </van-cell-group>
       <!-- END: 通訊錄類別 -->
 
@@ -317,10 +428,10 @@ const onSubmit = async () => {
               <van-button size="small" class="border-0" @click="handleChangeCate(item.user_id)">
                 <h5><i class="fa-solid fa-heart text-darkBlue"></i></h5>
               </van-button>
-              <van-button size="small" class="border-0" :url="`line://ti/p/@${item.line}`">
+              <van-button size="small" class="border-0" @click="doCopy(item.nfcurl)">
                 <h5><i class="fa-solid fa-share-nodes text-darkBlue"></i></h5>
               </van-button>
-              <van-button size="small" class="border-0" @click="handleDeleteFavi(item.id)">
+              <van-button size="small" class="border-0" @click="handleDeleteFavi(item.uf_id)">
                 <h5><i class="fa-solid fa-trash text-darkBlue"></i></h5>
               </van-button>
             </div>
diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue
index 5621fa2..f0a2697 100644
--- a/src/views/Member/index.vue
+++ b/src/views/Member/index.vue
@@ -669,8 +669,6 @@ const handleChangeTplSubmit = async () => {
         </van-list>
 
       </van-cell-group>
-
-
     </div>
 
     <div class="content cnt3" v-show="tabActive === 3">