提交 2f8f4156 编写于 作者: guangjun.yang's avatar guangjun.yang

解决:选择组件有问题

上级 d2a020cb
...@@ -8,8 +8,14 @@ ...@@ -8,8 +8,14 @@
<li class="order"> <li class="order">
<div class="num" @click="toggleOrder"> <div class="num" @click="toggleOrder">
<span>学习人数</span> <span>学习人数</span>
<img v-show="!isRise" src="../../../assets/custom/icon/icon-rise.png" alt /> <span v-show="kind == 0">
<img v-show="isRise" src="../../../assets/custom/icon/icon-drop.png" alt /> <img v-show="!isRise" src="../../../assets/custom/icon/icon-rise.png" alt />
<img v-show="isRise" src="../../../assets/custom/icon/icon-drop.png" alt />
</span>
<span v-show="kind == 1">
<img v-show="!isRiseOrg" src="../../../assets/custom/icon/icon-rise.png" alt />
<img v-show="isRiseOrg" src="../../../assets/custom/icon/icon-drop.png" alt />
</span>
</div> </div>
<div class="cart-wrapper"> <div class="cart-wrapper">
<div class="cart" @click="toggleCart"> <div class="cart" @click="toggleCart">
...@@ -114,10 +120,17 @@ export default { ...@@ -114,10 +120,17 @@ export default {
...mapActions(["setCartList", "setSearchParam", "setSearchParamOrg"]), ...mapActions(["setCartList", "setSearchParam", "setSearchParamOrg"]),
toggleOrder() { toggleOrder() {
this.isRise = !this.isRise; if(this.kind == 0) {
let dir = this.isRise ? 1 : 2; this.isRise = !this.isRise;
this.searchParam.dir = dir; let dir = this.isRise ? 1 : 2;
this.setSearchParam(this.searchParam); this.searchParam.dir = dir;
this.setSearchParam(this.searchParam);
} else {
this.isRiseOrg = !this.isRiseOrg;
let dir = this.isRiseOrg ? 1 : 2;
this.searchParamOrg.dir = dir;
this.setSearchParamOrg(this.searchParamOrg);
}
}, },
toggleCart() { toggleCart() {
this.isShowCart = !this.isShowCart; this.isShowCart = !this.isShowCart;
...@@ -155,6 +168,8 @@ export default { ...@@ -155,6 +168,8 @@ export default {
this.setCartList(this.cartList); this.setCartList(this.cartList);
this.$forceUpdate(); this.$forceUpdate();
}, },
// 通知父组件,打开创建资源(课程)弹框
showOrgCourse() { showOrgCourse() {
this.$emit('showOrgCourse', 'add'); this.$emit('showOrgCourse', 'add');
}, },
......
...@@ -54,7 +54,7 @@ service.interceptors.request.use(config => { ...@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
} }
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境 if( process.env.BUILD_ENV == "development" ){ // 本地开发环境
// console.log('环境变量>>>> ', process.env.BUILD_ENV); // console.log('环境变量>>>> ', process.env.BUILD_ENV);
config.headers['token'] = 'BCBEB604699441FE86DDB0C5C19A852B'; config.headers['token'] = '0BC342A9462E400FBEBBDAE1DB82C7DA';
// config.headers['token'] = localStorage.getItem('storageToken') // config.headers['token'] = localStorage.getItem('storageToken')
}else{ }else{
config.headers['token'] = localStorage.getItem('storageToken') config.headers['token'] = localStorage.getItem('storageToken')
......
此差异已折叠。
此差异已折叠。
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<el-form-item label="创建日期:" class="search-item"> <el-form-item label="创建日期:" class="search-item">
<el-date-picker <el-date-picker
v-model="searchForm.createdTime" v-model="searchForm.createdTime"
type="datetime" type="date"
size="small" size="small"
class="form-width" class="form-width"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -176,9 +176,17 @@ ...@@ -176,9 +176,17 @@
// 查询列表 // 查询列表
search() { search() {
this.GET("contents/course/custom/check/v1/list", this.searchForm).then(res => { let searchForm = Object.assign({}, this.searchForm);
let createdTime = searchForm.createdTime;
if(createdTime) {
searchForm.createdTime = new Date(searchForm.createdTime).getTime();
} else {
searchForm.createdTime = '';
}
this.GET("contents/course/custom/check/v1/list", searchForm).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
this.tableList = res.data || [{}]; this.tableList = res.data && res.data.courseList || [];
this.totalRows = res.data.totalSize || 0;
// this.protocolInfo = res.data; // this.protocolInfo = res.data;
} }
}); });
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册