Merge branch 'iteration-new-apply' into online

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/components/m-wx-tip/index.tsx

@@ -17,7 +17,7 @@ export default defineComponent({
     },
     message: {
       type: String,
-      default: '请使用微信打开'
+      default: '请使用微信扫描二维码'
     },
     showButton: {
       type: Boolean,

src/views/student-register/index copy.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
       showMore: true,
       showTips: false,
       showButton: false,
-      showMessage: '请使用微信打开'
+      showMessage: '请使用微信扫描二维码'
     });
 
     const getRegisterGoods = async () => {

src/views/student-register/index-origin.tsx

@@ -57,7 +57,7 @@ export default defineComponent({
       showMore: true,
       showTips: false,
       showButton: false,
-      showMessage: '请使用微信打开'
+      showMessage: '请使用微信扫描二维码'
     });
 
     const countDown = useCountDown({

src/views/student-register/index.tsx

@@ -132,7 +132,7 @@ export default defineComponent({
       // showMore: true,
       showTips: false,
       showButton: false,
-      showMessage: '请使用微信打开',
+      showMessage: '请使用微信扫描二维码',
       countDownStatus: true,
       countDownTime: 1000 * 120, // 倒计时时间
       // modelValue: false, // 是否选中协议

src/views/student-register/register-member/index.tsx

@@ -89,7 +89,7 @@ export default defineComponent({
       giftVipDay: null,
       showTips: false,
       showButton: false,
-      showMessage: '请使用微信打开'
+      showMessage: '请使用微信扫描二维码'
     });
     const studentInfo = reactive({
       autoRegister: true,

src/views/student-register/register-modal/index.tsx

@@ -84,7 +84,7 @@ export default defineComponent({
       showMore: true,
       showTips: false,
       showButton: false,
-      showMessage: '请使用微信打开'
+      showMessage: '请使用微信扫描二维码'
     });
     const state = reactive({
       showQrcode: false,

src/views/student-register/register-new/index.tsx

@@ -30,8 +30,8 @@ import { setLoginInit, state } from '@/state';
 import iconGift from '../images/icon-gift.png';
 import { useRoute, useRouter } from 'vue-router';
 import MSticky from '@/components/m-sticky';
-import registerBgIcon from "../images/register-bg.png";
-import vipGiftIcon from "../images/vip-gift-icon.png";
+import registerBgIcon from '../images/register-bg.png';
+import vipGiftIcon from '../images/vip-gift-icon.png';
 import agreeYes from '../images/agree-yes.png';
 import agreeNo from '../images/agree-no.png';
 
@@ -94,7 +94,7 @@ export default defineComponent({
       giftVipDay: null,
       showTips: false,
       showButton: false,
-      showMessage: '请使用微信打开'
+      showMessage: '请使用微信扫描二维码'
     });
     const isAgree = ref(false);
     const studentInfo = reactive({
@@ -291,10 +291,10 @@ export default defineComponent({
         ) : (
           ''
         )}
-        
+
         <img class={styles.headBg} src={registerBgIcon} />
         <Form labelAlign="top" class={styles.registerForm}>
-        <Field
+          <Field
             clearable={false}
             label="联系方式"
             placeholder="请输入手机号码"
@@ -314,12 +314,12 @@ export default defineComponent({
                 </div>
               )
             }}
-          </Field> 
+          </Field>
           <div class={[styles.fieldTipsGroup]}>
-              <div class={[styles.fieldTips]}>
-                手机号是音乐数字课堂的唯一登录账户
-              </div>
-          </div>            
+            <div class={[styles.fieldTips]}>
+              手机号是音乐数字课堂的唯一登录账户
+            </div>
+          </div>
           <Field
             center
             clearable={false}
@@ -356,7 +356,7 @@ export default defineComponent({
                   />
                 )
             }}
-          </Field>                 
+          </Field>
           <Field
             clearable={false}
             label="学生姓名"
@@ -386,7 +386,9 @@ export default defineComponent({
                     size="large"
                     type="primary"
                     color={
-                      !(studentInfo.extra.gender === 1) ? '#F5F6FA' : 'linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)'
+                      !(studentInfo.extra.gender === 1)
+                        ? '#F5F6FA'
+                        : 'linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)'
                     }
                     textColor={
                       !(studentInfo.extra.gender === 1) ? '#626264' : '#fff'
@@ -399,7 +401,9 @@ export default defineComponent({
                     size="large"
                     type="primary"
                     color={
-                      !(studentInfo.extra.gender === 0) ? '#F5F6FA' : 'linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)'
+                      !(studentInfo.extra.gender === 0)
+                        ? '#F5F6FA'
+                        : 'linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)'
                     }
                     textColor={
                       !(studentInfo.extra.gender === 0) ? '#626264' : '#fff'
@@ -436,15 +440,16 @@ export default defineComponent({
             required
             input-align="right"
           />
-          {
-            (studentInfo.extra.registerType === 'GIFT_VIP_DAY' && forms.giftVipDay && Number(forms.giftVipDay) > 0) ?
+          {studentInfo.extra.registerType === 'GIFT_VIP_DAY' &&
+          forms.giftVipDay &&
+          Number(forms.giftVipDay) > 0 ? (
             <div class={styles.giftTips}>
               <img src={vipGiftIcon} />
-              <span>注册成功即可获得乐器AI学练工具<i>{forms.giftVipDay}</i>天有效期</span>
+              <span>
+                注册成功即可获得乐器AI学练工具<i>{forms.giftVipDay}</i>天有效期
+              </span>
             </div>
-            : null
-          }
-
+          ) : null}
         </Form>
         {/* <div class={styles.agreeColumn}>
           <img src={isAgree.value ? agreeYes : agreeNo} onClick={() => (isAgree.value = !isAgree.value)} />

src/views/tenantAllData/index.module.less

@@ -346,7 +346,7 @@
   }
 
   .image {
-    width: 310px;
+    width: 100%;
   }
 
   .btnText {
@@ -368,6 +368,13 @@
   // margin-top: -40px;
 }
 
+.qrcodeBgDom {
+  width: 310px;
+  height: 158px;
+  background: url('./images/qrcode-bg.png') no-repeat center;
+  background-size: contain;
+}
+
 .templateSection {
   position: absolute;
   z-index: -10;
@@ -445,4 +452,4 @@
   height: 47px;
   max-width: 264px;
   margin: 29px auto 0;
-}
+}

src/views/tenantAllData/index.tsx

@@ -33,6 +33,7 @@ import OSearch from '@/components/m-search';
 import numeral from 'numeral';
 import MQrcode from '@/components/m-qrcode';
 import html2canvas from 'html2canvas';
+import MWxTip from '@/components/m-wx-tip';
 export default defineComponent({
   name: 'tenant-apply-data',
   setup() {
@@ -168,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,
@@ -182,8 +183,9 @@ export default defineComponent({
           imgs.saveLoading = false;
         })
         .catch(() => {
+          // console.log(e, 'e');
           imgs.saveLoading = false;
-          console.log('222');
+          // console.log('222');
         });
       // }
     };
@@ -384,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;
@@ -440,25 +442,35 @@ 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.qrcodeBgDom}></div>
 
-          <Button
-            type="primary"
-            round
-            block
-            class={styles.downloadBtn}
-            onClick={downImg}>
-            下载二维码
-          </Button> */}
-          <p class={styles.btnText}>长按或截图保存二维码</p>
+            <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>
+
+          <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} />
@@ -467,12 +479,15 @@ export default defineComponent({
                     text={forms.url}
                     logoSize={'small'}
                     size={'100%'}
+                    logoSrc={forms.urlItem.schoolLogo}
                   />
                 </div>
               </div>
             </div>
           </div>
         </div>
+
+        <MWxTip />
       </div>
     );
   }

src/views/tenantAllData/tenantDataSchool.tsx

@@ -30,6 +30,7 @@ import OSearch from '@/components/m-search';
 import numeral from 'numeral';
 import MQrcode from '@/components/m-qrcode';
 import html2canvas from 'html2canvas';
+import MWxTip from '@/components/m-wx-tip';
 export default defineComponent({
   name: 'tenant-apply-data',
   setup() {
@@ -372,6 +373,8 @@ export default defineComponent({
             }}
           />
         </Popup>
+
+        <MWxTip />
       </div>
     );
   }