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 @@
+
+
+
+
+
+
+
+
+
+
+ 视频调整
+ 确认视频
+
+
+
+
+
+ 调整建议
+ 剩余调整次数:{{ adjustCount }}
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 }}