确认要发布

src/components/education/notice/pushNotice.vue

@@ -33,7 +33,7 @@
           <el-form-item label="发送方式：">
             <el-col :span="20">
               <el-checkbox-group v-model="formData.channel">
-                <el-checkbox size="small" :label="1">查看原始数据</el-checkbox>
+                <el-checkbox size="small" :label="1">App系统消息推送</el-checkbox>
               </el-checkbox-group>
             </el-col>
           </el-form-item>
@@ -66,15 +66,15 @@
 
     <el-dialog 
       class="prot-dialog"
-      title="确认要发布吗？"
+      :title="dialogTitle"
       :visible.sync="isShowDialog"
       width="30%"
       center
       :close-on-click-modal=false
       :close-on-press-escape=false
       :show-close=false>
-      <p v-show="isCancleBtn" class="prot-dialog-tips-1">确定取消吗？取消后将不保存本次操作内容</p>
-      <p v-show="!isCancleBtn" class="prot-dialog-tips-1">点击发布后将立即生效，是否继续发布？</p>
+      <p v-show="isCancleBtn" class="prot-dialog-tips-1">取消后，将不保存本次操作内容</p>
+      <p v-show="!isCancleBtn" class="prot-dialog-tips-1">{{dialogContent}}</p>
       <!-- <p class="prot-dialog-tips-2">若您选择暂不发送，您只能录入量表的非敏感信息</p> -->
       <!-- <p class="prot-dialog-tips-3">为避免打扰居民，7天内只能发送1次，您已发送过短信，请尽快联系居民同意授权</p> -->
       <span v-show="isCancleBtn" slot="footer" class="dialog-footer">
@@ -113,6 +113,8 @@ export default {
       curmbFirst: "教培项目",
       curmbSecond: "推送管理",
       projectId: "",
+      dialogTitle: "确认要发布吗？",
+      dialogContent: `点击发布后将在「${this.formData.customPushTime}」向项目人员推送，是否继续发布？`,
       labelNameList: [
         {labelId: 1, labelName: '1111'},
         {labelId: 2, labelName: '2222'},
@@ -188,6 +190,7 @@ export default {
   },
   methods: {
     beforeConfirm() {
+      vm.dialogTitle = "确认要发布吗？";
       let flag = false;
       vm.$refs['formData'].validate(valid => {
         if (valid) {
@@ -198,9 +201,7 @@ export default {
       });
       if(!flag) return;
       vm.isCancleBtn = false;
-      // if(vm.formData.noticeId) {
       vm.isShowDialog = true;
-      // }
     },
 
     //提交推送信息
@@ -219,6 +220,7 @@ export default {
     },
     // 点击取消按钮
     cancleEdit() {
+      vm.dialogTitle = "确定取消吗？";
       vm.isCancleBtn = true;
       vm.isShowDialog = true;
     },
@@ -288,5 +290,8 @@ export default {
   .el-form-item__error {
     left: 13px;
   }
+  .prot-dialog-tips-1 {
+    text-align: center !important;
+  }
 }
 </style>
\ No newline at end of file

src/components/education/notice/sendNotice.vue

@@ -51,14 +51,14 @@
 
     <el-dialog 
       class="prot-dialog"
-      title="确认要发布吗？"
+      :title="dialogTitle"
       :visible.sync="isShowDialog"
       width="30%"
       center
       :close-on-click-modal=false
       :close-on-press-escape=false
       :show-close=false>
-      <p v-show="isCancleBtn" class="prot-dialog-tips-1">确定取消吗？取消后将不保存本次操作内容</p>
+      <p v-show="isCancleBtn" class="prot-dialog-tips-1">取消后，将不保存本次操作内容</p>
       <p v-show="!isCancleBtn" class="prot-dialog-tips-1">点击发布后将立即生效，是否继续发布？</p>
       <!-- <p class="prot-dialog-tips-2">若您选择暂不发送，您只能录入量表的非敏感信息</p> -->
       <!-- <p class="prot-dialog-tips-3">为避免打扰居民，7天内只能发送1次，您已发送过短信，请尽快联系居民同意授权</p> -->
@@ -103,6 +103,7 @@ export default {
       curmbFirst: "教培项目",
       curmbSecond: "公告管理",
       projectId: "",
+      dialogTitle: "",
       // formData: {
       //   noticeContent: "",
       //   noticeId: 0,
@@ -155,6 +156,8 @@ export default {
   methods: {
 
     beforeConfirm() {
+      vm.dialogTitle = "确认要发布吗？";
+      if(this.formData.openFlag == 1) {
         let flag = false;
         vm.$refs['formData'].validate(valid => {
           if (valid) {
@@ -164,10 +167,10 @@ export default {
           }
         });
         if(!flag) return;
+      }
       vm.isCancleBtn = false;
-      // if(vm.formData.noticeId) {
       vm.isShowDialog = true;
-      // }
+
     },
 
     //提交公告信息
@@ -186,6 +189,7 @@ export default {
     },
     // 点击取消按钮
     cancleEdit() {
+      vm.dialogTitle = "确定取消吗？";
       vm.isCancleBtn = true;
       vm.isShowDialog = true;
     },
@@ -251,5 +255,8 @@ export default {
   .el-form-item__error {
     left: 13px;
   }
+  .prot-dialog-tips-1 {
+    text-align: center !important;
+  }
 }
 </style>
\ No newline at end of file

src/utils/fetch.js

@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
-      config.headers['token'] = '52C379E6442B4B6AB3573E3E9D0822BE';
+      config.headers['token'] = '83C6DADDC9804239B226D5C86F156D58';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/edit-notice.vue

@@ -58,7 +58,7 @@ export default {
       curmbSecond: "项目管理",
       jumPathThird: 'template-manager',
       curmbThird: '发送通知',
-      activeName: 'second',
+      activeName: 'first',
       noticeInfo: {
         noticeInfo: {
           projectId: 0,
@@ -173,4 +173,7 @@ export default {
   .notice-editor-wrap {
     background: #fff;
   }
+  .prot-dialog-tips-1 {
+    text-align: center !important;
+  }
 </style>