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

src/pages/activity/activityList.vue

@@ -130,7 +130,7 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">活动列表</div>
@@ -183,6 +183,13 @@
               </div>
           </q-td>
         </template>
+        <template v-slot:body-cell-LocationName="props">
+          <q-td :props="props">
+              <div style="width:200px;white-space: pre-line;">
+                        {{props.row.LocationName}} 
+              </div>
+          </q-td>
+        </template>
         <template v-slot:body-cell-JoinNum="props">
           <q-td :props="props">
               <div>
@@ -299,12 +306,14 @@ import ActiveForm from '../../components/activity/active-from'
             name: "Id",
             label: "编号",
             field: "Id",
-            align: "left"
+            align: "left",
+            required:true,
           },
           {
             name: "activeName",
             label: "活动名称",
-            align: "left"
+            align: "left",
+            required:true,
           },
           {
             name: "ActivityTypeName",
@@ -332,7 +341,7 @@ import ActiveForm from '../../components/activity/active-from'
             label: "位置",
             field:"LocationName",
             align: "left",
-            width:80
+            style:"width:100px"
           },
           {
             name: "activeStutes",