完成相机布局配置

src/views/page-config/component/BasicLayoutEntry.vue

@@ -7,12 +7,8 @@
         </section>
         <section class="card__right">
           <span class="span__card--title"> PC端{{ titleDefault }} </span>
-<<<<<<< HEAD
-          <span class="span__card--describe"> {{ describeDefault }}PC端平台首页 </span>
-=======
           <span class="span__card--describe"> {{ describeDefault }}PC端平台{{ props.layoutType === LayoutConfigType.scene
             ? '生效' : '首页' }} </span>
->>>>>>> 23bcffa (完成相机布局配置)
         </section>
       </div>
       <div class="card--default" @click="toLayout('Phone')">
@@ -21,12 +17,8 @@
         </section>
         <section class="card__right">
           <span class="span__card--title"> 手机端{{ titleDefault }} </span>
-<<<<<<< HEAD
-          <span class="span__card--describe"> {{ describeDefault }}手机端平台首页 </span>
-=======
           <span class="span__card--describe"> {{ describeDefault }}手机端平台{{ props.layoutType === LayoutConfigType.scene
             ? '生效' : '首页' }} </span>
->>>>>>> 23bcffa (完成相机布局配置)
         </section>
       </div>
     </main>