Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -150,7 +150,13 @@
                     </el-select>
                   </template>
                   <template v-else>
-                    {{personStrToWord(childItem.PeopleType)}}
+                    {{personStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}人
+                    <template v-if="childItem.PeopleType==2">
+                       <br/> 12-18岁
+                    </template>
+                    <template v-if="childItem.PeopleType==3">
+                       <br/> 11岁及以下
+                    </template>
                   </template>
                 </td>
                 <td>

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -114,6 +114,12 @@
                 </td>
                 <td>
                   {{personStrToWord(childItem.PeopleType)}}
+                  <template v-if="childItem.PeopleType==2">
+                    <br /> 12-18岁
+                  </template>
+                  <template v-if="childItem.PeopleType==3">
+                    <br /> 11岁及以下
+                  </template>
                 </td>
                 <td>
                   {{childItem.PeopleNum}}