Merge branch 'dev5.3.4+' into test

src/api/config.js

@@ -294,7 +294,7 @@ export default {
   msg:{
     imgTip:'无法上传图片，图片大小不可超过2M'
   },
-  pageSizeArr:[10,50,100,500],         //分页每页显示条数选项
+  pageSizeArr:[10,50,100,500,1000,5000],         //分页每页显示条数选项
   pageSize:10,      //初始每页显示条数
   pageLayout:"total,sizes,prev, pager, next, jumper",        //分页组件成分
 }

src/components/icss/PubTagPartDetail.vue

@@ -67,12 +67,12 @@
               <ul v-else>
                 <template v-if="n == 1">
                   <li :class="['partDetail','ellipsis',{'redWordTip':isRed(poolDetailList[n][0].sexType)}]" v-for="item in poolDetailList[n][0].questionDetailList" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.name+' ]'" :key="item.id">
-                    [ {{item.name}}{{poolDetailList[n][0].sexType}} ]
+                    [ {{item.name}} ]
                   </li>
                 </template>
                 <template  v-if="n == 2 || n == 3 || n == 4 || n == 5">
                   <li :class="['partDetail','ellipsis',{'redWordTip':isRed(item.sexType)}]" v-for="item in poolDetailList[n]" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.tagName+' ]'" :key="item.tagName" @click="selectTagOne($event,item.id,n)">
-                    [ {{item.tagName}}{{item.sexType}} ]
+                    [ {{item.tagName}} ]
                   </li>
                 </template>
               </ul>