1

src/components/sallCenter/CustomPage.vue

@@ -21,19 +21,50 @@
           </el-table-column>
           <el-table-column prop="PageName" label="标题">
           </el-table-column>
-          <el-table-column label="导航与模板" prop="DetailsList" width="500">
+          <el-table-column label="导航与模板" prop="DetailsList" width="400">
             <template slot-scope="scope">
               <div class="templat-list">
                 <template v-if="scope.row.DetailsList && scope.row.DetailsList.length>0"
                   v-for="(subItem,subIndex) in scope.row.DetailsList">
                   <div class="templat-item" :key="subIndex">
-                    <div>{{subItem.NavName}}</div>
-                    <div style="color: rgb(153, 153, 153);">{{subItem.TemplateShowName}}</div>
+                    <div style="color: rgb(153, 153, 153);">
+                      <template v-if="subItem.NavName&&subItem.NavName!=''">{{subItem.NavName}}：</template>
+                      {{subItem.TemplateShowName}}</div>
                   </div>
                 </template>
               </div>
             </template>
           </el-table-column>
+          <el-table-column prop="IsShowBottomTabBar" label="导航条" width="100">
+            <template slot-scope="scope">
+              <template v-if="scope.row.IsShowNav==1">
+                显示
+              </template>
+              <template v-else>
+                <font style="color:red;">不显示</font>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column prop="IsShowBottomTabBar" label="底部导航" width="100">
+            <template slot-scope="scope">
+              <template v-if="scope.row.IsShowBottomTabBar==1">
+                显示
+              </template>
+              <template v-else>
+                <font style="color:red;">不显示</font>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column prop="IsNoShowTitle" label="标题" width="100">
+            <template slot-scope="scope">
+              <template v-if="scope.row.IsNoShowTitle==0">
+                显示
+              </template>
+              <template v-else>
+                <font style="color:red;">不显示</font>
+              </template>
+            </template>
+          </el-table-column>
           <el-table-column prop="IsHome" label="设为首页" width="150">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.IsHome" active-color="#409EFF" :active-value="1" :inactive-value="0"
@@ -48,6 +79,7 @@
               </el-switch>
             </template>
           </el-table-column>
+
           <el-table-column prop="IsUse" label="禁用/启用" width="120">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0"
@@ -93,6 +125,10 @@
                 :inactive-value="0">
               </el-switch>
             </el-form-item>
+            <el-form-item label="不显示标题">
+              <el-switch v-model="addMsg.IsNoShowTitle" active-color="#409EFF" :active-value="1" :inactive-value="0">
+              </el-switch>
+            </el-form-item>
             <el-form-item label="模板和导航">
               <div style="max-width:480px;">
                 <div class="Custom_item" v-for="(item,index) in addMsg.DetailsList" :key="index">
@@ -159,7 +195,8 @@
           IsHome: 0,
           IsUse: 1,
           IsShowNav: 0,
-          IsShowBottomTabBar:1,//是否显示底部导航
+          IsShowBottomTabBar: 1, //是否显示底部导航
+          IsNoShowTitle: 0, //是否不显示标题 
           DetailsList: []
         },
         total: 0,
@@ -260,7 +297,8 @@
             this.addMsg.IsShowNav = jsonData.IsShowNav;
             this.addMsg.IsHome = jsonData.IsHome;
             this.addMsg.DetailsList = jsonData.DetailsList;
-            this.addMsg.IsShowBottomTabBar=jsonData.IsShowBottomTabBar;
+            this.addMsg.IsShowBottomTabBar = jsonData.IsShowBottomTabBar;
+            this.addMsg.IsNoShowTitle = jsonData.IsNoShowTitle;
             this.CustomIsShowAdd = false;
           } else {
             this.Info(res.data.message);
@@ -340,7 +378,7 @@
   }
 
   .CustomPage .templat-item div {
-    width: 50%;
+    width: 90%;
     padding-left: 20px;
   }
 

src/components/tradePavilion/BrandEnterEdit.vue

@@ -433,7 +433,6 @@
         this.getData();
       }
       this.getTypeEnumList();
-      this.GetAuthenticationCategoryEnumList();
     },
     methods: {
       //获取类型

src/components/tradePavilion/tradePavilionIndex.vue

 <style>
-.offlineIndex {
+  .offlineIndex {
     height: 100%;
     display: flex;
     -webkit-box-orient: horizontal;
@@ -14,16 +14,16 @@
     box-sizing: border-box;
     min-width: 0;
     font-size: 14px;
-}
+  }
 
-.offlineIndex .mainLeftMenu {
+  .offlineIndex .mainLeftMenu {
     position: relative;
     display: flex;
     flex-direction: row;
     color: #fff;
-}
+  }
 
-.offlineIndex .leftMenu1 {
+  .offlineIndex .leftMenu1 {
     background: #444444;
     cursor: pointer;
     width: 200px;
@@ -33,17 +33,17 @@
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
-}
+  }
 
-.offlineIndex .asideInner {
+  .offlineIndex .asideInner {
     background: rgba(0, 0, 0, 0.15);
     padding: 6px 6px;
     width: 100%;
     border-radius: 3px;
     font-weight: bold;
-}
+  }
 
-.offlineIndex .F_Logo {
+  .offlineIndex .F_Logo {
     height: 60px;
     background: #464d54;
     color: #f2f2f2;
@@ -53,25 +53,25 @@
     padding: 0 15px;
     display: flex;
     align-items: center;
-}
+  }
 
-.offlineIndex .mainRightContent {
+  .offlineIndex .mainRightContent {
     width: 100%;
     height: 100%;
     background-color: #f3f3f3;
     min-width: 0;
-}
+  }
 
-.offlineIndex .mainRightTop {
+  .offlineIndex .mainRightTop {
     width: 100%;
     height: 60px;
     background: #fff;
     display: flex;
     justify-content: space-between;
     color: #909399;
-}
+  }
 
-.offlineIndex .mainRightLeft {
+  .offlineIndex .mainRightLeft {
     width: 110px;
     height: 60px;
     line-height: 62px;
@@ -80,37 +80,37 @@
     cursor: pointer;
     position: relative;
     top: -2px;
-}
+  }
 
-.offlineIndex .marinRightList {
+  .offlineIndex .marinRightList {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
     width: 300px;
     float: right;
-}
+  }
 
-.offlineIndex .marinRightList ul {
+  .offlineIndex .marinRightList ul {
     display: flex;
     width: 100%;
     justify-content: space-around;
-}
+  }
 
-.offlineIndex .marinRightList ul li {
+  .offlineIndex .marinRightList ul li {
     display: block;
     list-style-type: none;
     cursor: pointer;
     color: #909399;
     outline: none;
     border: none;
-}
+  }
 
-.offlineIndex .main_routerPage {
+  .offlineIndex .main_routerPage {
     padding: 20px;
     overflow-y: scroll;
-}
+  }
 
-.offlineIndex .FsettingUU {
+  .offlineIndex .FsettingUU {
     position: fixed;
     width: 200px;
     height: 100%;
@@ -120,9 +120,9 @@
     overflow: auto;
     z-index: 5;
     background-color: rgb(84, 92, 100);
-}
+  }
 
-.offlineIndex .FsettingUU .menu_item {
+  .offlineIndex .FsettingUU .menu_item {
     font-size: 14px;
     color: #303133;
     padding: 0 20px;
@@ -137,33 +137,34 @@
     color: #fff;
     display: flex;
     align-items: center;
-}
+  }
 
-.offlineIndex .FsettingUU .menu_item i {
+  .offlineIndex .FsettingUU .menu_item i {
     margin-right: 5px;
     width: 24px;
     text-align: center;
     font-size: 18px;
     vertical-align: middle;
     color: #909399;
-}
+  }
 
-.offlineIndex .menu_item:hover {
+  .offlineIndex .menu_item:hover {
     background-color: rgba(67, 74, 80, 0);
-}
+  }
 
-.offlineIndex .F_Logo:hover {
+  .offlineIndex .F_Logo:hover {
     background-color: #30353a;
     color: #fff;
-}
+  }
 
-.offlineIndex .Fchecked {
+  .offlineIndex .Fchecked {
     color: rgb(255, 208, 75) !important;
-}
+  }
 
-.offlineIndex .Fchecked i {
+  .offlineIndex .Fchecked i {
     color: rgb(255, 208, 75) !important;
-}
+  }
+
 </style>
 <template>
   <div class="offlineIndex">
@@ -174,79 +175,51 @@
             {{ currentUser.MallName }}
           </div>
         </div>
-        <ul class="FsettingUU" v-if="mall_userInfo.TenantId!=30">
+        <ul class="FsettingUU" v-if="currentUser.TenantId==18">
           <!-- <li class="menu_item" :class="{'Fchecked':isChecked=='/companyList'}"
             @click="isChecked='/companyList',CommonJump('companyList')">
             <i class="el-icon-menu"></i><span>公司资料</span>
           </li> -->
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/contactus' }"
-            @click="(isChecked = '/contactus'), CommonJump('contactus')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/contactus' }"
+            @click="(isChecked = '/contactus'), CommonJump('contactus')">
             <i class="el-icon-menu"></i><span>联系我们</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/brandClassification' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/brandClassification' }" @click="
               (isChecked = '/brandClassification'),
                 CommonJump('brandClassification')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>分类管理</span>
           </li>
 
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/VehicleManagement' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/VehicleManagement' }" @click="
               (isChecked = '/VehicleManagement'),
                 CommonJump('VehicleManagement')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>载体管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/brandManagement' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/brandManagement' }" @click="
               (isChecked = '/brandManagement'), CommonJump('brandManagement')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>品牌管理</span>
           </li>
 
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/activityType' }"
-            @click="(isChecked = '/activityType'), CommonJump('activityType')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/activityType' }"
+            @click="(isChecked = '/activityType'), CommonJump('activityType')">
             <i class="el-icon-menu"></i><span>活动类型管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/tradeactivityList' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/tradeactivityList' }" @click="
               (isChecked = '/tradeactivityList'),
                 CommonJump('tradeactivityList')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>活动列表</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/newsList' }"
-            @click="(isChecked = '/newsList'), CommonJump('newsList')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/newsList' }"
+            @click="(isChecked = '/newsList'), CommonJump('newsList')">
             <i class="el-icon-menu"></i><span>新闻列表</span>
           </li>
 
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/consultList' }"
-            @click="(isChecked = '/consultList'), CommonJump('consultList')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/consultList' }"
+            @click="(isChecked = '/consultList'), CommonJump('consultList')">
             <i class="el-icon-menu"></i><span>咨询管理</span>
           </li>
           <!-- <li class="menu_item" :class="{'Fchecked':isChecked=='/investmentList'}"
@@ -258,199 +231,113 @@
             <i class="el-icon-menu"></i><span>采购管理</span>
           </li> -->
 
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/realAuthentication' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/realAuthentication' }" @click="
               (isChecked = '/realAuthentication'),
                 CommonJump('realAuthentication')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>企业认证</span>
           </li>
 
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/firstStoreApply' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/firstStoreApply' }" @click="
               (isChecked = '/firstStoreApply'), CommonJump('firstStoreApply')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>首店申请</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/wishList' }"
-            @click="(isChecked = '/wishList'), CommonJump('wishList')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/wishList' }"
+            @click="(isChecked = '/wishList'), CommonJump('wishList')">
             <i class="el-icon-menu"></i><span>心愿列表</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/billboardList' }"
-            @click="(isChecked = '/billboardList'), CommonJump('billboardList')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/billboardList' }"
+            @click="(isChecked = '/billboardList'), CommonJump('billboardList')">
             <i class="el-icon-menu"></i><span>榜单管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == 'registrationLogin' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == 'registrationLogin' }" @click="
               (isChecked = 'registrationLogin'), CommonJump('registrationLogin')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>榜单报名表单</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/prizeMange' }"
-            @click="(isChecked = '/prizeMange'), CommonJump('prizeMange')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/prizeMange' }"
+            @click="(isChecked = '/prizeMange'), CommonJump('prizeMange')">
             <i class="el-icon-menu"></i><span>奖项管理</span>
           </li>
         </ul>
-        <!-- 宜宾 -->
-        <ul class="FsettingUU" v-else>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/ybrandClassification' }"
-            @click="
+        <!-- 宜宾商载通 -->
+        <ul class="FsettingUU" v-if="currentUser.TenantId==30">
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/ybrandClassification' }" @click="
               (isChecked = '/ybrandClassification'),
                 CommonJump('ybrandClassification')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>分类管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/BuildingServiceManager' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/BuildingServiceManager' }" @click="
               (isChecked = '/BuildingServiceManager'),
                 CommonJump('BuildingServiceManager')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>商业载体管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/BuildingManager' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/BuildingManager' }" @click="
               (isChecked = '/BuildingManager'),
                 CommonJump('BuildingManager')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>楼宇管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/BrandManager' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/BrandManager' }" @click="
               (isChecked = '/BrandManager'), CommonJump('BrandManager')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>消费品牌管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/EnterpriseManager' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/EnterpriseManager' }" @click="
               (isChecked = '/EnterpriseManager'), CommonJump('EnterpriseManager')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>企业服务管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/activityType' }"
-            @click="(isChecked = '/activityType'), CommonJump('activityType')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/activityType' }"
+            @click="(isChecked = '/activityType'), CommonJump('activityType')">
             <i class="el-icon-menu"></i><span>活动类型管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/tradeactivityList' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/tradeactivityList' }" @click="
               (isChecked = '/tradeactivityList'),
                 CommonJump('tradeactivityList')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>活动列表</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/newsList' }"
-            @click="(isChecked = '/newsList'), CommonJump('newsList')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/newsList' }"
+            @click="(isChecked = '/newsList'), CommonJump('newsList')">
             <i class="el-icon-menu"></i><span>新闻列表</span>
           </li>
-          <!-- <li class="menu_item" :class="{'Fchecked':isChecked=='/serviceTypeList'}"
-            @click="isChecked='/serviceTypeList',CommonJump('serviceTypeList')">
-            <i class="el-icon-menu"></i><span>服务类型列表</span>
-          </li> -->
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/consultList' }"
-            @click="(isChecked = '/consultList'), CommonJump('consultList')"
-          >
+
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/consultList' }"
+            @click="(isChecked = '/consultList'), CommonJump('consultList')">
             <i class="el-icon-menu"></i><span>咨询管理</span>
           </li>
-          <!-- <li class="menu_item" :class="{'Fchecked':isChecked=='/investmentList'}"
-            @click="isChecked='/investmentList',CommonJump('investmentList')">
-            <i class="el-icon-menu"></i><span>招商管理</span>
-          </li>
-          <li class="menu_item" :class="{'Fchecked':isChecked=='/procurementList'}"
-            @click="isChecked='/procurementList',CommonJump('procurementList')">
-            <i class="el-icon-menu"></i><span>采购管理</span>
-          </li> -->
 
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/realAuthentication' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/realAuthentication' }" @click="
               (isChecked = '/realAuthentication'),
                 CommonJump('realAuthentication')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>企业认证</span>
           </li>
 
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/firstStoreApply' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/firstStoreApply' }" @click="
               (isChecked = '/firstStoreApply'), CommonJump('firstStoreApply')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>首店申请</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/wishList' }"
-            @click="(isChecked = '/wishList'), CommonJump('wishList')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/wishList' }"
+            @click="(isChecked = '/wishList'), CommonJump('wishList')">
             <i class="el-icon-menu"></i><span>心愿列表</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/billboardList' }"
-            @click="(isChecked = '/billboardList'), CommonJump('billboardList')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/billboardList' }"
+            @click="(isChecked = '/billboardList'), CommonJump('billboardList')">
             <i class="el-icon-menu"></i><span>榜单管理</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == 'registrationLogin' }"
-            @click="
+          <li class="menu_item" :class="{ Fchecked: isChecked == 'registrationLogin' }" @click="
               (isChecked = 'registrationLogin'), CommonJump('registrationLogin')
-            "
-          >
+            ">
             <i class="el-icon-menu"></i><span>榜单报名表单</span>
           </li>
-          <li
-            class="menu_item"
-            :class="{ Fchecked: isChecked == '/prizeMange' }"
-            @click="(isChecked = '/prizeMange'), CommonJump('prizeMange')"
-          >
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/prizeMange' }"
+            @click="(isChecked = '/prizeMange'), CommonJump('prizeMange')">
             <i class="el-icon-menu"></i><span>奖项管理</span>
           </li>
         </ul>
@@ -458,12 +345,13 @@
     </div>
     <div class="mainRightContent">
       <div class="mainRightTop">
-        <div class="mainRightLeft">贸易服务</div>
+        <div class="mainRightLeft">
+          {{currentUser.MallName}}
+        </div>
         <div class="marinRightList">
           <ul>
             <li style="display: none">缓存</li>
-            <li style="display: none">
-              title="教程管理">
+            <li style="display: none" title="教程管理">
               <el-dropdown trigger="click">
                 <span class="el-dropdown-link">
                   教程管理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -483,14 +371,10 @@
                   <el-dropdown-item disabled>{{
                     currentUser.MallName
                   }}</el-dropdown-item>
-                  <el-dropdown-item disabled
-                    >{{ currentUser.Account }}({{
+                  <el-dropdown-item disabled>{{ currentUser.Account }}({{
                       currentUser.MobilePhone
-                    }})</el-dropdown-item
-                  >
-                  <el-dropdown-item @click.native="CommonJump('index')"
-                    >返回系统</el-dropdown-item
-                  >
+                    }})</el-dropdown-item>
+                  <el-dropdown-item @click.native="CommonJump('index')">返回系统</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </li>
@@ -504,21 +388,19 @@
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
       return {
         currentUser: {},
         isChecked: "",
         Height: 0,
         ERPEmpId: 0,
-      mall_userInfo:{}
       };
     },
     created() {
       this.currentUser = this.getLocalStorage();
       this.ERPEmpId = this.currentUser.ERPEmpId;
       this.isChecked = this.$route.path;
-    this.mall_userInfo = JSON.parse(localStorage.mall_userInfo);
       if (this.$route.query.FIndex) {
         this.CommonJump("companyList");
         this.isChecked = "/companyList";
@@ -532,5 +414,6 @@ export default {
         this.Height = document.documentElement.clientHeight - 60;
       };
     },
-};
+  };
+
 </script>