diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index bd68ea5..1351d79 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,182 +1,176 @@
-
-
+
diff --git a/src/components/img-upload/Cropper.vue b/src/components/img-upload/Cropper.vue
index 91a05c1..ea72547 100644
--- a/src/components/img-upload/Cropper.vue
+++ b/src/components/img-upload/Cropper.vue
@@ -92,7 +92,7 @@ export default {
previews: {}, // 预览数据
option: {
img: '', // 裁剪图片的地址 (默认:空)
- size: 0.8, // 裁剪生成图片的质量 (默认:1)
+ size: 1, // 裁剪生成图片的质量 (默认:1)
full: true, // 是否输出原图比例的截图 选true生成的图片会非常大 (默认:false)
outputType: 'jpg', // 裁剪生成图片的格式 (默认:jpg)
canMove: true, // 上传图片是否可以移动 (默认:true)
@@ -125,7 +125,7 @@ export default {
},
updateImg (file) {
this.option.img = file.url
- this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95
+ // this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95
},
realTime (data) {
// 实时预览
@@ -139,7 +139,7 @@ export default {
const that = this
if (type === 'blob') {
this.$refs.cropper.getCropBlob(data => {
- compress(data, 0.8).then(res => {
+ compress(data, 1).then(res => {
that.$emit('upload', res)
})
})
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index f4260ae..0252876 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -60,7 +60,8 @@
:label="item.schoolName"
:value="item.schoolId">
-
@@ -864,7 +865,7 @@ export default {
data.map((e, i) => {
e.id = i
const list = e.startAndEndTimeList
- if (list) {
+ if (list && list.length) {
let connect = true // 每个订单的开始结束日期是否连续
list.map((n, i) => {
// 第一个不用计算。用当前订单的开始日期跟上一个订单的结束日期做比较,只差一天,就表示是连续订单
diff --git a/src/views/parnerOperation/schemeSet.vue b/src/views/parnerOperation/schemeSet.vue
index e9ba14a..030e4fb 100644
--- a/src/views/parnerOperation/schemeSet.vue
+++ b/src/views/parnerOperation/schemeSet.vue
@@ -515,7 +515,7 @@ export default {
},
handleCurrentChange (val) {
this.page = val;
- this.getData();
+ this.getProduct();
},
handleSelectionChange (val) {
console.log("🚀 ~ file: schemeSet.vue:516 ~ handleSelectionChange ~ val:", val)
@@ -529,7 +529,6 @@ export default {
}).then(() => {
this.checkeds.splice(i, 1)
}).catch(() => { })
-
},
// 选择产品提交
productSubmit () {
diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue
index c120a92..006dbdd 100644
--- a/src/views/shop/addProduct/index.vue
+++ b/src/views/shop/addProduct/index.vue
@@ -283,6 +283,7 @@
:limit="1"
:action="api.fileupload"
:headers="headers"
+ :file-list="appletList"
name="file">
e.name = e.fileName)
+ if (e.mall.appletIcon) this.appletList = [
+ {
+ name: e.mall.appletIcon,
+ url: e.mall.appletIcon
+ }
+ ]
this.form = e
this.getOp()
this.$nextTick(() => {