Merge branch 'dev' into sta

src/utils/card/card0.js

@@ -172,7 +172,7 @@ function genCard(vcard) {
       "action": {
         "type": "uri",
         "label": "action",
-        "uri": "${vcard.nfcurl}&cardid=1"
+        "uri": "${vcard.nfcurl}"
       }    
     }
     `;
@@ -238,7 +238,7 @@ function genCard(vcard) {
               "action": {
                 "type": "uri",
                 "label": "action",
-                "uri": "${vcard.nfcurl}&cardid=1"
+                "uri": "${vcard.nfcurl}"
               }    
             },
             {

src/views/Home/index.vue

@@ -159,7 +159,7 @@ const noticeClick = (num) => {
 };
 
 const handleAD = async () => {
-  if (userInfo.value.status !== 1) {
+  if (userInfo.value.status === 0) {
     let res;
     res = await getMarquee();
     if (res.code === 200) {
@@ -304,7 +304,7 @@ const handleLogout = () => {
     </van-nav-bar>
 
     <!-- START: 跑馬燈 -->
-    <template v-if="userInfo.status !== 1">
+    <template v-if="userInfo.status === 0">
       <van-notice-bar color="#ffffff" background="#e05338" left-icon="volume" mode="link" :scrollable="true">
         <van-swipe class="notice-swipe" :touchable="false" :show-indicators="false">
           <van-swipe-item v-for="(item, key, index) in noticeData" :key="index" @click="noticeClick(key)">

src/views/Member/components/userInfo.vue

@@ -134,7 +134,7 @@ const onSubmit = async () => {
   }
 };
 
-const activeCollapse = ref(1);
+const activeCollapse = ref("1");
 </script>
 
 <template>
@@ -405,6 +405,7 @@ const activeCollapse = ref(1);
       </van-form>
     </van-cell-group>
   </div>
+
   <van-popup class="cropPopup" v-model:show="crop.show" closeable>
     <h5 class="text-center mt-3">檔案裁切上傳</h5>
     <div class="cropper-section">

src/views/Member/index.vue

@@ -192,6 +192,17 @@ const onMoveBtn = (type, index) => {
 
 }
 
+const onFailed = (errorInfo) => {
+  console.log('failed', errorInfo);
+  showFailToast('請確認欄位填寫是否完整');
+  if(errorInfo.errors[0].name === 'url'){
+    tabActive.value = 1
+    return
+  }
+  tabActive.value = 0
+  return
+};
+
 const onSubmit = async () => {
   showLoadingToast({
     duration: 0,
@@ -397,7 +408,7 @@ const handleChangeTplSubmit = async () => {
         </template>
       </van-tab>
     </van-tabs>
-    <van-form @submit="onSubmit">
+    <van-form @submit="onSubmit" @failed="onFailed">
       <div class="content cnt0" v-show="tabActive === 0">
         <van-cell-group inset>
           <div class="text-center p-4">
@@ -463,9 +474,9 @@ const handleChangeTplSubmit = async () => {
         <van-cell-group inset v-if="userStore.userData.level >= 3">
           <van-cell class="text-center bg-lightPink py-3">
             <template #title>
-              <h6 class="text-darkBlue"><strong>人脈資訊</strong></h6>
+              <h6 class="text-darkBlue"><strong>多元菁英人脈資訊</strong></h6>
               <div style="text-align: center;">
-                下面為客製型會員專屬提供被搜尋
+                下面為<span class="text-danger">客製型會員</span>專屬提供被搜尋
               </div>
             </template>
           </van-cell>
@@ -482,18 +493,18 @@ const handleChangeTplSubmit = async () => {
             padding: '0 16px',
           }"><strong>貴人資源共享</strong></van-divider>
           <van-collapse v-model="resourceActive" accordion>
-            <van-collapse-item title="工商簡介" name="3">
+            <van-collapse-item title="工商簡介" name="1">
               <van-field v-model="form.exchange" rows="3" type="textarea" name="exchange" maxlength="200"
                 placeholder="請填寫工商簡介" show-word-limit />
               <van-field v-model="form.exchange_link" label="分享網址：" name="exchange_link" placeholder="需求連結" />
             </van-collapse-item>
-            <van-collapse-item title="我能分享的資源" name="1">
+            <van-collapse-item title="我能分享的資源" name="2">
               <van-field v-model="form.supply" rows="3" type="textarea" maxlength="200" name="supply"
                 placeholder="請填寫能分享的資源" show-word-limit />
               <van-field v-model="form.supply_link" label="分享網址：" name="supply_link" placeholder="分享網址"
                 :rules="[{ validator: validatorUrl, message: '網址格式不正確,Ex. http://' }]" />
             </van-collapse-item>
-            <van-collapse-item title="我需要的資源" name="2">
+            <van-collapse-item title="我需要的資源" name="3">
               <van-field v-model="form.demand" rows="3" type="textarea" maxlength="200" name="demand"
                 placeholder="請填寫需要的的資源" show-word-limit />
               <van-field v-model="form.demand_link" label="分享網址：" name="demand_link" placeholder="需求連結" />
@@ -510,7 +521,8 @@ const handleChangeTplSubmit = async () => {
 
       <div class="content cnt1" v-show="tabActive === 1">
         <van-cell-group inset>
-          <van-field v-model="form.url" label="個人網頁" name="url" placeholder="請輸入您的個人網頁" />
+          <van-field v-model="form.url" label="個人網頁" name="url" placeholder="請輸入您的個人網頁" 
+          :rules="[{ validator: validatorUrl, message: '網址格式不正確,Ex. https://' }]"/>
           <van-field v-model="form.line" label="Line" name="line" placeholder="請輸入您的Line ID" />
           <van-field v-model="form.facebook" label="Facebook" name="facebook" placeholder="請輸入您的Facebook" />
           <van-field v-model="form.ig" label="IG" name="ig" placeholder="請輸入您的IG" />

src/views/Send/index.vue

@@ -99,7 +99,7 @@ async function showFlex(id) {
         }
       }
 
-      console.log('card', JSON.stringify(state.value.flexContent) )
+      // console.log('card', JSON.stringify(state.value.flexContent) )
 
       flexRef.value.innerHTML = ''
 

vite.config.js

@@ -11,6 +11,13 @@ export default defineConfig(({ mode }) => {
     server: {
       host: '0.0.0.0',
       port: 5173,
+      proxy: {
+        "/api": {
+          target: "https://utel.zltest.com.tw/appapi/v1",
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/api/, ""),
+        },
+      },
     },
     plugins: [
       vue(),