|
@@ -498,12 +498,12 @@
|
|
</div>
|
|
</div>
|
|
<!-- 素材列表 -->
|
|
<!-- 素材列表 -->
|
|
<div class="section-item" v-if="currentOrderInfo.orderStatus==1||currentOrderInfo.orderStatus==3">
|
|
<div class="section-item" v-if="currentOrderInfo.orderStatus==1||currentOrderInfo.orderStatus==3">
|
|
- <div class="tabBox">
|
|
|
|
|
|
+ <!-- <div class="tabBox">
|
|
<a-tabs v-model="tabKey" @change="tabChange">
|
|
<a-tabs v-model="tabKey" @change="tabChange">
|
|
<a-tab-pane :key='1' tab="真人物料"></a-tab-pane>
|
|
<a-tab-pane :key='1' tab="真人物料"></a-tab-pane>
|
|
<a-tab-pane :key='2' tab="剪辑物料"></a-tab-pane>
|
|
<a-tab-pane :key='2' tab="剪辑物料"></a-tab-pane>
|
|
</a-tabs>
|
|
</a-tabs>
|
|
- </div>
|
|
|
|
|
|
+ </div> -->
|
|
|
|
|
|
|
|
|
|
<div class="section-box">
|
|
<div class="section-box">
|
|
@@ -588,7 +588,7 @@
|
|
:multiple="false"
|
|
:multiple="false"
|
|
/>
|
|
/>
|
|
<span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
|
|
<span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
|
|
- <span v-if="confirmLoading && videoinfo.url != ''" style="color: green">上传成功</span>
|
|
|
|
|
|
+ <span v-if="confirmLoading && urlList.url != ''" style="color: green">上传成功</span>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
<a-form-item
|
|
<a-form-item
|
|
label="封面上传"
|
|
label="封面上传"
|
|
@@ -708,7 +708,7 @@
|
|
<a-textarea
|
|
<a-textarea
|
|
placeholder="请输入描述"
|
|
placeholder="请输入描述"
|
|
v-decorator="[
|
|
v-decorator="[
|
|
- 'describe', // 给表单赋值或拉取表单时,该input对应的key
|
|
|
|
|
|
+ 'description', // 给表单赋值或拉取表单时,该input对应的key
|
|
]"
|
|
]"
|
|
:auto-size="{ minRows: 3, maxRows: 10 }"
|
|
:auto-size="{ minRows: 3, maxRows: 10 }"
|
|
/>
|
|
/>
|
|
@@ -1633,9 +1633,10 @@ export default {
|
|
console.log(res);
|
|
console.log(res);
|
|
this.data=[]
|
|
this.data=[]
|
|
if(res.success){
|
|
if(res.success){
|
|
- this.data=res.result.list.filter(item=>item.materialType==this.tabKey);
|
|
|
|
- // this.ipagination.total=res.result.total
|
|
|
|
- this.ipagination.total=this.data.length
|
|
|
|
|
|
+ this.data=res.result.list;
|
|
|
|
+ // this.data=res.result.list.filter(item=>item.materialType==this.tabKey);
|
|
|
|
+ this.ipagination.total=res.result.total
|
|
|
|
+ // this.ipagination.total=this.data.length
|
|
this.loading=false
|
|
this.loading=false
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1817,30 +1818,29 @@ export default {
|
|
// 请求order详情数据
|
|
// 请求order详情数据
|
|
orderDetailHttp(){
|
|
orderDetailHttp(){
|
|
this.pageSpinning=true;
|
|
this.pageSpinning=true;
|
|
|
|
+ this.currentOrderInfo={}
|
|
getAction(this.url.orderDetail,{
|
|
getAction(this.url.orderDetail,{
|
|
id:this.currentOrderId
|
|
id:this.currentOrderId
|
|
}).then(res=>{
|
|
}).then(res=>{
|
|
console.log(res)
|
|
console.log(res)
|
|
this.pageSpinning=false;
|
|
this.pageSpinning=false;
|
|
- this.currentOrderInfo={}
|
|
|
|
if(res.success){
|
|
if(res.success){
|
|
this.currentOrderInfo=res.result;
|
|
this.currentOrderInfo=res.result;
|
|
- if(res.result.orderStatus){
|
|
|
|
- switch(res.result.orderStatus){
|
|
|
|
- case 0:
|
|
|
|
- this.currentStep=1;
|
|
|
|
- break
|
|
|
|
- case 1:
|
|
|
|
- this.currentStep=2;
|
|
|
|
- break
|
|
|
|
- case 2:
|
|
|
|
- this.currentStep=0;
|
|
|
|
- break
|
|
|
|
- case 3:
|
|
|
|
- this.currentStep=3;
|
|
|
|
- break
|
|
|
|
|
|
+ // res.result.orderStatus
|
|
|
|
+ console.log(this.currentOrderInfo.orderStatus)
|
|
|
|
+ if(this.currentOrderInfo.orderStatus || this.currentOrderInfo.orderStatus==0){
|
|
|
|
+ if(this.currentOrderInfo.orderStatus==0){
|
|
|
|
+ this.currentStep=1;
|
|
|
|
+ }else if(this.currentOrderInfo.orderStatus==1){
|
|
|
|
+ this.currentStep=2;
|
|
|
|
+ }else if(this.currentOrderInfo.orderStatus==2){
|
|
|
|
+ this.currentStep=0;
|
|
|
|
+ }else if(this.currentOrderInfo.orderStatus==3){
|
|
|
|
+ this.currentStep=3;
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
+ console.log(this.currentStep)
|
|
|
|
|
|
this.materialHttp()
|
|
this.materialHttp()
|
|
}
|
|
}
|
|
@@ -1873,8 +1873,8 @@ export default {
|
|
|
|
|
|
beforeUpload(file) {
|
|
beforeUpload(file) {
|
|
// this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
// this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
- // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
- this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
|
|
+ this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
+ // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
|
|
this.loadDisabled = true
|
|
this.loadDisabled = true
|
|
const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
|
|
const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
|
|
@@ -2397,10 +2397,7 @@ export default {
|
|
// });
|
|
// });
|
|
|
|
|
|
this.getTagListAll()
|
|
this.getTagListAll()
|
|
-
|
|
|
|
- },
|
|
|
|
- mounted() {
|
|
|
|
- let userInfo=localStorage.getItem('pro__Login_Userinfo');
|
|
|
|
|
|
+ let userInfo=localStorage.getItem('pro__Login_Userinfo');
|
|
if(userInfo){
|
|
if(userInfo){
|
|
this.userInfo=JSON.parse(userInfo).value
|
|
this.userInfo=JSON.parse(userInfo).value
|
|
}
|
|
}
|
|
@@ -2411,6 +2408,13 @@ export default {
|
|
if(this.currentOrderId){
|
|
if(this.currentOrderId){
|
|
this.orderDetailHttp()
|
|
this.orderDetailHttp()
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ mounted() {
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ destroyed() {
|
|
|
|
+ this.currentOrderInfo={}
|
|
},
|
|
},
|
|
activated() {
|
|
activated() {
|
|
this.currentOrderId=this.$parent.orderId;
|
|
this.currentOrderId=this.$parent.orderId;
|