修改提交代码

src/components/Pagination/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
+  <div :class="{ hidden: hidden }" class="pagination-container">
     <el-pagination
       :background="background"
       :current-page.sync="currentPage"
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { scrollTo } from '@/utils/scroll-to'
+import { scrollTo } from '@/utils/scroll-to';
 
 export default {
   name: 'Pagination',
@@ -35,7 +35,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 20, 30, 50];
       }
     },
     layout: {
@@ -58,41 +58,41 @@ export default {
   computed: {
     currentPage: {
       get() {
-        return this.page
+        return this.page;
       },
       set(val) {
-        this.$emit('update:page', val)
+        this.$emit('update:page', val);
       }
     },
     pageSize: {
       get() {
-        return this.limit
+        return this.limit;
       },
       set(val) {
-        this.$emit('update:limit', val)
+        this.$emit('update:limit', val);
       }
     }
   },
   methods: {
     handleSizeChange(val) {
-      this.$emit('pagination', { page: this.currentPage, limit: val })
+      this.$emit('pagination', { page: this.currentPage, limit: val });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
     },
     handleCurrentChange(val) {
-      this.$emit('pagination', { page: val, limit: this.pageSize })
+      this.$emit('pagination', { page: val, limit: this.pageSize });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
     }
   }
-}
+};
 </script>
 
 <style scoped>
 .pagination-container {
-  background: #fff;
+  /* background: #fff; */
   padding: 32px 16px;
 }
 .pagination-container.hidden {

src/components/Upload/multiUpload.vue

@@ -14,8 +14,7 @@
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    <el-dialog :visible.sync="dialogVisible">
-      <!-- :append-to-body="true" -->
+    <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
       <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
   </div>

src/components/poster-editor/index.vue

@@ -228,14 +228,14 @@
                    </span>
                    <el-input-number class="w-60" :controls="false" size="mini"></el-input-number>-->
                 </div>
-                <div class="style-config">
+                <!-- <div class="style-config">
                   <span class="label">
                     对齐
                   </span>
                   <align-select
                     v-model="activeWidget.style.align"
                   ></align-select>
-                </div>
+                </div> -->
                 <div class="style-config">
                   <span class="label">其他</span>
                   <span
@@ -316,19 +316,19 @@ export default {
   data() {
     return {
       painting: {
-        width: '120px',
-        height: '120px',
+        width: '240px',
+        height: '240px',
         background: '#eee',
         views: [
           {
             type: 'qrcode',
-            content: 'http://golden.shangqie.cn/#/?id=' + this.id,
+            content: 'http://golden.shangqie.cn?id=' + this.id,
             css: {
               top: '0',
               left: '0',
               color: '#000',
-              width: '120px',
-              height: '120px'
+              width: '240px',
+              height: '240px'
             }
           }
         ]
@@ -416,6 +416,9 @@ export default {
     handleActiveWidget(item) {
       this.widgetList.forEach(w => {
         if (item.uuid === w.uuid) {
+          if (w.type == 'text') {
+            w.setDataRange.box.detail.background = false;
+          }
           w.active = !item.active;
         } else {
           w.active = false;
@@ -516,7 +519,7 @@ export default {
             {
               useCORS: true,
               // 编辑器缩放保持 960 * 720 的尺寸
-              scale: 1 / this.dZoom
+              scale: 3 / this.dZoom
             }
           ).then(async canvas => {
             // console.timeEnd('1');
@@ -684,10 +687,10 @@ export default {
             uuid: '32a' + +new Date(),
             active: false,
             style: {
-              top: 129,
-              left: 86,
-              height: 120,
-              width: 120,
+              top: 65,
+              left: 17,
+              height: 240,
+              width: 240,
               align: { x: 0, y: 0 },
               lineHeight: 14,
               fontSize: 14,
@@ -761,10 +764,10 @@ export default {
                 }
               },
               content: {
-                show: false
+                show: true
               },
               innerStyle: {
-                show: false,
+                show: true,
                 detail: {
                   align: true,
                   lineHeight: true,
@@ -813,10 +816,10 @@ export default {
                 }
               },
               content: {
-                show: false
+                show: true
               },
               innerStyle: {
-                show: false,
+                show: true,
                 detail: {
                   align: true,
                   lineHeight: true,