Merge remote-tracking branch 'origin/main' into main

packages/app/src/pages/material/recommend/index.vue

@@ -23,14 +23,17 @@ const handleSubmit = async () => {
   if (valid) {
     console.log(formData.value)
     const { code, msg } = await createMaterialsReferrer(formData.value)
-    code === 0 && toast('提交成功')
-    code !== 0 && error(msg)
+    if (code === 0) {
+      toast('提交成功');
+      setTimeout(() => {
+        uni.switchTab({
+          url: `/pages/material/index`,
+        });
+      }, 1000); // 延迟1秒跳转
+    } else {
+      error(msg);
+    }
   }
-  uni.switchTab({
-    url: `/pages/material/index`
-  });
-  // router.push(`/pages/material/index`)
-  console.log("跳转后")
 }
 const schema = {
   materialsName: {

packages/app/src/pages/mine/index.vue

@@ -166,7 +166,9 @@ const nickNameClickHandle = async () => {
   if (isLogined.value) return
   uni.navigateTo({ url: '/pages/login/index' })
 }
-const handleToAuthentication = () => {
+const handleToAuthentication = (event) => {
+  // 阻止事件冒泡
+  event.stopPropagation();
   if (!isLogined.value) return router.push('/pages/login/index')
   router.push('/pages/mine/authentication/index')
 }
@@ -367,7 +369,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
           <div class="flex-1"></div>
           <div
             class="w-[83px] h-[29px] bg-gradient-to-l from-[#ffdab6] to-[#ffebd5] rounded-[30px] flex items-center justify-center"
-            @click="handleToAuthentication()"
+            @click="handleToAuthentication($event)"
           >
             <div
               class="text-[#9e5934] text-[13px] font-normal font-['PingFang_SC'] leading-relaxed flex items-center gap-1"

packages/merchant/src/pages/common/auth/change-password/index.vue

@@ -55,23 +55,29 @@ const confirmPasswordValidator = (val: any) => {
   if (formData.value?.newPassword?.trim() === '') {
     return Promise.reject('请输入新密码')
   }
-  if (formData.value?.newPassword !== formData.value?.confirmPassword) {
+
+  console.log(formData.value?.newPassword,"新|旧",formData.value?.confirmPassword)
+
+  if (formData.value?.newPassword != formData.value?.confirmPassword) {
     return Promise.reject('输入两次新密码不一致')
   }
+  return Promise.resolve();
 }
 const rules = ref({
   oldPassword: [{ required: true, message: '请输入旧密码' }],
   newPassword: [{ required: true, message: '请输入新密码' }],
   confirmPassword: [
-    { required: true, message: '请再次输入新密码', validator: confirmPasswordValidator },
+    { required: true, message: '请再次输入新密码', validator: confirmPasswordValidator},
   ],
 })
 const submitDisabled = computed(() => ({}))
 const handleSubmit = async () => {
-  // const data = await dataFormRef.value?.validate()
-  if (!(await dataFormRef.value!.validate())) {
+
+  const validationResult = await dataFormRef.value?.validate();
+  if (!validationResult?.valid) {
     return false
   }
+  // confirmPasswordValidator(dataFormRef.value)
   console.log(1111)
   if (!userInfo.value.userId) {
     return false

packages/merchant/src/pages/home/index.vue

@@ -272,6 +272,7 @@ onShareAppMessage(() => ({}))
           <!--            :query="designerPointsActivitiesQuery"-->
           <!--          >-->
           <!--            <template>-->
+          <div class="flex flex-col gap-4">
           <div class="flex flex-col gap-4" v-for="(it, i) in dynamicsList" :key="i">
             <!--                <template >-->
             <Card class="mb-4">
@@ -284,6 +285,7 @@ onShareAppMessage(() => ({}))
             </Card>
             <!--                </template>-->
           </div>
+          </div>
           <!--            </template>-->
           <!--          </PageHelperEvo>-->
         </div>

packages/merchant/src/pages/mine/merchant/merchant_settings.vue

@@ -73,7 +73,12 @@ onMounted(async () => {
         </div>
         <wd-img width="15px" height="15px" :src="rightArrowIcon"></wd-img>
       </div> -->
-      <SectionHeading title="修改密码" size="sm" end-arrow></SectionHeading>
+      <SectionHeading
+        title="修改密码"
+        size="sm"
+        path="/pages/common/auth/change-password/index"
+        end-arrow
+      ></SectionHeading>
     </div>
     <div class="w-full mt-[50px]">
       <wd-button block :round="false" @click="logout">