Merge branch 'feature_231120' into dev

src/views/Card/Edit.vue

@@ -331,7 +331,7 @@ const handleSubmit = async () => {
               <!-- <van-button size="small" class="ml-1 btn-moBlue" icon="tv-o" hairline @click="$router.push('/card/video')">教學影片</van-button> -->
               <van-button
                 size="small"
-                class="ml-1 btn-moBlue"
+                class="ml-1 btn-skyBlue"
                 icon="tv-o"
                 hairline
                 @click="showMovie = true"

src/views/Home/index.vue

@@ -267,9 +267,14 @@ const handleLogout = () => {
           <h5 class="text-gray">歡迎來到會員中心</h5>
         </a>
       </template>
-      <template #right>
+      <template #left>
         <div class="btn btn-sm text-skyBlue" @click="handleLogout">
-          <h4><i class="fa fa-sign-out" aria-hidden="true"></i></h4>
+          <h4><i class="fa-solid fa-arrow-right-to-bracket"></i></h4>
+        </div>
+      </template>
+      <template #right>
+        <div class="btn btn-sm text-skyBlue" @click="router.push('/member')">
+          <h4><i class="fa-solid fa-gear"></i></h4>
         </div>
       </template>
     </van-nav-bar>
@@ -299,7 +304,7 @@ const handleLogout = () => {
         </div>
         <div class="right">
           <div class="btn btn-sm text-darkBlue" @click="doShare">
-            <h4><i class="fa-solid fa-share-from-square"></i></h4>
+            <h4><i class="fa-solid fa-clone"></i></h4>
           </div>
         </div>
       </div>
@@ -320,12 +325,12 @@ const handleLogout = () => {
       </div>
     </div>
 
-    <div class="bwtFlex px-3 mb-2">
+    <!-- <div class="bwtFlex px-3 mb-2">
       <h5 class="font-weight-bold text-darkBlue">會員資料</h5>
       <a href="javascript:;" @click="router.push('/member')">
         <h5><i class="fa-solid fa-sliders text-darkBlue"></i></h5>
       </a>
-    </div>
+    </div> -->  
 
     <div class="content" v-if="userInfo">
       <van-cell-group inset>

src/views/Member/index.vue

@@ -479,29 +479,29 @@ const handleChangeTplSubmit = async() => {
           <van-field v-model="form.age" label="年齡" name="age" placeholder="請輸入您的年齡" />
           <van-field name="sex" label="性別">
             <template #input>
-              <van-radio-group v-model="genderChecked" direction="horizontal" checked-color="#345068">
+              <van-radio-group v-model="genderChecked" direction="horizontal" checked-color="#5b7b94">
                 <van-radio name="0">男</van-radio>
                 <van-radio name="1">女</van-radio>
               </van-radio-group>
             </template>
           </van-field>
 
-          <van-field v-model="areaName" is-link readonly name="area" label="區域" placeholder="請選擇區域"
+          <van-field v-model="areaName" is-link readonly name="area" label="區域" placeholder="請選擇區域" 
             @click="showAreaPicker = true" />
           <van-popup v-model:show="showAreaPicker" position="bottom">
-            <van-picker :columns="areaColumns" @confirm="onAreaConfirm" @cancel="showAreaPicker = false" />
+            <van-picker :columns="areaColumns" confirm-button-text="確認" cancel-button-text="取消" @confirm="onAreaConfirm" @cancel="showAreaPicker = false" />
           </van-popup>
           <van-field v-model="workName" is-link readonly name="work" label="工作性質" placeholder="請選擇工作性質"
             @click="showWorkPicker = true" />
           <van-popup v-model:show="showWorkPicker" position="bottom">
-            <van-picker :columns="workColumns" @confirm="onWorkConfirm" @cancel="showWorkPicker = false" />
+            <van-picker :columns="workColumns" confirm-button-text="確認" cancel-button-text="取消" @confirm="onWorkConfirm" @cancel="showWorkPicker = false" />
           </van-popup>
 
           <van-field readonly>
             <template #label>是否公開<br />資料搜尋</template>
             <template #input>
               <van-switch v-model="searchChecked" @update:model-value="searchOnUpdateValue" size="18px"
-                active-color="#345068" inactive-color="#888888" />
+                active-color="#5b7b94" inactive-color="#888888" />
             </template>
           </van-field>
 
@@ -649,16 +649,33 @@ const handleChangeTplSubmit = async() => {
 
     <div class="content cnt2" v-show="tabActive === 2">
       <van-cell-group inset>
-        <van-row align="center">
-          <van-col span="12">
+        <van-row gutter="0" align="center">
+          <van-col span="9">
             <van-field v-model="tab2result" is-link readonly name="picker" :border="false" placeholder="請選擇"
               @click="tab2showPicker = true" />
             <van-popup v-model:show="tab2showPicker" position="bottom">
-              <van-picker :columns="tab2columns" @confirm="tab2OnConfirm" @cancel="tab2showPicker = false" />
+              <van-picker
+              confirm-button-text="確認"
+              cancel-button-text="取消"
+              :columns="tab2columns"
+              @confirm="tab2OnConfirm"
+              @cancel="tab2showPicker = false"
+              />
             </van-popup>
           </van-col>
-          <van-col span="12">
-            <van-search v-model="search.keyword" placeholder="請輸入搜尋關鍵字" @search="tab2OnSearch" />
+          <van-col span="15">
+            <van-search
+            v-model="search.keyword"
+            show-action
+            placeholder="請輸入搜尋關鍵字"
+            @search="tab2OnSearch"
+            >
+              <template #action>
+                <van-button class="btn-darkBlue" @click="tab2OnSearch">
+                  搜索
+                </van-button>
+              </template>
+            </van-search>
           </van-col>
         </van-row>
       </van-cell-group>
@@ -834,6 +851,9 @@ const handleChangeTplSubmit = async() => {
       }
     }
   }
+  .van-search,.van-search-content{
+    padding-left: 0;
+  }
 }
 
 .cnt3 {