From ff0855c4385489482133a30681c9bcc9eae00762 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Tue, 4 Mar 2025 17:52:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=E5=B9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=20-=20=E8=AE=A2=E5=8D=95=E9=A1=B5=E8=B7=B3=E8=BD=AC=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=20name=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=20-=20=E5=AF=B9=E6=8E=A5=E8=A7=86=E9=A2=91=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=92=8C=E4=BA=A4=E4=BB=98=E8=A7=86=E9=A2=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/module/orderApi.js   |  11 ++
 common/api/module/productApi.js | 122 ---------------
 pages/fun/videoView.vue         | 265 ++++++++++++++++++++++++++++++++
 pages/tabBar/order.vue          |   6 +-
 4 files changed, 279 insertions(+), 125 deletions(-)
 create mode 100644 pages/fun/videoView.vue

diff --git a/common/api/module/orderApi.js b/common/api/module/orderApi.js
index 142dd9f..628c3e0 100644
--- a/common/api/module/orderApi.js
+++ b/common/api/module/orderApi.js
@@ -144,4 +144,15 @@ export default {
 				})
 		})
 	},
+	// 用户确认预览视频(调整或确认）
+	materialAdjust(data){
+		return new Promise((resolve, reject) => {
+			request.post('/mall/material/adjust',data)
+				.then((res) =>{
+					resolve(res);
+				}).catch(err =>{
+					reject(err);
+				})
+		})
+	},
 }
\ No newline at end of file
diff --git a/common/api/module/productApi.js b/common/api/module/productApi.js
index fe7b0be..1811eb1 100644
--- a/common/api/module/productApi.js
+++ b/common/api/module/productApi.js
@@ -22,126 +22,4 @@ export default {
 				})
 		})
 	},
-	// 获取订单商品列表
-	getMallclientOrderProductList(data){
-		return new Promise((resolve, reject) => {
-			request.get('/mallclient/clientorderItem/list',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 查询订单商品素材模板列表
-	getProductMaterialDictList(data){
-		return new Promise((resolve, reject) => {
-			request.get('/mall/materialDict/listWithProduct',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 查询订单商品素材列表(已有)
-	getMallOrderProductMaterialList(data){
-		return new Promise((resolve, reject) => {
-			request.get('/mall/material/list',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 查询订单商品素材模板素材项列表
-	getProductMaterialDictItemList(data){
-		return new Promise((resolve, reject) => {
-			request.get('/mall/materialTemplate/listById',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 删除文件
-	delOssFile(id){
-		console.log("id",id)
-		return new Promise((resolve, reject) => {
-			request.delete('/resource/oss/' + id)
-			.then((res) =>{
-				resolve(res);
-			}).catch(err =>{
-				reject(err);
-			})
-		})
-	},
-	// 订单素材列表（流程）
-	getOrderMaterialList(data){
-		return new Promise((resolve, reject) => {
-			request.get('/mall/orderMaterial/list',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 新增订单素材(流程）
-	AddOrderMaterial(data){
-		return new Promise((resolve, reject) => {
-			request.post('/mall/orderMaterial',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 修改素材(批量)
-	mallMaterialUpdateBatch(data){
-		return new Promise((resolve, reject) => {
-			request.put('/mall/material/updateBatch',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 提交商品素材列表（完成）
-	mallMaterialCommit(orderId,productId){
-		return new Promise((resolve, reject) => {
-			request.put('/mall/material/commit/' + orderId + '/' + productId)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 启动任务(流程）
-	startWorkFlow(data){
-		return new Promise((resolve, reject) => {
-			request.post('/workflow/task/startWorkFlow',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
-	// 办理流程(流程）
-	completeTask(data){
-		return new Promise((resolve, reject) => {
-			request.post('/workflow/task/completeTask',data)
-				.then((res) =>{
-					resolve(res);
-				}).catch(err =>{
-					reject(err);
-				})
-		})
-	},
 }
\ No newline at end of file
diff --git a/pages/fun/videoView.vue b/pages/fun/videoView.vue
new file mode 100644
index 0000000..62ededf
--- /dev/null
+++ b/pages/fun/videoView.vue
@@ -0,0 +1,265 @@
+<template>
+  <view class="video-preview">
+    <!-- 视频播放区域 -->
+    <view class="video-container">
+      <video
+				v-if="videoUrl"
+        :src="videoUrl"
+        class="video-player"
+        controls
+      ></video>
+			<u-empty v-else text="视频为空" src="play-circle"></u-empty>
+    </view>
+    
+    <!-- 底部按钮区域 -->
+    <view class="btn-box" :class="adjustCount == 0?'one':''" v-if="routeParams.name === '视频预览' && formState!= 'confirm'">
+      <u-button 
+				v-if="adjustCount !== 0"
+        type="default"
+        class="adjust-btn" 
+        @click="showAdjustModal"
+      >视频调整</u-button>
+      <u-button 
+        class="confirm-btn" 
+        type="primary"
+        @click="showConfirmModal"
+      >确认视频</u-button>
+    </view>
+    
+    <!-- 调整建议弹窗 -->
+    <u-popup
+      v-model="showAdjust"
+      @close="closeAdjustModal"
+      mode="center"
+      border-radius="10"
+    >
+      <view class="adjust-modal">
+        <view class="modal-title">调整建议</view>
+        <view class="adjust-count">剩余调整次数：{{ adjustCount }}</view>
+        <u-input
+          v-model="adjustForm.message"
+          placeholder="请输入调整建议"
+          auto-height
+          type="textarea"
+          border
+        ></u-input>
+        <view class="modal-buttons">
+          <u-button 
+            @click="cancelAdjustment"
+          >取消</u-button>
+          <u-button 
+            type="primary"
+            @click="submitAdjustment"
+            :disabled="adjustCount <= 0"
+          >提交</u-button>
+        </view>
+      </view>
+    </u-popup>
+    
+    <!-- 确认弹窗 -->
+    <u-modal
+      v-model="showConfirm"
+      title="确认提示"
+      content="视频确认后将生成正式交付视频，并完成订单，是否要确认？"
+      @confirm="submitAdjustment"
+      @cancel="closeConfirmModal"
+      show-cancel-button
+    ></u-modal>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      videoUrl: '', // 视频URL
+      adjustmentSuggestion: '', // 调整建议内容
+      showAdjust: false, // 调整弹窗显示状态
+      showConfirm: false, // 确认弹窗显示状态
+      videoStatus: 'preview',
+			routeParams:{
+				productId:'',
+				orderId:'',
+				orderItemId:'',
+				name:'',
+			},
+			adjustForm:{
+				businessKey: undefined,
+				state: 1,
+				message: undefined
+			},
+			adjustCount:0,
+			formState:'preview'
+    }
+  },
+	onLoad(option) {
+		if(option){
+			this.routeParams = option;
+		}
+		this.getInfo();
+	},
+  methods: {
+		async getInfo(){
+			let res = await this.$api.orderApi.getOrderMaterialList({ orderItemId: this.routeParams.orderItemId })
+			console.log("res",res)
+			if(res.rows.length!=0){
+				this.adjustForm.businessKey = res.rows[0].id;
+				if (this.routeParams.name === '视频预览') {
+					this.videoUrl = res.rows[0].resultPreview;
+					this.formState = res.rows[0].formState;
+					let count = res.rows[0].adjustCount || 0;
+					this.adjustCount = 3 - count > 0 ? 3 - count : 0;
+				} else {
+					this.videoUrl = res.rows[0].resultOutput;
+				}
+			}else{
+				
+			}
+		},
+    // 显示调整建议弹窗
+    showAdjustModal() {
+      this.adjustForm.state = 0;
+      this.adjustForm.message = '';
+      this.showAdjust = true;
+    },
+    
+    // 关闭调整建议弹窗
+    closeAdjustModal() {
+      this.showAdjust = false
+    },
+    
+    // 显示确认弹窗
+    showConfirmModal() {
+			this.adjustForm.state = 1;
+			this.adjustForm.message = '';
+      this.showConfirm = true;
+    },
+    
+    // 取消调整
+    cancelAdjustment() {
+      this.adjustmentSuggestion = ''
+      this.showAdjust = false
+    },
+    
+    // 提交调整建议
+    async submitAdjustment() {
+      if (this.adjustCount <= 0 && this.adjustForm.state == 0) {
+        this.$u.toast('已达到最大调整次数')
+        return
+      }
+			let res = await this.$api.orderApi.materialAdjust(this.adjustForm)
+			console.log("res",res)
+			if(res.code == 200){
+				this.$u.toast('提交成功')
+				uni.navigateBack({
+					delta: 1
+				})
+			}else{
+				this.$u.toast(res.msg)
+			}
+    },
+    
+    // 确认视频
+    confirmVideo() {
+      // TODO: 调用确认视频接口
+      this.$u.toast('视频已确认')
+      this.showConfirm = false
+    },
+    
+    // 关闭确认弹窗
+    closeConfirmModal() {
+      this.showConfirm = false
+    }
+  }
+}
+</script>
+<style>
+ page{
+  height: 100%;
+  background: #f5f5f5;
+ }
+</style>
+
+<style lang="scss" >
+.video-preview {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding-bottom: 120rpx;
+  .video-container {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20rpx;
+    
+    
+    .video-player {
+      border-radius: 20rpx;
+      width: 100%;
+      max-height: 100%;
+      // height: 400rpx;
+    }
+  }
+  
+  .btn-box {
+    display: flex;
+		justify-content: space-around;
+		align-items: center;
+		height: 120rpx;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: #fff;
+		z-index: 999;
+		button{
+			width: 340rpx;
+			height: 85rpx;
+			border-radius: 10rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		&.one{
+			button{
+				width: 680rpx;
+			}
+		}
+  }
+  
+  .adjust-modal {
+    background-color: #fff;
+    padding: 30rpx;
+    width: 600rpx;
+    
+    .modal-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      text-align: center;
+      margin-bottom: 20rpx;
+    }
+    
+    .adjust-count {
+      font-size: 28rpx;
+      color: #ff0000;
+      margin-bottom: 20rpx;
+    }
+    
+    .modal-buttons {
+      display: flex;
+      margin-top: 30rpx;
+      justify-content: space-around;
+      align-items: center;
+      button{
+        width: 260rpx;
+        height: 85rpx;
+        border-radius: 10rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/pages/tabBar/order.vue b/pages/tabBar/order.vue
index 23e2bf0..d8eb096 100644
--- a/pages/tabBar/order.vue
+++ b/pages/tabBar/order.vue
@@ -40,7 +40,7 @@
 								  size="mini"
 								  plain
 									type="primary"
-								  @click="goFun(val.funPath, val.productId, item.id, val.id)"
+								  @click="goFun(val.funPath, val.productId, item.id, val.id, val.funName)"
 								>{{ val.funName }}</u-button>
 							</view>
               <!-- <view class="product-specs">
@@ -269,10 +269,10 @@ export default {
         url: `/pages/order/detail?id=${item.id}`
       })
     },
-		goFun(path, productId, orderId, orderItemId){
+		goFun(path, productId, orderId, orderItemId, name){
 			console.log("path",path, productId, orderId)
 			uni.navigateTo({
-			  url: `/pages${path}?productId=${productId}&orderId=${orderId}&orderItemId=${orderItemId}`
+			  url: `/pages${path}?productId=${productId}&orderId=${orderId}&orderItemId=${orderItemId}&name=${name}`
 			})
 		}
   }