소스 검색

Merge branch 'config_href_url' into dev

# Conflicts:
#	src/views/pc/index.vue
CzRger 1 년 전
부모
커밋
8cf0c82dea
2개의 변경된 파일9개의 추가작업 그리고 38개의 파일을 삭제
  1. BIN
      src/views/common/img/info-main-2.png
  2. 9 38
      src/views/pc/index.vue

BIN
src/views/common/img/info-main-2.png


+ 9 - 38
src/views/pc/index.vue

@@ -23,27 +23,14 @@
           <div class="pc-info-label __hover" @click="item.href ? toHref(item) : switchInfo(item.mainImg)">{{item.label}}</div>
         </template>
       </div>
-      <div class="pc-info-input">
-        <el-input v-model="infoInput">
-          <template #suffix>
-            <img src="../common/img/info-input-img.png" class="__hover"/>
-          </template>
-        </el-input>
-      </div>
+<!--      <div class="pc-info-input">-->
+<!--        <el-input v-model="infoInput">-->
+<!--          <template #suffix>-->
+<!--            <img src="../common/img/info-input-img.png" class="__hover"/>-->
+<!--          </template>-->
+<!--        </el-input>-->
+<!--      </div>-->
       <div class="pc-info-download __hover">下载</div>
-      <el-dropdown v-if="$store.getters['app/isLogin']">
-        <div class="pc-info-user">
-          <img src="../common/img/info-user-icon.png" style="margin-right: 8px"/>
-          <span style="margin-right: 4px">{{$store.state.app.userInfo?.displayName}}</span>
-          <span style="margin-right: 6px">{{$store.state.app.userInfo?.organizations[0].organizationName}}</span>
-          <img src="../common/img/info-user-icon-suffix.png"/>
-        </div>
-        <template #dropdown>
-          <el-dropdown-menu>
-            <el-dropdown-item @click="$store.dispatch('app/EXIT_LOGIN')">退出</el-dropdown-item>
-          </el-dropdown-menu>
-        </template>
-      </el-dropdown>
     </div>
     <div class="pc-href" :style="`grid-template-columns: ${HrefMapper.map(v => v.span + 'fr').join(' ')};`">
       <template v-for="(item, index) in HrefMapper">
@@ -101,7 +88,7 @@ export default defineComponent({
     });
 
     const toHref = (val: { href: string | URL | undefined }) => {
-      window.open(that.$util.formatUrlByInfo(val.href), '_blank')
+      window.open(val.href, '_blank')
     }
 
     const switchInfo = (img) => {
@@ -229,7 +216,6 @@ export default defineComponent({
         }
       }
       .pc-info-input {
-        margin-left: 46px;
         height: 28px;
         border-radius: 14px;
         &:focus {
@@ -267,22 +253,7 @@ export default defineComponent({
         font-size: 14px;
         font-weight: normal;
         color: #FFFFFF;
-        margin: 0 10px 0 10px;
-      }
-      .pc-info-user {
-        box-sizing: border-box;
-        margin-right: 13px;
-        display: flex;
-        align-items: center;
-        padding: 5px 14px;
-        background: rgba(23,57,111,0.2);
-        border: 1px solid #82D6FF;
-        border-radius: 16px;
-        outline: none;
-        font-size: 14px;
-        font-family: Adobe Heiti Std;
-        font-weight: normal;
-        color: #82D6FF;
+        margin: 0 22px 0 46px;
       }
     }
     .pc-href {