Merge branch 'master' of http://47.100.2.119:3000/imengyu/minnan

src/pages/article/common/DetailTabPage.vue

@@ -35,7 +35,7 @@
               :autoScroll="true"
               :autoItemWidth="false"
               :defaultIndicatorWidth="130"
-              :width="730"
+              :width="710"
               class="top-tab"
             />
           </view>

src/pages/article/data/DefaultCategory.json

@@ -304,7 +304,7 @@
                   "visible": false
                 },
                 {
-                  "text": "闽南语在线课程",
+                  "text": "闽南话在线课程",
                   "type": "horizontal-large",
                   "data": {
                     "type": "commonContent",
@@ -330,7 +330,7 @@
                   "visible": false
                 },
                 {
-                  "text": "闽南话",
+                  "text": "闽南话常用语",
                   "showTitle": true,
                   "type": "AudioBlock",
                   "visible": true,
@@ -372,7 +372,8 @@
                   },
                   "morePage": "/pages/travel/fashion/list",
                   "detailsPage": "/pages/article/data/details?pageConfigName=songs-details",
-                  "type": "large-image"
+                  "type": "large-image",
+                  "showMore": false
                 },
                 {
                   "text": "“世界闽南语金曲盛典”",
@@ -393,7 +394,8 @@
                   },
                   "morePage": "/pages/travel/fashion/list",
                   "detailsPage": "/pages/article/data/details?pageConfigName=songs-details",
-                  "type": "large-image"
+                  "type": "large-image",
+                  "showMore": false
                 },
                 {
                   "text": "精品剧目",
@@ -969,7 +971,7 @@
               "dataSolve": [
                 "inheritor"
               ],
-              "detailsPage": "/pages/introduction/character/details",
+              "detailsPage": "/pages/article/data/details?pageConfigName=character-details",
               "itemType": "article-common",
               "showTotal": true,
               "dropdownDefines": []
@@ -1343,7 +1345,9 @@
                     }
                   ]
                 }
-              }
+              },
+              "key": "ichSitesList",
+              "width": 160
             },
             {
               "text": "传承人",
@@ -1736,7 +1740,8 @@
             {
               "text": "图片",
               "type": "images",
-              "prefix": ""
+              "prefix": "",
+              "visible": false
             },
             {
               "text": "视频",

src/pages/parts/ImageSwiper.vue

@@ -15,7 +15,7 @@
           width="100%"
           :height="height"
           :radius="15"
-          mode="aspectFill"
+          mode="aspectFit"
           touchable
           @click="onPreviewImage(key)"
         />