Merge branch 'iteration-new-apply' into jenkins-test

src/components/m-qrcode/index.tsx

@@ -14,6 +14,10 @@ export default defineComponent({
       type: String,
       default: '200px'
     },
+    logoSrc: {
+      type: String,
+      default: undefined
+    },
     logoSize: {
       type: String,
       default: 'default'
@@ -52,7 +56,7 @@ export default defineComponent({
         style={{ width: props.size, height: props.size }}>
         <canvas ref={canvas} class={styles.qrcodeCanvas}></canvas>
         <img
-          src={logo}
+          src={props.logoSrc || logo}
           class={[
             styles.qrcodeLogo,
             props.logoSize === 'small' && styles.small

src/views/tenantAllData/index.module.less

@@ -346,7 +346,7 @@
   }
 
   .image {
-    width: 310px;
+    width: 100%;
   }
 
   .btnText {
@@ -445,4 +445,4 @@
   height: 47px;
   max-width: 264px;
   margin: 29px auto 0;
-}
+}

src/views/tenantAllData/index.tsx

@@ -169,7 +169,7 @@ export default defineComponent({
       //   saveImg();
       // } else {
       const container: any = document.getElementById(`preview-container`);
-      console.log('1212121');
+      // console.log('1212121', container);
       html2canvas(container, {
         allowTaint: true,
         useCORS: true,
@@ -183,8 +183,9 @@ export default defineComponent({
           imgs.saveLoading = false;
         })
         .catch(() => {
+          // console.log(e, 'e');
           imgs.saveLoading = false;
-          console.log('222');
+          // console.log('222');
         });
       // }
     };
@@ -385,7 +386,7 @@ export default defineComponent({
             columns-type={['year']}
             onCancel={() => (forms.yearStatus = false)}
             onConfirm={(val: any) => {
-              console.log(val);
+              // console.log(val);
               // const selectedOption = val.selectedOptions[0];
               // console.log(selectedOption, 'selectedOption');
               // forms.schoolId = selectedOption.value;
@@ -441,25 +442,33 @@ export default defineComponent({
             class={styles.iconClose}
             onClick={() => (forms.qrcodeStatus = false)}></i>
 
-          <img src={imgs.image} class={styles.image} />
-          {/*
+          <div class={[styles.shareContaienr]}>
+            <img src={qrcodeBg} class={styles.qrcodeBg} />
+            <div class={styles.sectionGroup}>
+              {/* <div class={styles.section}> */}
+              {/* <div class={styles.memo}>{forms.urlItem.schoolName}</div>
+                <div class={styles.qrcodeSection}>
+                  <img src={qrbg} class={styles.qrbg} />
+                  <MQrcode
+                    class={styles.mqrcode}
+                    text={forms.url}
+                    logoSize={'small'}
+                    size={'100%'}
+                  />
+                </div> */}
+              <img src={imgs.image} class={styles.image} />
+              {/* </div> */}
+            </div>
+          </div>
 
-          <Button
-            type="primary"
-            round
-            block
-            class={styles.downloadBtn}
-            onClick={downImg}>
-            下载二维码
-          </Button> */}
           <p class={styles.btnText}>长按保存二维码</p>
         </Popup>
 
         <div class={styles.templateSection}>
-          <div class={[styles.shareContaienr]} id="preview-container">
+          <div class={[styles.shareContaienr]}>
             <img src={qrcodeBg} class={styles.qrcodeBg} />
             <div class={styles.sectionGroup}>
-              <div class={styles.section}>
+              <div class={styles.section} id="preview-container">
                 <div class={styles.memo}>{forms.urlItem.schoolName}</div>
                 <div class={styles.qrcodeSection}>
                   <img src={qrbg} class={styles.qrbg} />
@@ -468,6 +477,7 @@ export default defineComponent({
                     text={forms.url}
                     logoSize={'small'}
                     size={'100%'}
+                    logoSrc={forms.urlItem.schoolLogo}
                   />
                 </div>
               </div>