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

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() {
@@ -451,7 +452,7 @@ export default defineComponent({
             onClick={downImg}>
             下载二维码
           </Button> */}
-          <p class={styles.btnText}>长按或截图保存二维码</p>
+          <p class={styles.btnText}>长按保存二维码</p>
         </Popup>
 
         <div class={styles.templateSection}>
@@ -473,6 +474,8 @@ export default defineComponent({
             </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>
     );
   }