Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_0814

src/views/modules/news/news.vue

@@ -134,7 +134,7 @@
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="150">
+                         width="200">
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
@@ -147,14 +147,6 @@
                        type="text"
                        size="small"
                        @click="modifyOnLine(scope.row)">下线</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('handle')"
-                         fixed="right"
-                         header-align="center"
-                         align="center"
-                         width="100">
-          <template slot-scope="scope">
             <el-button v-if="scope.row.bannerFlag === '0' && scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
              && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date() "
                        type="text"

src/views/modules/user/user-add-or-update.vue

@@ -57,10 +57,12 @@
           <el-radio v-model="dataForm.pass"
                     label="1">是</el-radio>
           <el-radio v-model="dataForm.pass"
-                    label="0">否</el-radio>
+                    label="2">否</el-radio>
         </template>
       </el-form-item>
-      <el-form-item label="审核备注">
+      <el-form-item v-if="dataForm.pass === '2'"
+                    label="审核备注"
+                    prop="remark">
         <el-input v-model="dataForm.remark"
                   maxlength="50"
                   show-word-limit
@@ -133,6 +135,9 @@ export default {
         ],
         pass: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -180,6 +185,8 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
+          // 审核通过之后触发发短信
+          this.registerResult(this.dataForm.id, this.dataForm.pass)
           this.$message({
             message: this.$t('prompt.success'),
             type: 'success',
@@ -191,7 +198,14 @@ export default {
           })
         }).catch(() => { })
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    registerResult (userId, state) {
+      this.$http.get(`api/message/sms/registerResult?userId=` + userId + '&state=' + state).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+      }).catch(() => { })
+    }
   }
 }
 </script>