diff --git a/manifest.json b/manifest.json index 8df89a7..f16f8be 100644 --- a/manifest.json +++ b/manifest.json @@ -123,7 +123,7 @@ "devServer" : { "https" : false, "port" : 8055, -// "disableHostCheck" : true // 禁用 Host 检查 打包时改成false + "disableHostCheck" : true // 禁用 Host 检查 打包时改成false }, "router" : { "mode" : "hash", diff --git a/pages/fun/materialEdit.vue b/pages/fun/materialEdit.vue index a0833c2..ddaa2ac 100644 --- a/pages/fun/materialEdit.vue +++ b/pages/fun/materialEdit.vue @@ -9,6 +9,15 @@ + + 修改意见 + + + 剧本 视频的剧本 @@ -92,6 +101,7 @@ orderItemId: "", // 素材提交状态 commitState:'add', + comment:'', materialfrom:{ id: undefined, dictId: undefined, @@ -159,26 +169,17 @@ }); }, async getProductDetail(){ - // let res = await this.$api.orderApi.getMallclientOrderProductList({ orderId: this.orderId, productId: this.productId }) let res = await this.$api.orderApi.getOrderMaterialList({ orderItemId: this.orderItemId }) - console.log("res",res) - // this.materialfrom.productSn = res.rows[0].productSn; - // this.commitState = res.rows[0].commitState; - // if (this.commitState === 0) { - // this.getMaterialDictList(); - // } else { - // this.getMaterialList(); - // } if(res.rows.length!=0){ this.materialfrom.flowId = res.rows[0].id; this.commitState = res.rows[0].status; + this.comment = res.rows[0].comment || ''; + this.scriptContent = res.rows[0].script || ''; this.materialTemplateList = res.rows[0].materialItems || []; res.rows[0].materialItems.forEach(async (item,index)=>{ if(item.attrType !== 0 && item.attrValue !== ''){ let {fileUrl,fileName} = await this.getFileDetail(item.attrValue); console.log("fileUrl,fileName",fileUrl,fileName) - // this.materialTemplateList[index].fileUrl = fileUrl; - // this.materialTemplateList[index].fileName = fileName; this.$nextTick(()=>{ this.$set(this.materialTemplateList[index],'fileUrl',fileUrl) this.$set(this.materialTemplateList[index],'fileName',fileName) @@ -440,13 +441,21 @@ orderId: this.orderId, productId: this.productId, orderItemId: this.orderItemId, - materialItems: this.materialTemplateList + materialItems: this.materialTemplateList, + script: this.scriptContent }); this.buttonLoading = false; this.materialfrom.flowId = res.data.id; this.getProductDetail(); }else{ - res = await this.$api.orderApi.mallMaterialUpdateBatch(this.materialTemplateList); + res = await this.$api.orderApi.EditOrderMaterial({ + orderId: this.orderId, + productId: this.productId, + orderItemId: this.orderItemId, + materialItems: this.materialTemplateList, + script: this.scriptContent, + id: this.materialfrom.flowId + }); this.buttonLoading = false; } @@ -514,6 +523,15 @@ align-items: center; } } + .comment-box{ + background-color: rgb(254,242,242); + border: 1px solid rgb(254,226,226); + border-radius: 0.5rem; + padding: 1rem; + width: 100%; + color: red; + font-size: 36rpx; + } .form-item { margin-bottom: 20rpx; @@ -527,9 +545,9 @@ margin-bottom: 10rpx; font-weight: bold; .form-hint{ - font-size: 22rpx; - color: #666; - margin-left: 10rpx; + font-size: 20rpx; + color: #999; + margin-left: 6rpx; } }