wl
2022-12-27 c5823a28c388550ef40268c8a94294db9447720a
fix: bug处理和修改细节
18个文件已修改
206 ■■■■■ 已修改文件
miniprogram/pages/index/index.ts 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/cause/index.wxml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/group/message/Speech/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/group/message/index.wxss 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/group/message/records/index.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/index.wxml 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/index.wxss 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/report/detail/index.ts 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/report/detail/index.wxml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/report/detail/index.wxss 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/manager/report/index.ts 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/user/group/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/user/group/message/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/user/group/message/index.wxss 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/user/index.ts 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/user/pubulicty/index.ts 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/user/report/detail/index.ts 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/user/report/submitReport/index.ts 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/index/index.ts
@@ -32,11 +32,11 @@
                var info = wx.getStorageSync('info')
                console.log("获取缓存:" + role)
                if (role == 0) {
                    wx.redirectTo(
                        {
                            url: '../user/index'
                        }
                    )
                        wx.redirectTo(
                            {
                                url: '../user/index'
                            }
                        )
                }
                if (role == 1) {
                    wx.redirectTo(
@@ -82,9 +82,10 @@
                        wx.setStorageSync('token', res.data.data.token)
                        wx.setStorageSync('role', res.data.data.role)
                        wx.setStorageSync('id', res.data.data.id)
                        wx.setStorageSync('card',res.data.data.time)
                        console.log(res.data.data.id)
                        if (res.data.data.role == 0) {
                            var info=wx.getStorageSync('info')
                            var info=wx.getStorageSync('card')
                            if (info) {
                                wx.redirectTo(
                                    {
miniprogram/pages/manager/cause/index.wxml
@@ -5,11 +5,11 @@
            <view class="conter" data-cause="{{item}}" bindtap="getDetail">
                <view class="font-name">{{item.name}}   {{item.reportNumber}}人</view>
                <view class="font-wenzi">
                <view wx:if="{{item.status==0}}" class="font-wenzi1">未审核</view>
                <view wx:if="{{item.status==0}}" class="font-wenzi1">受理中</view>
                <view wx:if="{{item.status==1}}" class="font-wenzi2">不予立案</view>
                <view wx:if="{{item.status==2}}" class="font-wenzi3">受理中</view>
                <view wx:if="{{item.status==2}}" class="font-wenzi3">已立案</view>
                <view wx:if="{{item.status==3}}" class="font-wenzi4">已结案</view>
                <view wx:if="{{item.status==4}}" class="font-wenzi5">已立案</view>
                <view wx:if="{{item.status==4}}" class="font-wenzi5">已撤案</view>
                </view>
                <view class="font-qita">发案时间  {{item.firstTime}} </view>
                <view class="font-qita">责任人  {{item.userName}} </view>
miniprogram/pages/manager/group/message/Speech/index.wxml
@@ -22,7 +22,7 @@
                <!-- <button class="button" wx:if="{{item.banSpeech==0}}"  id="{{item.id}}" bindtap="memberDetail"  size="mini">禁言</button> -->
                <radio-group bindchange="pick" >
                    <radio  checked="{{item.banSpeech==1}}" value="{{item.id}}" bindtap="cancel"  color="red" class="button"></radio>
                </radio-group>
               </radio-group>
            </view>
        </view>
    </view>
miniprogram/pages/manager/group/message/index.wxss
@@ -89,11 +89,11 @@
 margin-top: 2%;
}
.more{
    height: 25px;
    width: 25px;
    height: 45px;
    width: 45px;
    float: right;
    margin-right: 2%;
    margin-top: 3%;
    margin-top: 1%;
}
.moreList{
    /* height: 30px; */
miniprogram/pages/manager/group/message/records/index.json
@@ -1,4 +1,4 @@
{
  "usingComponents": {},
  "navigationBarTitleText": "群成员"
  "navigationBarTitleText": "聊天记录"
}
miniprogram/pages/manager/index.wxml
@@ -5,25 +5,25 @@
        <!-- <text class="font-name">青阳经侦</text> -->
    </view>
    <view>
        <!-- <view class="box1" bindtap="getReport">
        <view class="box1" bindtap="getReport">
            <image class="icon" src="../icon/13_shouquan.png"></image>
            <text class="font-wenzi">报案详情</text>
        </view> -->
        </view>
        <view class="box2" bindtap="getGroup">
            <image class="icon" src="../icon/16_jinhuodl.png"></image>
            <text class="font-wenzi">群组聊天</text>
        </view>
        <view class="box1" bindtap="getCause">
            <image class="icon" src="../icon/18_sucai.png"></image>
            <text class="font-wenzi">案件管理</text>
        </view>
    </view>
    <view class="container3">
        <!-- <view class="box3" bindtap="getCause">
        <!-- <view class="box1" bindtap="getCause">
            <image class="icon" src="../icon/18_sucai.png"></image>
            <text class="font-wenzi">案件管理</text>
        </view> -->
        <view class="box3" bindtap="getAudi">
    </view>
    <view class="container3">
        <view class="box3" bindtap="getCause">
            <image class="icon" src="../icon/18_sucai.png"></image>
            <text class="font-wenzi">案件管理</text>
        </view>
        <view class="box4" bindtap="getAudi">
            <image class="icon" src="../icon/3_xiaji.png"></image>
            <text class="font-wenzi">个人中心</text>
        </view>
miniprogram/pages/manager/index.wxss
@@ -61,16 +61,29 @@
.box3{
    /* float:left; */
    /* margin-right: 15px; */
    margin-left: -66%;
    /* margin-left: -66%;
    height: 70px;
    width: 145px;
    border: 1px  solid rgba(0,0,0,0.2); */
    float:left;
    /* margin-top: 50%; */
    margin-left: -8%;
    /* margin-right: 15px; */
    height: 70px;
    width: 145px;
    border: 1px  solid rgba(0,0,0,0.2);
}
.box4{
    float:right;
    /* float:right;
    margin-right: -8%;
    height: 70px;
    width: 145px;
    border: 1px  solid rgba(0,0,0,0.2); */
    float:right;
    height: 70px;
    /* margin-top: 50%; */
    margin-right: -8%;
    width: 145px;
    border: 1px  solid rgba(0,0,0,0.2);
}
.container3{
miniprogram/pages/manager/report/detail/index.ts
@@ -20,7 +20,7 @@
//查看图片
face(){
    wx.previewMedia({
        sources:[{url:managerCauseDetail.globalData.imageUrl+"/img/"+this.data.reportDetail.pic}]
        sources:[{url:managerReportDetail.globalData.imageUrl+"/img/"+this.data.reportDetail.pic}]
    })
},
    //选择案件
@@ -29,24 +29,35 @@
        console.log(this.data.reportDetail)
    },
    cancel(){
        console.log("cancel")
        wx.navigateBack({
        })
    },
    //通过
    pass(){
        wx.request(
            {
                url: managerReportDetail.globalData.url +"/report/audit" ,
                method:"POST",
                data:this.data.reportDetail,
                header: { 'token':wx.getStorageSync('token') ,
                'content-type': 'application/json'
            } ,success:(res)=>{
                console.log(res)
                 wx.reLaunch({
                    url:'../../cause/index'
                })
            }
    })
        if(this.data.reportDetail.causeId==null){
            wx.showToast({
                title:"请选择关联案件",
                icon:"error"
            })
        }else{
            wx.request(
                {
                    url: managerReportDetail.globalData.url +"/report/audit" ,
                    method:"POST",
                    data:this.data.reportDetail,
                    header: { 'token':wx.getStorageSync('token') ,
                    'content-type': 'application/json'
                } ,success:(res)=>{
                    console.log(res)
                     wx.reLaunch({
                        url:'../../cause/index'
                    })
                }
        })
        }
},
    onLoad(e) {
        console.log(e)
@@ -54,7 +65,7 @@
            {
                url:managerReportDetail.globalData.url+"/report/" + e.id,
                method: "GET",
                // header: { 'token':wx.getStorageSync('token') },
                header: { 'token':wx.getStorageSync('token') },
                success: (res) => {
                    this.setData({
                        reportDetail: res.data.data,
@@ -63,7 +74,7 @@
                  console.log(this.data.reportDetail)
                    for (let index = 0; index < this.data.images.length; index++) {
                        if(this.data.images!=null&&this.data.images[index]!=""&&this.data.images!=undefined){
                            this.data.images[index]=managerCauseDetail.globalData.imageUrl+"/img/"+this.data.images[index]
                            this.data.images[index]=managerReportDetail.globalData.imageUrl+"/img/"+this.data.images[index]
                        }  else{
                            this.data.images=[]
                        } 
@@ -78,7 +89,7 @@
            {
                url: managerReportDetail.globalData.url+  "/cause/getCauseList",
                method: "GET",
                // header: { 'token': wx.getStorageSync('token')},
                header: { 'token': wx.getStorageSync('token')},
                success: (res) => {
                    this.setData({
                        causeList: res.data.data.records
miniprogram/pages/manager/report/detail/index.wxml
@@ -56,7 +56,8 @@
        <view class="font-wenzi">关联案件</view>
    </view>
    <view class="button">
        <button size="mini" class="button2" bindtap="deny">驳 回</button>
        <button class="button1" size="mini" bindtap="pass">通 过</button>
        <!-- <button size="mini" class="button2" bindtap="deny">驳 回</button> -->
        <button class="button2" size="mini" bindtap="pass">通 过</button>
        <button class="button1" size="mini" bindtap="cancel">取 消</button>
    </view>
</view>
miniprogram/pages/manager/report/detail/index.wxss
@@ -22,14 +22,15 @@
}
.button1{
    margin-left:50%;
    color: white;
    color: black;
    font-size: 14px;
    font-weight:normal;
    font-style: normal;
    background-color: #6699ff;
    background:rgba(255, 255, 255, 0.7);
    border: black solid 1px;
}
.button2{
    background: red;
    background: #6699ff;
    font-size: 14px;
    font-weight:normal;
    font-style: normal;
miniprogram/pages/manager/report/index.ts
@@ -25,14 +25,14 @@
        {
          url:report.globalData.url+"/wx/manager/report",
          method:"GET",
          data:{
              id:wx.getStorageSync('id')
          },
        //   data:{
        //       id:wx.getStorageSync('id')
        //   },
          header:{'token':wx.getStorageSync('token')},
          success:(res)=>{
              console.log(res)
              this.setData({
                reportList:res.data.data.records
                reportList:res.data.data
              })
          }
              })
miniprogram/pages/user/group/index.wxml
@@ -7,9 +7,9 @@
                <view class="noInGroup" wx:if="{{item.isInGroup==0}}">未进群</view>
                <image class="icon1" src="../../icon/群聊.png"></image>
                <view class="font-name"> {{item.groupName}} </view>
                <view class="font-wenzi">{{item.time}}</view>
                <view wx:if="{{item.time!=''&&item.time!=null}}" class="font-wenzi">{{item.time}}</view>
                <view wx:if="{{item.count!=0&&item.count!=null}}" class="count">{{item.count}}</view>
                <view class="font-qita">{{item.message}} </view>
                <view wx:if="{{item.message!=''&&item.message!=null}}" class="font-qita">{{item.message}} </view>
            </view>
        </view>
    </view>
miniprogram/pages/user/group/message/index.wxml
@@ -29,7 +29,7 @@
            <image src="../../../icon/群成员-01.png" class="bottom-icon"></image>
            <view class="wenzi-wenzi">群成员</view>
        </view> -->
        <view class="view" bindtap="publicty">
        <view class="view-0" bindtap="publicty">
            <image src="../../../icon/公告.png" class="bottom-icon"></image>
            <view class="wenzi-wenzi">群公告</view>
        </view>
miniprogram/pages/user/group/message/index.wxss
@@ -83,18 +83,18 @@
}
.input{
 width: 78%;
 height: 30px;
 height: 35px;
 background-color:     #F5F5F9;
 margin-left: 5%;
 border-radius:10px;
 margin-top: 2%;
}
.more{
    height: 25px;
    width: 25px;
    height: 45px;
    width: 45px;
    float: right;
    margin-right: 2%;
    margin-top: 3%;
    margin-top: 1%;
}
.moreList{
    /* height: 30px; */
miniprogram/pages/user/index.ts
@@ -17,16 +17,22 @@
    onLoad() {
        if( wx.getStorageSync('info')==''){
            wx.redirectTo({
                url: '../user/loginInfo/index'
            })
        }
        wx.request(  
            {
              url:user.globalData.url+"/publicity?size="+"4",
              url:user.globalData.url+"/wx/publicity?size="+"4",
              method:"GET",
              header:{'token':wx.getStorageSync('token')},
              success:(res)=>{
                console.log(res)
                  this.setData({
                    causeList:res.data.data.records
                    causeList:res.data.data
                  })
                  console.log(this.data.causeList)
              }
                  })
    },
miniprogram/pages/user/pubulicty/index.ts
@@ -11,14 +11,15 @@
  onLoad() {
    wx.request(  
        {
          url:userCause.globalData.url+"/publicity",
          url:userCause.globalData.url+"/wx/publicity",
          method:"GET",
          header:{'token':wx.getStorageSync('token')},
          success:(res)=>{
            console.log(res)
              this.setData({
                causeList:res.data.data.records
                causeList:res.data.data
              })
              console.log(this.data.causeList)
          }
              })
    }
miniprogram/pages/user/report/detail/index.ts
@@ -36,13 +36,12 @@
                    for (let index = 0; index < this.data.images.length; index++) {
                        if(this.data.images!=null&&this.data.images[index]!=""&&this.data.images!=undefined){
                            this.data.images[index]=userDetail.globalData.imageUrl+"/img/"+this.data.images[index]
                        }  else{
                            this.data.images=[]
                        }
                        }
                    }
                    this.setData({
                        images:this.data.images
                    })
                    console.log(this.data.images);
                }
            })
miniprogram/pages/user/report/submitReport/index.ts
@@ -30,22 +30,18 @@
                        url: submitReport.globalData.url+"/minio/upload",
                        success: res => {
                            const result = JSON.parse(res.data)
                          this.data.images.push({
                              url:submitReport.globalData.imageUrl+"/img/"+result.data
                          })
                          this.setData({
                            images:this.data.images
                        })
                        if(index< this.data.imagesFile.length-1){
                             this.data.materials+=result.data+","
                        }else{
                            this.data.materials+=result.data
                        }
                        this.setData({
                            materials:this.data.materials
                        })
                                this.data.images.push({
                                    url:submitReport.globalData.imageUrl+"/img/"+result.data
                                })
                                this.setData({
                                    images:this.data.images
                                })
                                this.setData({
                                    materials: this.data.materials+=result.data+","
                                })
                                console.log(this.data.materials);
                        } 
                    })
                    })
                }
            }
        })
@@ -75,10 +71,11 @@
       })
    },
    pass() {
        this.data.reportDetail.materials=this.data.materials
        this.data.materials=this.data.materials.substring(0,this.data.materials.length-1);
        this.data.reportDetail.reportMaterials=this.data.materials
        this.data.reportDetail.userId=wx.getStorageSync('id')
        this.data.reportDetail.cheatTime=this.data.cheatTime
        if (  this.data.reportDetail.materials == null||  this.data.reportDetail.information==null||  this.data.reportDetail.reportDescription==null) {
        if (  this.data.reportDetail.information==null||  this.data.reportDetail.reportDescription==null) {
            wx.showToast({
                icon: "none",
                title: '请完整填完表单!',