From c5823a28c388550ef40268c8a94294db9447720a Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 27 十二月 2022 15:38:49 +0800
Subject: [PATCH] fix: bug处理和修改细节
---
miniprogram/pages/user/group/message/index.wxml | 2
miniprogram/pages/user/pubulicty/index.ts | 7 +
miniprogram/pages/user/group/message/index.wxss | 8 +-
miniprogram/pages/manager/report/detail/index.wxml | 5
miniprogram/pages/index/index.ts | 13 +-
miniprogram/pages/manager/report/detail/index.wxss | 7 +
miniprogram/pages/user/group/index.wxml | 4
miniprogram/pages/manager/report/index.ts | 8 +-
miniprogram/pages/manager/group/message/Speech/index.wxml | 2
miniprogram/pages/manager/group/message/index.wxss | 6
miniprogram/pages/user/report/submitReport/index.ts | 31 +++----
miniprogram/pages/user/report/detail/index.ts | 5
miniprogram/pages/manager/cause/index.wxml | 6
miniprogram/pages/manager/index.wxss | 17 +++
miniprogram/pages/user/index.ts | 12 ++
miniprogram/pages/manager/group/message/records/index.json | 2
miniprogram/pages/manager/report/detail/index.ts | 51 +++++++-----
miniprogram/pages/manager/index.wxml | 20 ++--
18 files changed, 118 insertions(+), 88 deletions(-)
diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts
index 48d687c..86f9096 100644
--- a/miniprogram/pages/index/index.ts
+++ b/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(
{
diff --git a/miniprogram/pages/manager/cause/index.wxml b/miniprogram/pages/manager/cause/index.wxml
index cc9beff..4d15a50 100644
--- a/miniprogram/pages/manager/cause/index.wxml
+++ b/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>
diff --git a/miniprogram/pages/manager/group/message/Speech/index.wxml b/miniprogram/pages/manager/group/message/Speech/index.wxml
index fd25847..4ebe926 100644
--- a/miniprogram/pages/manager/group/message/Speech/index.wxml
+++ b/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>
diff --git a/miniprogram/pages/manager/group/message/index.wxss b/miniprogram/pages/manager/group/message/index.wxss
index eb05654..625077b 100644
--- a/miniprogram/pages/manager/group/message/index.wxss
+++ b/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; */
diff --git a/miniprogram/pages/manager/group/message/records/index.json b/miniprogram/pages/manager/group/message/records/index.json
index 18b7c0b..dc8f968 100644
--- a/miniprogram/pages/manager/group/message/records/index.json
+++ b/miniprogram/pages/manager/group/message/records/index.json
@@ -1,4 +1,4 @@
{
"usingComponents": {},
- "navigationBarTitleText": "缇ゆ垚鍛�"
+ "navigationBarTitleText": "鑱婂ぉ璁板綍"
}
\ No newline at end of file
diff --git a/miniprogram/pages/manager/index.wxml b/miniprogram/pages/manager/index.wxml
index 6602982..fb3fe48 100644
--- a/miniprogram/pages/manager/index.wxml
+++ b/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>
diff --git a/miniprogram/pages/manager/index.wxss b/miniprogram/pages/manager/index.wxss
index 7bbef09..d8bd251 100644
--- a/miniprogram/pages/manager/index.wxss
+++ b/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{
diff --git a/miniprogram/pages/manager/report/detail/index.ts b/miniprogram/pages/manager/report/detail/index.ts
index 00b04df..eaaa96a 100644
--- a/miniprogram/pages/manager/report/detail/index.ts
+++ b/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
diff --git a/miniprogram/pages/manager/report/detail/index.wxml b/miniprogram/pages/manager/report/detail/index.wxml
index 3b440cc..ced5f47 100644
--- a/miniprogram/pages/manager/report/detail/index.wxml
+++ b/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>
\ No newline at end of file
diff --git a/miniprogram/pages/manager/report/detail/index.wxss b/miniprogram/pages/manager/report/detail/index.wxss
index 7ed1312..d26b478 100644
--- a/miniprogram/pages/manager/report/detail/index.wxss
+++ b/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;
diff --git a/miniprogram/pages/manager/report/index.ts b/miniprogram/pages/manager/report/index.ts
index b6ad2fb..2cede68 100644
--- a/miniprogram/pages/manager/report/index.ts
+++ b/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
})
}
})
diff --git a/miniprogram/pages/user/group/index.wxml b/miniprogram/pages/user/group/index.wxml
index d32bfb4..aaae39d 100644
--- a/miniprogram/pages/user/group/index.wxml
+++ b/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>
diff --git a/miniprogram/pages/user/group/message/index.wxml b/miniprogram/pages/user/group/message/index.wxml
index 0c78456..e4f7e12 100644
--- a/miniprogram/pages/user/group/message/index.wxml
+++ b/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>
diff --git a/miniprogram/pages/user/group/message/index.wxss b/miniprogram/pages/user/group/message/index.wxss
index d28d054..464b813 100644
--- a/miniprogram/pages/user/group/message/index.wxss
+++ b/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; */
diff --git a/miniprogram/pages/user/index.ts b/miniprogram/pages/user/index.ts
index 92ebeb6..6707ce4 100644
--- a/miniprogram/pages/user/index.ts
+++ b/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)
+
}
})
},
diff --git a/miniprogram/pages/user/pubulicty/index.ts b/miniprogram/pages/user/pubulicty/index.ts
index 2b71296..691b34d 100644
--- a/miniprogram/pages/user/pubulicty/index.ts
+++ b/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)
+
}
})
}
diff --git a/miniprogram/pages/user/report/detail/index.ts b/miniprogram/pages/user/report/detail/index.ts
index 7de56bc..88c9525 100644
--- a/miniprogram/pages/user/report/detail/index.ts
+++ b/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);
}
})
diff --git a/miniprogram/pages/user/report/submitReport/index.ts b/miniprogram/pages/user/report/submitReport/index.ts
index 3ffafab..af3320e 100644
--- a/miniprogram/pages/user/report/submitReport/index.ts
+++ b/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: '璇峰畬鏁村～瀹岃〃鍗曪紒',
--
Gitblit v1.8.0