github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-11-01 15:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

Browse Source
This commit is contained in:
evoxwht 2023-06-29 15:52:39 +08:00
commit 37aef7f10d
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
template/admin/src/components/uploadPictures/index.vue
View File

@ -177,11 +177,6 @@
</div>
</template>
</el-table-column>
<el-table-column label="大小" min-width="80">
<template slot-scope="scope">
<span>{{ scope.row.size }}</span>
</template>
</el-table-column>
<el-table-column label="上传时间" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.time }}</span>

1
template/uni-app/pages/goods/goods_list/index.vue
View File

@ -361,6 +361,7 @@
}
.productList .list .item .name {
line-height: 42rpx;
height: 84rpx;
}

3
template/uni-app/pages/goods_cate/goods_cate1.vue
View File

@ -191,7 +191,8 @@
tap: function(index, id) {
this.toView = id;
this.navActive = index;
this.$set(this, 'lock', true);
this.$set(this, 'lock', true);
uni.$emit('scroll');
},
getAllCategory: function(type) {
let that = this;