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: {
       //获取类型