no message

@@ -210,6 +210,15 @@ export function getBaseInfoByActiveId(id) {
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+export function getHotelTags(id) {
+  return request({
+    url: `/ota/hotelTags/getHotelTags`,
+    method: 'get',
+    params: {
+      hotelId: id
+    }
+  })
+}
 
 
 export function checkRoomPayByUserId(id) {
 export function checkRoomPayByUserId(id) {
   return request({
   return request({

@@ -8,6 +8,16 @@ export function getMaList(params) {
   })
   })
 }
 }
 
 
+export function getLabelList(params) {
+  return request({
+    url: `league/competitionLabel/cptLabelList`,
+    method: 'get',
+    params: {
+      cptId:'1892760956095897602'
+    }
+  })
+}
+
 export function getMatchById(params) {
 export function getMatchById(params) {
   return request({
   return request({
     url: `/league/competition/PCDetail`,
     url: `/league/competition/PCDetail`,
@@ -77,6 +87,13 @@ export function countryList() {
   })
   })
 }
 }
 
 
+export function getAssociation() {
+  return request({
+    url: `/system/association/getList`,
+    method: 'get'
+  })
+}
+
 export function saveMyBaseInfo(data) {
 export function saveMyBaseInfo(data) {
   return request({
   return request({
     url: `/systemj/personInfo/saveMyBaseInfo`,
     url: `/systemj/personInfo/saveMyBaseInfo`,

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="19px" height="22px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M17.918,21.431 C17.588,21.763 17.131,21.954 16.664,21.954 L9.937,21.954 C9.804,21.986 9.668,22.002 9.534,22.003 L1.771,22.003 C1.297,22.003 0.852,21.817 0.517,21.480 C0.182,21.143 -0.002,20.695 -0.002,20.218 L-0.002,2.340 C-0.002,1.863 0.182,1.415 0.517,1.078 C0.852,0.741 1.297,0.556 1.771,0.556 L9.533,0.556 C10.507,0.563 11.297,1.363 11.297,2.340 L11.297,5.215 L16.869,5.218 C17.763,5.322 18.438,6.084 18.438,6.990 L18.438,20.169 C18.438,20.646 18.253,21.094 17.918,21.431 ZM9.813,2.340 C9.813,2.266 9.784,2.193 9.731,2.140 C9.678,2.087 9.608,2.058 9.533,2.058 L1.771,2.058 C1.617,2.058 1.491,2.185 1.491,2.340 L1.491,20.215 C1.494,20.368 1.620,20.491 1.771,20.491 L9.509,20.491 C9.567,20.470 9.628,20.456 9.689,20.450 C9.766,20.399 9.813,20.312 9.813,20.217 L9.813,2.340 ZM16.944,7.020 C16.944,6.944 16.915,6.873 16.862,6.820 C16.809,6.766 16.739,6.737 16.664,6.737 L11.307,6.737 L11.307,20.223 C11.306,20.300 11.301,20.376 11.292,20.452 L16.678,20.452 C16.753,20.452 16.824,20.422 16.877,20.369 C16.930,20.316 16.959,20.245 16.959,20.170 L16.944,7.020 ZM6.000,13.000 L8.000,13.000 L8.000,14.000 L6.000,14.000 L6.000,13.000 ZM6.000,10.000 L8.000,10.000 L8.000,11.000 L6.000,11.000 L6.000,10.000 ZM6.000,6.1000 L8.000,6.1000 L8.000,8.000 L6.000,8.000 L6.000,6.1000 ZM2.1000,13.000 L4.1000,13.000 L4.1000,14.000 L2.1000,14.000 L2.1000,13.000 ZM2.1000,10.000 L4.1000,10.000 L4.1000,11.000 L2.1000,11.000 L2.1000,10.000 ZM2.1000,6.1000 L4.1000,6.1000 L4.1000,8.000 L2.1000,8.000 L2.1000,6.1000 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="24px" height="21px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M22.738,13.691 L22.738,2.239 C22.738,1.023 21.782,0.034 20.605,0.034 L3.729,0.034 C2.552,0.034 1.595,1.023 1.595,2.239 L1.595,13.691 C1.057,13.808 0.651,14.303 0.651,14.894 L0.651,17.819 C0.651,18.498 1.185,19.049 1.841,19.049 L2.538,19.049 L2.539,20.257 C2.539,20.667 2.861,20.999 3.257,20.999 C3.653,20.999 3.975,20.667 3.975,20.257 L3.975,19.049 L19.415,19.049 L19.415,20.257 C19.415,20.667 19.737,20.999 20.133,20.999 C20.529,20.999 20.851,20.667 20.851,20.257 L20.851,19.049 L22.492,19.049 C23.149,19.049 23.682,18.498 23.682,17.819 L23.682,14.894 C23.682,14.303 23.277,13.808 22.738,13.691 ZM18.717,4.911 L14.055,4.911 C13.398,4.911 12.865,5.462 12.865,6.140 L12.865,7.861 L11.469,7.861 L11.469,6.140 C11.469,5.462 10.936,4.911 10.280,4.911 L5.616,4.911 C4.960,4.911 4.427,5.462 4.427,6.140 L4.427,8.046 C3.913,8.211 3.440,8.477 3.031,8.833 L3.031,2.254 L3.036,2.155 C3.077,1.792 3.375,1.518 3.729,1.518 L20.598,1.518 L20.687,1.523 C21.038,1.566 21.303,1.874 21.303,2.239 L21.304,8.835 C20.895,8.478 20.421,8.211 19.907,8.048 L19.907,6.140 C19.907,5.462 19.374,4.911 18.717,4.911 ZM18.471,6.395 L18.471,7.861 L14.301,7.861 L14.301,6.395 L18.471,6.395 ZM10.033,6.395 L10.033,7.861 L5.862,7.861 L5.862,6.395 L10.033,6.395 ZM3.031,12.024 L3.036,11.860 C3.116,10.450 4.249,9.345 5.616,9.345 L18.710,9.345 L18.869,9.350 C20.234,9.433 21.303,10.604 21.303,12.017 L21.303,13.664 L3.031,13.664 L3.031,12.024 ZM22.246,15.148 L22.246,17.565 L2.087,17.565 L2.087,15.148 L22.246,15.148 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="27px" height="15px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M24.994,15.002 L24.994,13.313 L14.981,13.313 L14.981,15.002 L13.805,15.002 L13.805,8.096 C13.805,7.470 14.136,6.886 14.676,6.549 L14.676,2.184 C14.676,1.172 15.526,0.349 16.572,0.349 L23.402,0.349 C24.448,0.349 25.299,1.172 25.299,2.184 L25.299,6.548 C25.838,6.882 26.169,7.467 26.169,8.096 L26.169,15.002 L24.994,15.002 ZM24.123,2.184 C24.124,1.1000 24.047,1.820 23.913,1.690 C23.779,1.561 23.595,1.489 23.404,1.489 L16.572,1.489 C16.388,1.487 16.199,1.559 16.063,1.691 C15.928,1.821 15.851,2.000 15.851,2.184 L15.851,6.261 L17.288,6.261 L17.288,3.875 C17.288,3.318 17.738,2.882 18.314,2.882 L21.661,2.882 C21.934,2.892 22.196,2.987 22.386,3.172 C22.580,3.359 22.687,3.609 22.687,3.875 L22.687,6.261 L24.123,6.261 L24.123,2.184 ZM18.463,6.261 L21.511,6.261 L21.511,4.023 L18.463,4.023 C18.462,4.314 18.461,5.064 18.463,6.261 ZM24.994,8.096 C24.996,7.913 24.920,7.734 24.788,7.604 C24.655,7.474 24.463,7.393 24.283,7.401 L15.692,7.401 C15.299,7.402 14.980,7.714 14.981,8.095 L14.981,12.173 L24.994,12.173 L24.994,8.096 ZM11.193,13.313 L1.180,13.313 L1.180,15.002 L0.005,15.002 L0.005,8.096 C0.005,7.470 0.336,6.885 0.876,6.549 L0.876,2.184 C0.876,1.172 1.726,0.349 2.772,0.349 L9.602,0.349 C10.648,0.349 11.498,1.172 11.498,2.184 L11.498,6.548 C12.038,6.882 12.369,7.467 12.369,8.096 L12.369,15.002 L11.193,15.002 L11.193,13.313 ZM10.323,2.184 C10.323,1.1000 10.247,1.820 10.113,1.690 C9.978,1.561 9.785,1.485 9.604,1.489 L2.772,1.489 C2.586,1.483 2.396,1.561 2.262,1.691 C2.128,1.821 2.051,2.000 2.051,2.184 L2.051,6.261 L3.487,6.261 L3.487,3.875 C3.487,3.318 3.938,2.882 4.513,2.882 L7.861,2.882 C7.862,2.882 7.864,2.882 7.865,2.882 C8.137,2.882 8.393,2.985 8.586,3.172 C8.780,3.359 8.887,3.609 8.886,3.875 L8.886,6.261 L10.323,6.261 L10.323,2.184 ZM4.663,6.261 L7.711,6.261 L7.711,4.023 L4.663,4.023 C4.661,4.252 4.660,4.837 4.663,6.261 ZM11.193,8.096 C11.195,7.912 11.120,7.734 10.987,7.604 C10.855,7.475 10.672,7.401 10.484,7.401 C10.484,7.401 10.483,7.401 10.483,7.401 L1.892,7.401 C1.499,7.402 1.180,7.714 1.180,8.095 L1.180,12.173 L11.193,12.173 L11.193,8.096 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="21px" height="22px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M17.852,21.127 L3.131,21.127 C1.703,21.130 0.543,19.981 0.540,18.561 L0.540,8.275 C0.541,7.448 0.943,6.671 1.621,6.190 L9.530,0.640 C10.106,0.232 10.878,0.232 11.453,0.640 L19.364,6.190 C20.041,6.671 20.443,7.448 20.443,8.275 L20.443,18.561 C20.441,19.981 19.280,21.130 17.852,21.127 ZM6.484,19.727 L14.530,19.727 L14.530,11.848 L6.484,11.848 L6.484,19.727 ZM19.031,8.275 C19.030,7.899 18.847,7.546 18.539,7.328 L10.629,1.778 C10.547,1.720 10.437,1.720 10.355,1.778 L2.444,7.327 L2.445,7.327 C2.137,7.546 1.954,7.899 1.954,8.275 L1.954,18.561 C1.954,19.205 2.481,19.727 3.131,19.727 L5.151,19.727 L5.151,11.848 C5.151,11.117 5.748,10.524 6.484,10.524 L14.530,10.524 C15.265,10.524 15.862,11.117 15.862,11.848 L15.862,19.727 L17.852,19.727 C18.503,19.727 19.031,19.205 19.031,18.560 L19.031,8.275 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="23px" height="21px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M0.005,20.997 L0.005,13.050 C0.005,11.746 0.513,11.495 1.417,10.573 C2.321,9.651 3.548,9.133 4.827,9.133 L7.782,9.133 C7.735,9.388 7.711,9.646 7.710,9.906 C7.707,10.116 7.719,10.326 7.745,10.534 L4.827,10.534 C3.913,10.534 3.037,10.904 2.391,11.563 C1.745,12.222 1.382,12.115 1.382,13.047 L1.382,19.592 L6.845,19.592 L6.845,16.533 C6.845,15.974 7.063,15.438 7.451,15.043 C7.838,14.648 8.364,14.426 8.912,14.426 L14.307,14.426 C14.855,14.426 15.380,14.648 15.768,15.043 C16.156,15.438 16.373,15.974 16.373,16.533 L16.373,19.592 L21.606,19.592 L21.606,13.047 C21.606,11.107 20.063,10.534 18.161,10.534 L16.094,10.534 C16.124,10.326 16.140,10.116 16.142,9.906 C16.141,9.646 16.117,9.388 16.070,9.133 L18.171,9.133 C20.833,9.133 22.992,10.332 22.994,13.047 L22.994,20.997 L0.005,20.997 ZM14.995,16.533 C14.995,16.347 14.923,16.168 14.794,16.037 C14.664,15.905 14.489,15.831 14.307,15.831 L8.912,15.831 C8.730,15.831 8.554,15.905 8.425,16.037 C8.296,16.168 8.223,16.347 8.223,16.533 L8.223,19.592 L14.995,19.592 L14.995,16.533 ZM17.699,7.717 C15.607,7.717 13.910,5.987 13.910,3.854 C13.910,1.720 15.607,-0.010 17.699,-0.010 C19.792,-0.010 21.488,1.720 21.488,3.854 C21.488,4.878 21.089,5.861 20.379,6.586 C19.668,7.310 18.704,7.717 17.699,7.717 ZM17.699,1.395 C16.724,1.395 15.845,1.994 15.472,2.913 C15.098,3.831 15.305,4.889 15.994,5.592 C16.684,6.295 17.721,6.506 18.622,6.125 C19.523,5.745 20.111,4.848 20.111,3.854 C20.111,2.496 19.031,1.395 17.699,1.395 ZM14.882,10.060 C14.878,11.707 13.569,13.042 11.954,13.045 C10.337,13.045 9.026,11.709 9.026,10.060 C9.026,8.411 10.337,7.074 11.954,7.074 C13.571,7.074 14.882,8.411 14.882,10.060 ZM11.954,8.479 C11.098,8.479 10.404,9.187 10.404,10.060 C10.404,10.933 11.098,11.641 11.954,11.641 C12.810,11.641 13.504,10.933 13.504,10.060 C13.504,9.187 12.810,8.479 11.954,8.479 ZM6.160,7.717 C4.067,7.717 2.371,5.987 2.371,3.854 C2.371,1.720 4.067,-0.010 6.160,-0.010 C8.253,-0.010 9.949,1.720 9.949,3.854 C9.949,4.878 9.550,5.861 8.839,6.586 C8.129,7.310 7.165,7.717 6.160,7.717 ZM6.160,1.395 C5.185,1.395 4.306,1.994 3.932,2.913 C3.559,3.831 3.765,4.889 4.455,5.592 C5.145,6.295 6.182,6.506 7.083,6.125 C7.984,5.745 8.571,4.848 8.571,3.854 C8.571,2.496 7.492,1.395 6.160,1.395 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="24px" height="18px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M11.883,14.268 C10.979,14.268 10.226,15.105 10.226,16.109 C10.226,17.114 10.979,17.954 11.883,17.954 C12.787,17.954 13.541,17.117 13.541,16.109 C13.538,15.105 12.785,14.268 11.883,14.268 L11.883,14.268 ZM5.857,12.088 L7.062,13.428 C8.418,12.088 10.075,11.416 11.881,11.416 C13.688,11.416 15.494,12.253 16.699,13.428 L17.904,12.088 C16.247,10.414 14.138,9.406 11.881,9.406 C9.623,9.409 7.514,10.581 5.857,12.088 L5.857,12.088 ZM2.847,8.737 L4.052,10.076 C6.158,8.067 8.870,6.728 11.883,6.728 C14.897,6.728 17.606,8.067 19.715,10.247 L20.920,8.740 C18.510,6.225 15.349,4.719 11.883,4.719 C8.418,4.716 5.254,6.393 2.847,8.737 L2.847,8.737 ZM11.883,0.025 C7.216,0.025 2.997,2.037 -0.013,5.385 L1.192,6.725 C3.898,3.711 7.665,1.867 11.883,1.867 C16.099,1.867 19.866,3.711 22.728,6.725 L23.933,5.385 C20.767,2.037 16.551,0.025 11.883,0.025 L11.883,0.025 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="22px" height="20px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M19.610,13.577 L2.348,13.577 C1.287,13.577 0.487,12.767 0.487,11.693 L0.487,2.660 C0.487,1.586 1.287,0.777 2.348,0.777 L19.668,0.777 C20.728,0.777 21.528,1.586 21.528,2.660 L21.528,11.693 C21.464,12.752 20.621,13.577 19.610,13.577 ZM20.125,2.660 C20.125,2.375 19.950,2.198 19.668,2.198 L2.348,2.198 C2.066,2.198 1.891,2.375 1.891,2.660 L1.891,7.580 L20.125,7.580 L20.125,2.660 ZM20.125,9.002 L1.891,9.002 L1.891,11.693 C1.891,11.974 2.070,12.156 2.348,12.156 L19.668,12.156 C19.950,12.156 20.125,11.978 20.125,11.693 L20.125,9.002 ZM14.107,3.064 L18.567,3.064 C18.981,3.064 19.269,3.357 19.269,3.775 C19.269,4.213 18.905,4.485 18.567,4.485 L14.107,4.485 C13.694,4.485 13.405,4.193 13.405,3.775 C13.405,3.357 13.694,3.064 14.107,3.064 ZM4.948,17.558 C4.948,17.535 4.930,17.511 4.888,17.464 C4.855,17.424 4.817,17.379 4.787,17.320 C4.607,17.081 4.369,16.761 4.369,16.267 C4.369,15.325 4.984,14.684 5.243,14.574 C5.378,14.478 5.560,14.439 5.746,14.466 C5.939,14.493 6.109,14.589 6.211,14.726 C6.423,15.013 6.354,15.506 6.071,15.721 C6.063,15.727 5.772,15.930 5.772,16.267 C5.772,16.294 5.772,16.319 5.891,16.399 L5.925,16.433 L5.982,16.519 C6.097,16.689 6.240,16.900 6.343,17.160 C6.529,17.847 6.308,18.632 5.691,19.506 C5.498,19.705 5.299,19.793 5.070,19.793 C4.928,19.793 4.799,19.728 4.674,19.666 C4.366,19.435 4.297,18.943 4.509,18.656 C4.876,18.210 5.033,17.836 4.954,17.596 L4.948,17.558 ZM10.277,17.558 C10.277,17.497 10.255,17.468 10.139,17.352 L10.109,17.312 C9.935,17.080 9.698,16.760 9.698,16.267 C9.698,15.325 10.313,14.684 10.573,14.574 C10.708,14.478 10.890,14.439 11.076,14.466 C11.269,14.494 11.438,14.589 11.541,14.726 C11.642,14.864 11.685,15.056 11.658,15.250 C11.630,15.446 11.537,15.617 11.401,15.721 C11.392,15.727 11.101,15.930 11.101,16.267 C11.101,16.294 11.101,16.318 11.221,16.398 L11.255,16.434 L11.319,16.529 C11.431,16.696 11.571,16.905 11.673,17.159 C11.858,17.848 11.637,18.633 11.021,19.506 C10.827,19.705 10.628,19.793 10.400,19.793 C10.258,19.793 10.129,19.729 10.005,19.666 C9.842,19.547 9.748,19.376 9.721,19.180 C9.693,18.985 9.736,18.793 9.839,18.656 C10.205,18.210 10.362,17.836 10.283,17.596 L10.277,17.558 ZM15.606,17.558 C15.606,17.497 15.583,17.468 15.469,17.352 L15.439,17.313 C15.266,17.080 15.028,16.761 15.028,16.267 C15.028,15.325 15.643,14.684 15.902,14.574 C16.036,14.477 16.217,14.436 16.405,14.466 C16.598,14.494 16.768,14.589 16.870,14.726 C16.972,14.864 17.015,15.056 16.987,15.251 C16.959,15.446 16.865,15.617 16.729,15.721 C16.721,15.727 16.431,15.930 16.431,16.267 C16.431,16.294 16.431,16.318 16.551,16.398 L16.585,16.434 L16.648,16.528 C16.760,16.695 16.900,16.905 17.001,17.160 C17.188,17.847 16.967,18.633 16.350,19.506 C16.156,19.705 15.957,19.793 15.729,19.793 C15.586,19.793 15.457,19.728 15.333,19.666 C15.025,19.436 14.955,18.943 15.168,18.656 C15.536,18.210 15.691,17.836 15.613,17.597 L15.606,17.558 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="23px" height="21px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M13.085,9.324 C12.936,9.218 12.838,9.053 12.814,8.870 C12.790,8.687 12.842,8.502 12.958,8.360 C13.209,8.067 13.636,8.015 13.947,8.239 C14.094,8.346 14.191,8.510 14.215,8.693 C14.239,8.875 14.188,9.059 14.074,9.202 C13.823,9.495 13.396,9.548 13.085,9.324 ZM9.239,9.324 C9.092,9.216 8.996,9.052 8.972,8.870 C8.948,8.687 8.999,8.503 9.112,8.360 C9.364,8.063 9.796,8.010 10.109,8.239 C10.257,8.346 10.353,8.511 10.376,8.694 C10.398,8.877 10.345,9.061 10.228,9.202 C9.978,9.495 9.550,9.548 9.239,9.324 ZM8.926,5.281 C8.926,4.332 9.422,3.455 10.228,2.981 C10.325,2.924 10.432,2.896 10.534,2.852 C10.414,2.606 10.258,2.378 10.058,2.186 C9.615,1.759 9.023,1.530 8.413,1.548 C7.142,1.510 6.081,2.528 6.040,3.824 L6.040,10.530 L22.256,10.530 L21.259,15.407 C20.914,17.117 19.534,18.477 17.723,19.053 L18.306,19.815 C18.422,19.955 18.474,20.139 18.450,20.321 C18.426,20.503 18.328,20.666 18.180,20.770 C17.870,20.990 17.448,20.938 17.198,20.649 L16.454,19.686 C16.366,19.580 16.328,19.447 16.317,19.311 C16.137,19.326 15.961,19.352 15.777,19.352 L6.717,19.352 C6.537,19.352 6.365,19.326 6.189,19.312 C6.179,19.447 6.142,19.579 6.055,19.686 L5.296,20.649 C5.048,20.933 4.631,20.985 4.322,20.770 C4.174,20.666 4.076,20.503 4.052,20.321 C4.028,20.139 4.080,19.955 4.195,19.815 L4.777,19.055 C2.963,18.481 1.581,17.119 1.235,15.407 L0.238,10.530 L4.553,10.530 L4.553,3.824 C4.593,1.690 6.321,-0.007 8.413,0.031 C9.417,0.013 10.388,0.402 11.110,1.114 C11.558,1.555 11.871,2.103 12.062,2.696 C12.328,2.753 12.589,2.838 12.832,2.981 C13.637,3.455 14.133,4.332 14.133,5.281 L14.133,7.753 L8.926,7.753 L8.926,5.281 ZM6.717,17.820 L15.777,17.820 C17.756,17.820 19.496,16.644 19.809,15.081 L19.926,14.505 L2.568,14.505 L2.686,15.081 C3.005,16.644 4.739,17.820 6.717,17.820 ZM2.068,12.047 L2.275,13.063 L20.219,13.063 L20.426,12.047 L2.068,12.047 ZM10.414,6.236 L12.646,6.236 L12.646,5.281 C12.646,4.874 12.433,4.498 12.088,4.295 C11.743,4.092 11.317,4.092 10.972,4.295 C10.627,4.498 10.414,4.874 10.414,5.281 L10.414,6.236 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="18px" height="21px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M17.788,8.090 C17.652,8.227 17.466,8.304 17.272,8.304 L6.567,8.304 C6.374,8.304 6.188,8.227 6.051,8.090 C5.914,7.953 5.837,7.767 5.837,7.573 L5.837,6.599 C5.840,5.120 7.036,3.922 8.513,3.919 L11.190,3.919 L11.190,1.727 C11.190,1.592 11.081,1.483 10.946,1.483 L5.594,1.483 C3.311,1.486 1.460,3.338 1.458,5.625 L1.458,20.242 C1.458,20.645 1.131,20.972 0.728,20.972 C0.325,20.972 -0.002,20.645 -0.002,20.242 L-0.002,5.625 C0.001,2.531 2.504,0.024 5.594,0.021 L10.946,0.021 C11.398,0.021 11.831,0.201 12.151,0.521 C12.470,0.841 12.650,1.274 12.650,1.727 L12.650,3.919 L15.326,3.919 C16.803,3.922 17.1000,5.120 18.002,6.599 L18.002,7.573 C18.002,7.767 17.925,7.953 17.788,8.090 ZM16.542,6.599 C16.542,6.276 16.414,5.966 16.186,5.738 C15.958,5.509 15.649,5.381 15.326,5.381 L12.095,5.381 C11.980,5.413 11.859,5.413 11.745,5.381 L8.513,5.381 C7.842,5.381 7.297,5.926 7.297,6.599 L7.297,6.843 L16.542,6.843 L16.542,6.599 ZM8.027,9.766 C8.220,9.766 8.406,9.843 8.543,9.980 C8.680,10.117 8.757,10.303 8.757,10.497 L8.757,10.984 C8.757,11.388 8.430,11.715 8.027,11.715 C7.624,11.715 7.297,11.388 7.297,10.984 L7.297,10.497 C7.297,10.303 7.374,10.117 7.511,9.980 C7.648,9.843 7.833,9.766 8.027,9.766 ZM8.027,13.177 C8.430,13.177 8.757,13.504 8.757,13.907 L8.757,14.395 C8.757,14.798 8.430,15.126 8.027,15.126 C7.624,15.126 7.297,14.798 7.297,14.395 L7.297,13.907 C7.297,13.504 7.624,13.177 8.027,13.177 ZM8.027,16.587 C8.430,16.587 8.757,16.914 8.757,17.318 L8.757,17.805 C8.757,18.209 8.430,18.536 8.027,18.536 C7.624,18.536 7.297,18.209 7.297,17.805 L7.297,17.318 C7.297,16.914 7.624,16.587 8.027,16.587 ZM11.920,9.766 C12.323,9.766 12.650,10.093 12.650,10.497 L12.650,10.984 C12.650,11.388 12.323,11.715 11.920,11.715 C11.517,11.715 11.190,11.388 11.190,10.984 L11.190,10.497 C11.190,10.093 11.517,9.766 11.920,9.766 ZM11.920,13.177 C12.323,13.177 12.650,13.504 12.650,13.907 L12.650,14.395 C12.650,14.798 12.323,15.126 11.920,15.126 C11.517,15.126 11.190,14.798 11.190,14.395 L11.190,13.907 C11.190,13.504 11.517,13.177 11.920,13.177 ZM11.920,16.587 C12.323,16.587 12.650,16.914 12.650,17.318 L12.650,17.805 C12.650,18.209 12.323,18.536 11.920,18.536 C11.517,18.536 11.190,18.209 11.190,17.805 L11.190,17.318 C11.190,16.914 11.517,16.587 11.920,16.587 ZM15.813,9.766 C16.216,9.766 16.542,10.093 16.542,10.497 L16.542,10.984 C16.542,11.388 16.216,11.715 15.813,11.715 C15.409,11.715 15.083,11.388 15.083,10.984 L15.083,10.497 C15.083,10.093 15.409,9.766 15.813,9.766 ZM15.813,13.177 C16.216,13.177 16.542,13.504 16.542,13.907 L16.542,14.395 C16.542,14.798 16.216,15.126 15.813,15.126 C15.409,15.126 15.083,14.798 15.083,14.395 L15.083,13.907 C15.083,13.504 15.409,13.177 15.813,13.177 ZM15.813,16.587 C16.216,16.587 16.542,16.914 16.542,17.318 L16.542,17.805 C16.542,18.209 16.216,18.536 15.813,18.536 C15.409,18.536 15.083,18.209 15.083,17.805 L15.083,17.318 C15.083,16.914 15.409,16.587 15.813,16.587 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="21px" height="20px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M19.593,5.846 L14.662,10.831 L19.735,16.028 C20.017,16.318 20.017,16.753 19.735,17.042 C19.628,17.224 19.452,17.296 19.275,17.296 C19.098,17.296 18.921,17.224 18.780,17.079 L4.033,1.969 C3.750,1.679 3.750,1.245 4.033,0.955 C4.316,0.665 4.741,0.665 5.024,0.955 L10.224,6.283 L15.137,1.281 C15.526,0.882 15.986,0.665 16.481,0.592 C17.012,0.520 17.542,0.701 17.896,1.063 L19.805,3.020 C20.513,3.745 20.406,5.013 19.593,5.846 ZM13.610,4.894 L11.231,7.316 L13.670,9.814 L16.039,7.386 L13.617,4.904 C13.614,4.901 13.613,4.897 13.610,4.894 ZM18.780,4.035 L16.870,2.078 C16.799,2.005 16.693,2.005 16.623,2.042 C16.446,2.078 16.269,2.151 16.127,2.332 L14.601,3.886 C14.603,3.887 14.605,3.888 14.607,3.890 L17.029,6.372 L18.568,4.796 C18.850,4.506 18.886,4.143 18.780,4.035 ZM6.049,19.289 C5.943,19.434 5.766,19.506 5.589,19.506 C5.413,19.506 5.236,19.434 5.094,19.289 L2.124,16.282 C1.841,15.992 1.841,15.557 2.124,15.267 C2.407,14.977 2.831,14.977 3.114,15.267 L6.049,18.274 C6.332,18.564 6.332,18.999 6.049,19.289 ZM2.371,12.042 C2.548,12.405 2.407,12.839 2.088,13.021 C2.053,13.093 1.912,13.129 1.806,13.129 C1.558,13.129 1.310,12.984 1.169,12.731 C0.285,10.991 0.285,9.433 1.204,8.057 C1.806,7.151 1.806,6.064 1.134,4.687 C0.957,4.325 1.098,3.890 1.452,3.709 C1.806,3.527 2.230,3.672 2.407,4.035 C3.291,5.883 3.291,7.513 2.336,8.854 C1.735,9.760 1.735,10.810 2.371,12.042 ZM4.281,13.238 C4.352,12.731 4.564,12.260 4.953,11.897 L8.666,8.093 L9.656,9.107 L5.943,12.912 C5.802,13.057 5.695,13.238 5.695,13.419 C5.695,13.455 5.695,13.600 5.766,13.673 L7.676,15.629 C7.782,15.738 8.136,15.702 8.418,15.412 L12.025,11.716 L13.016,12.731 L9.373,16.426 C8.949,16.861 8.383,17.115 7.817,17.115 C7.357,17.115 6.969,16.970 6.650,16.644 L4.741,14.687 C4.387,14.325 4.210,13.781 4.281,13.238 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="22px" height="22px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M8.069,3.973 C8.976,3.973 9.711,3.233 9.711,2.321 C9.711,1.409 8.976,0.670 8.069,0.670 C7.163,0.670 6.427,1.409 6.427,2.321 C6.427,3.233 7.163,3.973 8.069,3.973 L8.069,3.973 ZM7.729,6.147 C7.656,5.697 7.959,5.272 8.407,5.199 C8.854,5.125 9.276,5.431 9.349,5.881 L9.674,7.885 L17.577,7.885 C18.030,7.885 18.398,8.255 18.398,8.711 C18.398,9.167 18.030,9.536 17.577,9.536 L9.942,9.536 L10.377,12.218 C10.451,12.681 10.722,12.912 11.187,12.912 L16.886,12.912 C17.942,12.912 18.689,13.394 19.127,14.360 L21.547,19.697 C21.735,20.112 21.553,20.602 21.140,20.791 C20.728,20.981 20.241,20.798 20.053,20.383 L17.632,15.045 C17.487,14.723 17.238,14.562 16.885,14.562 L11.188,14.562 C9.793,14.562 8.982,13.870 8.757,12.484 L7.729,6.147 L7.729,6.147 ZM5.1000,9.425 C6.406,9.240 6.591,8.763 6.417,8.350 C6.243,7.938 5.774,7.740 5.359,7.905 C4.488,8.276 3.716,8.800 3.044,9.476 C1.620,10.908 0.907,12.637 0.907,14.661 C0.907,16.687 1.620,18.416 3.044,19.848 C4.467,21.280 6.186,21.996 8.199,21.996 C10.213,21.996 11.932,21.280 13.355,19.848 C14.029,19.171 14.549,18.394 14.918,17.517 C15.083,17.099 14.886,16.626 14.474,16.451 C14.063,16.276 13.588,16.464 13.405,16.874 C13.120,17.553 12.717,18.155 12.195,18.680 C11.091,19.790 9.759,20.345 8.199,20.345 C6.639,20.345 5.308,19.790 4.204,18.680 C3.101,17.571 2.549,16.232 2.549,14.662 C2.549,13.093 3.101,11.754 4.204,10.644 C4.726,10.119 5.325,9.713 6.001,9.426 L5.1000,9.425 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="21px" height="22px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M20.141,8.001 C20.020,7.878 19.851,7.806 19.675,7.803 L4.162,7.803 L4.162,2.942 C4.162,2.364 4.616,1.910 5.196,1.910 C5.789,1.910 6.254,2.364 6.254,2.944 C6.254,3.317 6.564,3.621 6.952,3.621 L6.953,3.621 C7.323,3.607 7.625,3.312 7.641,2.944 C7.641,1.603 6.567,0.554 5.196,0.554 C3.862,0.554 2.776,1.625 2.776,2.942 L2.776,7.803 L0.759,7.803 C0.585,7.806 0.416,7.878 0.296,8.001 C0.176,8.125 0.110,8.293 0.115,8.458 L0.115,21.056 C0.115,21.424 0.399,21.711 0.761,21.711 L19.678,21.711 C19.852,21.708 20.021,21.636 20.141,21.513 C20.261,21.390 20.327,21.222 20.322,21.056 L20.322,8.463 C20.327,8.293 20.261,8.124 20.141,8.001 ZM18.958,12.309 L18.958,20.355 L9.911,20.355 L9.911,12.309 L18.958,12.309 ZM18.958,9.158 L18.958,10.953 L9.911,10.953 L9.911,9.158 L18.958,9.158 ZM8.527,9.158 L8.527,20.355 L1.479,20.355 L1.479,9.158 L8.527,9.158 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="22px" height="22px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M19.845,21.814 L1.970,21.814 C1.263,21.814 0.685,21.239 0.685,20.529 L0.685,13.248 C0.685,12.823 1.031,12.478 1.457,12.478 C1.883,12.478 2.228,12.823 2.228,13.248 L2.228,14.405 L4.999,14.405 L4.999,2.701 C5.000,1.425 6.035,0.390 7.312,0.387 L14.500,0.387 C15.778,0.389 16.814,1.424 16.815,2.701 L16.815,14.407 L19.587,14.407 L19.587,13.251 C19.586,13.046 19.668,12.849 19.812,12.705 C19.957,12.560 20.154,12.479 20.358,12.479 C20.783,12.479 21.130,12.824 21.130,13.251 L21.130,20.529 C21.129,21.238 20.555,21.813 19.845,21.814 ZM5.001,15.947 L2.228,15.947 L2.228,20.274 L5.001,20.274 L5.001,15.947 ZM6.541,20.274 L10.136,20.274 L10.136,15.947 L6.541,15.947 L6.541,20.274 ZM15.272,2.701 C15.272,2.277 14.925,1.930 14.500,1.930 L7.312,1.930 C6.888,1.930 6.541,2.277 6.541,2.701 L6.541,14.405 L15.272,14.405 L15.272,2.701 ZM15.272,15.947 L11.678,15.947 L11.678,20.274 L15.272,20.274 L15.272,15.947 ZM19.587,15.947 L16.815,15.947 L16.815,20.274 L19.587,20.274 L19.587,15.947 ZM13.412,5.340 C13.498,5.235 13.623,5.169 13.758,5.156 C13.893,5.143 14.028,5.185 14.132,5.273 C14.349,5.459 14.377,5.785 14.196,6.005 L11.129,9.733 C11.044,9.839 10.919,9.906 10.783,9.919 C10.648,9.932 10.512,9.889 10.409,9.800 C10.192,9.613 10.164,9.288 10.345,9.067 L13.412,5.340 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="26px" height="23px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M24.733,22.182 C24.184,22.726 23.542,22.989 22.771,22.989 L3.751,22.989 C2.978,22.989 2.334,22.722 1.784,22.174 C1.263,21.675 0.968,20.965 0.978,20.233 C0.978,19.470 1.245,18.831 1.796,18.284 C2.292,17.776 2.991,17.483 3.712,17.483 L4.920,17.483 L5.246,17.454 L5.207,17.113 L5.205,15.605 L4.966,15.561 C4.267,15.434 3.639,15.096 3.147,14.585 C2.409,13.825 2.035,12.726 2.035,11.318 C2.035,9.852 2.372,8.452 3.035,7.159 C3.818,5.635 4.744,4.895 5.865,4.895 C6.680,4.895 7.387,5.287 8.024,6.096 L8.320,6.472 L10.547,1.607 C10.653,1.377 10.886,1.225 11.142,1.224 C11.399,1.224 11.633,1.371 11.742,1.597 L16.510,11.533 L18.514,8.349 C18.651,8.135 18.902,8.019 19.146,8.047 C19.384,8.068 19.597,8.226 19.687,8.460 L23.233,17.514 L23.388,17.548 C23.894,17.653 24.334,17.896 24.731,18.288 L24.733,18.288 C25.278,18.831 25.544,19.468 25.544,20.236 C25.544,21.002 25.278,21.639 24.733,22.182 ZM18.413,18.138 C18.413,17.778 18.710,17.483 19.073,17.483 L21.807,17.483 L18.934,10.151 L16.992,13.240 C16.798,13.539 16.548,13.575 16.370,13.542 C16.155,13.534 15.942,13.392 15.836,13.176 L11.163,3.428 L9.072,7.995 L9.114,8.106 C9.502,9.136 9.698,10.217 9.694,11.318 C9.694,12.725 9.320,13.824 8.579,14.588 C8.089,15.098 7.460,15.434 6.762,15.561 L6.524,15.605 L6.521,17.149 L6.490,17.483 L13.260,17.483 C13.494,17.483 13.714,17.609 13.833,17.811 C13.950,18.014 13.950,18.264 13.830,18.466 C13.716,18.667 13.496,18.793 13.260,18.793 L3.759,18.793 C3.735,18.791 3.712,18.791 3.688,18.791 C3.312,18.791 3.001,18.928 2.730,19.208 C2.445,19.480 2.291,19.851 2.297,20.233 C2.297,20.632 2.440,20.976 2.724,21.259 C3.001,21.533 3.357,21.678 3.751,21.678 L22.771,21.678 C23.173,21.678 23.516,21.537 23.793,21.263 L23.796,21.259 C24.070,20.996 24.230,20.618 24.225,20.247 C24.231,19.861 24.076,19.481 23.808,19.224 C23.539,18.948 23.171,18.793 22.793,18.793 L19.073,18.793 C18.710,18.793 18.413,18.498 18.413,18.138 ZM5.865,10.140 C6.228,10.140 6.524,10.434 6.524,10.794 L6.524,14.310 L6.925,14.152 C7.887,13.770 8.375,12.818 8.375,11.318 C8.375,10.061 8.087,8.863 7.519,7.754 C6.991,6.731 6.420,6.189 5.863,6.189 C5.308,6.191 4.736,6.731 4.210,7.754 C3.644,8.853 3.347,10.085 3.354,11.317 C3.354,12.818 3.842,13.770 4.805,14.152 L5.205,14.310 L5.205,10.794 C5.205,10.434 5.502,10.140 5.865,10.140 ZM20.657,6.309 C19.070,6.309 17.778,5.027 17.778,3.453 C17.778,1.877 19.070,0.595 20.657,0.595 C22.245,0.595 23.536,1.877 23.536,3.453 C23.536,5.027 22.245,6.309 20.657,6.309 ZM21.766,2.362 C21.481,2.069 21.085,1.903 20.677,1.903 C20.229,1.904 19.859,2.054 19.558,2.353 L19.556,2.355 C19.257,2.644 19.091,3.042 19.099,3.448 C19.099,3.871 19.257,4.249 19.556,4.550 C19.859,4.848 20.230,4.1000 20.657,4.1000 C21.080,4.1000 21.463,4.843 21.763,4.547 C22.064,4.245 22.217,3.876 22.217,3.453 C22.217,3.028 22.065,2.661 21.766,2.362 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="21px" height="19px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M17.639,0.573 C18.090,0.573 18.523,0.755 18.842,1.075 C19.161,1.398 19.339,1.834 19.339,2.287 L19.339,17.371 L19.616,17.371 C19.919,17.371 20.169,17.601 20.208,18.010 L20.213,18.126 C20.213,18.608 19.946,18.881 19.616,18.881 L18.585,18.880 L18.572,18.881 L1.568,18.881 C1.240,18.881 0.973,18.608 0.970,18.126 C0.970,17.645 1.238,17.372 1.568,17.372 L1.859,17.371 L1.859,2.287 C1.859,1.385 2.551,0.646 3.432,0.578 L3.559,0.573 L17.639,0.573 ZM9.784,9.270 L9.784,2.132 L3.902,2.132 C3.771,2.134 3.646,2.187 3.554,2.281 C3.462,2.375 3.412,2.501 3.413,2.632 L3.415,17.371 L9.784,17.371 L9.784,11.273 L9.784,9.270 ZM11.333,9.967 C11.333,9.967 11.333,10.058 11.333,10.221 C11.333,11.522 11.333,17.371 11.333,17.371 L17.800,17.371 L17.799,2.632 C17.802,2.389 17.627,2.180 17.387,2.139 L17.308,2.132 L11.333,2.132 L11.333,7.963 L11.333,9.967 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="21px" height="19px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M17.639,0.573 C18.090,0.573 18.523,0.755 18.842,1.075 C19.161,1.398 19.339,1.834 19.339,2.287 L19.339,17.371 L19.616,17.371 C19.919,17.371 20.169,17.601 20.208,18.010 L20.213,18.126 C20.213,18.608 19.946,18.881 19.616,18.881 L18.585,18.880 L18.572,18.881 L1.568,18.881 C1.240,18.881 0.973,18.608 0.970,18.126 C0.970,17.645 1.238,17.372 1.568,17.372 L1.859,17.371 L1.859,2.287 C1.859,1.385 2.551,0.646 3.432,0.578 L3.559,0.573 L17.639,0.573 ZM9.784,2.132 L3.902,2.132 C3.771,2.134 3.646,2.187 3.554,2.281 C3.462,2.375 3.412,2.501 3.413,2.632 L3.415,17.371 L9.784,17.371 L9.784,11.273 L6.817,13.775 C6.687,13.909 6.385,13.945 6.182,13.888 L6.101,13.857 C5.906,13.761 5.684,13.606 5.629,13.398 C5.575,13.193 5.617,12.802 5.771,12.654 L9.784,9.270 L9.784,2.132 ZM17.308,2.132 L11.333,2.132 L11.333,7.963 L14.340,5.428 C14.549,5.218 15.053,5.199 15.315,5.371 L15.387,5.428 C15.619,5.659 15.619,6.318 15.387,6.550 L11.333,9.967 L11.333,17.371 L17.800,17.371 L17.799,2.632 C17.802,2.389 17.627,2.180 17.387,2.139 L17.308,2.132 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="22px" height="21px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M17.928,17.431 L12.883,17.431 L12.883,19.178 L15.220,19.178 C15.575,19.178 15.862,19.465 15.862,19.820 C15.862,20.174 15.575,20.462 15.220,20.462 L6.031,20.462 C5.676,20.462 5.389,20.174 5.389,19.820 C5.389,19.465 5.676,19.178 6.031,19.178 L8.368,19.178 L8.368,17.431 L3.323,17.431 C1.553,17.431 0.113,15.992 0.113,14.221 L0.113,3.646 C0.113,1.876 1.553,0.436 3.323,0.436 L17.928,0.436 C19.698,0.436 21.138,1.876 21.138,3.646 L21.138,14.221 C21.138,15.992 19.698,17.431 17.928,17.431 ZM11.598,19.178 L11.598,17.431 L9.653,17.431 L9.653,19.178 L11.598,19.178 ZM19.854,3.646 C19.854,2.584 18.990,1.720 17.928,1.720 L3.323,1.720 C2.261,1.720 1.397,2.584 1.397,3.646 L1.397,11.894 L2.949,11.894 L2.949,3.784 C2.949,3.429 3.236,3.142 3.591,3.142 L17.660,3.142 C18.015,3.142 18.303,3.429 18.303,3.784 L18.303,11.894 L19.854,11.894 L19.854,3.646 ZM4.233,4.426 L4.233,11.894 L17.018,11.894 L17.018,4.426 L4.233,4.426 ZM19.854,13.178 L17.660,13.178 L3.591,13.178 L1.397,13.178 L1.397,14.221 C1.397,15.283 2.261,16.147 3.323,16.147 L17.928,16.147 C18.990,16.147 19.854,15.283 19.854,14.221 L19.854,13.178 ZM10.927,15.325 L9.627,15.325 C9.273,15.325 8.985,15.037 8.985,14.683 C8.985,14.328 9.273,14.041 9.627,14.041 L10.927,14.041 C11.281,14.041 11.569,14.328 11.569,14.683 C11.569,15.037 11.281,15.325 10.927,15.325 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="22px" height="22px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M18.368,18.070 L14.685,18.070 L14.685,20.444 L15.898,20.444 C16.241,20.444 16.519,20.722 16.519,21.066 C16.519,21.409 16.241,21.687 15.898,21.687 L14.064,21.687 L7.688,21.687 L5.854,21.687 C5.511,21.687 5.233,21.409 5.233,21.066 C5.233,20.722 5.511,20.444 5.854,20.444 L7.066,20.444 L7.066,18.070 L3.602,18.070 C1.888,18.070 0.495,16.676 0.495,14.963 L0.495,14.205 L0.495,3.813 C0.495,2.100 1.888,0.706 3.602,0.706 L18.368,0.706 C20.082,0.706 21.475,2.100 21.475,3.813 L21.475,14.205 L21.475,14.963 C21.475,16.676 20.082,18.070 18.368,18.070 ZM8.309,20.444 L13.442,20.444 L13.442,18.070 L8.309,18.070 L8.309,20.444 ZM20.233,3.813 C20.233,2.786 19.396,1.949 18.368,1.949 L3.602,1.949 C2.574,1.949 1.737,2.786 1.737,3.813 L1.737,13.584 L20.233,13.584 L20.233,3.813 ZM20.233,14.827 L1.737,14.827 L1.737,14.963 C1.737,15.990 2.574,16.827 3.602,16.827 L7.688,16.827 L14.064,16.827 L18.368,16.827 C19.396,16.827 20.233,15.990 20.233,14.963 L20.233,14.827 ZM10.229,6.392 L8.506,6.392 L8.506,11.197 L7.546,11.197 L7.546,6.392 L5.823,6.392 L5.823,5.515 L10.229,5.515 L10.229,6.392 ZM13.326,9.758 L15.074,5.515 L16.147,5.515 L13.863,11.197 L12.790,11.197 L10.505,5.515 L11.578,5.515 L13.326,9.758 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="22px" height="22px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M20.933,13.104 L16.664,13.104 L15.780,9.309 C15.655,8.767 15.165,8.381 14.603,8.381 L7.920,8.381 C7.358,8.381 6.879,8.767 6.744,9.309 L5.859,13.104 L1.612,13.104 C1.205,13.104 0.872,13.437 0.872,13.844 C0.872,14.250 1.205,14.584 1.612,14.584 L3.423,14.584 L3.423,19.525 C3.423,20.683 4.360,21.621 5.515,21.621 L17.050,21.621 C18.205,21.621 19.142,20.683 19.142,19.525 L19.142,16.367 C19.142,15.960 18.809,15.626 18.403,15.626 C17.997,15.626 17.664,15.960 17.664,16.367 L17.664,18.952 C17.664,19.609 17.133,20.151 16.467,20.151 L6.088,20.151 C5.432,20.151 4.891,19.619 4.891,18.952 L4.891,14.584 L20.933,14.584 C21.339,14.584 21.672,14.250 21.672,13.844 C21.672,13.437 21.349,13.104 20.933,13.104 L20.933,13.104 ZM7.379,13.104 L8.139,9.851 L14.395,9.851 L15.155,13.104 L7.379,13.104 ZM11.272,7.683 C13.167,7.683 14.697,6.150 14.697,4.253 C14.697,2.366 13.167,0.823 11.272,0.823 C9.377,0.823 7.847,2.366 7.847,4.253 C7.847,6.150 9.377,7.683 11.272,7.683 L11.272,7.683 ZM11.272,2.303 C12.344,2.303 13.219,3.179 13.219,4.253 C13.219,5.326 12.344,6.202 11.272,6.202 C10.200,6.202 9.325,5.326 9.325,4.253 C9.325,3.179 10.200,2.303 11.272,2.303 L11.272,2.303 Z"/></svg>
\ No newline at end of file

+<svg 
 xmlns="http://www.w3.org/2000/svg"
 xmlns:xlink="http://www.w3.org/1999/xlink"
 width="26px" height="18px"><path fill-rule="evenodd"  fill="rgb(146, 154, 160)"
 d="M24.415,17.908 L23.190,17.908 L2.099,17.908 L0.874,17.908 C0.465,17.908 0.132,17.564 0.132,17.139 C0.132,16.715 0.465,16.371 0.874,16.371 L1.405,16.371 C1.844,10.610 6.348,5.996 11.903,5.614 L11.903,5.372 C11.057,5.055 10.448,4.222 10.448,3.237 C10.448,1.980 11.433,0.958 12.645,0.958 C13.856,0.958 14.841,1.980 14.841,3.237 C14.841,4.222 14.232,5.055 13.386,5.372 L13.386,5.614 C18.941,5.996 23.445,10.610 23.884,16.371 L24.415,16.371 C24.824,16.371 25.156,16.715 25.156,17.139 C25.156,17.564 24.824,17.908 24.415,17.908 ZM12.645,2.495 C12.250,2.495 11.930,2.828 11.930,3.237 C11.930,3.645 12.250,3.978 12.645,3.978 C13.039,3.978 13.359,3.645 13.359,3.237 C13.359,2.828 13.039,2.495 12.645,2.495 ZM12.645,7.114 C7.564,7.114 3.332,11.200 2.879,16.371 L22.409,16.371 C21.957,11.200 17.725,7.114 12.645,7.114 ZM3.718,14.817 C4.804,10.628 8.475,7.701 12.645,7.701 C13.054,7.701 13.386,8.045 13.386,8.470 C13.386,8.894 13.054,9.238 12.645,9.238 C9.144,9.238 6.062,11.696 5.149,15.216 C5.061,15.559 4.761,15.785 4.434,15.785 C4.371,15.785 4.306,15.777 4.241,15.759 C3.846,15.649 3.612,15.227 3.718,14.817 Z"/></svg>
\ No newline at end of file

@@ -525,7 +525,7 @@ img{display: block;}
 	 ul{margin: 0;padding: 0;white-space: nowrap;
 	 ul{margin: 0;padding: 0;white-space: nowrap;
 		 li{border-radius: 5px;display: inline;padding: 5px 15px; font-size: 18px;text-transform: capitalize;
 		 li{border-radius: 5px;display: inline;padding: 5px 15px; font-size: 18px;text-transform: capitalize;
 		 color: #fff;cursor: pointer;}
 		 color: #fff;cursor: pointer;}
-		 li.active{background: #FFFFFF;color: var(--el-color-primary);cursor: default;}
+		 li.active{background: #FFFFFF;color:#000;cursor: default;}
 	 }
 	 }
  }
  }
 .news-l-r{
 .news-l-r{

@@ -72,10 +72,10 @@
         <img class="kf" src="@/assets/logo/btn01.png"/>
         <img class="kf" src="@/assets/logo/btn01.png"/>
         <div class="text-center ">LIVE CHAT</div>
         <div class="text-center ">LIVE CHAT</div>
       </div>
       </div>
-      <div @click="goHelp">
-        <img class="kf" src="@/assets/logo/btn02.png"/>
-        <div class="text-center uppercase">Video Guide</div>
-      </div>
+<!--      <div @click="goHelp">-->
+<!--        <img class="kf" src="@/assets/logo/btn02.png"/>-->
+<!--        <div class="text-center uppercase">Video Guide</div>-->
+<!--      </div>-->
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

@@ -94,12 +94,23 @@
       useStore().setVisitor()
       useStore().setVisitor()
       return
       return
     }
     }
-    //todo 是否为会议酒店
-    ElMessageBox.confirm('该酒店为会议酒店，是否继续预定','',{
-      cancelButtonText: language.value==1?'Close ':'关闭',
-      confirmButtonText: language.value==1?'Continue to book':'继续预订',
-      type: 'warning',
-    }).then((res) => {
+    if(item.meeting=='1'){
+      ElMessageBox.confirm( item.meetText,'',{
+        cancelButtonText: language.value==1?'Close ':'关闭',
+        confirmButtonText: language.value==1?'Continue to book':'继续预订',
+        type: 'warning',
+      }).then((res) => {
+        router.push({
+          name:'hotelDetail',
+          params:{
+            hotelId:item.hotelId,
+          },
+          query:{
+            id:item.id
+          }
+        })
+      })
+    } else {
       router.push({
       router.push({
         name:'hotelDetail',
         name:'hotelDetail',
         params:{
         params:{
@@ -109,9 +120,7 @@
           id:item.id
           id:item.id
         }
         }
       })
       })
-    })
-
-
+    }
   }
   }
 </script>
 </script>
 
 

@@ -63,12 +63,45 @@
         </el-row>
         </el-row>
       </div>
       </div>
 
 
+      <el-card class="mt30">
+        <div class="lineHead">
+          <ul>
+            <li class="active">
+              {{ language == 0 ? '服务及设施' : 'Services & Facilities' }}
+            </li>
+          </ul>
+        </div>
+        <div class="labelBox">
+          <div v-if="labelObj.apartment==1"><img src="@/assets/img/svg/tag01@2x.png"/>{{ language==0 ?'公寓': 'Apartment' }}</div>
+          <div v-if="labelObj.bigRoom==1"><img src="@/assets/img/svg/tag02@2x.png"/>{{ language==0 ?'大床房': 'Big Bedroom' }}</div>
+          <div v-if="labelObj.twoRoom==1"><img src="@/assets/img/svg/tag03@2x.png"/>{{ language==0 ?'双床房': 'Double Bedroom' }}</div>
+          <div v-if="labelObj.suite==1"><img src="@/assets/img/svg/tag04@2x.png"/>{{ language==0 ?'套房': 'Suite' }}</div>
+          <div v-if="labelObj.familyRoom==1"><img src="@/assets/img/svg/tag05@2x.png"/>{{ language==0 ?'家庭房': 'Family Room' }}</div>
+          <div v-if="labelObj.wifi==1"><img src="@/assets/img/svg/tag06@2x.png"/>{{ language==0 ?'无线网': 'wifi' }}</div>
+          <div v-if="labelObj.airConditioner==1"><img src="@/assets/img/svg/tag07@2x.png"/>{{ language==0 ?'空调': 'Air Conditioner' }}</div>
+          <div v-if="labelObj.inBathroom==1"><img src="@/assets/img/svg/tag08@2x.png"/>{{ language==0 ?'独立卫浴': 'In-bathroom' }}</div>
+          <div v-if="labelObj.outBathroom==1"><img src="@/assets/img/svg/tag09@2x.png"/>{{ language==0 ?'公共卫浴': 'Out-bathroom' }}</div>
+          <div v-if="labelObj.smoking==1"><img src="@/assets/img/svg/tag10@2x.png"/>{{ language==0 ?'禁烟': 'No Smoking' }}</div>
+          <div v-if="labelObj.facilities==1"><img src="@/assets/img/svg/tag11@2x.png"/>{{ language==0 ?'无障碍设施': 'Facilities' }}</div>
+          <div v-if="labelObj.kitchen==1"><img src="@/assets/img/svg/tag12@2x.png"/>{{ language==0 ?'厨房': 'Kitchen' }}</div>
+          <div v-if="labelObj.balcony==1"><img src="@/assets/img/svg/tag13@2x.png"/>{{ language==0 ?'阳台': 'Balcony' }}</div>
+          <div v-if="labelObj.scenery==1"><img src="@/assets/img/svg/tag14@2x.png"/>{{ language==0 ?'风景': 'Scenery' }}</div>
+          <div v-if="labelObj.windowed==1"><img src="@/assets/img/svg/tag15@2x.png"/>{{ language==0 ?'有窗': 'Windowed' }}</div>
+          <div v-if="labelObj.windowless==1"><img src="@/assets/img/svg/tag16@2x.png"/>{{ language==0 ?'无窗': 'Windowless' }}</div>
+          <div v-if="labelObj.computer==1"><img src="@/assets/img/svg/tag17@2x.png"/>{{ language==0 ?'电脑': 'computer' }}</div>
+          <div v-if="labelObj.tv==1"><img src="@/assets/img/svg/tag18@2x.png"/>{{ language==0 ?'电视': 'tv' }}</div>
+          <div v-if="labelObj.hours==1"><img src="@/assets/img/svg/tag19@2x.png"/>{{ language==0 ?'24小时前台': '24Hours Available' }}</div>
+          <div v-if="labelObj.breakfast==1"><img src="@/assets/img/svg/tag20@2x.png"/>{{ language==0 ?'早餐': 'breakfast' }}</div>
+        </div>
+      </el-card>
+
       <el-card class="mt30 mb60">
       <el-card class="mt30 mb60">
         <div class="lineHead">
         <div class="lineHead">
           <ul>
           <ul>
-            <li>
+            <li class="active">
               {{ language == 0 ? '房型选择' : 'Available Rooms' }}
               {{ language == 0 ? '房型选择' : 'Available Rooms' }}
-              <span style="margin-left: 50px" @click="initTime">
+            </li>
+            <span style="margin-left: 50px" @click="initTime">
                  <el-date-picker
                  <el-date-picker
                      @change="getDaysBetween"
                      @change="getDaysBetween"
                      v-model="hotTime"
                      v-model="hotTime"
@@ -80,7 +113,6 @@
                      value-format="YYYY-MM-DD"
                      value-format="YYYY-MM-DD"
                  />
                  />
               </span>
               </span>
-            </li>
           </ul>
           </ul>
         </div>
         </div>
         <div>
         <div>
@@ -154,7 +186,7 @@ import {useRouter} from "vue-router";
 import {ref, reactive, onMounted, getCurrentInstance} from "vue";
 import {ref, reactive, onMounted, getCurrentInstance} from "vue";
 import {useRoute} from "vue-router";
 import {useRoute} from "vue-router";
 import {dayjs} from 'element-plus'
 import {dayjs} from 'element-plus'
-import {getHotelById, getHotelRooms, checkRoomPayByUserId} from "@/apiPc/booking"
+import {getHotelById, getHotelRooms, checkRoomPayByUserId, getHotelTags} from "@/apiPc/booking"
 import {getBaseInfoByActiveId} from "@/apiPc/booking";
 import {getBaseInfoByActiveId} from "@/apiPc/booking";
 
 
 const {proxy} = getCurrentInstance()
 const {proxy} = getCurrentInstance()
@@ -178,6 +210,7 @@ const loading = ref(false)
 const roomList = ref([])
 const roomList = ref([])
 const map = ref(null)
 const map = ref(null)
 const formTime = ref({})
 const formTime = ref({})
+const labelObj = ref({})
 
 
 let baseHotTime;
 let baseHotTime;
 
 
@@ -191,12 +224,15 @@ onMounted(() => {
   }).finally(() => {
   }).finally(() => {
     console.log(formTime.value)
     console.log(formTime.value)
     getDateTime()
     getDateTime()
-
     getData()
     getData()
   })
   })
-
+  getLabel()
 })
 })
-
+function getLabel() {
+  getHotelTags(route.params.hotelId).then(res=>{
+    labelObj.value = res.data
+  })
+}
 function initTime() {
 function initTime() {
   if (!hotTime.value[0]) {
   if (!hotTime.value[0]) {
     hotTime.value = baseHotTime
     hotTime.value = baseHotTime
@@ -498,7 +534,8 @@ function goMap() {
 
 
   span {
   span {
     border-radius: 13px;
     border-radius: 13px;
-    font-size: 12px;
+    font-size: 12px;    display: inline-block;
+    margin-bottom: 6px;
     padding: 4px 10px;
     padding: 4px 10px;
     margin-right: 10px;
     margin-right: 10px;
     font-weight: 400;
     font-weight: 400;
@@ -573,7 +610,26 @@ function goMap() {
   box-shadow: none;
   box-shadow: none;
 }
 }
 
 
+
+
+.labelBox{display: flex;flex-wrap: wrap;
+  div{width: 25%;display: flex;align-items: center;gap: 10px;font-weight: 400;margin-top: 20px;
+    font-size: 16px;padding-left: 20px;
+    color: #030303;
+    img{width: 30px;height: 30px;}
+  }
+}
+@media screen and (max-width: 1400px) {
+  .labelBox{
+    div{width: 33%;}
+  }
+}
 @media screen and (max-width: 768px) {
 @media screen and (max-width: 768px) {
   .roomImg{margin: 0 0 20px;}
   .roomImg{margin: 0 0 20px;}
+  .labelBox{
+    div{width: 50%;font-size: 14px;margin-top: 12px;
+      img{width: 24px;height: 24px;}
+    }
+  }
 }
 }
 </style>
 </style>

@@ -9,6 +9,11 @@
               <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
               <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
               <img v-else class="bannerImg" src="@/assets/dance/banner.png">
               <img v-else class="bannerImg" src="@/assets/dance/banner.png">
               <div class="box forPc" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
               <div class="box forPc" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
+                <div class="btabs">
+                  <div v-for="tab in tabList" @click.stop="goMatchWithTab(n,tab.id)">{{tab.customTitle}}</div>
+                </div>
+
+
                 <div v-if="!liveData || liveData.videoStatus==0">
                 <div v-if="!liveData || liveData.videoStatus==0">
 <!--                  <div class="banner-count bb"></div>-->
 <!--                  <div class="banner-count bb"></div>-->
                 </div>
                 </div>
@@ -337,6 +342,7 @@ const matchData = ref({})
 const maList = ref([])
 const maList = ref([])
 const loading = ref(false)
 const loading = ref(false)
 const picList = ref([])
 const picList = ref([])
+const tabList = ref([])
 const partners = ref([])
 const partners = ref([])
 const liveData = ref({})
 const liveData = ref({})
 const aboutUsContent = ref('')
 const aboutUsContent = ref('')
@@ -398,6 +404,10 @@ const init = () => {
     matchData.value = maList.value[0]
     matchData.value = maList.value[0]
     getMatchInfo(matchData.value.id)
     getMatchInfo(matchData.value.id)
   })
   })
+
+  match.getLabelList().then(res=> {
+    tabList.value = res.data
+  })
   getpartners()
   getpartners()
 }
 }
 const getMatchInfo = (id) => {
 const getMatchInfo = (id) => {
@@ -460,6 +470,14 @@ const goMatch = (n) => {
     path: `/match/list/${n.id}`
     path: `/match/list/${n.id}`
   })
   })
 }
 }
+const goMatchWithTab = (n, tabId) => {
+  router.push({
+    path: `/match/list/${n.id}`,
+    query: {
+      tabId: tabId
+    }
+  })
+}
 
 
 const goGuide = () => {
 const goGuide = () => {
   router.push({
   router.push({
@@ -511,7 +529,13 @@ const gopicliveUrl = () => {
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-
+.btabs{display: flex;position: absolute;bottom: 60px;gap: 10px;
+  div{color: #fff;  background-color: rgba(0, 0, 0, 0.5);
+    backdrop-filter: blur(4px);border: 2px solid #9ba6d4;border-radius: 50px;
+    padding:6px 20px;
+  }
+  div:hover{cursor: pointer;background: #fff;color: #000;border:2px solid #fff;}
+}
 .zn-bg {
 .zn-bg {
   background: #FFFFFF;margin-bottom: 22px;
   background: #FFFFFF;margin-bottom: 22px;
   box-shadow: 0px 0px 46px 0px rgba(1, 16, 64, 0.08);
   box-shadow: 0px 0px 46px 0px rgba(1, 16, 64, 0.08);

@@ -8,6 +8,9 @@
               <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
               <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
               <img v-else class="bannerImg" src="@/assets/dance/banner.png">
               <img v-else class="bannerImg" src="@/assets/dance/banner.png">
               <div class="box" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
               <div class="box" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
+                <div class="btabs">
+                  <div v-for="tab in tabList" @click.stop="goMatchWithTab(n,tab.id)">{{tab.customTitle}}</div>
+                </div>
                 <div class="banner-count" v-if="currentDateTime < liveData.videoStart" @click="goliveUrl">
                 <div class="banner-count" v-if="currentDateTime < liveData.videoStart" @click="goliveUrl">
                   Live Countdown
                   Live Countdown
                   <van-count-down :time="liveStartTime" format="DD 天 HH 时 mm 分 ss 秒">
                   <van-count-down :time="liveStartTime" format="DD 天 HH 时 mm 分 ss 秒">
@@ -341,6 +344,7 @@ const nowscores = ref([])
 const livelist = ref([])
 const livelist = ref([])
 const maList = ref([])
 const maList = ref([])
 const picList = ref([])
 const picList = ref([])
+const tabList = ref([])
 const calendarValue = ref('2024-07-22')
 const calendarValue = ref('2024-07-22')
 const aboutUsContent = ref('')
 const aboutUsContent = ref('')
 const partners = ref([])
 const partners = ref([])
@@ -384,6 +388,10 @@ const init = () => {
     matchData.value = maList.value[0]
     matchData.value = maList.value[0]
     getMatchInfo(matchData.value.id)
     getMatchInfo(matchData.value.id)
   })
   })
+  match.getLabelList().then(res=> {
+    tabList.value = res.data
+  })
+
   getpartners()
   getpartners()
 }
 }
 const getMatchInfo = (id) => {
 const getMatchInfo = (id) => {
@@ -437,7 +445,14 @@ const goMatch = (n) => {
     path: `/match/list/${n.id}`
     path: `/match/list/${n.id}`
   })
   })
 }
 }
-
+const goMatchWithTab = (n, tabId) => {
+  router.push({
+    path: `/match/list/${n.id}`,
+    query: {
+      tabId: tabId
+    }
+  })
+}
 const building = () => {
 const building = () => {
   ElMessage.warning('Building')
   ElMessage.warning('Building')
 }
 }
@@ -491,6 +506,13 @@ const gopicliveUrl = () => {
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
+.btabs{display: flex;position: absolute;bottom: 60px;gap: 10px;
+  div{color: #fff;  background-color: rgba(0, 0, 0, 0.5);
+    backdrop-filter: blur(4px);border: 2px solid #9ba6d4;border-radius: 50px;
+    padding:6px 20px;
+  }
+  div:hover{cursor: pointer;background: #fff;color: #000;border:2px solid #fff;}
+}
 .zn-bg{background: linear-gradient(90deg, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #453DEA, #8623FC);
 .zn-bg{background: linear-gradient(90deg, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #8623FC, #453DEA, #8623FC);
   border-radius: 15px;}
   border-radius: 15px;}
 .zn-Box{background-size: contain;position: relative;overflow: hidden;
 .zn-Box{background-size: contain;position: relative;overflow: hidden;

@@ -189,8 +189,14 @@
 <!--    邀请函  @click="applyInvitation"-->
 <!--    邀请函  @click="applyInvitation"-->
 <!--      <quick-row :match-id="matchId"/>-->
 <!--      <quick-row :match-id="matchId"/>-->
       <el-row>
       <el-row>
-        <el-col></el-col>
-        <el-col></el-col>
+        <el-col :span="24">
+          <el-tabs v-model="activeName" class="match-tabs">
+            <el-tab-pane v-for="tab in tabList" :label="tab.customTitle" :name="tab.id">
+              <div class="richContent" v-html="tab.customText"></div>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+<!--        <el-col></el-col>-->
       </el-row>
       </el-row>
     </div>
     </div>
 
 
@@ -249,7 +255,7 @@ import {dayjs, ElMessage, ElMessageBox} from 'element-plus'
 import useUserStore from "@/store/modules/user"
 import useUserStore from "@/store/modules/user"
 import {useStorage} from "@vueuse/core/index"
 import {useStorage} from "@vueuse/core/index"
 import {Search} from "@element-plus/icons-vue"
 import {Search} from "@element-plus/icons-vue"
-import {getInfoByCptId} from "@/apiPc/match";
+import {getInfoByCptId, getLabelList} from "@/apiPc/match";
 
 
 const user = useUserStore().user
 const user = useUserStore().user
 const group = useUserStore().group
 const group = useUserStore().group
@@ -257,8 +263,10 @@ const data = reactive({
   error: false,
   error: false,
   loading: false,
   loading: false,
   matchData: {},
   matchData: {},
+  tabList: [],
   matchId: '0',
   matchId: '0',
   groupId: '',
   groupId: '',
+  activeName: '',
   activeName2: 'first',
   activeName2: 'first',
   menu: [
   menu: [
     {name: 'Event details', cn: '赛事详情', active: 1},
     {name: 'Event details', cn: '赛事详情', active: 1},
@@ -289,9 +297,9 @@ const {
   matchId,
   matchId,
   groupId,
   groupId,
   menu,
   menu,
-  menu1,
+  menu1,tabList,
   signDoneGroupList, signDoneGroupListToTal, queryGroupList,
   signDoneGroupList, signDoneGroupListToTal, queryGroupList,
-  time, startSign, isNational
+  time, startSign, isNational,activeName
 } = toRefs(data)
 } = toRefs(data)
 const signTypePop = ref(false)
 const signTypePop = ref(false)
 const upgradePop = ref(false)
 const upgradePop = ref(false)
@@ -308,8 +316,18 @@ onMounted(() => {
   } else {
   } else {
     getMatchId()
     getMatchId()
   }
   }
+  getTab()
 })
 })
-
+function getTab() {
+  match.getLabelList().then(res=>{
+    tabList.value = res.data
+    if(route.query.tabId){
+      activeName.value = route.query.tabId
+    } else {
+      activeName.value = tabList.value[0].id
+    }
+  })
+}
 function getMatchId() {
 function getMatchId() {
   match.getMaList({topFlag: 1, status: 1}).then((res) => {
   match.getMaList({topFlag: 1, status: 1}).then((res) => {
     matchId.value = res.rows[0].id
     matchId.value = res.rows[0].id

@@ -3,6 +3,14 @@
             width="480" :append-to-body="true"  destroy-on-close @close="close" center>
             width="480" :append-to-body="true"  destroy-on-close @close="close" center>
     <div>
     <div>
       <el-form class="d-form" size="large" :label-width="language==0?80:150" :label-position="language==0?'right':'top'" style="max-width: 500px;margin: auto">
       <el-form class="d-form" size="large" :label-width="language==0?80:150" :label-position="language==0?'right':'top'" style="max-width: 500px;margin: auto">
+        <div style="display: flex;gap: 20px;">
+          <el-form-item :label="language==0?'姓':'Last Name'" required style="width: 100%;">
+            <el-input type="text" v-model="form.lastName" :placeholder="language==0?'请输入您的姓':'Please enter your last name'"/>
+          </el-form-item>
+          <el-form-item :label="language==0?'名':'First Name'" required style="width: 100%;">
+            <el-input type="text" v-model="form.firstName" :placeholder="language==0?'请输入您的名':'Please enter your first name'"/>
+          </el-form-item>
+        </div>
         <el-form-item :label="language==0?'邮箱':'E-mail'" required>
         <el-form-item :label="language==0?'邮箱':'E-mail'" required>
           <el-input type="text" v-model="form.account" @change="resetCode" @blur="verifyCode"
           <el-input type="text" v-model="form.account" @change="resetCode" @blur="verifyCode"
           />
           />
@@ -33,6 +41,14 @@
                    type="inside" @success="codeSuccess"></Vcode>
                    type="inside" @success="codeSuccess"></Vcode>
           </div>
           </div>
         </el-form-item>
         </el-form-item>
+        <el-form-item :label="language==0?'协会':'Association'" required>
+          <el-select v-model="form.associationCode" :placeholder="language==0?'请选择':'Please select'">
+            <el-option v-for="item in associationList" :key="item.code" :label="language==0?item.nameCn:item.nameEn"
+                       :value="item.code">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item :label="language==0?'密码':'Password'" required>
         <el-form-item :label="language==0?'密码':'Password'" required>
           <el-input type="password" show-password v-model="form.password"
           <el-input type="password" show-password v-model="form.password"
                     :placeholder="language==0?'6-16位密码。区分大小写':''"/>
                     :placeholder="language==0?'6-16位密码。区分大小写':''"/>
@@ -58,7 +74,7 @@ import {reactive, toRefs} from 'vue'
 import Vcode from "vue3-puzzle-vcode"
 import Vcode from "vue3-puzzle-vcode"
 import {ElMessage} from 'element-plus'
 import {ElMessage} from 'element-plus'
 import CountDown from '@chenfengyuan/vue-countdown'
 import CountDown from '@chenfengyuan/vue-countdown'
-import {getCaptchaSms} from "@/apiPc/match";
+import {getAssociation, getCaptchaSms} from "@/apiPc/match";
 import {onMounted} from "@vue/runtime-core";
 import {onMounted} from "@vue/runtime-core";
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
 import {vistorRegister} from "@/apiPc/common";
 import {vistorRegister} from "@/apiPc/common";
@@ -76,9 +92,10 @@ const data = reactive({
   failVcode: '验证失败，请重试',
   failVcode: '验证失败，请重试',
   successVcode: '验证通过！',
   successVcode: '验证通过！',
   sliderText: '拖动滑块完成拼图',
   sliderText: '拖动滑块完成拼图',
-  show:false
+  show:false,
+  associationList:[]
 })
 })
-const {isShow, isCodeTrue, counting, form, activeStep, failVcode, successVcode, sliderText,show} = toRefs(data)
+const {isShow, isCodeTrue, counting, form, activeStep, failVcode, successVcode, sliderText,show,associationList} = toRefs(data)
 const emit = defineEmits(['submit'])
 const emit = defineEmits(['submit'])
 onMounted(() => {
 onMounted(() => {
   if (language.value == 1) {
   if (language.value == 1) {
@@ -86,7 +103,14 @@ onMounted(() => {
     successVcode.value = 'Success!'
     successVcode.value = 'Success!'
     sliderText.value = 'Drag the slider to complete the puzzle'
     sliderText.value = 'Drag the slider to complete the puzzle'
   }
   }
+  getAssociationList()
 })
 })
+const getAssociationList = () => {
+  getAssociation().then(res=>{
+    associationList.value = res.data
+  })
+}
+
 const open = (params) => {
 const open = (params) => {
   show.value = true
   show.value = true
 }
 }