Merge branch 'dev' of http://1.94.207.143:3000/xyy/xyy-m into dev

src/components/Profile/Notes/Auditing/Item.vue

@@ -27,6 +27,7 @@
     </div>
 
     <template #right>
+      <div class="pl-2 h-full">
       <van-button
         square
         text="撤销审核"
@@ -34,6 +35,7 @@
         type="warning"
         class="delete-button"
       />
+    </div>
     </template>
   </van-swipe-cell>
 </template>
@@ -63,5 +65,9 @@ function handleWrite() {
 <style lang="scss" scoped>
 .delete-button {
   height: 100%;
+
+}
+.van-button--warning{
+  border:none;
 }
 </style>

src/components/Profile/Notes/Draft/Item.vue

@@ -25,6 +25,7 @@
       </div>
     </div>
     <template #right>
+      <div class="pl-2 h-full">
       <van-button square text="继续写" @click="handleWrite" type="warning" class="delete-button" />
       <van-button
         square
@@ -33,6 +34,7 @@
         type="danger"
         class="delete-button"
       />
+    </div>
     </template>
   </van-swipe-cell>
 </template>

src/components/Profile/Notes/Published/Item.vue

@@ -41,13 +41,15 @@
       </div>
     </div>
     <template #right>
-      <van-button
+      <div class="pl-2 h-full">
+        <van-button
         square
         text="下架"
         @click="$emit('onNoteDown')"
         type="danger"
         class="delete-button"
-      />
+        />
+      </div>
     </template>
   </van-swipe-cell>
 </template>
@@ -70,4 +72,7 @@ defineEmits(['onNoteDown', 'onShare'])
 .delete-button {
   height: 100%;
 }
+.van-button--danger {
+  border:none;
+}
 </style>

src/components/Profile/Notes/Rejected/Item.vue

@@ -24,6 +24,7 @@
       </div>
     </div>
     <template #right>
+      <div class="pl-2 h-full">
       <van-button square text="编辑" @click="handleWrite" type="warning" class="delete-button" />
       <van-button
         square
@@ -32,6 +33,7 @@
         type="danger"
         class="delete-button"
       />
+      </div>
     </template>
   </van-swipe-cell>
 </template>

src/pages/profile/userInfo.client.vue

@@ -4,7 +4,7 @@
       <van-cell-group inset>
         <van-field name="uploader" label="头像">
           <template #input>
-            <!-- <div @click="handleChangeAvatar">
+            <div @click="handleChangeAvatar">
               <van-image
                 v-if="form.headImageUrl"
                 :src="form.headImageUrl"
@@ -21,9 +21,9 @@
                   style="font-size: 36px"
                 ></span>
               </div>
-            </div> -->
+            </div>
 
-            <van-uploader
+            <!-- <van-uploader
               style="--van-uploader-border-radius: 40px"
               :after-read="afterRead"
               :max-count="1"
@@ -33,7 +33,7 @@
               result-type="file"
               accept="image/*"
               reupload
-            />
+            /> -->
           </template>
         </van-field>
         <van-field
@@ -144,6 +144,7 @@ onChange(async (files) => {
   try {
     showLoadingToast({
       message: "图片上传中...",
+      duration: 1000000,
     });
     const { data } = await request("/website/tourism/user/upload", {
       method: "post",

src/pages/yj/[id].vue

@@ -498,6 +498,10 @@ function goBack() {
 }
 useSeoMeta({
   title: "游记详情",
+  ogTitle: detailData?.projectTitle || '精美热门游记',
+  description: '逍遥游，乐逍遥，自由自在',
+  ogDescription: detailData?.projectTitle || '精美热门游记',
+  ogImage: '',
 });
 onMounted(() => {
   getComments()