Merge branch 'feature/0430' into 'release/6.9.2'

fix slid img



See merge request !73

@@ -17,20 +17,17 @@ export default {
   computed: {
     ...mapState(['yoho']),
     image() {
-      const fixedWidth = 1000;
       let {contentData, width, height} = this.data;
-      const scale = width / height;
+      let fixedWidth = 1000;
       let mode = 1;
+      const scale = width / height;
 
-      if (width >= fixedWidth || scale > 1) {
-        width = fixedWidth;
-        height = Math.floor(fixedWidth / scale);
-      } else {
-        mode = 5;
-        width = Math.floor(fixedWidth / scale);
-        height = fixedWidth;
+      if (fixedWidth > width) {
+        fixedWidth = width;
       }
 
+      height = Math.floor(fixedWidth / scale);
+
       if (this.share) {
         contentData += `${contentData.indexOf('?') ? '|' : '?'}watermark/1/image/aHR0cHM6Ly9jZG4ueW9oby5jbi93YXRlcm1hcmsvZ3Jhc3MucG5n/gravity/South`
       }