Skip to content

A
admin-base
Commit 5bb62fd3 authored by 赵茹林's avatar 赵茹林
Browse files
Options

期数名称

parent e9d96da5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2106 additions and 1915 deletions
index.html
View file @ 5bb62fd3
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
</head> </head>
<body> <body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://lib.baomitu.com/vue/2.5.17/vue.min.js"></script> <!--<script src="https://lib.baomitu.com/vue/2.5.17/vue.min.js"></script>-->
<script src="https://lib.baomitu.com/vue/2.5.17/vue.js"></script>
<script src="https://lib.baomitu.com/vuex/3.0.1/vuex.min.js"></script> <script src="https://lib.baomitu.com/vuex/3.0.1/vuex.min.js"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://lib.baomitu.com/axios/0.18.0/axios.min.js"></script> <script src="https://lib.baomitu.com/axios/0.18.0/axios.min.js"></script>
......
src/components/config/index.vue
View file @ 5bb62fd3
...@@ -200,10 +200,7 @@ ...@@ -200,10 +200,7 @@
<el-table-column prop="title" label="标题"></el-table-column> <el-table-column prop="title" label="标题"></el-table-column>
<el-table-column label="操作" width="120px" v-if="!$store.state.readonly"> <el-table-column label="操作" width="120px" v-if="!$store.state.readonly">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button @click="delStarListFn(scope.row)" type="warning" plain size="mini">删除</el-button>
@click="delStarListFn(scope.row)"
type="warning" plain size="mini">删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/components/conversionList/marketEnrollmentConversionList.vue
View file @ 5bb62fd3
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
:picker-options="{shortcuts:[today,yesterday,last7Day,last30Day]}" :picker-options="{shortcuts:[today,yesterday,last7Day,last30Day]}"
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
@change="getList" @change="getList"></el-date-picker>
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="商品课时数"> <el-form-item label="商品课时数">
<el-select <el-select
...@@ -21,14 +20,12 @@ ...@@ -21,14 +20,12 @@
placeholder="请选择" placeholder="请选择"
style="width: 150px" style="width: 150px"
clearable clearable
@change="selectChange" @change="selectChange">
>
<el-option <el-option
v-for="(data,index) in watchList" v-for="(data,index) in watchList"
:key="index" :key="index"
:label="data.title" :label="data.title"
:value="data.id" :value="data.id"></el-option>
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="渠道code"> <el-form-item label="渠道code">
...@@ -63,7 +60,13 @@ ...@@ -63,7 +60,13 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:span-method="arraySpanMethod"> :span-method="arraySpanMethod">
<!--height="calc(100vh - 210px)"--> <!--height="calc(100vh - 210px)"-->
<el-table-column prop="periods_title" align="center" min-width="80" fixed label="期数名称"></el-table-column> <!--<el-table-column prop="periods_title" align="center" min-width="80" fixed label="期数名称"></el-table-column>-->
<el-table-column align="center" fixed label="期数名称" width="120px">
<template slot-scope="scope">
<div v-html="periodName(scope.row)"></div>
<!--{{periodName(scope.row)}}-->
</template>
</el-table-column>
<el-table-column prop="is_other" min-width="160" align="left" fixed label="渠道信息"> <el-table-column prop="is_other" min-width="160" align="left" fixed label="渠道信息">
<template slot-scope="scope"> <template slot-scope="scope">
来源：{{scope.row.is_other==0?"内部":"外部"}}<br> 来源：{{scope.row.is_other==0?"内部":"外部"}}<br>
...@@ -178,6 +181,27 @@ export default { ...@@ -178,6 +181,27 @@ export default {
}; };
}, },
methods: { methods: {
periodName(val) {
let str = '';
if (val.goods_id) {
str += `【${val.goods_id}】`
}
if (val.periods_title) {
str += `${val.periods_title}`
}
if (val.watch_num) {
str += `${val.watch_num}课时<br>`
} else {
str += `<br>`
}
if (val.start_at) {
str += `（${val.start_at.slice(5).replace('-', '')}）`
}
if (val.has_watch_num || val.has_watch_num == 0) {
str += `-d${val.has_watch_num}`
}
return str
},
selectChange(value) { selectChange(value) {
this.searchFrom.watch_num = this.watchList[value].title; this.searchFrom.watch_num = this.watchList[value].title;
this.getList(); this.getList();
......
src/components/conversionList/periodsConversionList.vue
View file @ 5bb62fd3
...@@ -87,7 +87,13 @@ ...@@ -87,7 +87,13 @@
@sort-change="sortMethod" @sort-change="sortMethod"
:style="{width: width+'px'}" :style="{width: width+'px'}"
fixed> fixed>
<el-table-column prop="periods_title" label="期数名称" ></el-table-column> <!--<el-table-column prop="periods_title" label="期数名称"></el-table-column>-->
<el-table-column label="期数名称" width="170px">
<template slot-scope="scope">
<div v-html="periodName(scope.row)"></div>
<!--{{periodName(scope.row)}}-->
</template>
</el-table-column>
<el-table-column <el-table-column
prop="duration_over_at" prop="duration_over_at"
label="开课看课时间" label="开课看课时间"
...@@ -134,12 +140,7 @@ ...@@ -134,12 +140,7 @@
</div> </div>
</template> </template>
<script> <script>
import { import { getPeriodsConversionListApi, getGoodsListApi, getPeriodsOtherListApi, getTeacherListApi } from "../../service/api";
getPeriodsConversionListApi,
getGoodsListApi,
getPeriodsOtherListApi,
getTeacherListApi
} from "../../service/api";
import page from "../framework/page"; import page from "../framework/page";
import { GOODSTYPE, CLASSSOURCE } from "../../util/wordbook"; import { GOODSTYPE, CLASSSOURCE } from "../../util/wordbook";
import { tipArr3 } from "../../util/tipArr"; import { tipArr3 } from "../../util/tipArr";
...@@ -242,7 +243,6 @@ export default { ...@@ -242,7 +243,6 @@ export default {
]; ];
} }
}, },
propertyList: [],
spanArr: [], spanArr: [],
contentSpanArr: [], contentSpanArr: [],
searchFrom: { searchFrom: {
...@@ -269,6 +269,27 @@ export default { ...@@ -269,6 +269,27 @@ export default {
}, },
components: { page }, components: { page },
methods: { methods: {
periodName(val) {
let str = '';
if (val.goods_id) {
str += `【${val.goods_id}】`
}
if (val.periods_title) {
str += `${val.periods_title}<br>`
} else {
str += `<br>`
}
if (val.watch_num) {
str += `${val.watch_num}课时`
}
if (val.start_at) {
str += `（${val.start_at.slice(5).replace('-', '')}）`
}
if (val.has_watch_num || val.has_watch_num == 0) {
str += `-d${val.has_watch_num}`
}
return str
},
rendertip(h, { column }) { rendertip(h, { column }) {
// console.log(h) // console.log(h)
return h("span", [ return h("span", [
......
src/components/conversionList/sourceConversionList.vue
View file @ 5bb62fd3
...@@ -170,13 +170,7 @@ ...@@ -170,13 +170,7 @@
</div> </div>
</template> </template>
<script> <script>
import { import { getPeriodsConversionListApi, getSourceConversionListApi, getGoodsListApi, getPeriodsOtherListApi, getTeacherListApi } from "../../service/api";
getPeriodsConversionListApi,
getSourceConversionListApi,
getGoodsListApi,
getPeriodsOtherListApi,
getTeacherListApi
} from "../../service/api";
import page from "../framework/page"; import page from "../framework/page";
import { GOODSTYPE, CLASSSOURCE,ORDERSTATUS } from "../../util/wordbook"; import { GOODSTYPE, CLASSSOURCE,ORDERSTATUS } from "../../util/wordbook";
import { tipArr3 } from "../../util/tipArr"; import { tipArr3 } from "../../util/tipArr";
...@@ -295,7 +289,6 @@ export default { ...@@ -295,7 +289,6 @@ export default {
teacher_id: "", teacher_id: "",
periods_title: "" periods_title: ""
}, },
propertyList: [],
watchList: [ watchList: [
{ id: 0, title: 5 }, { id: 0, title: 5 },
{ id: 1, title: 6 }, { id: 1, title: 6 },
......
src/components/logistics/index.vue
View file @ 5bb62fd3
<template> <template>
<div class="sms"> <div class="admin-refresh sms">
<div class="section-search">
<el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline size="small"> <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline size="small">
<el-form-item label="用户ID"> <el-form-item label="用户ID">
<el-input v-model="searchFrom.user_id" style="width: 80px"></el-input> <el-input v-model="searchFrom.user_id" style="width: 80px"></el-input>
...@@ -16,13 +17,14 @@ ...@@ -16,13 +17,14 @@
</el-form-item>--> </el-form-item>-->
<el-form-item label="期数"> <el-form-item label="期数">
<el-cascader <el-cascader
:popper-class="'refresh-cascader-multi width-480'"
style="width: 480px"
:options="goodsList" :options="goodsList"
:props="{value:'id',label:'name'}" :props="{value:'id',label:'name'}"
@active-item-change="handleItemChange" @active-item-change="handleItemChange"
@change="changePeriods" @change="changePeriods"
filterable filterable
v-model="selectedGoods" v-model="selectedGoods"></el-cascader>
></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="主题"> <el-form-item label="主题">
<el-select filterable v-model="searchFrom.theme_id" placeholder="请选择" clearable> <el-select filterable v-model="searchFrom.theme_id" placeholder="请选择" clearable>
...@@ -50,49 +52,57 @@ ...@@ -50,49 +52,57 @@
:onSuccess="fileSuccess" :onSuccess="fileSuccess"
:headers="uploadHeader" :headers="uploadHeader"
:data="{param_token:param_token}" :data="{param_token:param_token}"
action="/api/admin/order/deliver/list/import" action="/api/admin/order/deliver/list/import">
>
<el-button type="success" plain>导入发货信息</el-button> <el-button type="success" plain>导入发货信息</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-tabs v-model="searchFrom.type" type="card" @tab-click="handleClick"> </div>
<el-tabs v-model="searchFrom.type" type="card" @tab-click="handleClick" style="padding-top: 10px;background-color: #fff">
<el-tab-pane label="当前待发货" name="0"></el-tab-pane> <el-tab-pane label="当前待发货" name="0"></el-tab-pane>
<el-tab-pane label="所有待发货" name="1"></el-tab-pane> <el-tab-pane label="所有待发货" name="1"></el-tab-pane>
<el-tab-pane label="所有已发货" name="2"></el-tab-pane> <el-tab-pane label="所有已发货" name="2"></el-tab-pane>
</el-tabs> </el-tabs>
<el-table :data="deliverList" size="mini" style="width: 100%"> <el-table :data="deliverList" size="mini" style="width: 100%">
<el-table-column width="220" class="f-c" label="用户"> <el-table-column width="200" class="f-c" label="用户">
<template slot-scope="scope"> <template slot-scope="scope">
<img class="avatar" :src="scope.row.user_avatar" /> <img style="vertical-align: top" class="avatar" :src="scope.row.user_avatar" />
<span style="display: inline-block;">
{{scope.row.user_nickname}} {{scope.row.user_nickname}}
<br /> <br />
(ID:{{scope.row.user_id}}) (ID:{{scope.row.user_id}})
<br /> <br />
手机：{{scope.row.user_mobile}} 手机：{{scope.row.user_mobile}}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="收货地址"> <el-table-column prop="address" label="收货地址">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.receive_name}} {{scope.row.receive_name}}
<br /> <br/>
{{scope.row.receive_mobile}} {{scope.row.receive_mobile}}
<br /> <br/>
{{scope.row.province_name}}{{scope.row.city_name}}{{scope.row.area_name}}{{scope.row.address}} {{scope.row.province_name}}{{scope.row.city_name}}{{scope.row.area_name}}{{scope.row.address}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="periods_title" label="期数名称"></el-table-column> <!--<el-table-column prop="periods_title" label="期数名称"></el-table-column>-->
<el-table-column prop="periods_title" label="期数名称">
<template slot-scope="scope">
<div v-html="periodName(scope.row)"></div>
<!--{{periodName(scope.row)}}-->
</template>
</el-table-column>
<el-table-column prop="theme_name" label="主题"></el-table-column> <el-table-column prop="theme_name" label="主题"></el-table-column>
<el-table-column prop="deliver_start_at" label="预计发货开始时间"></el-table-column> <el-table-column prop="deliver_start_at" label="预计发货开始时间" width="100px"></el-table-column>
<el-table-column prop="deliver_end_at" label="预计发货结束时间"></el-table-column> <el-table-column prop="deliver_end_at" label="预计发货结束时间" width="100px"></el-table-column>
<el-table-column prop="deliver_at" label="发货时间"></el-table-column> <el-table-column prop="deliver_at" label="发货时间" width="100px"></el-table-column>
<el-table-column prop="status" label="物流状态"> <el-table-column prop="status" label="物流状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.status|LogisticsStatusFil}} {{scope.row.status|LogisticsStatusFil}}<br/>
<br />
<span v-if="searchFrom.type==2"> <span v-if="searchFrom.type==2">
名称:{{scope.row.express_name}} 名称:{{scope.row.express_name}}<br/>
<br />
单号:{{scope.row.express_no}} 单号:{{scope.row.express_no}}
</span> </span>
</template> </template>
...@@ -182,6 +192,27 @@ export default { ...@@ -182,6 +192,27 @@ export default {
this.init(); this.init();
}, },
methods: { methods: {
periodName(val) {
let str = '';
if (val.goods_id) {
str += `【${val.goods_id}】`
}
if (val.periods_title) {
str += `${val.periods_title}<br>`
} else {
str += `<br>`
}
if (val.watch_num) {
str += `${val.watch_num}课时`
}
if (val.start_at) {
str += `（${val.start_at.slice(5).replace('-', '')}）`
}
if (val.has_watch_num || val.has_watch_num == 0) {
str += `-d${val.has_watch_num}`
}
return str
},
cancelEvent() { cancelEvent() {
this.showFlag = false; this.showFlag = false;
}, },
...@@ -402,9 +433,6 @@ export default { ...@@ -402,9 +433,6 @@ export default {
</script> </script>
<style scoped> <style scoped>
.sms {
padding: 20px 0;
}
.el-button + .el-button { .el-button + .el-button {
margin-left: 0; margin-left: 0;
/* margin-top: 10px; */ /* margin-top: 10px; */
......
src/components/marketStatistics/index.vue
View file @ 5bb62fd3
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
:span-method="arraySpanMethod"> :span-method="arraySpanMethod">
<el-table-column min-width="180" prop="wait_join_num" align="left" fixed="left" label="期数总状况"> <el-table-column min-width="180" prop="wait_join_num" align="left" fixed="left" label="期数总状况">
<template slot-scope="scope"> <template slot-scope="scope">
期数名称：{{scope.row.title}} 期数名称：{{scope.row.title=='合计' ? '合计' : periodName(scope.row)}}
<br /> <br />
开始时间：{{scope.row.start_at}} 开始时间：{{scope.row.start_at}}
<br /> <br />
...@@ -77,6 +77,25 @@ export default { ...@@ -77,6 +77,25 @@ export default {
}; };
}, },
methods: { methods: {
periodName(val) {
let str = '';
if (val.goods_id) {
str += `【${val.goods_id}】`
}
if (val.title) {
str += `${val.title}`
}
if (val.watch_num) {
str += `${val.watch_num}课时`
}
if (val.start_at) {
str += `（${val.start_at.slice(5).replace('-', '')}）`
}
if (val.has_watch_num || val.has_watch_num == 0) {
str += `-d${val.has_watch_num}`
}
return str
},
initPage() { initPage() {
getPeriodsClassCurDataApi().then(res => { getPeriodsClassCurDataApi().then(res => {
this.list = res; this.list = res;
......
src/components/monthOrder/index.vue
View file @ 5bb62fd3
This diff is collapsed.
src/components/notBuyClass/index.vue
View file @ 5bb62fd3
...@@ -35,12 +35,14 @@ ...@@ -35,12 +35,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="class_name" label="班级名称"> <el-table-column prop="class_name" label="班级名称"></el-table-column>
</el-table-column> <el-table-column label="期数名称" prop="periods_name" width="170px">
<el-table-column label="期数标题" prop="periods_name"> <template slot-scope="scope">
</el-table-column> <div v-html="periodName(scope.row)"></div>
<el-table-column label="商品名称" prop="goods_name"> <!--{{periodName(scope.row)}}-->
</template>
</el-table-column> </el-table-column>
<el-table-column label="商品名称" prop="goods_name"></el-table-column>
<el-table-column label="手机号" prop="mobile"> <el-table-column label="手机号" prop="mobile">
</el-table-column> </el-table-column>
<el-table-column prop="created_at" label="创建时间" sortable> <el-table-column prop="created_at" label="创建时间" sortable>
...@@ -54,19 +56,19 @@ ...@@ -54,19 +56,19 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<page :nowPage="nowPage" :total="total" @pageChange="onPageChange" @sizeChange="onSizeChange" /> <page :nowPage="nowPage" :total="total" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
<entrance :entranceObj="entranceObj"/> <entrance :entranceObj="entranceObj"/>
</div> </div>
</template> </template>
<script> <script>
import entrance from "./entrance"; import entrance from "./entrance";
import { getClassConfigApi ,getGoodsListApi,updateDescApi,exportExcelApi } from "../../service/api"; import {getClassConfigApi, getGoodsListApi, updateDescApi, exportExcelApi} from "../../service/api";
import page from "../framework/page"; import page from "../framework/page";
import {GOODSTYPE} from "../../util/wordbook"; import {GOODSTYPE} from "../../util/wordbook";
export default { export default {
name: "notBuyClass", name: "notBuyClass",
data() { data() {
return { return {
...@@ -78,21 +80,21 @@ export default { ...@@ -78,21 +80,21 @@ export default {
title: "无需登录入口", title: "无需登录入口",
show: false show: false
}, },
searchFrom:{ searchFrom: {
user_id:"", user_id: "",
goods_id:"", goods_id: "",
mobile:"", mobile: "",
}, },
goodList:[], goodList: [],
}; };
}, },
components: { components: {
entrance, entrance,
page page
}, },
filters:{ filters: {
filterGoods(val){ filterGoods(val) {
return '[' + GOODSTYPE[val.goods_type] + ']' + '[' +val.current_price / 100 + '元]' + val.name return '[' + GOODSTYPE[val.goods_type] + ']' + '[' + val.current_price / 100 + '元]' + val.name
} }
}, },
mounted() { mounted() {
...@@ -101,6 +103,29 @@ export default { ...@@ -101,6 +103,29 @@ export default {
}, },
methods: { methods: {
periodName(val) {
let str = '';
if (!val.periods_name) {
str = '-'
} else {
if (val.goods_id) {
str += `【${val.goods_id}】`
}
if (val.periods_name) {
str += `${val.periods_name}<br>`
}
if (val.watch_num) {
str += `${val.watch_num}课时`
}
if (val.start_at) {
str += `（${val.start_at.slice(5).replace('-', '')}）`
}
if (val.has_watch_num || val.has_watch_num == 0) {
str += `-d${val.has_watch_num}`
}
}
return str
},
onPageChange(val) { onPageChange(val) {
this.nowPage = val; this.nowPage = val;
this.getList(); this.getList();
...@@ -116,29 +141,29 @@ export default { ...@@ -116,29 +141,29 @@ export default {
page: this.nowPage page: this.nowPage
}; };
// 搜索筛选 // 搜索筛选
if(this.searchFrom.user_id){ if (this.searchFrom.user_id) {
json.user_id=this.searchFrom.user_id json.user_id = this.searchFrom.user_id
} }
if(this.searchFrom.goods_id){ if (this.searchFrom.goods_id) {
json.goods_id=this.searchFrom.goods_id json.goods_id = this.searchFrom.goods_id
} }
if(this.searchFrom.nickname){ if (this.searchFrom.nickname) {
json.nickname=this.searchFrom.nickname json.nickname = this.searchFrom.nickname
} }
if(this.searchFrom.mobile){ if (this.searchFrom.mobile) {
json.mobile=this.searchFrom.mobile json.mobile = this.searchFrom.mobile
} }
getClassConfigApi(json).then(res => { getClassConfigApi(json).then(res => {
this.total = res.total; this.total = res.total;
this.configList=res.list; this.configList = res.list;
}); });
}, },
getGoodsOption(){ getGoodsOption() {
let json = { let json = {
page: 1, page: 1,
limit: 100 limit: 100
}; };
getGoodsListApi(json).then(res=>{ getGoodsListApi(json).then(res => {
this.goodList = res.list; this.goodList = res.list;
}) })
}, },
...@@ -146,15 +171,15 @@ export default { ...@@ -146,15 +171,15 @@ export default {
this.$prompt('', '编辑备注', { this.$prompt('', '编辑备注', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
inputType:'textarea', inputType: 'textarea',
inputValue: desc || '' inputValue: desc || ''
}).then(({ value }) => { }).then(({value}) => {
this.$confirm('确定保存?', '提示', { this.$confirm('确定保存?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(()=>{ }).then(() => {
updateDescApi({desc: value},id).then(res=>{ updateDescApi({desc: value}, id).then(res => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '编辑备注成功' message: '编辑备注成功'
...@@ -164,48 +189,51 @@ export default { ...@@ -164,48 +189,51 @@ export default {
}); });
}) })
}, },
exportTable(){ exportTable() {
let json = {}; let json = {};
if(this.searchFrom.user_id){ if (this.searchFrom.user_id) {
json.user_id=this.searchFrom.user_id json.user_id = this.searchFrom.user_id
} }
if(this.searchFrom.goods_id){ if (this.searchFrom.goods_id) {
json.goods_id=this.searchFrom.goods_id json.goods_id = this.searchFrom.goods_id
} }
if(this.searchFrom.mobile){ if (this.searchFrom.mobile) {
json.mobile=this.searchFrom.mobile json.mobile = this.searchFrom.mobile
} }
if(this.searchFrom.nickname){ if (this.searchFrom.nickname) {
json.nickname=this.searchFrom.nickname json.nickname = this.searchFrom.nickname
} }
exportExcelApi('/api/admin/user/receive/course/log/export',json) exportExcelApi('/api/admin/user/receive/course/log/export', json)
}, },
} }
}; };
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.not_buy { .not_buy {
.head { .head {
margin-bottom: 10px; margin-bottom: 10px;
} }
width: 100%; width: 100%;
padding: 20px 0; padding: 20px 0;
.page-div { .page-div {
text-align: center; text-align: center;
padding-top: 20px; padding-top: 20px;
} }
} }
.avatar { .avatar {
width: 50px; width: 50px;
min-width:50px !important; min-width: 50px !important;
height: 50px; height: 50px;
border-radius: 50%; border-radius: 50%;
line-height:1; line-height: 1;
} }
</style> </style>
<style> <style>
.userInfo >div{ .userInfo > div {
display: flex; display: flex;
flex-flow: row nowrap; flex-flow: row nowrap;
justify-content: flex-start; justify-content: flex-start;
......
src/components/order/index.vue
View file @ 5bb62fd3
This diff is collapsed.
src/components/teacher/index.vue
View file @ 5bb62fd3
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
<style scoped lang="less"> <style scoped lang="less">
@import "../../util/public"; @import "../../util/public";
.user{ .user{
height: 100%; /*height: 100%;*/
overflow: auto; overflow: auto;
padding: 20px 0; padding: 20px 0;
.btn-content{ .btn-content{
......
src/components/teacherDetail/index.vue
View file @ 5bb62fd3
This diff is collapsed.
src/components/teacherDetail/task.vue
View file @ 5bb62fd3
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<div class="title" style="width:8%"> <div class="title" style="width:8%">
<div class="header bg-h">期数</div> <div class="header bg-h">期数</div>
<div> <div>
{{data.title}} <!--{{data.title}}-->
<div v-html="periodName(data)"></div>
</div> </div>
</div> </div>
<div class="over_work" style="background-color: #fffbe4"> <div class="over_work" style="background-color: #fffbe4">
...@@ -563,6 +564,29 @@ ...@@ -563,6 +564,29 @@
} }
}, },
methods:{ methods:{
periodName(val) {
let str = '';
if (!val.title) {
str = '-'
} else {
if (val.goods_id) {
str += `【${val.goods_id}】`
}
if (val.title) {
str += `${val.title}<br>`
}
if (val.watch_num) {
str += `${val.watch_num}课时`
}
if (val.start_at) {
str += `（${val.start_at.slice(5).replace('-', '')}）`
}
if (val.has_watch_num || val.has_watch_num == 0) {
str += `-d${val.has_watch_num}`
}
}
return str
},
formatTime(date){ formatTime(date){
let year = date.getFullYear(); let year = date.getFullYear();
let Month = date.getMonth()+1; let Month = date.getMonth()+1;
......
src/components/userDetail/index.vue
View file @ 5bb62fd3
This diff is collapsed.
src/components/yunji/index.vue
View file @ 5bb62fd3
...@@ -156,7 +156,12 @@ ...@@ -156,7 +156,12 @@
<div v-if='scope.row.user_id === 0'>用户未绑定</div> <div v-if='scope.row.user_id === 0'>用户未绑定</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="periods_title" label="期数"> <!--<el-table-column prop="periods_title" label="期数名称"></el-table-column>-->
<el-table-column prop="periods_title" label="期数名称" width="150px">
<template slot-scope="scope">
<div v-html="periodName(scope.row)"></div>
<!--{{periodName(scope.row)}}-->
</template>
</el-table-column> </el-table-column>
<el-table-column prop="goods_name" label="商品名称"> <el-table-column prop="goods_name" label="商品名称">
</el-table-column> </el-table-column>
...@@ -500,6 +505,29 @@ export default { ...@@ -500,6 +505,29 @@ export default {
}); });
}, },
methods: { methods: {
periodName(val) {
let str = '';
if (!val.periods_title) {
str = '-'
} else {
if (val.goods_id) {
str += `【${val.goods_id}】`
}
if (val.periods_title) {
str += `${val.periods_title}<br>`
}
if (val.watch_num) {
str += `${val.watch_num}课时`
}
if (val.start_at) {
str += `（${val.start_at.slice(5).replace('-', '')}）`
}
if (val.has_watch_num || val.has_watch_num == 0) {
str += `-d${val.has_watch_num}`
}
}
return str
},
initClearOtherOrder(id){ initClearOtherOrder(id){
this.$confirm('确认清除?', '提示', { this.$confirm('确认清除?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
......
src/service/api.js
View file @ 5bb62fd3
...@@ -1364,7 +1364,7 @@ export const getStaffRecordApi = function (json) { ...@@ -1364,7 +1364,7 @@ export const getStaffRecordApi = function (json) {
// 系统配置设备 // 系统配置设备
export const getTeacherTypeListApi = function (json) { export const getTeacherTypeListApi = function (json) {
return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/type/list`, json) return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/type/list`, json)
}; };
export const postTeacherTypeListApi = function (json) { export const postTeacherTypeListApi = function (json) {
return Vue.prototype.$post(`${_baseUrl}api/admin/teacher/type/add`, json) return Vue.prototype.$post(`${_baseUrl}api/admin/teacher/type/add`, json)
}; };
...@@ -1375,3 +1375,7 @@ export const postMediaConvertApi = function (json) { ...@@ -1375,3 +1375,7 @@ export const postMediaConvertApi = function (json) {
return Vue.prototype.$post(`${_baseUrl}api/public/media/convert`, json) return Vue.prototype.$post(`${_baseUrl}api/public/media/convert`, json)
}; };
///api/public/media/convert ///api/public/media/convert
// 最近更新时间
export const getUpdateTimeApi = function () {
return Vue.prototype.$fetch(`${_baseUrl}api/admin/get/report/time`)
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment