Merge branch 'dev_v2' of ssh://gogs.zfire.top:2222/zfire-front/supply-front into dev_v2

src/views/dashboard.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="app-container">
+  <popu>
+    <div class="app-container">
     <div class="menu-list">
       <div>
         <div class="main-title">
@@ -274,6 +275,7 @@
       <div v-else class="tip">暂无物流信息</div>
     </el-dialog>
   </div>
+  </popu>
 </template>
 
 <script>
@@ -292,9 +294,12 @@ import {
 import { getListOrderTrack } from '@/api/supply/pickup'
 import { getFileUrl } from '@/api/common'
 import { mapGetters } from 'vuex'
-
+import popu from '@/components/template/popu.vue';
 export default {
   name: 'Dashboard',
+  components: {
+    popu,
+  },
   created() {
     this.getDataList({
       pageSize: this.pageSize,

src/views/iframeView.vue

@@ -1,9 +1,16 @@
 <template>
+  <popu>
   <iframe :src="url" height="99.5%" width="100%" frameBorder="0" />
+  </popu>
 </template>
 <script>
+import popu from '@/components/template/popu.vue';
+
 import { getFanruanToken } from '@/utils/auth'
 export default {
+  components: {
+    popu,
+  },
   data() {
     return {
       fanruanToken: getFanruanToken()