Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/components/label_other/paragraph.vue

 <template>
   <div class="q-mt-lg">
-    <div class="section-block paragraph1">
-      {{plugData.ParagraphContent}}
+    <div class="section-block paragraph1" v-html="plugData.ParagraphContent">
     </div>
   </div>
 </template>
@@ -19,4 +18,9 @@
     padding: 20px 0;
     color: #666;
   }
+  .paragraph1 li{
+    list-style: none;
+    padding:0;
+    margin:0;
+  }
 </style>
\ No newline at end of file

src/components/label_slider/small.vue

 <template>
   <!--輪播圖-小-->
   <q-carousel v-model="slide" transition-prev="slide-right" transition-next="slide-left" :autoplay="5000" swipeable
-    animated control-color="white" padding arrows infinite height="235px"
-    class="bg-primary text-white shadow-1 q-mt-lg q-mb-xl">
-    <q-carousel-slide v-for="(x, i) in plugData.Details" :key="i" @click="clickSlideHandler(x.LinkUrl)" :name="i"
-      :img-src="x.LinkImg" />
+    animated control-color="white" padding :arrows="imgLength>1" infinite height="235px"
+    class="bg-primary text-white q-mb-xl">
+    <template v-for="(x, i) in plugData.Details">
+    <q-carousel-slide  :key="i" v-if="x.LinkImg" @click="clickSlideHandler(x.LinkUrl)" :name="i"
+      :img-src="x.LinkImg">
+      <div class="full-height column justify-center text-h4">
+        <div class="text-center text-shadow">{{ plugData.Title }}</div>
+      </div>
+    </q-carousel-slide>
+    </template>
   </q-carousel>
 </template>
 <script>
   export default {
     props: ["plugData"],
+    
     data() {
       return {
         slide: 0,
+        imgLength:0
       };
     },
+    created() {
+      this.imgLength = this.plugData.Details.filter(x=>x.LinkImg!='').length
+    },
     methods: {
       clickSlideHandler(url) {
         if (url && url.length > 1) {

src/pages/customer.vue

 <template>
-  <q-page>
+  <q-page >
     <template v-for="(item,index) in CustomerData">
       <div :key="index">
         <!--自訂版型(影片)-->
@@ -62,6 +62,7 @@
 
         <!--自訂版型(輪播圖)white_label_slider-->
         <sliderBig v-if="item.Id=='white_label_slider'&&item.plugData.Type==1" :plugData="item.plugData"></sliderBig>
+        
         <sliderSmall v-if="item.Id=='white_label_slider'&&item.plugData.Type==2" :plugData="item.plugData">
         </sliderSmall>
 
@@ -235,6 +236,12 @@
       return {
         Id: 0,
         CustomerData: {},
+        pageTitle:''
+      };
+    },
+    meta() {
+      return {
+        title: this.pageTitle 
       };
     },
     created() {
@@ -255,6 +262,7 @@
             res => {
               if (res.data.resultCode == 1) {
                 if (res.data.data) {
+                  this.pageTitle = res.data.data.PageName
                   this.CustomerData = res.data.data.PageDataList;
                 }
               }