From 4f9a8b45f77974a5f59fc3e9f5820f03828d8be9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 六月 2025 17:58:26 +0800
Subject: [PATCH] 视频编辑、下架、删除功能

---
 uni_modules/uni-transition/changelog.md                                 |    2 
 pages/video/video-edit.vue                                              |  497 ++++++++++++------
 pages/tabbar/video/video.vue                                            |   30 +
 uni_modules/uni-transition/package.json                                 |  117 ++-
 uni_modules/uni-popup/changelog.md                                      |    3 
 uni_modules/uni-transition/components/uni-transition/uni-transition.vue |  529 ++++++++++----------
 components/dropdown-menu.vue                                            |    6 
 pages.json                                                              |    4 
 uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue  |    4 
 api/video.js                                                            |   41 +
 uni_modules/uni-popup/package.json                                      |  193 ++++---
 pages/video/home-page.vue                                               |   82 ++
 12 files changed, 935 insertions(+), 573 deletions(-)

diff --git a/api/video.js b/api/video.js
index 6c830ed..eaa231d 100644
--- a/api/video.js
+++ b/api/video.js
@@ -156,4 +156,45 @@
     method: Method.GET,
     needToken: true
   });
+}
+
+
+/**
+ * 鍒犻櫎瑙嗛
+ * 
+ * @param params
+ */
+ export function delVideo(id) {
+  return http.request({
+    url: "/lmk/video/" + id,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+/**
+ * 淇敼瑙嗛
+ * 
+ * @param params
+ */
+ export function updateVideo(data) {
+  return http.request({
+    url: "/lmk/video",
+    method: Method.PUT,
+    needToken: true,
+	data: data
+  });
+}
+
+/**
+ * 鐢ㄦ埛涓嬫灦瑙嗛
+ * 
+ * @param params
+ */
+ export function userDownVideo(id) {
+  return http.request({
+    url: "/lmk/video/down/" + id,
+    method: Method.POST,
+    needToken: true
+  });
 }
\ No newline at end of file
diff --git a/components/dropdown-menu.vue b/components/dropdown-menu.vue
index 066a6d6..24b7d60 100644
--- a/components/dropdown-menu.vue
+++ b/components/dropdown-menu.vue
@@ -40,6 +40,10 @@
 export default {
   name: 'DropdownMenu',
   props: {
+	// 涓氬姟鏁版嵁锛岄�変腑鑿滃崟鍚庝竴鍚岃繑鍥�
+	data: {
+		type: Object
+	},
     // 閫夐」鍒楄〃
     options: {
       type: Array,
@@ -103,7 +107,7 @@
       // 鏍规嵁閰嶇疆杩斿洖鏁翠釜瀵硅薄鎴杤alue鍊�
       const emitValue = typeof item === 'object' ? item[this.valueKey] : item
       this.$emit('input', emitValue)
-      this.$emit('change', emitValue)
+      this.$emit('change', emitValue, this.data)
     }
   }
 }
diff --git a/pages.json b/pages.json
index 71ab3f6..147a0aa 100644
--- a/pages.json
+++ b/pages.json
@@ -2,8 +2,8 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-			"^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue", //uview,
-			"^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp缁勪欢
+			"^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue" //uview,
+			// "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp缁勪欢
 		}
 	},
 	// "preloadRule": {
diff --git a/pages/tabbar/video/video.vue b/pages/tabbar/video/video.vue
index be52e74..af7dfeb 100644
--- a/pages/tabbar/video/video.vue
+++ b/pages/tabbar/video/video.vue
@@ -132,7 +132,7 @@
 					<view class="goods-price" style="flex: 1;">楼{{ goods.price }}</view>
 					<view @click.stop="() => {}" style="flex: 1;display: flex;justify-content: center;align-items: center;">
 						<view style="width: 90rpx">鏁伴噺锛�</view>
-						<uni-number-box v-model="goods.selectNum" :min="0"/>
+						<uni-number-box v-model="goods.goodsNum" :min="0"/>
 					</view>
 				</view>
               </view>
@@ -451,7 +451,22 @@
     },
     // 閲嶆柊涓婁紶
     reUpload() {
-      this.resetData()
+      this.videoInfo = {
+      	  url: '',
+      	  fileKey: '',
+      	  fileType: '',
+      	  fileSize: 0,
+      	  originalFileName: '',
+      	  cover: ''
+      };
+      this.formData.videoFileKey = ''
+      this.formData.cover = ''
+      this.formData.videoFit = 'cover'
+      this.formData.videoDuration = 0
+      this.formData.videoImgs = []
+      this.formData.fileInfo = {}
+      this.formData.videoContentType = 'video'
+      this.videoPreviewImgs = []
 	  this.fileTypeShow = true
     },
     // 閫夋嫨瑙嗛鍥鹃泦
@@ -527,13 +542,20 @@
 
     // 閫夋嫨鍟嗗搧
     chooseGoods() {
+	  if(this.selectedGoodsList.length > 0) {
+	  		  const selectedGoodsIds = new Set(this.selectedGoodsList.map(i => i.goodsId));
+	  			  console.log(selectedGoodsIds, "mimade");
+	  		  this.goodsList?.forEach(goods => {
+	  		      this.$set(goods, 'selected', selectedGoodsIds.has(goods.goodsId));
+	  		    });
+	  }
       this.showGoodsPicker = true;
     },
 
     // 閫夋嫨鍏蜂綋鍟嗗搧
     selectGoods(goods, index) {
 	  if(! this.selectedGoodsList.some(item => item.id === goods.id)) {
-		goods["selectNum"] = 1
+		goods["goodsNum"] = 1
 		this.selectedGoodsList.push(goods)
 		this.goodsList[index].selected = true
 	  } else {
@@ -616,7 +638,7 @@
         if (valid && this.canPublish) {
           this.loading = true;
           this.formData.fileInfo = this.videoInfo;
-		  this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsNum: item.selectNum}});
+		  this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsNum: item.goodsNum}});
           publish(this.formData).then(res => {
 			  uni.showToast({
 			    title: '瑙嗛宸叉彁浜ゅ鏍竳',
diff --git a/pages/video/home-page.vue b/pages/video/home-page.vue
index 76ca651..5ce3063 100644
--- a/pages/video/home-page.vue
+++ b/pages/video/home-page.vue
@@ -73,9 +73,10 @@
 				      <view class="stat">
 				        <uni-icons type="heart" size="16" color="#fff"></uni-icons>
 				        <text>{{item.collectNum}}</text>
-						<view class="more-op">
+						<view class="more-op" v-if="userInfo.self">
 							<dropdown-menu
 							:options="item.options"
+							:data="{id: item.id, title: item.title}"
 							placement="top"
 							theme-color="#07C160"
 							@change="handleChange"
@@ -118,6 +119,18 @@
 		  <!-- <image src="/static/images/empty.png" mode="aspectFit" class="empty-image"></image> -->
 		  <text class="empty-text">杩樻病鏈夌偣璧炰綔鍝佸摝~</text>
 		</view>
+		
+		<!-- 鍒犻櫎瑙嗛鎻愰啋妗� -->
+		<uni-popup ref="delDialog" type="dialog">
+			<uni-popup-dialog type="error" cancelText="鍙栨秷" confirmText="鍒犻櫎" title="鎻愰啋" :content="`鎮ㄦ鍦ㄥ垹闄わ細${opVideo.title}`" @confirm="deleteVideo"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
+		
+		<!-- 涓嬫灦瑙嗛鎻愰啋妗� -->
+		<uni-popup ref="downDialog" type="dialog">
+			<uni-popup-dialog type="error" cancelText="鍙栨秷" confirmText="涓嬫灦" title="鎻愰啋" :content="`鎮ㄦ鍦ㄤ笅鏋讹細${opVideo.title}`" @confirm="downVideo"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
   </view>
 </template>
 
@@ -125,16 +138,20 @@
 import DropdownMenu from '@/components/dropdown-menu.vue'
 
 import {getAuthorInfo, getAuthorVideoPage, getAuthorCollectVideoPage} from '@/api/user.js'
-import {subscribe, unSubscribe} from '@/api/video.js'
+import {subscribe, unSubscribe, delVideo, updateVideo, userDownVideo} from '@/api/video.js'
 export default {
   components: {DropdownMenu},
   data() {
     return {
-		options: [
-		        { command: 1, label: '鍖椾含' },
-		        { command: 2, label: '涓婃捣' },
-		        { command: 3, label: '骞垮窞' }
-		      ],
+	  options: [
+			{ command: 1, label: '鍖椾含' },
+			{ command: 2, label: '涓婃捣' },
+			{ command: 3, label: '骞垮窞' }
+		  ],
+	  opVideo: { // 姝ｅ湪鎿嶄綔鐨勮棰�
+		  id: '',
+		  title: ''
+	  },
       currentTab: 'works', // works: 浣滃搧, likes: 鍠滄
       authorId: '',
       userInfo: {
@@ -174,9 +191,54 @@
 	this.getAuthorVideoPage();
   },
   methods: {
-	  handleChange(value) {
-	        console.log('閫変腑鍊�:', value)
-	      },
+	dialogClose() {
+		this.opVideo = {
+			id: '',
+			title: ''
+		}
+	},
+	// 涓嬫灦瑙嗛
+	downVideo() {
+		userDownVideo(this.opVideo.id).then(res => {
+			uni.showToast({
+				title: '涓嬫灦鎴愬姛',
+				duration: 2000
+			});
+			// 鍒锋柊鏁版嵁
+			this.videoList = [];
+			this.videoQuery.pageNumber = 1;
+			this.getAuthorVideoPage();
+		})
+	},
+	// 鍒犻櫎瑙嗛
+	deleteVideo() {
+		delVideo(this.opVideo.id).then(res => {
+			uni.showToast({
+				title: '鍒犻櫎鎴愬姛',
+				duration: 2000
+			});
+			// 鍒锋柊鏁版嵁
+			this.videoList = [];
+			this.videoQuery.pageNumber = 1;
+			this.getAuthorVideoPage();
+		})
+	},
+	// 瑙﹀彂瑙嗛鎿嶄綔
+	handleChange(value, data) {
+	    console.log('閫変腑鍊�:', value)
+		this.opVideo.id = data.id;
+		this.opVideo.title = data.title;
+		if (value === 'DELETE') {
+			this.$refs.delDialog.open()
+		} else if (value === 'DOWN') {
+			this.$refs.downDialog.open()
+		} else if (value === 'EDIT') {
+			// 璺宠浆缂栬緫瑙嗛椤甸潰
+			uni.navigateTo({
+			  url: `/pages/video/video-edit?id=${this.opVideo.id}`
+			});
+		}
+	},
 	getPage() {
 		if(this.currentTab === 'works') {
 			if(this.nomoreVideo) {
diff --git a/pages/video/video-edit.vue b/pages/video/video-edit.vue
index f8a3ec2..1b51fe7 100644
--- a/pages/video/video-edit.vue
+++ b/pages/video/video-edit.vue
@@ -1,49 +1,73 @@
 <template>
   <view class="publish-container">
+	<u-popup v-model="fileTypeShow" mode="bottom"  round="20" height="35%">
+		<view style="width: 100%;height:100%;display: flex;flex-direction: column;justify-content: center;align-items: center;">
+			<view>璇烽�夋嫨瑕佸彂甯冪殑绫诲瀷</view>
+			<u-button style="width: 50%;margin-bottom: 30rpx;margin-top: 20rpx;" type="success" @click="chooseVideo">瑙嗛</u-button>
+			<u-button style="width: 50%;" type="success" @click="chooseImgs">鍥剧墖</u-button>
+		</view>
+	</u-popup>
     <!-- 瑙嗛涓婁紶鍖哄煙 -->
     <view class="upload-section">
-      <view class="upload-btn" @click="chooseVideo" v-if="!videoInfo.url">
+      <view class="upload-btn" @click="this.fileTypeShow = true" v-if="!formData.videoFileKey && formData.videoImgs.length < 1">
         <u-icon name="plus" size="40" color="#999"></u-icon>
-        <text class="upload-text">鐐瑰嚮涓婁紶瑙嗛</text>
-        <text class="upload-tips">鏀寔MP4鏍煎紡锛屾渶闀�60绉�</text>
+        <text class="upload-text">鐐瑰嚮涓婁紶</text>
       </view>
-      
-      <view class="video-preview" v-else>
-        <video 
-          :src="videoInfo.url" 
+
+      <view class="video-preview" v-else-if="formData.videoContentType === 'video'">
+        <video
+          :src="videoInfo.url"
           :object-fit="formData.videoFit"
           class="video-player"
           :poster="videoInfo.cover || ''"
         ></video>
-		<view class="progress-box">
+		<view class="progress-box" v-if="showUploadProgress">
 			<progress style="width: 100%;" :percent="videoUploadProgress" active-mode="forwards" show-info stroke-width="6" :active="true" active-color="#ff573e" />
 		</view>
         <view class="video-actions">
           <u-button type="error" size="mini" @click="reUpload">閲嶆柊涓婁紶</u-button>
-          <u-button type="primary" size="mini" @click="chooseCover" v-if="videoInfo.url">{{formData.cover ? '鏇存崲灏侀潰' : '璇烽�夋嫨灏侀潰'}}</u-button>
+          <u-button type="primary" size="mini" @click="chooseCover" v-if="formData.videoFileKey">{{formData.cover ? '鏇存崲灏侀潰' : '璇烽�夋嫨灏侀潰'}}</u-button>
         </view>
       </view>
+
+	  <view class="image-list" v-else-if="formData.videoContentType === 'img'">
+		<view
+		  v-for="item in videoPreviewImgs"
+		  :key="item"
+		  class="image-item"
+		  :style="{width: itemWidth + 'px', height: itemWidth + 'px'}"
+		>
+		  <image
+			:src="item"
+			mode="aspectFill"
+			class="image"
+		  />
+		</view>
+		<view class="video-actions">
+		  <u-button type="error" size="mini" @click="reUpload">閲嶆柊涓婁紶</u-button>
+		</view>
+	  </view>
     </view>
-    
+
     <!-- 瑙嗛淇℃伅琛ㄥ崟 -->
     <view class="form-section">
       <u-form :model="formData" ref="formRef" labelWidth="80">
         <!-- 鏍囬杈撳叆 -->
         <u-form-item label="鏍囬" prop="title" borderBottom>
-          <u-input 
-            v-model="formData.title" 
+          <u-input
+            v-model="formData.title"
             placeholder="璇疯緭鍏ヨ棰戞爣棰�,20瀛椾互鍐�"
             maxlength="20"
 			show-word-limit
             clearable
           />
         </u-form-item>
-        
+
         <!-- 璇濋杈撳叆 -->
         <u-form-item label="璇濋" prop="tags" borderBottom>
           <view class="tags-input-container">
-            <u-input 
-              v-model="tagInput" 
+            <u-input
+              v-model="tagInput"
               placeholder="杈撳叆璇濋锛屽洖杞︾‘璁�"
               clearable
               @confirm="addTag"
@@ -52,7 +76,7 @@
             ></u-input>
             <!-- 宸查�夎瘽棰樺睍绀� -->
             <view class="tags-display" v-if="formData.tags.length > 0">
-              <my-tag 
+              <my-tag
                 v-for="(tag, index) in formData.tags"
                 :key="index"
                 :text="tag.tagName"
@@ -69,7 +93,7 @@
 		  <view class="hot-topics" v-if="showTopicRecommendations">
 		    <text class="section-title">{{ tagInput ? '鎺ㄨ崘璇濋' : '鐑棬璇濋' }}</text>
 		    <view class="topic-list">
-		      <my-tag 
+		      <my-tag
 		        v-for="(tag, index) in recommendedTags"
 		        :key="index"
 		        :text="tag.tagName"
@@ -81,47 +105,54 @@
 		    </view>
 		  </view>
         </u-form-item>
-		
-        
+
+
         <!-- 鍟嗗搧閾炬帴 -->
         <u-form-item label="鍟嗗搧" prop="goodsId" borderBottom>
           <view class="goods-link-container">
-            <u-input  
+            <u-input
               placeholder="鍙�夋嫨鎺ㄨ崘鍟嗗搧"
               clearable
               v-if="!selectedGoods"
               @click="chooseGoods"
               disabled
             >
-              <u-icon 
-                slot="right" 
-                name="search" 
-                size="24" 
+              <u-icon
+                slot="right"
+                name="search"
+                size="24"
                 @click="chooseGoods"
               ></u-icon>
             </u-input>
-            <view class="goods-preview" v-if="selectedGoods">
-              <image :src="selectedGoods.image" class="goods-image"></image>
+            <view class="goods-preview" @click="chooseGoods" v-for="goods in selectedGoodsList" :key="goods.id">
+              <image :src="goods.thumbnail" class="goods-image"></image>
               <view class="goods-info">
-                <text class="goods-name">{{ selectedGoods.name }}</text>
-                <text class="goods-price">楼{{ selectedGoods.price }}</text>
+                <text class="goods-name">{{ goods.goodsName }}</text>
+				<view style="display: flex;">
+					<view class="goods-price" style="flex: 1;">楼{{ goods.price }}</view>
+					<view @click.stop="() => {}" style="flex: 1;display: flex;justify-content: center;align-items: center;">
+						<view style="width: 90rpx">鏁伴噺锛�</view>
+						<uni-number-box v-model="goods.goodsNum" :min="0"/>
+					</view>
+				</view>
               </view>
-              <u-icon 
-                name="close" 
-                size="20" 
-                @click="clearGoods"
+              <u-icon
+				style="position: absolute;right: 8rpx;top: 8rpx"
+                name="close"
+                size="24"
+                @click.stop="clearGoods(goods)"
               ></u-icon>
             </view>
           </view>
         </u-form-item>
       </u-form>
     </view>
-    
+
     <!-- 鍙戝竷鎸夐挳 -->
     <view class="publish-btn">
-      <u-button 
-        type="primary" 
-        shape="circle" 
+      <u-button
+        type="success"
+        shape="circle"
         :loading="loading"
         @click="handlePublish"
         :disabled="!canPublish"
@@ -129,7 +160,7 @@
         {{ loading ? '鍙戝竷涓�...' : '绔嬪嵆鍙戝竷' }}
       </u-button>
     </view>
-    
+
     <!-- 鍟嗗搧閫夋嫨寮圭獥 -->
     <u-popup v-model="showGoodsPicker" mode="bottom" round="20" height="70%">
       <view class="goods-picker">
@@ -138,34 +169,37 @@
           <u-icon name="close" size="24" @click="showGoodsPicker = false"></u-icon>
         </view>
         <view class="search-bar">
-          <u-search 
-            v-model="goodsSearch" 
-            placeholder="鎼滅储鍟嗗搧鍚嶇О" 
+          <u-search
+            v-model="goodsQuery.keyword"
+            placeholder="鎼滅储鍟嗗搧"
             :showAction="false"
+			@change="handlerGoodsSearch"
           ></u-search>
         </view>
-        <scroll-view class="goods-list" scroll-y>
-          <view 
-            class="goods-item" 
-            v-for="goods in filteredGoods" 
+        <scroll-view class="goods-list" @scrolltolower="loadMoreGoods" scroll-y :show-scrollbar="false">
+          <view
+            class="goods-item"
+            v-for="(goods, index) in goodsList"
             :key="goods.id"
-            @click="selectGoods(goods)"
+            @click="selectGoods(goods, index)"
           >
-            <image :src="goods.image" class="goods-image"></image>
+            <image :src="goods.thumbnail" class="goods-image"></image>
             <view class="goods-info">
-              <text class="goods-name">{{ goods.name }}</text>
+              <text class="goods-name">{{ goods.goodsName }}</text>
               <text class="goods-price">楼{{ goods.price }}</text>
+<!--              <view>{{ goods.sellingPoint }}</view> -->
             </view>
-            <u-icon 
-              name="checkmark" 
-              size="24" 
-              :color="selectedGoods && selectedGoods.id === goods.id ? '#2979ff' : '#ccc'"
+            <u-icon
+			  v-if="goods.selected"
+              name="checkmark"
+              size="36"
+              :color="'#2979ff'"
             ></u-icon>
           </view>
         </scroll-view>
       </view>
     </u-popup>
-    
+
     <custom-tabbar bgColor="#ffffff" selected="video"></custom-tabbar>
   </view>
 </template>
@@ -175,21 +209,26 @@
 import MyTag from '@/components/my-tag.vue'
 
 import { getSTSToken, getFilePreviewUrl } from "@/api/common.js";
-import { publish, getVideoDetail } from "@/api/video.js";
+import { updateVideo, getVideoDetail } from "@/api/video.js";
 import { getRecommendTag3 } from "@/api/video-tag.js";
 import { getFileKey } from "@/utils/file.js";
+import { getVideoGoodsList } from "@/api/goods.js";
+
 export default {
   components: {MyTag},
   data() {
     return {
+	  showUploadProgress: false,
+	  fileTypeShow: false,
 	  cosClient: null,
 	  bucket: '',
 	  region: '',
+	  endpoint: '',
 	  videoUploadProgress: 0,
       loading: false,
       showGoodsPicker: false,
-      goodsSearch: '',
       tagInput: '',
+	  videoPreviewImgs: [], // 棰勮鍥剧墖鍦板潃
       videoInfo: {
 		  url: '',
 		  fileKey: '',
@@ -197,6 +236,12 @@
 		  fileSize: 0,
 		  originalFileName: '',
 		  cover: ''
+	  },
+	  goodsQuery: {
+		keyword: '',
+		searchFromSelfStore: false, // 鏄惁鏄煡璇㈣嚜瀹跺簵閾哄晢鍝�
+		pageNumber: 1,
+		pageSize: 5
 	  },
       formData: {
 		id: '',
@@ -206,49 +251,50 @@
 		videoDuration: 0,
 		videoFit: 'cover',
         goodsId: '',
+        videoContentType: 'video',
+        videoImgs: [],
         tags: [],
 		fileInfo: {}
       },
-      selectedGoods: null,
-      goodsList: [
-        {
-          id: '1',
-          name: '鏂版鏃犵嚎钃濈墮鑰虫満',
-          price: '199.00',
-          image: 'https://via.placeholder.com/100'
-        },
-        {
-          id: '2',
-          name: '鏅鸿兘鎵嬬幆杩愬姩鎵嬭〃',
-          price: '299.00',
-          image: 'https://via.placeholder.com/100'
-        }
-      ],
+      selectedGoodsList: [],
+      goodsList: [],
+	  noMoreGoods: false, // 娌℃湁鏇村鍟嗗搧浜�
       recommendedTags: [],
       rules: {
         title: [
           { required: true, message: '璇疯緭鍏ヨ棰戞爣棰�', trigger: 'blur' },
           { min: 1, max: 20, message: '鏍囬闀垮害鍦�1鍒�20涓瓧绗�', trigger: 'blur' }
         ]
-      }
+      },
+	  screenWidth: 375,
+	  gap: 10 // 鍥剧墖闂磋窛
     };
   },
   computed: {
     canPublish() {
-      return this.formData.videoFileKey && this.formData.title && this.formData.cover;
-    },
-    filteredGoods() {
-      if (!this.goodsSearch) return this.goodsList;
-      return this.goodsList.filter(goods => 
-        goods.name.toLowerCase().includes(this.goodsSearch.toLowerCase())
-      );
+		if(this.formData.videoContentType === 'video') {
+			return this.formData.videoFileKey && this.formData.title && this.formData.cover;
+		} else if(this.formData.videoContentType === 'img') {
+			return this.formData.videoImgs.length > 0 && this.formData.title;
+		}
     },
     showTopicRecommendations() {
       return (this.tagInput === '' || this.recommendedTags.length > 0) && this.formData.tags.length < 5;
-    }
+    },
+	// 璁＄畻姣忎釜鍥剧墖椤圭殑瀹藉害锛堣�冭檻闂磋窛锛�
+	itemWidth() {
+	  return (this.screenWidth - (this.gap * 4) - 20) / 3
+	}
   },
   onLoad(option) {
-	  this.getVideoDetail(option.id)
+	this.getVDetail(option.id)
+    // 鑾峰彇灞忓箷瀹藉害
+	const systemInfo = uni.getSystemInfoSync()
+	this.screenWidth = systemInfo.windowWidth
+	this.goodsQuery.pageNumber = 1
+	this.goodsQuery.pageSize = 10
+	this.getVideoGoodsByEs()
+	
   },
   onShow() {
   	this.initCOS()
@@ -256,23 +302,57 @@
 	this.getRecommendTags()
   },
   methods: {
-	  getVideoDetail(id) {
-		  getVideoDetail(id).then(res => {
-			  this.fileInfo.cover = res.data.data.coverUrl
-			  this.fileInfo.url = res.data.data.videoUrl
-			  this.formData.cover = res.data.data.coverFileKey
-			  this.formData.id = res.data.data.id
-			  this.formData.title = res.data.data.title
-			  this.formData.videoFileKey = res.data.data.videoFileKey
-			  this.formData.videoFit = res.data.data.videoFit
-			  this.formData.videoDuration = res.data.data.videoDuration
-			  this.formData.goodsId = res.data.data.goodsId
-			  this.formData.tags = res.data.data.tags
-		  }).catch(() => {
-			  uni.navigateBack({
-			  	delta: 1
-			  });
-		  })
+	  getVDetail(id) {
+	  		  getVideoDetail(id).then(res => {
+	  			  this.videoInfo.cover = res.data.data.coverUrl
+	  			  this.videoInfo.url = res.data.data.videoUrl
+				  this.formData.videoImgs = res.data.data.imgs
+				  this.formData.videoContentType = res.data.data.videoContentType
+	  			  this.formData.cover = res.data.data.coverFileKey
+	  			  this.formData.id = res.data.data.id
+	  			  this.formData.title = res.data.data.title
+	  			  this.formData.videoFileKey = res.data.data.videoFileKey
+	  			  this.formData.videoFit = res.data.data.videoFit
+	  			  this.formData.videoDuration = res.data.data.videoDuration
+	  			  this.selectedGoodsList = res.data.data.goodsList
+	  			  this.formData.tags = res.data.data.tags
+				  this.showUploadProgress = false
+	  			  console.log("瑙嗛璇︽儏", this.formData);
+	  		  })
+	  	  },
+	  // 鍔犺浇鏇村鍟嗗搧
+	  loadMoreGoods() {
+		if(this.noMoreGoods) {
+			return
+		}
+		this.goodsQuery.pageNumber += 1;
+		this.goodsQuery.pageSize = 5;
+		this.getVideoGoodsByEs()
+	  },
+	  // 澶勭悊鍟嗗搧鎼滅储鍊�
+	  handlerGoodsSearch() {
+		  this.goodsQuery.pageNumber = 1
+		  this.goodsQuery.pageSize = 10
+		  this.getVideoGoodsByEs()
+	  },
+	  // 鑾峰彇鍟嗗搧鍒嗛〉
+	  async getVideoGoodsByEs() {
+		getVideoGoodsList(this.goodsQuery).then(res => {
+			
+			if(this.goodsQuery.pageNumber === 1) {
+				this.goodsList = res.data.data
+			} else {
+				this.goodsList = [
+				  ...this.goodsList,
+				  ...res.data.data.filter(
+				    (newItem) => !this.goodsList.some((oldItem) => oldItem.id === newItem.id)
+				  ),
+				];
+			}
+			if(res.data.data.length < this.goodsQuery.pageSize) {
+				this.noMoreGoods = true;
+			}
+		})
 	  },
 	  // 鑾峰彇鎺ㄨ崘鏍囩
 	  async getRecommendTags(type) {
@@ -290,7 +370,7 @@
 		  getSTSToken().then(res => {
 			  const COS = require('@/lib/cos-wx-sdk-v5.js'); // 寮�鍙戞椂浣跨敤
 			  // const COS = require('./lib/cos-wx-sdk-v5.min.js'); // 涓婄嚎鏃朵娇鐢ㄥ帇缂╁寘
-			  
+
 			  // console.log(COS.version);  sdk 鐗堟湰闇�瑕佷笉浣庝簬 1.7.2
 			  this.cosClient = new COS({
 			      SecretId: res.data.data.tmpSecretId, // sts 鏈嶅姟涓嬪彂鐨勪复鏃� secretId
@@ -302,21 +382,28 @@
 			   });
 			   this.bucket = res.data.data.bucket
 			   this.region = res.data.data.region
+			   this.endpoint = res.data.data.endpoint
 		  })
-		  
+
 	  },
     // 閫夋嫨瑙嗛
     chooseVideo() {
+	  this.fileTypeShow = false;
+	  // 娓呯┖閫夋嫨鐨勫浘鐗�
+	  this.videoPreviewImgs = [];
+	  this.formData.videoImgs = [];
+	  this.formData.videoContentType = 'video'
       uni.chooseVideo({
         sourceType: ['album', 'camera'],
         maxDuration: 60,
         camera: 'back',
         success: (res) => {
 			this.videoUploadProgress = 0
+			
 			// 鑾峰彇鏂囦欢鍚�
 			const tempPath = res.tempFilePath;
 			let fileName = tempPath.substring(tempPath.lastIndexOf('/') + 1);
-			
+
 			// 澶勭悊瀹夊崜鍙兘鐨刄RI缂栫爜
 			if(fileName.indexOf('%') > -1) {
 				fileName = decodeURIComponent(fileName);
@@ -334,12 +421,12 @@
 		   this.formData.videoDuration = res.duration;
 		   // 鍒ゆ柇瑙嗛鐨勫～鍏呮ā寮�
 		   this.formData.videoFit = this.calculateVideoFit(res.width, res.height)
-		  
+		   this.showUploadProgress = true
 		   this.cosClient.uploadFile({
 		        Bucket: this.bucket,
 		        Region: this.region,
 		        Key: fileKey,
-		        FilePath: res.tempFilePath, 
+		        FilePath: res.tempFilePath,
 		        SliceSize: 1024 * 1024 * 5,     /* 瑙﹀彂鍒嗗潡涓婁紶鐨勯槇鍊�,5M */
 		        onProgress: (progressData) => {
 					console.log(progressData.percent);
@@ -357,7 +444,7 @@
 					  cover: ''
 				  }
 		        } else {
-				  console.log(this.videoInfo);
+				  
 		        }
 		    });
         },
@@ -374,27 +461,75 @@
     calculateVideoFit(width, height) {
         const viewportRatio = uni.getSystemInfoSync().windowWidth / uni.getSystemInfoSync().windowHeight;
         const videoRatio = width / height;
-        
+
         // 瑙勫垯1锛氳秴瀹借棰戯紙濡傜數褰�21:9锛�
         if (videoRatio > 2) return 'contain';
-        
+
         // 瑙勫垯2锛氱珫灞忚棰戯紙濡�9:16锛�
         if (videoRatio < 0.8) return 'cover';
-        
+
         // 瑙勫垯3锛氭帴杩戝睆骞曟瘮渚嬬殑妯睆瑙嗛
         return Math.abs(videoRatio - viewportRatio) > 0.3 ? 'contain' : 'cover';
     },
     // 閲嶆柊涓婁紶
     reUpload() {
       this.videoInfo = {
-        url: '',
-        cover: '',
-        duration: 0,
-        size: 0
+      	  url: '',
+      	  fileKey: '',
+      	  fileType: '',
+      	  fileSize: 0,
+      	  originalFileName: '',
+      	  cover: ''
       };
-      this.chooseVideo();
+	  this.formData.videoFileKey = ''
+	  this.formData.cover = ''
+	  this.formData.videoFit = 'cover'
+	  this.formData.videoDuration = 0
+	  this.formData.videoImgs = []
+	  this.formData.fileInfo = {}
+	  this.formData.videoContentType = 'video'
+      this.videoPreviewImgs = []
+	  this.fileTypeShow = true
     },
-    
+    // 閫夋嫨瑙嗛鍥鹃泦
+    chooseImgs() {
+	  this.fileTypeShow = false
+	  // 娓呯┖閫夋嫨鐨勮棰�
+	  this.formData.videoFileKey = '';
+	  this.formData.cover = '';
+	  this.formData.videoContentType = 'img'
+      uni.chooseImage({
+        count: 9,
+        sizeType: ['compressed'],
+        sourceType: ['album'],
+        success: (res) => {
+		  res.tempFilePaths.forEach(tmpImg => {
+			  let fileName = tmpImg.substring(tmpImg.lastIndexOf('/') + 1);
+			  // 澶勭悊瀹夊崜鍙兘鐨刄RI缂栫爜
+			  if(fileName.indexOf('%') > -1) {
+			      			fileName = decodeURIComponent(fileName);
+			  }
+			  const fileKey = getFileKey(fileName);
+			  this.cosClient.uploadFile({
+			       Bucket: this.bucket,
+			       Region: this.region,
+			       Key: fileKey,
+			       FilePath: tmpImg,
+			       SliceSize: 1024 * 1024 * 5     /* 瑙﹀彂鍒嗗潡涓婁紶鐨勯槇鍊�,5M */
+			   }, (err, data) => {
+			       if (err) {
+			         console.log('涓婁紶澶辫触', err);
+			       } else {
+			  		 // 鑾峰彇灏侀潰鐨勮闂湴鍧�
+					 this.videoPreviewImgs.push(this.endpoint + '/' + fileKey);
+					 this.formData.videoImgs.push(fileKey);
+			       }
+			   });
+		  })
+
+        }
+      });
+    },
     // 閫夋嫨灏侀潰
     chooseCover() {
       uni.chooseImage({
@@ -413,41 +548,54 @@
 		       Bucket: this.bucket,
 		       Region: this.region,
 		       Key: fileKey,
-		       FilePath: res.tempFilePaths[0], 
+		       FilePath: res.tempFilePaths[0],
 		       SliceSize: 1024 * 1024 * 5     /* 瑙﹀彂鍒嗗潡涓婁紶鐨勯槇鍊�,5M */
 		   }, (err, data) => {
 		       if (err) {
 		         console.log('涓婁紶澶辫触', err);
 		       } else {
-		  		 // 鑾峰彇灏侀潰鐨勮闂湴鍧�
-		  		 getFilePreviewUrl(fileKey).then(res => {
-				   this.videoInfo.cover = res.data.data
-				   this.formData.cover = fileKey
-		  		 })
+		  		 this.videoInfo.cover = this.endpoint + '/' + fileKey
+		  		 this.formData.cover = fileKey
 		       }
 		   });
         }
       });
     },
-    
+
     // 閫夋嫨鍟嗗搧
     chooseGoods() {
+	  if(this.selectedGoodsList.length > 0) {
+	  		  const selectedGoodsIds = new Set(this.selectedGoodsList.map(i => i.goodsId));
+			  console.log(selectedGoodsIds, "mimade");
+	  		  this.goodsList?.forEach(goods => {
+	  		      this.$set(goods, 'selected', selectedGoodsIds.has(goods.goodsId));
+	  		    });
+	  }
       this.showGoodsPicker = true;
     },
-    
+
     // 閫夋嫨鍏蜂綋鍟嗗搧
-    selectGoods(goods) {
-      this.selectedGoods = goods;
-      this.formData.goodsId = goods.id;
-      this.showGoodsPicker = false;
+    selectGoods(goods, index) {
+	  if(! this.selectedGoodsList.some(item => item.id === goods.id)) {
+		goods["goodsNum"] = 1
+		this.selectedGoodsList.push(goods)
+		this.goodsList[index].selected = true
+	  } else {
+		this.goodsList[index].selected = false
+		this.selectedGoodsList = this.selectedGoodsList.filter(item => item.id !== goods.id);
+	  }
     },
-    
+
     // 娓呴櫎鍟嗗搧
-    clearGoods() {
-      this.selectedGoods = null;
-      this.formData.goodsId = '';
+    clearGoods(goods) {
+      this.selectedGoodsList = this.selectedGoodsList.filter(item => item.id !== goods.id);
+	  this.goodsList.forEach(item => {
+		  if(item.id === goods.id) {
+			  item.selected = false
+		  }
+	  })
     },
-    
+
     // 鎼滅储鐑棬璇濋
     searchTags() {
       if (this.tagInput.trim() !== '') {
@@ -478,7 +626,7 @@
         });
       }
     },
-    
+
     // 閫夋嫨鎺ㄨ崘璇濋
     selectTopic(index) {
 	  const tag = this.recommendedTags[index]
@@ -489,7 +637,7 @@
         });
         return;
       }
-      
+
       if (this.formData.tags.filter(item => item.tagName === tag.tagName).length < 1) {
         this.formData.tags.push(tag);
         this.tagInput = '';
@@ -500,49 +648,31 @@
         });
       }
     },
-    
+
     // 绉婚櫎鏍囩
     removeTag(index) {
       this.formData.tags.splice(index, 1);
     },
-    
+
     // 澶勭悊鍙戝竷
     handlePublish() {
       this.$refs.formRef.validate(valid => {
         if (valid && this.canPublish) {
           this.loading = true;
           this.formData.fileInfo = this.videoInfo;
-		  console.log(this.formData);
-          publish(this.formData).then(res => {
+		  this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsNum: item.goodsNum}});
+          updateVideo(this.formData).then(res => {
 			  uni.showToast({
 			    title: '瑙嗛宸叉彁浜ゅ鏍竳',
 			    icon: 'success'
 			  });
 			  this.loading = false
 			  // 閲嶇疆琛ㄥ崟
-			  this.videoInfo = {
-			  	  url: '',
-			  	  fileKey: '',
-			  	  fileType: '',
-			  	  fileSize: 0,
-			  	  originalFileName: '',
-			  	  cover: ''
-			  };
-			  this.formData = {
-				id: '',
-			    title: '',
-				videoFileKey: '',
-				cover: '',
-				videoFit: 'cover',
-				videoDuration: 0,
-			    goodsId: '',
-			    tags: [],
-			    fileInfo: {}
-			  };
+			  this.resetData();
 			  this.selectedGoods = null;
 			  this.tagInput = '';
 			  this.recommendedTags = [];
-			  
+
 			  // TODO 鍏堣烦棣栭〉,鍚庨潰璺虫垜鐨勮棰戦〉闈�
 			  setTimeout(() => {
 			    uni.switchTab({
@@ -557,21 +687,46 @@
           });
         }
       });
-    }
+    },
+	resetData() {
+		// 閲嶇疆琛ㄥ崟
+		this.videoInfo = {
+			  url: '',
+			  fileKey: '',
+			  fileType: '',
+			  fileSize: 0,
+			  originalFileName: '',
+			  cover: ''
+		};
+		this.formData = {
+		  id: '',
+		  title: '',
+		  videoFileKey: '',
+		  cover: '',
+		  videoFit: 'cover',
+		  videoDuration: 0,
+		  goodsId: '',
+		  videoContentType: 'video',
+		  videoImgs: [],
+		  tags: [],
+		  fileInfo: {}
+		};
+		this.videoPreviewImgs = []
+		this.selectedGoodsList = []
+	}
   }
 };
 </script>
 
 <style scoped>
 .publish-container {
-  padding: 20rpx;
+  padding: 10px;
   padding-bottom: 120rpx;
 }
 
 .upload-section {
   background-color: #f8f8f8;
   border-radius: 16rpx;
-  padding: 40rpx;
   margin-bottom: 30rpx;
   display: flex;
   justify-content: center;
@@ -611,9 +766,11 @@
 }
 
 .video-actions {
+  width: 100%;
   margin-top: 20rpx;
   display: flex;
   justify-content: center;
+  align-items: center;
   gap: 20rpx;
 }
 
@@ -634,6 +791,7 @@
   background-color: #f9f9f9;
   border-radius: 8rpx;
   margin-top: 15rpx;
+  position: relative;
 }
 
 .goods-preview .goods-image {
@@ -705,10 +863,11 @@
 }
 
 .publish-btn {
-  position: fixed;
+  /* position: fixed;
   bottom: 100rpx;
   left: 20rpx;
-  right: 20rpx;
+  right: 20rpx; */
+  margin-top: 40rpx;
 }
 
 .goods-picker {
@@ -779,4 +938,22 @@
     height: 25px;
     margin-top: 10px;
 }
-</style>
\ No newline at end of file
+
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+
+.image-item {
+  margin: 5px;
+  overflow: hidden;
+  border-radius: 8px;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+}
+
+.image {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index 013272a..f28b928 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,3 +1,6 @@
+## 1.9.9锛�2025-06-11锛�
+- 淇 uni-popup-dialog 涓� setVal 鏂规硶鎶ラ敊鐨勯棶棰�
+- 淇 uni-popup-dialog 鏁版嵁鍙屽悜缁戝畾闂銆�
 ## 1.9.8锛�2025-04-16锛�
 - 淇 鏇存柊缁勪欢绀轰緥 锛岃В鍐虫洿鏂版暟鎹垨淇濆瓨椤圭洰瀵艰嚧寮圭獥娑堝け鐨勯棶棰�
 ## 1.9.7锛�2025-04-14锛�
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index f5731d5..12ce2c9 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -156,11 +156,11 @@
 				}
 			},
 			value(val) {
-				setVal(val)
+				this.setVal(val)
 			},
 			// #ifdef VUE3
 			modelValue(val) {
-				setVal(val)
+				this.setVal(val)
 			},
 			// #endif
 			val(val) {
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index d8bfb9f..7be6c66 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,90 +1,107 @@
 {
-	"id": "uni-popup",
-	"displayName": "uni-popup 寮瑰嚭灞�",
-	"version": "1.9.8",
-	"description": " Popup 缁勪欢锛屾彁渚涘父鐢ㄧ殑寮瑰眰",
-	"keywords": [
-        "uni-ui",
-        "寮瑰嚭灞�",
-        "寮圭獥",
-        "popup",
-        "寮规"
+  "id": "uni-popup",
+  "displayName": "uni-popup 寮瑰嚭灞�",
+  "version": "1.9.9",
+  "description": " Popup 缁勪欢锛屾彁渚涘父鐢ㄧ殑寮瑰眰",
+  "keywords": [
+    "uni-ui",
+    "寮瑰嚭灞�",
+    "寮圭獥",
+    "popup",
+    "寮规"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.01",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "鏃�",
+      "data": "鏃�",
+      "permissions": "鏃�"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss",
+      "uni-transition"
     ],
-	"repository": "https://github.com/dcloudio/uni-ui",
-	"engines": {
-		"HBuilderX": ""
-	},
-	"directories": {
-		"example": "../../temps/example_temps"
-	},
-    "dcloudext": {
-        "sale": {
-			"regular": {
-				"price": "0.00"
-			},
-			"sourcecode": {
-				"price": "0.00"
-			}
-		},
-		"contact": {
-			"qq": ""
-		},
-		"declaration": {
-			"ads": "鏃�",
-			"data": "鏃�",
-			"permissions": "鏃�"
-		},
-        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-        "type": "component-vue"
-	},
-	"uni_modules": {
-		"dependencies": [
-			"uni-scss",
-			"uni-transition"
-		],
-		"encrypt": [],
-		"platforms": {
-			"cloud": {
-				"tcb": "y",
-                "aliyun": "y",
-                "alipay": "n"
-			},
-			"client": {
-				"App": {
-                    "app-vue": "y",
-                    "app-nvue": "y",
-                    "app-harmony": "u",
-                    "app-uvue": "u"
-                },
-				"H5-mobile": {
-					"Safari": "y",
-					"Android Browser": "y",
-					"寰俊娴忚鍣�(Android)": "y",
-					"QQ娴忚鍣�(Android)": "y"
-				},
-				"H5-pc": {
-					"Chrome": "y",
-					"IE": "y",
-					"Edge": "y",
-					"Firefox": "y",
-					"Safari": "y"
-				},
-				"灏忕▼搴�": {
-					"寰俊": "y",
-					"闃块噷": "y",
-					"鐧惧害": "y",
-					"瀛楄妭璺冲姩": "y",
-					"QQ": "y"
-				},
-				"蹇簲鐢�": {
-					"鍗庝负": "u",
-					"鑱旂洘": "u"
-                },
-                "Vue": {
-                    "vue2": "y",
-                    "vue3": "y"
-                }
-			}
-		}
-	}
-}
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "鈭�",
+            "vue3": "鈭�"
+          },
+          "web": {
+            "safari": "鈭�",
+            "chrome": "鈭�"
+          },
+          "app": {
+            "vue": "鈭�",
+            "nvue": "鈭�",
+            "android": "鈭�",
+            "ios": "鈭�",
+            "harmony": "x"
+          },
+          "mp": {
+            "weixin": "鈭�",
+            "alipay": "鈭�",
+            "toutiao": "鈭�",
+            "baidu": "鈭�",
+            "kuaishou": "鈭�",
+            "jd": "鈭�",
+            "harmony": "鈭�",
+            "qq": "鈭�",
+            "lark": "鈭�"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
index 2f2b10d..1e500ab 100644
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
@@ -1,3 +1,5 @@
+## 1.3.5锛�2025-06-11锛�
+- 淇 绗竴娆℃墽琛屼笉鏄剧ず鍔ㄧ敾鐨勯棶棰�
 ## 1.3.4锛�2025-04-16锛�
 - 淇 椤甸潰鏁版嵁鏇存柊鍒板簳鍔ㄧ敾澶嶅師鐨勯棶棰�
 - 淇 绀轰緥椤甸潰鎵撳紑鎶ラ敊鐨勯棶棰�
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
index 8772572..cce8538 100644
--- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -1,289 +1,286 @@
 <template>
-  <!-- #ifndef APP-NVUE -->
-  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
-  <!-- #endif -->
-  <!-- #ifdef APP-NVUE -->
-  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
-  <!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
 </template>
 
 <script>
-import { createAnimation } from './createAnimation'
+	import { createAnimation } from './createAnimation'
 
-/**
- * Transition 杩囨浮鍔ㄧ敾
- * @description 绠�鍗曡繃娓″姩鐢荤粍浠�
- * @tutorial https://ext.dcloud.net.cn/plugin?id=985
- * @property {Boolean} show = [false|true] 鎺у埗缁勪欢鏄剧ず鎴栭殣钘�
- * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 杩囨浮鍔ㄧ敾绫诲瀷
- *  @value fade 娓愰殣娓愬嚭杩囨浮
- *  @value slide-top 鐢变笂鑷充笅杩囨浮
- *  @value slide-right 鐢卞彸鑷冲乏杩囨浮
- *  @value slide-bottom 鐢变笅鑷充笂杩囨浮
- *  @value slide-left 鐢卞乏鑷冲彸杩囨浮
- *  @value zoom-in 鐢卞皬鍒板ぇ杩囨浮
- *  @value zoom-out 鐢卞ぇ鍒板皬杩囨浮
- * @property {Number} duration 杩囨浮鍔ㄧ敾鎸佺画鏃堕棿
- * @property {Object} styles 缁勪欢鏍峰紡锛屽悓 css 鏍峰紡锛屾敞鎰忓甫鈥�-鈥樿繛鎺ョ鐨勫睘鎬ч渶瑕佷娇鐢ㄥ皬椹煎嘲鍐欐硶濡傦細`backgroundColor:red`
- */
-export default {
-	name: 'uniTransition',
-	emits:['click','change'],
-	props: {
-		show: {
-			type: Boolean,
-			default: false
-		},
-		modeClass: {
-			type: [Array, String],
-			default() {
-				return 'fade'
-			}
-		},
-		duration: {
-			type: Number,
-			default: 300
-		},
-		styles: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		customClass:{
-			type: String,
-			default: ''
-		},
-		onceRender:{
-			type:Boolean,
-			default:false
-		},
-	},
-	data() {
-		return {
-			isShow: false,
-			transform: '',
-			opacity: 1,
-			animationData: {},
-			durationTime: 300,
-			config: {}
-		}
-	},
-	watch: {
-		show: {
-			handler(newVal) {
-				if (newVal) {
-					this.open()
-				} else {
-					// 閬垮厤涓婃潵灏辨墽琛� close,瀵艰嚧鍔ㄧ敾閿欎贡
-					if (this.isShow) {
-						this.close()
-					}
+	/**
+	 * Transition 杩囨浮鍔ㄧ敾
+	 * @description 绠�鍗曡繃娓″姩鐢荤粍浠�
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+	 * @property {Boolean} show = [false|true] 鎺у埗缁勪欢鏄剧ず鎴栭殣钘�
+	 * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 杩囨浮鍔ㄧ敾绫诲瀷
+	 *  @value fade 娓愰殣娓愬嚭杩囨浮
+	 *  @value slide-top 鐢变笂鑷充笅杩囨浮
+	 *  @value slide-right 鐢卞彸鑷冲乏杩囨浮
+	 *  @value slide-bottom 鐢变笅鑷充笂杩囨浮
+	 *  @value slide-left 鐢卞乏鑷冲彸杩囨浮
+	 *  @value zoom-in 鐢卞皬鍒板ぇ杩囨浮
+	 *  @value zoom-out 鐢卞ぇ鍒板皬杩囨浮
+	 * @property {Number} duration 杩囨浮鍔ㄧ敾鎸佺画鏃堕棿
+	 * @property {Object} styles 缁勪欢鏍峰紡锛屽悓 css 鏍峰紡锛屾敞鎰忓甫鈥�-鈥樿繛鎺ョ鐨勫睘鎬ч渶瑕佷娇鐢ㄥ皬椹煎嘲鍐欐硶濡傦細`backgroundColor:red`
+	 */
+	export default {
+		name: 'uniTransition',
+		emits: ['click', 'change'],
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			modeClass: {
+				type: [Array, String],
+				default () {
+					return 'fade'
 				}
 			},
-			immediate: true
-		}
-	},
-	computed: {
-		// 鐢熸垚鏍峰紡鏁版嵁
-		stylesObject() {
-			let styles = {
-				...this.styles,
-				'transition-duration': this.duration / 1000 + 's'
-			}
-			let transform = ''
-			for (let i in styles) {
-				let line = this.toLine(i)
-				transform += line + ':' + styles[i] + ';'
-			}
-			return transform
-		},
-		// 鍒濆鍖栧姩鐢绘潯浠�
-		transformStyles() {
-			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
-		}
-	},
-	created() {
-		// 鍔ㄧ敾榛樿閰嶇疆
-		this.config = {
-			duration: this.duration,
-			timingFunction: 'ease',
-			transformOrigin: '50% 50%',
-			delay: 0
-		}
-		this.durationTime = this.duration
-	},
-	methods: {
-		/**
-		 *  ref 瑙﹀彂 鍒濆鍖栧姩鐢�
-		 */
-		init(obj = {}) {
-			if (obj.duration) {
-				this.durationTime = obj.duration
-			}
-			this.animation = createAnimation(Object.assign(this.config, obj),this)
-		},
-		/**
-		 * 鐐瑰嚮缁勪欢瑙﹀彂鍥炶皟
-		 */
-		onClick() {
-			this.$emit('click', {
-				detail: this.isShow
-			})
-		},
-		/**
-		 * ref 瑙﹀彂 鍔ㄧ敾鍒嗙粍
-		 * @param {Object} obj
-		 */
-		step(obj, config = {}) {
-			if (!this.animation) return
-			for (let i in obj) {
-				try {
-					if(typeof obj[i] === 'object'){
-						this.animation[i](...obj[i])
-					}else{
-						this.animation[i](obj[i])
-					}
-				} catch (e) {
-					console.error(`鏂规硶 ${i} 涓嶅瓨鍦╜)
+			duration: {
+				type: Number,
+				default: 300
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {}
 				}
+			},
+			customClass: {
+				type: String,
+				default: ''
+			},
+			onceRender: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				isShow: false,
+				transform: '',
+				opacity: 0,
+				animationData: {},
+				durationTime: 300,
+				config: {}
 			}
-			this.animation.step(config)
-			return this
 		},
-		/**
-		 *  ref 瑙﹀彂 鎵ц鍔ㄧ敾
-		 */
-		run(fn) {
-			if (!this.animation) return
-			this.animation.run(fn)
-		},
-		// 寮�濮嬭繃搴﹀姩鐢�
-		open() {
-			clearTimeout(this.timer)
-			this.transform = ''
-			this.isShow = true
-			let { opacity, transform } = this.styleInit(false)
-			if (typeof opacity !== 'undefined') {
-				this.opacity = opacity
+		watch: {
+			show: {
+				handler(newVal) {
+					if (newVal) {
+						this.open()
+					} else {
+						// 閬垮厤涓婃潵灏辨墽琛� close,瀵艰嚧鍔ㄧ敾閿欎贡
+						if (this.isShow) {
+							this.close()
+						}
+					}
+				},
+				immediate: true
 			}
-			this.transform = transform
-			// 纭繚鍔ㄦ�佹牱寮忓凡缁忕敓鏁堝悗锛屾墽琛屽姩鐢伙紝濡傛灉涓嶅姞 nextTick 锛屼細瀵艰嚧 wx 鍔ㄧ敾鎵ц寮傚父
-			this.$nextTick(() => {
-				// TODO 瀹氭椂鍣ㄤ繚璇佸姩鐢诲畬鍏ㄦ墽琛岋紝鐩墠鏈変簺闂锛屽悗闈細鍙栨秷瀹氭椂鍣�
-				this.timer = setTimeout(() => {
-					this.animation = createAnimation(this.config, this)
-					this.tranfromInit(false).step()
-					this.animation.run(() => {
-						this.transform = ''
-						this.opacity = opacity || 1
-					})
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				}, 20)
-			})
 		},
-		// 鍏抽棴杩囧害鍔ㄧ敾
-		close(type) {
-			if (!this.animation) return
-			this.tranfromInit(true)
-				.step()
-				.run(() => {
-					this.isShow = false
-					this.animationData = null
-					this.animation = null
-					let { opacity, transform } = this.styleInit(false)
-					this.opacity = opacity || 1
-					this.transform = transform
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				})
-		},
-		// 澶勭悊鍔ㄧ敾寮�濮嬪墠鐨勯粯璁ゆ牱寮�
-		styleInit(type) {
-			let styles = {
-				transform: ''
-			}
-			let buildStyle = (type, mode) => {
-				if (mode === 'fade') {
-					styles.opacity = this.animationType(type)[mode]
-				} else {
-					styles.transform += this.animationType(type)[mode] + ' '
+		computed: {
+			// 鐢熸垚鏍峰紡鏁版嵁
+			stylesObject() {
+				let styles = {
+					...this.styles,
+					'transition-duration': this.duration / 1000 + 's'
 				}
-			}
-			if (typeof this.modeClass === 'string') {
-				buildStyle(type, this.modeClass)
-			} else {
-				this.modeClass.forEach(mode => {
-					buildStyle(type, mode)
-				})
-			}
-			return styles
-		},
-		// 澶勭悊鍐呯疆缁勫悎鍔ㄧ敾
-		tranfromInit(type) {
-			let buildTranfrom = (type, mode) => {
-				let aniNum = null
-				if (mode === 'fade') {
-					aniNum = type ? 0 : 1
-				} else {
-					aniNum = type ? '-100%' : '0'
-					if (mode === 'zoom-in') {
-						aniNum = type ? 0.8 : 1
-					}
-					if (mode === 'zoom-out') {
-						aniNum = type ? 1.2 : 1
-					}
-					if (mode === 'slide-right') {
-						aniNum = type ? '100%' : '0'
-					}
-					if (mode === 'slide-bottom') {
-						aniNum = type ? '100%' : '0'
-					}
+				let transform = ''
+				for (let i in styles) {
+					let line = this.toLine(i)
+					transform += line + ':' + styles[i] + ';'
 				}
-				this.animation[this.animationMode()[mode]](aniNum)
+				return transform
+			},
+			// 鍒濆鍖栧姩鐢绘潯浠�
+			transformStyles() {
+				return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
 			}
-			if (typeof this.modeClass === 'string') {
-				buildTranfrom(type, this.modeClass)
-			} else {
-				this.modeClass.forEach(mode => {
-					buildTranfrom(type, mode)
+		},
+		created() {
+			// 鍔ㄧ敾榛樿閰嶇疆
+			this.config = {
+				duration: this.duration,
+				timingFunction: 'ease',
+				transformOrigin: '50% 50%',
+				delay: 0
+			}
+			this.durationTime = this.duration
+		},
+		methods: {
+			/**
+			 *  ref 瑙﹀彂 鍒濆鍖栧姩鐢�
+			 */
+			init(obj = {}) {
+				if (obj.duration) {
+					this.durationTime = obj.duration
+				}
+				this.animation = createAnimation(Object.assign(this.config, obj), this)
+			},
+			/**
+			 * 鐐瑰嚮缁勪欢瑙﹀彂鍥炶皟
+			 */
+			onClick() {
+				this.$emit('click', {
+					detail: this.isShow
 				})
-			}
+			},
+			/**
+			 * ref 瑙﹀彂 鍔ㄧ敾鍒嗙粍
+			 * @param {Object} obj
+			 */
+			step(obj, config = {}) {
+				if (!this.animation) return this
+				Object.keys(obj).forEach(key => {
+					const value = obj[key]
+					if (typeof this.animation[key] === 'function') {
+						Array.isArray(value) ?
+							this.animation[key](...value) :
+							this.animation[key](value)
+					}
+				})
+				this.animation.step(config)
+				return this
+			},
+			/**
+			 *  ref 瑙﹀彂 鎵ц鍔ㄧ敾
+			 */
+			run(fn) {
+				if (!this.animation) return
+				this.animation.run(fn)
+			},
+			// 寮�濮嬭繃搴﹀姩鐢�
+			open() {
+				clearTimeout(this.timer)
+				this.isShow = true
+				// 鏂板鍒濆鐘舵�侀噸缃�昏緫锛堝叧閿級
+				this.transform = this.styleInit(false).transform || ''
+				this.opacity = this.styleInit(false).opacity || 0
 
-			return this.animation
-		},
-		animationType(type) {
-			return {
-				fade: type ? 0 : 1,
-				'slide-top': `translateY(${type ? '0' : '-100%'})`,
-				'slide-right': `translateX(${type ? '0' : '100%'})`,
-				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
-				'slide-left': `translateX(${type ? '0' : '-100%'})`,
-				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
-				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+				// 纭繚鍔ㄦ�佹牱寮忓凡缁忕敓鏁堝悗锛屾墽琛屽姩鐢伙紝濡傛灉涓嶅姞 nextTick 锛屼細瀵艰嚧 wx 鍔ㄧ敾鎵ц寮傚父
+				this.$nextTick(() => {
+					// TODO 瀹氭椂鍣ㄤ繚璇佸姩鐢诲畬鍏ㄦ墽琛岋紝鐩墠鏈変簺闂锛屽悗闈細鍙栨秷瀹氭椂鍣�
+					this.timer = setTimeout(() => {
+						this.animation = createAnimation(this.config, this)
+						this.tranfromInit(false).step()
+						this.animation.run(() => {
+							this.transform = ''
+							this.opacity = this.styleInit(false).opacity || 1
+							this.$emit('change', {
+								detail: this.isShow
+							})
+						})
+					}, 80)
+				})
+			},
+			// 鍏抽棴杩囧害鍔ㄧ敾
+			close(type) {
+				if (!this.animation) return
+				this.tranfromInit(true)
+					.step()
+					.run(() => {
+						this.isShow = false
+						this.animationData = null
+						this.animation = null
+						let { opacity, transform } = this.styleInit(false)
+						this.opacity = opacity || 1
+						this.transform = transform
+						this.$emit('change', {
+							detail: this.isShow
+						})
+					})
+			},
+			// 澶勭悊鍔ㄧ敾寮�濮嬪墠鐨勯粯璁ゆ牱寮�
+			styleInit(type) {
+				let styles = { transform: '', opacity: 1 }
+				const buildStyle = (type, mode) => {
+					const value = this.animationType(type)[mode] // 鐩存帴浣跨敤 type 鎺у埗鐘舵��
+					if (mode.startsWith('fade')) {
+						styles.opacity = value
+					} else {
+						styles.transform += value + ' '
+					}
+				}
+
+				if (typeof this.modeClass === 'string') {
+					buildStyle(type, this.modeClass)
+				} else {
+					this.modeClass.forEach(mode => buildStyle(type, mode))
+				}
+				return styles
+			},
+			// 澶勭悊鍐呯疆缁勫悎鍔ㄧ敾
+			tranfromInit(type) {
+				let buildTranfrom = (type, mode) => {
+					let aniNum = null
+					if (mode === 'fade') {
+						aniNum = type ? 0 : 1
+					} else {
+						aniNum = type ? '-100%' : '0'
+						if (mode === 'zoom-in') {
+							aniNum = type ? 0.8 : 1
+						}
+						if (mode === 'zoom-out') {
+							aniNum = type ? 1.2 : 1
+						}
+						if (mode === 'slide-right') {
+							aniNum = type ? '100%' : '0'
+						}
+						if (mode === 'slide-bottom') {
+							aniNum = type ? '100%' : '0'
+						}
+					}
+					this.animation[this.animationMode()[mode]](aniNum)
+				}
+				if (typeof this.modeClass === 'string') {
+					buildTranfrom(type, this.modeClass)
+				} else {
+					this.modeClass.forEach(mode => {
+						buildTranfrom(type, mode)
+					})
+				}
+
+				return this.animation
+			},
+			animationType(type) {
+				return {
+					fade: type ? 1 : 0,
+					'slide-top': `translateY(${type ? '0' : '-100%'})`,
+					'slide-right': `translateX(${type ? '0' : '100%'})`,
+					'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+					'slide-left': `translateX(${type ? '0' : '-100%'})`,
+					'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+					'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+				}
+			},
+			// 鍐呯疆鍔ㄧ敾绫诲瀷涓庡疄闄呭姩鐢诲搴斿瓧鍏�
+			animationMode() {
+				return {
+					fade: 'opacity',
+					'slide-top': 'translateY',
+					'slide-right': 'translateX',
+					'slide-bottom': 'translateY',
+					'slide-left': 'translateX',
+					'zoom-in': 'scale',
+					'zoom-out': 'scale'
+				}
+			},
+			// 椹煎嘲杞腑妯嚎
+			toLine(name) {
+				return name.replace(/([A-Z])/g, '-$1').toLowerCase()
 			}
-		},
-		// 鍐呯疆鍔ㄧ敾绫诲瀷涓庡疄闄呭姩鐢诲搴斿瓧鍏�
-		animationMode() {
-			return {
-				fade: 'opacity',
-				'slide-top': 'translateY',
-				'slide-right': 'translateX',
-				'slide-bottom': 'translateY',
-				'slide-left': 'translateX',
-				'zoom-in': 'scale',
-				'zoom-out': 'scale'
-			}
-		},
-		// 椹煎嘲杞腑妯嚎
-		toLine(name) {
-			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
 		}
 	}
-}
 </script>
 
 <style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
index b76a3ab..5e5136a 100644
--- a/uni_modules/uni-transition/package.json
+++ b/uni_modules/uni-transition/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-transition",
   "displayName": "uni-transition 杩囨浮鍔ㄧ敾",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "鍏冪礌鐨勭畝鍗曡繃娓″姩鐢�",
   "keywords": [
     "uni-ui",
@@ -12,12 +12,14 @@
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
   "engines": {
-    "HBuilderX": ""
+    "HBuilderX": "",
+    "uni-app": "^4.01",
+    "uni-app-x": ""
   },
   "directories": {
     "example": "../../temps/example_temps"
   },
-"dcloudext": {
+  "dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -35,51 +37,86 @@
       "permissions": "鏃�"
     },
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-    "type": "component-vue"
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
   },
   "uni_modules": {
-    "dependencies": ["uni-scss"],
+    "dependencies": [
+      "uni-scss"
+    ],
     "encrypt": [],
     "platforms": {
       "cloud": {
-        "tcb": "y",
-        "aliyun": "y",
-        "alipay": "n"
+        "tcb": "鈭�",
+        "aliyun": "鈭�",
+        "alipay": "x"
       },
       "client": {
-        "App": {
-            "app-vue": "y",
-            "app-nvue": "y",
-            "app-harmony": "u",
-            "app-uvue": "n"
+        "uni-app": {
+          "vue": {
+            "vue2": "鈭�",
+            "vue3": "鈭�"
+          },
+          "web": {
+            "safari": "鈭�",
+            "chrome": "鈭�"
+          },
+          "app": {
+            "vue": "鈭�",
+            "nvue": "鈭�",
+            "android": "鈭�",
+            "ios": "鈭�",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": {
+                "extVersion": "1.0.2",
+                "minVersion": ""
+            },
+            "alipay": {
+                "extVersion": "1.0.2",
+                "minVersion": ""
+            },
+            "toutiao": {
+                "extVersion": "1.0.2",
+                "minVersion": ""
+            },
+            "baidu": {
+                "extVersion": "1.0.2",
+                "minVersion": ""
+            },
+            "kuaishou": {
+                "extVersion": "1.1.0",
+                "minVersion": ""
+            },
+            "jd": {
+                "extVersion": "1.0.2",
+                "minVersion": ""
+            },
+            "harmony": "x",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
         },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "寰俊娴忚鍣�(Android)": "y",
-          "QQ娴忚鍣�(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "灏忕▼搴�": {
-          "寰俊": "y",
-          "闃块噷": "y",
-          "鐧惧害": "y",
-          "瀛楄妭璺冲姩": "y",
-          "QQ": "y"
-        },
-        "蹇簲鐢�": {
-          "鍗庝负": "u",
-          "鑱旂洘": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
         }
       }
     }

--
Gitblit v1.8.0