From 4fa16a83ce835c58ca0aa16dcb30c4c6f1608e68 Mon Sep 17 00:00:00 2001
From: bruce68410 <kai326326@gmail.com>
Date: Tue, 14 Nov 2023 14:48:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=8C=AF=E8=AA=A4=E4=BF=AE=E6=AD=A3(?=
 =?UTF-8?q?=E9=A1=8F=E8=89=B2=E6=8C=89=E9=88=95=E5=82=B3=E9=81=9E=E7=89=A9?=
 =?UTF-8?q?=E4=BB=B6=E9=8C=AF=E8=AA=A4=E3=80=81=E6=96=87=E5=AD=97=E9=9D=A0?=
 =?UTF-8?q?=E5=8F=B3=E3=80=81=E6=9B=B4=E6=8F=9B=E5=9C=96=E7=89=87=E6=94=B9?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Card/Edit.vue | 43 +++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/Card/Edit.vue b/src/views/Card/Edit.vue
index 625ac4d..72e1891 100644
--- a/src/views/Card/Edit.vue
+++ b/src/views/Card/Edit.vue
@@ -495,10 +495,8 @@ const handleSubmit = async () => {
                             :src="form.json5.cards[form.page - 1].image"
                             alt=""
                           />
-                          <p
-                            class="ml-3 px-2 py-1 text-white bg-skyBlue rounded-pill"
-                          >
-                            <i class="fa-solid fa-arrow-left"></i> 點擊更換圖片
+                          <p class="ml-3 px-2 py-1 text-white bg-skyBlue rounded-pill">
+                            <i class="fa-solid fa-arrow-up"></i> 點擊更換圖片
                           </p>
                         </div>
                       </template>
@@ -508,11 +506,8 @@ const handleSubmit = async () => {
                             class="upload-img"
                             src="@/assets/images/upload.jpg"
                           />
-                          <p class="ml-3">請上傳圖片</p>
-                          <p
-                            class="ml-3 px-2 py-1 text-white bg-skyBlue rounded-pill"
-                          >
-                            請上傳圖片
+                          <p class="ml-3 px-2 py-1 text-white bg-skyBlue rounded-pill">
+                            <i class="fa-solid fa-arrow-up"></i> 請上傳圖片
                           </p>
                         </div>
                       </template>
@@ -581,6 +576,7 @@ const handleSubmit = async () => {
                   v-model="form.json5.cards[form.page - 1].titleColor"
                   label="標題文字顏色"
                   id="vcard-titleColor"
+                  input-align="right"
                   placeholder="請輸入標題文字的色碼，如：#333333"
                   :border="false"
                   :rules="[{ required: true, message: '標題文字色碼必填' }]"
@@ -641,6 +637,7 @@ const handleSubmit = async () => {
                   v-model="form.json5.cards[form.page - 1].descColor"
                   label="說明文字顏色"
                   id="vcard-descColor"
+                  input-align="right"
                   placeholder="請輸入說明文字的色碼，如：#333333"
                   :rules="[{ required: true, message: '說明文字色碼必填' }]"
                 >
@@ -750,19 +747,18 @@ const handleSubmit = async () => {
                         <input
                           v-model="btn.color"
                           type="color"
-                          class="form-control-color"
+                          class="colorCube"
                         />
                       </template>
                     </van-field>
 
                     <van-field
-                      v-model="btn.color"
-                      label="按鈕背景顏色"
-                      id="vcard-titleColor"
+                      v-model="btn.btnHeight"
+                      label="按鈕大小"
+                      id="vcard-btnHeight"
                       input-align="right"
-                      placeholder="請輸入標題文字的色碼，如：#333333"
                       :border="false"
-                      :rules="[{ required: true, message: '標題文字色碼必填' }]"
+                      :rules="[{ required: true, message: '按鈕大小必填' }]"
                     >
                       <template #input>
                         <van-radio-group
@@ -797,8 +793,8 @@ const handleSubmit = async () => {
 </template>
 
 <style lang="less" scoped>
-.form-control-color,
-.form-control-color:valid {
+.colorCube,
+.colorCube:valid {
   appearance: none;
   background: 0 0;
   border: 1px solid #ced4da;
@@ -810,11 +806,16 @@ const handleSubmit = async () => {
 .flex-section {
   width: 100%;
 }
-.upload-main {
-  .upload-img {
-    margin: 5px 0;
-    width: 250px;
+.van-field__control{
+  justify-content: center;
+  .upload-main {
+    flex-direction: column;
+    .upload-img {
+      margin: 5px 0;
+      width: 250px;
+    }
   }
+
 }
 
 

From 09c3b39343c9c6bb7d90788420b4317c5ad455c0 Mon Sep 17 00:00:00 2001
From: bruce68410 <kai326326@gmail.com>
Date: Wed, 15 Nov 2023 14:27:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E5=9E=8B?=
 =?UTF-8?q?=E6=8A=93=E5=8F=83=E6=95=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Member/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Member/index.vue b/src/views/Member/index.vue
index 3e5c350..73eb31a 100644
--- a/src/views/Member/index.vue
+++ b/src/views/Member/index.vue
@@ -729,7 +729,7 @@ onBeforeMount(async () => {
               width="100%" 
               position="top" 
               fit="cover"
-              src="/src/assets/images/tp/tp_1.jpg"
+              src="@/assets/images/tp/tp_1.jpg"
             />
           </div>
 
@@ -746,11 +746,11 @@ onBeforeMount(async () => {
 
       <van-cell-group inset>
         <van-row>
-          <van-col span="12" v-for="(item, index) in tab3list" :key="index">
+          <van-col span="12" v-for="index in 4" :key="index">
             <div class="imgBtn" :data-id="index">
               <div class="imgCnt">
                 <van-image 
-                  src="/src/assets/images/tp/tp_1.jpg"
+                  :src="`assets/images/tp/tp_${index}.jpg`"
                 />
               </div>      
             </div>