发布内容和评论增加安全审核；锦水警事列表样式优化；

project.config.json

@@ -72,7 +72,7 @@
 					"id": 1,
 					"name": "pages/indexNew/indexNew",
 					"pathName": "pages/indexNew/indexNew",
-					"query": "scene=1233592630168813569",
+					"query": "scene=1233592247862198274",
 					"scene": 1011
 				},
 				{

subpages/associationNew/pages/addTopic/addTopic.js

@@ -16,7 +16,9 @@ Page({
     },
     partyGroupId: "",
     topicType:"",//0:事好儿鼓个掌 1:话对捧个场
-    addTopicPrevious: 0
+    addTopicPrevious: 0,
+    violationsCount: 0,
+    isConReview: false
   },
   onShow () {
 
@@ -273,26 +275,62 @@ Page({
       topicLatitude: this.data.location.latitude,//话题位置纬度
       topicLongitude: this.data.location.longitude,//话题位置经度
       partyGroupId:this.data.partyGroupId,//党群ID
-      images: imagesList
+      images: imagesList,
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中",
     })
+    let that = this
     addTopic(para).then(res => {
       wx.hideLoading()
       console.log(res)
+      if (res.code == 0) {
         wx.showToast({
           title: "发布成功",
           icon: "none",
           duration: 2000
         })
+        this.setData({
+          violationsCount: 0,
+          isConReview: false
+        })
         // var prePages = pages[pages.length - 2]
         setTimeout(() => {
           // prePages.pullRefreshGetTopicList() 
           wx.navigateBack()
         }, 1000)
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        console.log(this.data.violationsCount)
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.addTopic()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
-      console.log(err)
+      console.log('err',err)
     })
   },
   // 删除图片

subpages/associationNew/pages/eventlist/eventlist.js

@@ -28,7 +28,10 @@ Page({
     infoCompleted: 0,
     completeInfoDialogVisible: false,
     ifpreviewImage:false,//解决图片放大刷新列表的问题
-    commentViewContent: "发个小看法" // 写评论按钮 文字内容
+    commentViewContent: "发个小看法", // 写评论按钮 文字内容
+    violationsCount: 0,
+    isConReview: false,
+    lastTopicId: ""
   },
   /**
    * 生命周期函数--监听页面加载
@@ -221,6 +224,9 @@ Page({
       })
       return false
     }
+    if (this.data.topicId != e.currentTarget.dataset.id) {
+      this.data.violationsCount = 0
+    }
     this.setData({
       ifcomment: true,
       focus: true,
@@ -231,10 +237,14 @@ Page({
 
   // 失去焦点
   bindAddressInput () {
+    setTimeout(() => {
+      if (this.data.violationsCount != 2){
         this.setData({ //失去焦点以后view隐藏
           ifcomment: false,
           commentContent: ""
         })      
+      }      
+    }, 500);
   },
   // 双向绑定
   bindIdentity (e) {
@@ -244,15 +254,63 @@ Page({
   },
   // 评论按钮点击事件
   commentSubmit () {
+    if (this.data.commentContent == '') {
+      wx.showToast({
+        title: "请输入评论内容",
+        icon: "none",
+        duration: 1500
+      })
+      return
+    }
     let that = this;
     const para = {
       topicId: that.data.topicId,//被评论的话题ID
       faCommentId: "",//父评论（被评论）ID
       content: that.data.commentContent,//评论内容
+      isConReview: that.data.isConReview
     }
-    commentSubmit(para).then(() => {
+    commentSubmit(para).then(res => {
       // 评论成功以后，调用接口比对出当前评论列表的数据，对已有列表数据进行替换
+      if (res.code == 0) {
+        this.setData({
+          violationsCount: 0,
+          isConReview: false,
+          ifcomment: false,
+          commentContent: ""
+        })
         that.NowTopiclist()
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.setData({
+                  isConReview: true
+                })
+                that.commentSubmit()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false,
+                  ifcomment: false,
+                  commentContent: ""
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
       console.log(err)
     })

subpages/associationNew/utils/api.js

@@ -89,7 +89,7 @@ export function topiclist ({pageIndex,pageSize,timestamp,topicType,partyGroupId,
  * 发布话题
  */
 
-export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images}) {
+export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images,isConReview}) {
   return request.post("partyGroup/topic/submit",{
     topicType,
     topicContent,
@@ -97,7 +97,8 @@ export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,to
     topicLatitude,
     topicLongitude,
     partyGroupId,
-    images
+    images,
+    isConReview
   })
 }
 
@@ -105,11 +106,12 @@ export function addTopic ({topicType, topicContent,topicAddress,topicLatitude,to
  * 话题评论
  */
 
-export function commentSubmit ({topicId, faCommentId,content}) {
+export function commentSubmit ({topicId, faCommentId,content,isConReview}) {
   return request.post("partyGroup/comment/submit",{
     topicId,
     faCommentId,
-    content
+    content,
+    isConReview
   })
 }
 

subpages/discussion/pages/addIssue/addIssue.js

@@ -16,6 +16,8 @@ Page({
     publishIssuePrevious: 0,
     focus: false,
     isBlock: true,
+    violationsCount: 0,
+    isConReview: false
   },
   onLoad () {
     this.data.qqMapWX = new QQMapWX({
@@ -228,17 +230,50 @@ Page({
       issueAddress: this.data.addressContent,
       issueLongitude: this.data.longitude,
       issueLatitude: this.data.latitude,
-      images: imagesList
+      images: imagesList,
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中..."
     })
+    let that = this
     addIssue(para).then(res => {
       wx.hideLoading()
       console.log("发布议题", res)
+      if (res.code == 0) {
         this.setData({
-        dialogVisible: !this.data.dialogVisible
+          dialogVisible: !this.data.dialogVisible,
+          violationsCount: 0,
+          isConReview: false
         })
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.publishIssue()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
       wx.showToast({
         title: err,

subpages/discussion/pages/publishEvaluation/publishEvaluation.js

@@ -11,7 +11,9 @@ Page({
     textareaValue: "",
     evaluationCallbackVisible: false,
     satisifyType: "",
-    itemId: ""
+    itemId: "",
+    violationsCount: 0,
+    isConReview: false
   },
   onLoad (options) {
     if (options.itemId) {
@@ -49,17 +51,49 @@ Page({
     const para = {
       itemId: this.data.itemId,
       evaluationScore: this.data.satisifyType === "notSatisify" ? 0 : this.data.satisifyType === "normalSatisify" ? 1 : this.data.satisifyType === "verySatisify" ? 2 : "",
-      evaluationContent: this.data.textareaValue
+      evaluationContent: this.data.textareaValue,
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中..."
     })
+    let that = this
     satisfyEvaluation(para).then(res => {
       wx.hideLoading()
       console.log("满意度评价", res)
+      if (res.code == 0) {
         this.setData({
           evaluationCallbackVisible: !this.data.evaluationCallbackVisible
         })        
+      } else if (res.code == 533) {
+        this.data.violationsCount++
+        console.log(this.data.violationsCount)
+        if (this.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (this.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.publishEvaluation()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
+      }
     }).catch(err => {
       wx.hideLoading()
       console.log(err)

subpages/discussion/pages/remarkOrReply/remarkOrReply.js

@@ -9,7 +9,9 @@ Page({
     faCommentId: "",
     detailType: "issue",
     issueId: "",
-    projectId: ""
+    projectId: "",
+    violationsCount: 0, //违规次数
+    isConReview: false
   },
   onLoad (options) {
     if (options.detailType === "issue") {
@@ -47,16 +49,19 @@ Page({
       issueId: this.data.detailType === "issue" ? this.data.issueId : "",
       faCommentId: this.data.faCommentId,
       content: this.data.textareaValue,
-      itemId: this.data.detailType === "project" ? this.data.projectId : ""
+      itemId: this.data.detailType === "project" ? this.data.projectId : "",
+      isConReview: this.data.isConReview
     }
     wx.showLoading({
       title: "加载中..."
     })
+    let that = this
     if (this.data.faCommentId) { //评论 回复 回调
       if (this.data.detailType === "issue") { //议题
         issueComReply(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
+          if (res.code == 0) {
             wx.showToast({
               title: "评论成功",
               icon: "none",
@@ -70,6 +75,36 @@ Page({
             setTimeout(() => {
               wx.navigateBack()
             }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
+          }
         }).catch(err => {
           console.log(err)
         })
@@ -77,6 +112,7 @@ Page({
         itemComReply(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
+          if (res.code == 0) {
             wx.showToast({
               title: "评论成功",
               icon: "none",
@@ -90,6 +126,36 @@ Page({
             setTimeout(() => {
               wx.navigateBack()
             }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
+          }
         }).catch(err => {
           console.log(err)
         })
@@ -99,6 +165,7 @@ Page({
         issueCom(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
+          if (res.code == 0) {
             wx.showToast({
               title: "评论成功",
               icon: "none",
@@ -112,6 +179,36 @@ Page({
             setTimeout(() => {
               wx.navigateBack()
             }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
+          }
         }).catch(err => {
           console.log(err)
         })
@@ -119,6 +216,7 @@ Page({
         itemCom(para).then(res => {
           wx.hideLoading()
           console.log("评论或回复", res)
+          if (res.code == 0) {
             wx.showToast({
               title: "评论成功",
               icon: "none",
@@ -132,6 +230,36 @@ Page({
             setTimeout(() => {
               wx.navigateBack()
             }, 500)            
+          } else if (res.code == 533) {
+            this.data.violationsCount++
+            if (this.data.violationsCount == 1){
+              wx.showToast({
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              })          
+            } else if (this.data.violationsCount == 2) {
+              wx.showModal({
+                title: '提示',
+                content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+                success (res) {
+                  if (res.confirm) {
+                    console.log('用户点击确定')
+                    that.setData({
+                      isConReview: true
+                    })
+                    that.remarkOrReply()
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                    that.setData({
+                      violationsCount: 0,
+                      isConReview: false
+                    })
+                  }
+                }
+              })
+            }
+          }
         }).catch(err => {
           console.log(err)
         })

subpages/discussion/utils/api.js

@@ -3,13 +3,14 @@ const request = require("../../../utils/request")
 /**
  * 发布议题
  */
-export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images }) {
+export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images, isConReview }) {
   return request.post("events/issue/submit", {
     eventContent,
     issueAddress,
     issueLongitude,
     issueLatitude,
-    images
+    images,
+    isConReview
   })
 }
 
@@ -107,46 +108,50 @@ export function topicReply ({ issueId, faCommentId, content, itemId }) {
  * 议题评论 v2
  */
 
-export function issueCom ({ issueId, faCommentId, content, itemId }) {
+export function issueCom ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/issueCom", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 /**
  * 议题评论的回复 v2
  */
-export function issueComReply ({ issueId, faCommentId, content, itemId }) {
+export function issueComReply ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/issueComReply", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 
 /**
  * 项目评论 v2
  */
-export function itemCom ({ issueId, faCommentId, content, itemId }) {
+export function itemCom ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/itemCom", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 /**
  * 项目评论的回复 v2
  */
-export function itemComReply ({ issueId, faCommentId, content, itemId }) {
+export function itemComReply ({ issueId, faCommentId, content, itemId, isConReview }) {
   return request.post("events/comment/itemComReply", {
     issueId,
     faCommentId,
     content,
-    itemId
+    itemId,
+    isConReview
   })
 }
 /**
@@ -286,11 +291,12 @@ export function getProjectList (params) {
 /**
  * 项目满意度评价
  */
-export function satisfyEvaluation ({ itemId, evaluationScore, evaluationContent }) {
+export function satisfyEvaluation ({ itemId, evaluationScore, evaluationContent, isConReview }) {
   return request.post("events/item/evaluation", {
     itemId,
     evaluationScore,
-    evaluationContent
+    evaluationContent,
+    isConReview
   })
 }
 

subpages/heart/pages/clockIn/clockIn.js

@@ -23,7 +23,9 @@ Page({
     effectiveFlag: Number, //打卡是否有效（0-否，1-是）
     phraseList: [], //常用于列表
     phraseId: "", //常用语id
-    ldata: false
+    ldata: false,
+    violationsCount: 0, //违规次数
+    isConReview: false
   },
   /**
    * 生命周期函数--监听页面加载
@@ -290,9 +292,11 @@ Page({
       clockAddress: this.data.operationAddress,
       images: this.data.images,
       clockType: this.data.clockType, //打卡类型（0-打卡，1-更新打卡）
-      effectiveFlag: this.data.effectiveFlag //打卡是否有效（0-否，1-是）
+      effectiveFlag: this.data.effectiveFlag, //打卡是否有效（0-否，1-是）
+      isConReview: this.data.isConReview
     }
     // console.log('~~~~~~~":::::' + JSON.stringify(params))
+    let that = this
     api.clock(params).then(function (res) {
       if (res.code == 0) {
         wx.showToast({
@@ -305,8 +309,34 @@ Page({
             }, 1000);
           }
         })
+      } else if (res.code == 533) {
+        that.data.violationsCount++
+        if (that.data.violationsCount == 1){
+          wx.showToast({
+            title: res.msg,
+            icon: "none",
+            duration: 2000
+          })          
+        } else if (that.data.violationsCount == 2) {
+          wx.showModal({
+            title: '提示',
+            content: '您提交的内容再次被判定为违规，您确定是否要提交？',
+            success (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                that.data.isConReview = true
+                that.submission()
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+                that.setData({
+                  violationsCount: 0,
+                  isConReview: false
+                })
+              }
+            }
+          })
+        }
       }
-
     })
   },
   Rad (d) { //经纬度转换成三角函数中度分表形式。

subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss

@@ -14,7 +14,7 @@ page{
 }
 .selfContent {
   width: 100%;
-  display: table;
+  /* display: table; */
   background: #ffffff;
   border-radius: 16rpx;
   box-sizing: border-box;

subpages/oneKeyService/pages/warning/warning.wxml

@@ -34,7 +34,8 @@
     data-id="{{item.id}}">
     <view class="name">{{item.noticeTitle}}</view>
     <view class="info">
-        <rich-text space="nbsp" nodes="{{item.noticeContentNew}}"></rich-text>
+        <!-- <rich-text space="nbsp" nodes="{{item.noticeContentNew}}"></rich-text> -->
+        <text>{{common.getStr(item.noticeContentNew)}}</text>
     </view>
 </view>
 
@@ -43,3 +44,8 @@
  <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 
 <no-data isShow="{{nodata}}"></no-data>
+<wxs module="common">
+    module.exports.getStr = function(content) {
+        return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'')
+    }
+</wxs>

subpages/oneKeyService/pages/warning/warning.wxss

@@ -51,6 +51,16 @@ page {
   -webkit-box-orient: vertical;
 }
 
+.list-item .info text {
+  line-height: 46rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  font-size: 30rpx;
+}
 /* 轮播图start */
 
 .altitle {

subpages/understandJs/pages/noticeDetail/noticeDetail.wxss

@@ -14,7 +14,7 @@ page{
 }
 .selfContent {
   width: 100%;
-  display: table;
+  /* display: table; */
   background: #ffffff;
   border-radius: 16rpx;
   box-sizing: border-box;

utils/config.js

@@ -6,14 +6,14 @@ module.exports = {
 };
 
 function BASEURL() {
-  return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+  // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
   // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
-  // return "http://219.146.91.110:9094/epdc-api/api/"  // 测试环境 ip接口地址
+  // return "http://192.168.43.19:9094/epdc-api/api/"  // 测试环境 ip接口地址
   // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
   // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
   //  return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
-  // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+  return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
-  // return 'http://192.168.43.19:9094/epdc-api/api/'
+  // return 'http://10.10.10.63:9094/epdc-api/api/'
 }
 
 function WEBROOT() {

utils/request.js

@@ -15,7 +15,7 @@ const request =  function (url, options) {
       },
       success (response) {
         if (response.statusCode === 200) {
-          if(response.data.code===0){
+          if(response.data.code===0 || response.data.code===533){
             resolve(response.data)
           }else{
             let errmsg = response.data.msg