合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

 
                 if (radio==1){
                     try {
-                       InputStream inputStream= QRCode.encode(tpActivity.getId()+"");
+                       InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(),tpActivity.getId()+"");
                         String codeUrl= imageServiceI.getImageUrl(inputStream);
                         TdImages tdImages= new TdImages();
                         tdImages.setImageUrl(codeUrl);

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

 </template>
 
 <script>
-
+import html2canvas from 'html2canvas';
 export default {
   name: 'Index',
   data() {