Merge branch 'dev' into order

@@ -85,7 +85,7 @@
                 {{ matchData.beginTime?.slice(0, 10) }} ~ {{ matchData.endTime?.slice(0, 10) }}
                 {{ matchData.beginTime?.slice(0, 10) }} ~ {{ matchData.endTime?.slice(0, 10) }}
               </p>
               </p>
               <p class="ppl esp">
               <p class="ppl esp">
-                <label>{{ language == 0 ? '地&ensp;&ensp;&ensp;&ensp;点' : 'Location' }}：</label>
+                <label>{{ language == 0 ? '地&ensp;&ensp;&ensp;&ensp;点' : 'LOCATION' }}：</label>
                 {{ matchData.address }}
                 {{ matchData.address }}
               </p>
               </p>
               <p class="ppl"><label>{{ language == 0 ? '赛事级别' : 'EVENT LEVEL' }}：</label>{{ matchData.level }}</p>
               <p class="ppl"><label>{{ language == 0 ? '赛事级别' : 'EVENT LEVEL' }}：</label>{{ matchData.level }}</p>
@@ -101,7 +101,7 @@
                 086-{{ matchData.contactTelno }}
                 086-{{ matchData.contactTelno }}
               </p>
               </p>
               <p class="ppl" v-if="matchData.contactEmail">
               <p class="ppl" v-if="matchData.contactEmail">
-                <label>{{ language == 0 ? '邮&ensp;&ensp;&ensp;&ensp;箱' : 'E-mail' }}：</label>
+                <label>{{ language == 0 ? '邮&ensp;&ensp;&ensp;&ensp;箱' : 'EMAIL' }}：</label>
                 {{ matchData.contactEmail }}</p>
                 {{ matchData.contactEmail }}</p>
             </div>
             </div>
             <div style="height: 30px"></div>
             <div style="height: 30px"></div>