Merge remote-tracking branch 'origin/develop' into develop

src/components/personalCenter/index.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="header">
+    <div>
+      <img style="height: 50px;width: 100%" :src="require('@/assets/images/shangqi/home/top-logo.png')">
+    </div>
       <!-- header头部 右侧内容 当前登录人和退出-->
 <!--      <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">-->
 <!--        <div>-->

src/main.js

@@ -102,7 +102,11 @@ router.beforeEach(function (to, from, next) {
                 if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
                     extractedVerify(token)
                 }else {
-                    extractedLocalStorage('home2','');
+                    if(path === '/standardSearch/All'){
+                        extractedLocalStorage('standardSearch/All','');
+                    }else {
+                        extractedLocalStorage('home2','');
+                    }
                     // ssoLoginUrlDev 默认sso 地址
                     window.location.href = ssoLoginUrlDev
                 }

src/pages/processCenter/pages/creatProcess/zcrk/step1.vue

@@ -16,7 +16,7 @@
                     class="label-input-form"
                     label-width="210px"
             >
-                <div style="flex: auto; overflow: auto;" v-show="active === '1'">
+                <div style="flex: auto;" v-show="active === '1'">
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>