Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

src/views/Workshop/profile.vue

@@ -19,7 +19,7 @@ const isEdit = ref(false)
 const form = reactive({
   name: { msg: '', value: userInfoStore.state.userInfo.username },
   email: { msg: '', value: userInfoStore.state.userInfo.email },
-  password: { show: false, msg: '', value: userInfoStore.state.userInfo.password }
+//   password: { show: false, msg: '', value: userInfoStore.state.userInfo.password }
 })
 const open = () => {
   isEdit.value = false
@@ -45,6 +45,11 @@ const edit = () => {
 }
 const confirm = () => {
   overallStore.setLoading(true)
+  const params = {
+    username: form.name.value,
+    email: form.email.value,
+  }
+  console.log(params)
   setTimeout(() => {
     overallStore.setLoading(false)
     isEdit.value = false
@@ -186,7 +191,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
         <span class="title">Profile</span>
         <van-icon name="cross" class="close" @click="close" />
       </div>
-      <div class="box">
+      <form class="box" @submit.prevent.stop="confirm">
         <div class="form-item">
           <div class="label">Your Name</div>
           <label class="input">
@@ -196,6 +201,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
               placeholder="Enter your name"
               v-model="form.name.value"
               :readonly="!isEdit"
+			  required
             />
             <!-- <div class="icon" v-if="isEdit" @click.stop="onSaveItem('name')">
 							<SvgIcon name="confirmation" size="37" />
@@ -226,7 +232,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
           </label>
           <p class="error" v-show="form.email.msg">{{ form.email.msg }}</p>
         </div>
-        <div class="form-item">
+        <div class="form-item" v-if="form.password">
           <div class="label">Password</div>
           <label class="input">
             <div class="icon" @click="form.password.show = !form.password.show">
@@ -249,7 +255,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
         </div>
 
         <template v-if="isEdit">
-          <button class="confirm" @click="confirm">Confirm</button>
+          <button type="submit" class="confirm">Confirm</button>
           <p class="tip">Powered by AiDLab for Lane Crawford</p>
         </template>
         <template v-else>
@@ -257,7 +263,7 @@ defineExpose({ open, close, openSwitchCustomerPopup })
           <button class="edit" @click="edit">Edit Profile</button>
           <button class="logout" @click="logout">Log out</button>
         </template>
-      </div>
+      </form>
     </div>
   </van-popup>
   <van-popup