merge

src/components/commons/Header2.0.vue

@@ -55,13 +55,12 @@
               </router-link>
             </li>
 
-<!--            <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>-->
-
-<!--            <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">-->
-<!--              <router-link v-if="isLogin" to="/statistics">-->
-<!--                <span>机构统计</span>-->
-<!--              </router-link>-->
-<!--            </li>-->
+            <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>
+            <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">
+              <router-link v-if="isLogin" to="/statistics">
+                <span>机构统计</span>
+              </router-link>
+            </li>
 
 <!--            <span v-if="isLogin&&(rolesPermissions.isSystemAdministrator || rolesPermissions.isRegionManager)">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>-->
 <!--            <li v-if="isLogin&&(rolesPermissions.isSystemAdministrator || rolesPermissions.isRegionManager)">-->

src/pages/DetailPage/CrowdDetail.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -84,6 +84,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         loading: false,
         isLogin: false,

src/pages/HomepageSearch/AgencyList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -104,6 +104,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         isLogin: false,
         loading: false,

src/pages/HomepageSearch/AgencyResidentList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -99,6 +99,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         isLogin: false,
         searchType: '0',

src/pages/HomepageSearch/CompetitionList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -97,6 +97,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         isLogin: false,
         loading: false,

src/pages/HomepageSearch/CrowdList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -95,6 +95,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         isLogin: false,
         loading: false,

src/pages/HomepageSearch/ExpertList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -72,6 +72,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         isLogin: false,
         loading: false,

src/pages/HomepageSearch/ResourceList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -107,6 +107,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         isLogin: false,
         loading: false,

src/pages/HomepageSearch/UserList.vue

@@ -6,7 +6,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -108,6 +108,7 @@
       return {
         user: {},
         isLogin: false,
+        logo_transparent:CONFIG.logo_transparent,
         id: 0,
         // searchVal: '',
         searchType: '0',

src/pages/Square/PopularProjectAndTaskList.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png"/>
+            <img class="logo-img" :src="logo_transparent"/>
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -112,6 +112,7 @@
     data() {
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         loading: false,
         isLogin: false,
         searchType: 'project',

src/pages/Square/Square2.0.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png" />
+            <img class="logo-img" :src="logo_transparent" />
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -82,6 +82,7 @@
       return {
         logoTitle:CONFIG.logoTitle,
         SQUARE_DISPLAY:CONFIG.SQUARE_DISPLAY,
+        logo_transparent:CONFIG.logo_transparent,
         user: {},
         isLogin: false,
         searchType:CONFIG.square_searchType,

src/pages/Technology/Technology2.0.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png" />
+            <img class="logo-img" :src="logo_transparent" />
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -95,6 +95,7 @@
       return {
         logoTitle:CONFIG.logoTitle,
         TECHNOLOGY_DISPLAY:CONFIG.TECHNOLOGY_DISPLAY,
+        logo_transparent:CONFIG.logo_transparent,
         loading: false,
         isLogin: false,
         searchVal: '',

src/pages/Technology/TechnologyMore.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left" @click="gotoHome" style="cursor: pointer">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png" />
+            <img class="logo-img" :src="logo_transparent" />
             <span class="logo-title">{{logoTitle}}</span>
           </div>
         </el-col>
@@ -80,6 +80,7 @@
     data(){
       return {
         logoTitle:CONFIG.logoTitle,
+        logo_transparent:CONFIG.logo_transparent,
         loading: false,
         isLogin: false,
         searchVal: '',