Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

视频接口优化，案例检索

Browse Source
This commit is contained in:
xiezhijun
2021-05-08 19:09:32 +08:00
parent d474e823c3
commit 8600f48740
26 changed files with 396 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stdiet-ui/src/api/custom/commision.js
View File

@ -96,3 +96,13 @@ export function orderDetailDay(query) {
})
}
// 导出具体订单按天计算提成明细
export function exportOrderDetailDay(query) {
return request({
url: '/custom/commision/exportOrderDetailDay',
method: 'get',
params: query
})
}

9
stdiet-ui/src/api/custom/nutritionalVideo.js
View File

@ -69,3 +69,12 @@ export function updateWxShow(data){
params: data
})
}
// 查询营养视频播放地址
export function getVideoPlayUrlById(id) {
return request({
url: '/custom/nutritionalVideo/getVideoPlayUrlById/' + id,
method: 'get'
})
}

11
stdiet-ui/src/components/FileUpload/UploadFile.vue
View File

@ -9,10 +9,11 @@
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl || coverUrl" :src="imageUrl || coverUrl" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__tip" slot="tip">
1、只能上传png、jpg文件，且每个文件不超过{{
<div class="el-upload__tip" slot="tip" style="color:#1890ff">
<div>1、只能上传png、jpg文件，且每个文件不超过{{
upload.fileSize / (1024 * 1024)
}}M
}}M</div>
<div style="margin-top:-10px;">{{tips ? ('2、'+tips) : ''}}</div>
</div>
</el-upload>
</template>
@ -79,6 +80,10 @@ export default {
coverUrl:{
type: String,
default: ""
},
tips: {
type: String,
default: ""
}
}
};

34
stdiet-ui/src/components/OrdercommissDetail/index.vue
View File

@ -37,6 +37,7 @@
<div
class="order_total_data"
>
<span class="order_total_data_span_right20">
当前页总服务金额：{{totalServerAmount}}元
</span>
@ -50,6 +51,18 @@
>未发放总提成：{{ totalNotSendCommission }}元</span
>
</div>
<el-row :gutter="10" class="mb8" style="margin-top: 10px;margin-left:10px">
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['commisionDay:detail:export']"
>导出
</el-button>
</el-col>
</el-row>
<div style="width:100%;height:80%;overflow: auto">
<el-table :data="orderList" v-loading="loading" stripe>
<el-table-column
@ -208,7 +221,7 @@
</div>
</template>
<script>
import { orderDetailDay } from "@/api/custom/commision";
import { orderDetailDay,exportOrderDetailDay } from "@/api/custom/commision";
import OrderDetail from "@/components/OrderDetail";
export default {
@ -317,6 +330,23 @@ export default {
handleOnDetailClick(data) {
this.$refs.orderDetailRef.showDialog(data.orderId);
},
handleExport(){
this.queryParam.serverScopeStartTime = this.serverDateScope && this.serverDateScope.length > 0 ? this.serverDateScope[0] : null;
this.queryParam.serverScopeEndTime = this.serverDateScope && this.serverDateScope.length > 0 ? this.serverDateScope[1] : null;
const queryParams = this.queryParam;
this.$confirm("是否确认导出所有订单提成比例数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return exportOrderDetailDay(queryParams);
})
.then((response) => {
this.download(response.msg);
})
.catch(function () {});
}
},
};
</script>
@ -332,7 +362,7 @@ export default {
.order_total_data {
float: right;
margin-right: 40px;
margin-bottom:20px
margin-bottom:15px
}
.order_total_data_span_right20 {

2
stdiet-ui/src/components/PhysicalSignsDialog/index.vue
View File

@ -102,7 +102,7 @@
</el-table>
</div>
<!-- 其他信息 -->
<div style="height: 390px; overflow: auto">
<div style="height: 370px; overflow: auto">
<div
v-for="(item, index) in dataList.slice(1, 10)"
style="margin-bottom: 50px"

17
stdiet-ui/src/components/UploadVideo/index.vue
View File

@ -23,7 +23,7 @@
</el-form-item>
<el-form-item label="视频封面" prop="coverUrl">
<UploadFile ref="uploadFile" :prefix="'videoCover'" @callbackMethod="handleCoverUrl"></UploadFile>
<UploadFile ref="uploadFile" :prefix="'videoCover'" @callbackMethod="handleCoverUrl" :tips="'视频未传封面图片时，会主动截取封面，但会存在延迟，请勿直接发布到小程序'"></UploadFile>
</el-form-item>
<div style="display:flex">
<el-form-item label="视频类别" prop="cateId">
@ -52,7 +52,9 @@
<div>
<input type="file" accept=".mp4" ref="videoFile" id="videoFile" @change="fileChange($event)">
<div > <span>上传状态：{{statusText}}</span><span style="margin-left:100px">进度：{{authProgress}}%</span></div>
<div > 1、只能上传mp4文件，上传大文件时请使用客户端上传，防止上传超时</div>
<div style="color:#1890ff">
1、只能上传mp4文件，上传大文件时请使用客户端上传，防止上传超时
</div>
</div>
</el-form-item>
<el-form-item label="展示状态" prop="wxShow">
@ -61,7 +63,7 @@
active-text="小程序展示"
inactive-text="小程序不展示">
</el-switch>
<div>提示：请保证内容正确再展示到小程序</div>
<div style="color:red">提示：请保证内容正确再展示到小程序</div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -86,9 +88,6 @@
title: [
{ required: true, message: "标题不能为空", trigger: "blur" },
],
coverUrl: [
{ required: true, message: "封面不能为空", trigger: "blur" },
],
cateId:[
{ required: true, message: "视频类别不能为空", trigger: "blur" },
],
@ -145,13 +144,13 @@
},
methods: {
showDialog(classifyList, callback){
if(classifyList != null && classifyList.length > 0){
this.defaultClassify = classifyList[0].id;
}
this.resetVideoFrom();
this.open = true;
this.callback = callback;
this.classifyList = classifyList;
if(classifyList != null && classifyList.length > 0){
this.defaultClassify = classifyList[0].id;
}
},
handleCoverUrl(url){
this.videoFrom.coverUrl = url;

36
stdiet-ui/src/views/custom/customerCase/index.vue
View File

@ -17,8 +17,7 @@
</el-form-item>-->
<el-form-item label="案例信息" prop="name">
<el-select
v-model="keywordArray"
multiple
v-model="queryParams.keyword"
filterable
allow-create
clearable
@ -150,12 +149,22 @@
></AutoHideMessage>
</template>
</el-table-column>
<el-table-column label="所属客户" align="center" prop="customerName" />
<el-table-column label="所属客户" align="center" prop="customerName">
<template slot-scope="scope">
<el-button
size="normal"
type="text"
@click="handleOnHealthSignClick(scope.row.customerId)"
title="点击查看用户详情"
>{{scope.row.customerName}}</el-button
>
</template>
</el-table-column>
<el-table-column label="文件" align="center">
<template slot-scope="scope">
<el-button
size="mini"
size="normal"
type="text"
@click="getFileListByCaseId(scope.row)"
>文件列表
@ -323,6 +332,9 @@
@dealCustomerId="dealCustomerId"
ref="selectCustomerRef"
></SelectCustomer>
<!-- 健康评估弹窗 -->
<PhysicalSignsDialog ref="physicalSignsDialogRef" />
</div>
</template>
@ -337,13 +349,16 @@ import {
getFileListByCaseId,
updateWxShow
} from "@/api/custom/customerCase";
import {
getCustomer
} from "@/api/custom/customer";
import DragUpload from "@/components/FileUpload/DragUpload";
import DragUploadEdit from "@/components/FileUpload/DragUploadEdit";
import SelectCustomer from "@/components/Customer/SelectCustomer";
import MuchFileDown from "@/components/FileDownload/MuchFileDown";
import AutoHideMessage from "@/components/AutoHideMessage";
import AutoHideInfo from "@/components/AutoHideInfo";
import PhysicalSignsDialog from "@/components/PhysicalSignsDialog";
export default {
name: "CustomerCase",
data() {
@ -398,6 +413,7 @@ export default {
AutoHideMessage: AutoHideMessage,
AutoHideInfo: AutoHideInfo,
DragUploadEdit: DragUploadEdit,
PhysicalSignsDialog
},
created() {
this.getList();
@ -409,7 +425,7 @@ export default {
/** 查询客户案例管理列表 */
getList() {
this.loading = true;
this.queryParams.keyword = this.keywordArray.join(",");
//this.queryParams.keyword = this.keywordArray.join(",");
listCustomerCase(this.queryParams).then((response) => {
this.customerCaseList = response.rows;
this.total = response.total;
@ -425,6 +441,14 @@ export default {
this.$refs["editUploadCaseFile"].uploadReset();
this.reset();
},
handleOnHealthSignClick(id) {
getCustomer(id).then((response) => {
if(response.code == 200){
this.$refs["physicalSignsDialogRef"].showDialog(response.data);
}
});
},
// 表单重置
reset() {
this.form = {

42
stdiet-ui/src/views/custom/nutritionalVideo/index.vue
View File

@ -110,8 +110,16 @@
</el-image>
</template>
</el-table-column>
<el-table-column label="标题" align="center" prop="title" width="200"/>
<el-table-column label="描述" align="center" prop="description" />
<el-table-column label="标题" align="center" prop="title" width="200">
<template slot-scope="scope" >
<AutoHideMessage :data="scope.row.title == null ? '' : (scope.row.title+'')" :maxLength="20"></AutoHideMessage>
</template>
</el-table-column>
<el-table-column label="描述" align="center" prop="description" >
<template slot-scope="scope" >
<AutoHideMessage :data="scope.row.description == null ? '' : (scope.row.description+'')" :maxLength="100"></AutoHideMessage>
</template>
</el-table-column>
<!--<el-table-column label="标签" align="center" prop="tags" width="100"/>-->
<el-table-column label="分类" align="center" prop="cateName" width="100"/>
<el-table-column label="权限等级" align="center" prop="payLevelName" width="100"/>
@ -128,6 +136,13 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="getVideoPlayUrl(scope.row.id)"
v-hasPermi="['custom:nutritionalVideo:query']"
>播放</el-button>
<el-button
size="mini"
type="text"
@ -229,11 +244,12 @@
</template>
<script>
import { listNutritionalVideo, getNutritionalVideo, delNutritionalVideo, addNutritionalVideo, updateNutritionalVideo, exportNutritionalVideo, updateWxShow } from "@/api/custom/nutritionalVideo";
import { listNutritionalVideo, getNutritionalVideo, delNutritionalVideo, addNutritionalVideo, updateNutritionalVideo, exportNutritionalVideo, updateWxShow,getVideoPlayUrlById } from "@/api/custom/nutritionalVideo";
import {getAllClassify } from "@/api/custom/videoClassify";
import UploadVideo from "@/components/UploadVideo";
import UploadFile from "@/components/FileUpload/UploadFile";
import VideoClassify from "../videoClassify";
import AutoHideMessage from "@/components/AutoHideMessage";
export default {
name: "NutritionalVideo",
data() {
@ -269,6 +285,15 @@
form: {},
// 表单校验
rules: {
title: [
{ required: true, message: "标题不能为空", trigger: "blur" },
],
cateId:[
{ required: true, message: "视频类别不能为空", trigger: "blur" },
],
payLevel:[
{ required: true, message: "视频权限不能为空", trigger: "blur" },
]
},
coverImageList:[],
//分类列表
@ -288,7 +313,7 @@
});
},
components: {
UploadVideo,UploadFile,VideoClassify
UploadVideo,UploadFile,VideoClassify,AutoHideMessage
},
methods: {
/** 查询营养视频列表 */
@ -372,6 +397,15 @@
this.title = "修改营养视频";
});
},
//获取播放地址
getVideoPlayUrl(id){
getVideoPlayUrlById(id).then(response => {
let url = response.data.playUrl;
if(url != undefined && url != null){
window.open(url, '_blank');
}
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {