diff --git a/src/api/index.js b/src/api/index.js index e952d78..41d4384 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -21,6 +21,12 @@ export const setUserTpl = async (tpl) => export const toggleSendWithAD = async (type) => ajax(`/user/toggleSendWithAD`, { type }, "POST"); +export const searchConnection = async (type) => + ajax(`/user/searchConnection`, { type }, "POST"); + +export const setUserNfcTpl = async (tpl) => + ajax(`/user/setUserNfcTpl`, { tpl }, "POST"); + export const register = async (userInfo) => ajax(`/auth/register`, userInfo, "POST"); @@ -65,4 +71,7 @@ export const getMovie = async () => export const getMarquee = async () => ajax(`/ads/getMarquee`); +//通訊錄 +export const addUserFavi = async (params) => + ajax(`/UserFavi/addUserFavi`, params , "POST"); diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 30f140f..8906a4c 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -634,10 +634,8 @@ h1, h2, h3, h4, h5, h6 { margin-top: 5px; margin-right: 5px; } -.van-cell-group .van-cell .van-field__label--top i, .van-cell-group .van-cell .van-field__label--top svg { - color: #5b7b94; - margin-top: 0px; - margin-right: 5px; +.van-cell-group .van-cell .van-cell { + padding: 6px 0px; } /* ========================================= stage ============================================= */ diff --git a/src/assets/images/tp/tp_1.jpg b/src/assets/images/tp/tp_1.jpg new file mode 100644 index 0000000..ecccafc Binary files /dev/null and b/src/assets/images/tp/tp_1.jpg differ diff --git a/src/assets/images/tp/tp_2.jpg b/src/assets/images/tp/tp_2.jpg new file mode 100644 index 0000000..c6f9abf Binary files /dev/null and b/src/assets/images/tp/tp_2.jpg differ diff --git a/src/assets/images/tp/tp_3.jpg b/src/assets/images/tp/tp_3.jpg new file mode 100644 index 0000000..2406d09 Binary files /dev/null and b/src/assets/images/tp/tp_3.jpg differ diff --git a/src/assets/images/tp/tp_4.jpg b/src/assets/images/tp/tp_4.jpg new file mode 100644 index 0000000..6c653ca Binary files /dev/null and b/src/assets/images/tp/tp_4.jpg differ diff --git a/src/assets/sass/layout/_layout.scss b/src/assets/sass/layout/_layout.scss index 7b2bf2a..b27e847 100644 --- a/src/assets/sass/layout/_layout.scss +++ b/src/assets/sass/layout/_layout.scss @@ -57,7 +57,7 @@ .van-cell-group{ border-radius: 5px; margin-bottom: 15px; - overflow: hidden; + overflow: hidden; .van-cell{ padding: 6px 16px; align-items: center; @@ -85,12 +85,8 @@ margin-right: 5px; } } - .van-field__label--top{ - i,svg{ - color: #5b7b94; - margin-top: 0px; - margin-right: 5px; - } + .van-cell{ + padding: 6px 0px; } } } diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 592eb10..1b5107b 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -404,6 +404,11 @@ const handleLogout = () => { + +
+
發送名片
 + +
diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue index 1bb11b1..12362f3 100644 --- a/src/views/Member/index.vue +++ b/src/views/Member/index.vue @@ -2,19 +2,19 @@ import _ from 'lodash' import axios from 'axios' -import { ref , nextTick} from 'vue' +import { ref , nextTick, onBeforeMount} from 'vue' import { Cropper } from 'vue-advanced-cropper'; import 'vue-advanced-cropper/dist/style.css'; -import Footer from '@/components/Footer.vue' +// import Footer from '@/components/Footer.vue' import { useStore } from 'vuex' import { useRouter } from 'vue-router' import { showToast } from 'vant' import { showLoadingToast,showSuccessToast } from 'vant'; -import { getUserInfo , updateCard , getMovie } from '@/api' +import { getUserInfo , updateCard , searchConnection, addUserFavi, setUserNfcTpl} from '@/api' const URL = window.URL || window.webkitURL; @@ -22,7 +22,8 @@ const store = useStore() const router = useRouter() const form = ref({addon:[]}) -const activeName = ref(0) + +const genderChecked = ref() const fileList = ref([]); @@ -62,8 +63,7 @@ const validatorTel = (val) => { // onMounted(async ()=>{ let userRes = await getUserInfo() if(userRes.code===200){ - form.value = userRes.data - console.log(form); + form.value = userRes.data }else{ } @@ -110,10 +110,6 @@ const onCrop = () => { return } -const onClose = () =>{ - crop.value.show = false -} - const afterRead = async(file, name) => { crop.value.show = true @@ -159,12 +155,89 @@ const onSubmit = async () => { if(res.code===200){ showSuccessToast('更新成功') store.commit('user/setUserInfo',form.value) - router.push('/') + router.push('/member') }else{ showToast.fail('更新失敗') } }; +const searchChecked = ref(true); +const searchOnUpdateValue = (newValue) => { + showConfirmDialog({ + title: '提醒', + message: '是否切换开关？', + }).then(() => { + searchChecked.value = newValue; + }); +}; + +const tab2result = ref(''); +const tab2showPicker = ref(false); +const tab2columns = [ + { text: '台北', value: 'Taipei' }, + { text: '桃園', value: 'Taoyuan' }, + { text: '台中', value: 'Taichung' }, + { text: '彰化', value: 'Changhua' }, + { text: '高雄', value: 'Kaohsiung' }, +]; + +const tab2list = ref([]); +const tab2Loading = ref(false); +const tab2Finished = ref(false); +const tab2TodoLists = ref([]); +const tab2AddFriend = ref([]); +onBeforeMount(async () => { + let res = await searchConnection(); + console.log(res); + if(res.code===200){ + tab2list.value = res.data; + } + + res = await addUserFavi({uf_user_id:form.value.user_id}); + // console.log(res); + if(res.code===200){ + tab2AddFriend.value = res.data; + } +}); + +const tab2ListonLoad = () => { + // 异步更新数据 + // setTimeout 仅做示例，真实场景中一般为 ajax 请求 + // setTimeout(() => { + // for (let i = 0; i < 10; i++) { + // tab2list.value.push(tab2list.value.length + 1); + // } + + // // 加载状态结束 + // tab2Loading.value = false; + + // // 数据全部加载完成 + // if (tab2list.value.length >= 40) { + // tab2Finished.value = true; + // } + // }, 1000); +}; + +const tab2OnConfirm = ({ selectedOptions }) => { + tab2result.value = selectedOptions[0]?.text; + tab2showPicker.value = false; +}; + +const tab2searchValue = ref(''); +const tab2OnSearch = () => { + // tab2TodoLists = tab2list.filter(tab2searchValue); + // console.log(tab2TodoLists) +}; + +const tab3list = ref([]); +onBeforeMount(async () => { + let res = await setUserNfcTpl(); + console.log(res); + if(res.code===200){ + tab3list.value = res.data; + } +}); +