Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/web-admin

src/views/platActivi/act/detail.vue

@@ -77,6 +77,7 @@ export default {
         { label: '封面图片(345*85)', model: 'cover', type: 'upload', limit: 1, url: '/files/point/act/upload' },
         { label: '是否在首页展示', model: 'show_index', type: 'select' },
         { label: '是否开启', model: 'is_use', type: 'select' },
+        { label: '排序', model: 'sort', type: 'number' },
       ],
       // 是否使用
       isuseList: [],
@@ -145,7 +146,7 @@ export default {
     test: {
       deep: true,
       immediate: true,
-      handler(val) {},
+      handler(val) { },
     },
   },
 };

src/views/platActivi/act/goods.vue

@@ -11,8 +11,17 @@
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
         <el-col :span="24" class="four">
-          <data-table :select="true" :selected="selected" @handleSelect="handleSelect" :fields="fields" :opera="opera"
-                      @query="search" :data="list" :total="total" @del="toDel">
+          <data-table
+            :select="true"
+            :selected="selected"
+            @handleSelect="handleSelect"
+            :fields="fields"
+            :opera="opera"
+            @query="search"
+            :data="list"
+            :total="total"
+            @del="toDel"
+          >
           </data-table>
         </el-col>
       </el-col>

src/views/platActivi/act/index.vue

@@ -71,6 +71,7 @@ export default {
             else return '暂无';
           },
         },
+        { label: '排序', model: 'sort' },
       ],
       list: [],
       total: 0,
@@ -153,7 +154,7 @@ export default {
     test: {
       deep: true,
       immediate: true,
-      handler(val) {},
+      handler(val) { },
     },
   },
 };