首页调整

src/views/home/index.vue

@@ -121,8 +121,8 @@
                                v-if="messageScrollList.length"
                                :data="messageScrollList"
                                :class-option="defineScroll">
-            <div v-for="o in messageScrollList" :key="o.id" class="scroll-box-content">
-              <el-timeline-item :hide-timestamp="false">
+            <el-timeline class="scroll-box-content">
+              <el-timeline-item :hide-timestamp="false" v-for="o in messageScrollList" :key="o.id">
                 <template slot="dot">
                   <span class="scroll-box-content-dot"></span>
                 </template>
@@ -133,7 +133,7 @@
                     }}</span>
                 </div>
               </el-timeline-item>
-            </div>
+            </el-timeline>
 
           </vue-seamless-scroll>
           <el-empty v-else description="暂无"></el-empty>
@@ -147,9 +147,10 @@
         </div>
         <draggable v-model="commonList" class="card-cell-content">
 
-            <!--                   @click="handleCommonListDel(item,index)"></i>-->
+          <!--                   @click="handleCommonListDel(item,index)"></i>-->
           <div v-for="(item,index) in commonList" :key="item.id" class="card-cell-content-box"
-               @click="handleAdd(item,index)" :title="!['-999','-1'].includes(item.id)&&isDelFlag?'点击删除':''" :class="!['-999','-1'].includes(item.id)&&isDelFlag?'div-del':''">
+               @click="handleAdd(item,index)" :title="!['-999','-1'].includes(item.id)&&isDelFlag?'点击删除':''"
+               :class="!['-999','-1'].includes(item.id)&&isDelFlag?'div-del':''">
             <!--            <el-popover-->
             <!--              v-if="item.id !=='-1'"-->
             <!--              placement="top-start"-->
@@ -349,7 +350,7 @@ export default {
         this.isDelFlag = !this.isDelFlag
         this.commonList.pop()
         this.commonList.push({
-          name: `${this.isDelFlag?'取消删除':'删除'}`,
+          name: `${this.isDelFlag ? '取消删除' : '删除'}`,
           id: '-999',
           icon: 'el-icon-delete',
         })
@@ -735,6 +736,7 @@ export default {
   background: #cccccc !important;
   position: relative;
 }
+
 .div-del::after {
   content: "—";
   position: absolute;

src/views/user/profile/index.vue

@@ -244,7 +244,10 @@ export default {
     // 是否开启响应式布局
     styleResponsive() {
       return this.$store.state.theme.styleResponsive;
-    }
+    },
+    isQianKun() {
+      return window.__POWERED_BY_QIANKUN__;
+    },
   },
   async created() {
     this.userInfo = await getUserDetail(this.user.info.userId)
@@ -285,12 +288,20 @@ export default {
       const filePath = await getPathAddress()
       this.form.img = filePath + data.storePath
       await saveOrUpdateUser(this.form);
-      window.setGlobalState.commit('user/setUserInfo', {
-        ...this.user.info,
-        avatar: this.form.avatar,
-        avatarAddress: this.form.img
-      });
-      console.log(this.user,'======');
+      if (this.isQianKun) {
+        this.$portalStore.commit('user/setUserInfo', {
+          ...this.user.info,
+          avatar: this.form.avatar,
+          avatarAddress: this.form.img
+        });
+      } else {
+        this.$store.commit('user/setUserInfo', {
+          ...this.user.info,
+          avatar: this.form.avatar,
+          avatarAddress: this.form.img
+        });
+      }
+
     },
     /* 打开图片裁剪 */
     openCropper() {