Merge branch 'dev' into main

Longgererer · Longgererer · commit f47d38febb93 · 2021-09-26T13:55:43.000+08:00
diff --git a/src/components/headerAccount.vue b/src/components/headerAccount.vue
@@ -35,7 +35,6 @@ import { mapState, mapMutations } from 'vuex'
 import localStore from '@utils/local-storage'
 import { qiNiuImgLink } from '@utils/publicData'
 import cookie from '@utils/cookie'
-import IframeHandler from '@utils/editor/handleInstanceView'
 export default {
   props: {
     dense: {
diff --git a/src/components/instanceCard.vue b/src/components/instanceCard.vue
@@ -16,7 +16,7 @@
           </v-avatar>
         </template>
         <user-card :avatar="info.userPicture" :myFollow="info.myFollow" :username="info.username" :nickname="info.name"
-          :about="info.description" @setFollow="setFollow"></user-card>
+          :about="info.description"></user-card>
       </v-menu>
       <div class="instance-info d-flex flex-clo pointer">
         <span class="text-sm" :title="info.exampleName">{{info.exampleName}}</span>
@@ -104,9 +104,6 @@ export default {
       }
       this.likeLoading = false
     },
-    setFollow(isFollow) {
-      this.$emit('setFollow', isFollow, this.cardIndex)
-    },
     setFav(isFav) {
       this.$emit('setFav', isFav, this.cardIndex)
     },
diff --git a/src/service/env.js b/src/service/env.js
@@ -2,13 +2,13 @@ const isProd = ['production', 'prod'].includes(process.env.NODE_ENV)
 
 const env = {
   dev: {
-    server: 'http://www.firstbird.asia:8090',
+    server: 'http://106.12.110.94:8090',
     // server: 'http://192.168.10.58:8090',
     // server: 'http://192.169.1.33:8090',
     client: 'http://localhost:8080',
   },
   prod: {
-    server: '//www.firstbird.asia:8090',
+    server: '//106.12.110.94:8090',
     client: 'https://www.lliiooiill.cn',
   }
 }
diff --git a/src/views/explore/index.vue b/src/views/explore/index.vue
@@ -49,7 +49,7 @@
       <div v-show="!nothing">
         <div class="explore-instance-list">
           <div class="explore-list-item" v-for="(item, index) in instanceList" :key="item.exampleId">
-            <instance-card :info="item" :cardIndex="index" @setFollow="setFollow" @setFav="setFav"></instance-card>
+            <instance-card :info="item" :cardIndex="index" @setFav="setFav"></instance-card>
           </div>
           <div class="skeleton-list-item" v-show="listLoading" v-for="(item, index) in 12" :key="index">
             <instance-skeleton></instance-skeleton>
@@ -73,6 +73,17 @@ import { judgeMode } from '@utils/editor/judgeMode'
 import * as p2b from '@utils/paramsToBase64'
 export default {
   name: 'Explore',
+  provide() {
+    return {
+      setFollow: (isFollow, username) => {
+        this.instanceList.forEach((item) => {
+          if (item.username === username) {
+            item.myFollow = isFollow
+          }
+        })
+      },
+    }
+  },
   data() {
     return {
       sortList: Object.freeze([
@@ -190,9 +201,6 @@ export default {
       this.searchLoading = false
       this.listLoading = false
     },
-    setFollow(isFollow, index) {
-      this.instanceList[index].myFollow = isFollow
-    },
     setFav(isFav, index) {
       const item = this.instanceList[index]
       item.myFavorites = isFav
diff --git a/src/views/user/liked.vue b/src/views/user/liked.vue
@@ -5,7 +5,7 @@
         <instance-skeleton></instance-skeleton>
       </div>
       <div class="liked-list-item" v-show="!loading" v-for="(item, index) in likedList" :key="item.exampleId">
-        <instance-card :info="item" :cardIndex="index" @setFollow="setFollow" @setFav="setFav" @search="init">
+        <instance-card :info="item" :cardIndex="index" @setFav="setFav" @search="init">
         </instance-card>
       </div>
     </div>
@@ -30,6 +30,17 @@ import InstanceCard from '@components/instanceCard'
 import * as p2b from '@utils/paramsToBase64'
 export default {
   name: 'Liked',
+  provide() {
+    return {
+      setFollow: (isFollow, username) => {
+        this.likedList.forEach((item) => {
+          if (item.username === username) {
+            item.myFollow = isFollow
+          }
+        })
+      },
+    }
+  },
   data() {
     return {
       likedList: [],
@@ -83,9 +94,6 @@ export default {
       }
       this.loading = false
     },
-    setFollow(isFollow, index) {
-      this.likedList[index].myFollow = isFollow
-    },
     setFav(isFav, index) {
       const item = this.likedList[index]
       item.myFavorites = isFav
