Merge branch 'master' of http://git.cc-lotus.info/Information/cxyy-web2

src/views/one/index.vue

@@ -74,7 +74,7 @@ const searchOther = async () => {
   }
 }
 const searchNew = async () => {
-  const info = { skip: 0, limit: 10, type: active.value, is_use: '0', status: '1' }
+  const info = { skip: 0, limit: 10, type: active.value, is_use: '0', status: '1', is_show: '0' }
   let res
   // 政策新闻
   res = await newsStore.query(info)

src/views/one/page.vue

@@ -142,7 +142,7 @@
           </div>
           <div class="join_top">
             <div class="join_item" v-for="(item, index) in friendList" :key="index" @click="toFriend(item)">
-              <el-image class="image" :src="getFile(item.url)" fit="fill">
+              <el-image class="image" :src="getFile(item.file)" fit="fill">
                 <template v-slot:error>
                   <el-image class="image" :src="friend" fit="fill" />
                 </template>