Merge remote-tracking branch 'origin/master'

src/views/bst/ad/index.vue

@@ -166,7 +166,7 @@
 
       <!-- 添加或修改广告对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" label-width="80px" v-loading="detailLoading">
+        <el-form ref="form" :rules="rules" :model="form" label-width="80px" v-loading="detailLoading">
           <el-form-item label="运营区" prop="areaId" >
               <area-remote-select
                 v-model="form.areaId"
@@ -256,6 +256,20 @@
           //{key: 'deleted', visible: true, label: '逻辑删除标志，0否，1是', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
           //{key: 'urlType', visible: true, label: '跳转类型，1外链跳转，2站内跳转', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         ],
+        rules: {
+          areaId: [
+            { required: true, message: '运营区不能为空', trigger: 'change' }
+          ],
+          picture: [
+            { required: true, message: '广告图片不能为空', trigger: 'change' }
+          ],
+          urlType: [
+            { required: true, message: '跳转类型不能为空', trigger: 'change' }
+          ],
+          url: [
+            { required: true, message: '跳转链接不能为空', trigger: 'blur' },
+          ]
+        },
         // 排序方式
         orderSorts: ['ascending', 'descending', null],
         // 遮罩层