Merge branch 'master' of http://bj.gitlab.cnlive.com/w-front-end/select_good

zhiyangdu
2 parents c6c9babc fedb676b
Showing 3 changed files with 4 additions and 6 deletions
src/components/columnListBox/columnListBox.less
src/components/palaceGrid/palaceGrid.vue
src/main.js
@@ -19,7 +19,6 @@
 		padding-bottom: 18px;
 		width: 690px;
 		.left-box {
-			break-inside: avoid;
 			.item-box {
 				&:last-child {
 					margin-bottom: 0;
@@ -27,7 +26,6 @@
 			}
 		}
 		.right-box {
-			break-inside: avoid;
 			.item-box {
 				&:first-child {
 					/deep/ .item {
@@ -9,7 +9,7 @@
                         class="img"
                         fit="cover"
                         lazy-load
-                        :src="item.img || item"
+                        :src="(item.img || item) + SIGN.BIG"
                     >
                     <template v-slot:error>
                         <img  class="img" src="static/img/x.jpg" alt=""/>
@@ -128,9 +128,9 @@ Vue.prototype.getApiVersion = function() {
 // 参数设置
 Vue.prototype.SIGN = {
-    SMALL: "?imageMogr2/thumbnail/200",
-    MIDDLE: "?imageMogr2/thumbnail/400",
-    BIG: "?imageMogr2/thumbnail/750",
+    SMALL: "?imageMogr2/thumbnail/200/format/jpg",
+    MIDDLE: "?imageMogr2/thumbnail/400/format/jpg",
+    BIG: "?imageMogr2/thumbnail/750/format/jpg",
     SOURCE: ""
 }
 /* 设置图片尺寸参数 结束 */