Merge branch 'master' into dev_202207

src/pages/match/list/index.vue

@@ -74,24 +74,18 @@
                                               <template v-if="item.sponsor">
                                                 <div :class="{'flex-top': item.sponsor.split(',').length > 1}">
                                                     <span class="label">主办方：</span>
-                                                    <template v-if="item.sponsor.split(',').length > 1">
-                                                        <div>
-                                                            <span v-for="(sponsor,index) in item.sponsor.split(',')"
-                                                                :key="index" class="val a-line">{{ sponsor }}</span>
-                                                        </div>
-                                                    </template>
+                                                    <div v-if="item.sponsor.split(',').length > 1" class="val a-line">
+                                                        <template v-for="sponsor in item.sponsor.split(',')">{{ sponsor }}</template>
+                                                    </div>
                                                     <span v-else class="val">{{ item.sponsor }}</span>
                                                 </div>
                                               </template>
                                               <template v-if="item.undertaker">
                                                 <div :class="{'flex-top': item.undertaker.split(',').length > 1}">
                                                     <span class="label">承办方：</span>
-                                                    <template v-if="item.undertaker.split(',').length > 1">
-                                                        <div>
-                                                            <span v-for="(undertaker,index) in item.undertaker.split(',')"
-                                                                :key="index" class="val a-line">{{ undertaker }}</span>
-                                                        </div>
-                                                    </template>
+                                                    <div v-if="item.undertaker.split(',').length > 1" class="val a-line">
+                                                        <template v-for="undertaker in item.undertaker.split(',')">{{ undertaker }}</template>
+                                                    </div>
                                                     <span v-else class="val">{{ item.undertaker }}</span>
                                                 </div>
                                               </template>
@@ -505,7 +499,7 @@ export default {
         }
     }
     .list-wrap {
-        flex: 1;
+        width: calc(100% - 180px);
         margin-left: 24px;
         .list {
             li {
@@ -630,6 +624,8 @@ export default {
 
                         .val {
                             max-width: 350px;
+                            text-overflow: ellipsis;
+                            overflow: hidden;
                         }
 
                         .a-line {

src/pages/touristMatch/list/index.vue

@@ -64,22 +64,16 @@
                                             <div class="metas">
                                                 <div :class="{'flex-top': item.sponsor.split(',').length > 1}">
                                                     <span class="label">主办方：</span>
-                                                    <template v-if="item.sponsor.split(',').length > 1">
-                                                        <div>
-                                                            <span v-for="(sponsor,index) in item.sponsor.split(',')"
-                                                                :key="index" class="val a-line">{{ sponsor }}</span>
-                                                        </div>
-                                                    </template>
+                                                    <div v-if="item.sponsor.split(',').length > 1" class="val a-line">
+                                                        <template v-for="sponsor in item.sponsor.split(',')">{{ sponsor }}</template>
+                                                    </div>
                                                     <span v-else class="val">{{ item.sponsor }}</span>
                                                 </div>
                                                 <div :class="{'flex-top': item.undertaker.split(',').length > 1}">
                                                     <span class="label">承办方：</span>
-                                                    <template v-if="item.undertaker.split(',').length > 1">
-                                                        <div>
-                                                            <span v-for="(undertaker,index) in item.undertaker.split(',')"
-                                                                :key="index" class="val a-line">{{ undertaker }}</span>
-                                                        </div>
-                                                    </template>
+                                                    <div v-if="item.undertaker.split(',').length > 1" class="val a-line">
+                                                        <template v-for="undertaker in item.undertaker.split(',')">{{ undertaker }}</template>
+                                                    </div>
                                                     <span v-else class="val">{{ item.undertaker }}</span>
                                                 </div>
                                                 <div>
@@ -616,6 +610,8 @@ export default {
 
                         .val {
                             max-width: 350px;
+                            text-overflow: ellipsis;
+                            overflow: hidden;
                         }
 
                         .a-line {