From b28a722045219cb35e125f66887152feec9a8771 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 06 四月 2023 19:10:27 +0800
Subject: [PATCH] 根据需求修改
---
miniprogram/pages/manager/myself/index.wxml | 2
miniprogram/app.ts | 4
miniprogram/image/home_art.png | 0
miniprogram/image/center_art.png | 0
miniprogram/image/center.png | 0
miniprogram/pages/index/index.ts | 10 +-
miniprogram/pages/user/index.wxss | 27 +++-----
miniprogram/image/user.png | 0
miniprogram/pages/user/group/index.wxml | 2
miniprogram/pages/user/report/submitReport/index.wxml | 2
miniprogram/image/home.png | 0
miniprogram/pages/user/index.wxml | 20 +++++-
miniprogram/pages/user/report/submitReport/index.ts | 30 ++++++++++
miniprogram/image/user_art.png | 0
miniprogram/pages/user/index.ts | 14 ++++
miniprogram/app.json | 35 +++++++++++
project.config.json | 4 +
17 files changed, 117 insertions(+), 33 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 8ae0b5e..778664f 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -58,5 +58,40 @@
"navigationBarTitleText": "闈掔緤鍒嗗眬缁忎睛澶ч槦",
"navigationBarTextStyle": "black"
},
+ "tabBar": {
+
+ "list": [{
+
+ "pagePath": "pages/user/index",
+
+ "text": "棣栭〉",
+
+ "iconPath": "/image/home.png",
+
+ "selectedIconPath": "/image/home_art.png"
+
+ },{
+
+ "pagePath": "pages/user/group/index",
+
+ "text": "妗堜欢鍜ㄨ",
+
+ "iconPath": "/image/center.png",
+
+ "selectedIconPath": "/image/center_art.png"
+
+ },{
+
+ "pagePath": "pages/manager/myself/index",
+
+ "text": "鎴戠殑",
+
+ "iconPath": "/image/user.png",
+
+ "selectedIconPath": "/image/user_art.png"
+
+ }]
+
+ },
"sitemapLocation": "sitemap.json"
}
\ No newline at end of file
diff --git a/miniprogram/app.ts b/miniprogram/app.ts
index 4160081..a9c5d3c 100644
--- a/miniprogram/app.ts
+++ b/miniprogram/app.ts
@@ -1,8 +1,8 @@
// app.ts
App({
globalData: {
- url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
- // url:'http://192.168.3.220:8080',
+ // url:'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
+ url:'http://192.168.3.220:8080',
// url:'http://221.237.182.28:8443/api',
imageUrl:'https://qyqjzdd.cdqingyang.gov.cn/minio'
// imageUrl:'http://192.168.3.220:8080/minio'
diff --git a/miniprogram/image/center.png b/miniprogram/image/center.png
new file mode 100644
index 0000000..e8f16cb
--- /dev/null
+++ b/miniprogram/image/center.png
Binary files differ
diff --git a/miniprogram/image/center_art.png b/miniprogram/image/center_art.png
new file mode 100644
index 0000000..87f0830
--- /dev/null
+++ b/miniprogram/image/center_art.png
Binary files differ
diff --git a/miniprogram/image/home.png b/miniprogram/image/home.png
new file mode 100644
index 0000000..50acdfd
--- /dev/null
+++ b/miniprogram/image/home.png
Binary files differ
diff --git a/miniprogram/image/home_art.png b/miniprogram/image/home_art.png
new file mode 100644
index 0000000..a408f71
--- /dev/null
+++ b/miniprogram/image/home_art.png
Binary files differ
diff --git a/miniprogram/image/user.png b/miniprogram/image/user.png
new file mode 100644
index 0000000..f13fe44
--- /dev/null
+++ b/miniprogram/image/user.png
Binary files differ
diff --git a/miniprogram/image/user_art.png b/miniprogram/image/user_art.png
new file mode 100644
index 0000000..8a0a742
--- /dev/null
+++ b/miniprogram/image/user_art.png
Binary files differ
diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts
index 6a8219e..892f945 100644
--- a/miniprogram/pages/index/index.ts
+++ b/miniprogram/pages/index/index.ts
@@ -41,7 +41,7 @@
if (role == 1) {
wx.redirectTo(
{
- url: '../manager/index'
+ url: '../user/index'
}
)
}
@@ -85,8 +85,8 @@
wx.setStorageSync('phone', res.data.msg)
if (res.data.data==2) {
wx.redirectTo(
- {
- url: '../user/pubulicty/index'
+ { url: '../user/index'
+ // url: '../user/pubulicty/index'
// url: '../user/loginInfo/index'
}
)
@@ -98,8 +98,8 @@
)
}else{
wx.redirectTo(
- {
- url: '../manager/index'
+ {url: '../user/index'
+ // url: '../manager/index'
}
)
}
diff --git a/miniprogram/pages/manager/myself/index.wxml b/miniprogram/pages/manager/myself/index.wxml
index b4e6c68..6b50e02 100644
--- a/miniprogram/pages/manager/myself/index.wxml
+++ b/miniprogram/pages/manager/myself/index.wxml
@@ -7,7 +7,7 @@
</view>
<view class="span">{{reportList.name}} <view class="pNum">{{reportList.phoneNum}}</view>
</view>
- <view class="wenzi">闈掗槼鍖哄叕瀹夊垎灞�缁忎睛澶ч槦</view>
+ <view class="wenzi">闈掔緤鍖哄叕瀹夊垎灞�缁忎睛澶ч槦</view>
<view class="span2">
<view class="cNum">{{reportList.causeNum}}
<view class="wenzi-low">妗堜欢鏁�</view>
diff --git a/miniprogram/pages/user/group/index.wxml b/miniprogram/pages/user/group/index.wxml
index f5292a9..edc8abe 100644
--- a/miniprogram/pages/user/group/index.wxml
+++ b/miniprogram/pages/user/group/index.wxml
@@ -14,6 +14,6 @@
</view>
</view>
<van-empty class="empty" description="灏氭湭鍔犲叆缇ょ粍" wx:if="{{groupList.length === 0}}">
- <van-button round type="info" size="small" custom-class ="bottom-button" bind:click="toHome">鍥炲埌棣栭〉</van-button>
+ <!-- <van-button round type="info" size="small" custom-class ="bottom-button" bind:click="toHome">鍥炲埌棣栭〉</van-button> -->
</van-empty>
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/index.ts b/miniprogram/pages/user/index.ts
index 1fe27cb..b5327ac 100644
--- a/miniprogram/pages/user/index.ts
+++ b/miniprogram/pages/user/index.ts
@@ -54,11 +54,23 @@
}})
if (wx.getStorageSync('info') == '') {
wx.redirectTo({
- url: '../user/loginInfo/index'
+ url: "pages/user/index"
})
}
},
+ toDetailedInformation(){
+ console.log('鎶ユ璇︽儏');
+ wx.navigateTo({
+ url: '/pages/manager/report/index'
+ })
+ },
+ toManage(){
+ console.log('妗堜欢绠＄悊');
+ wx.navigateTo({
+ url: '/pages/manager/cause/index'
+ })
+ },
getReport() {
wx.navigateTo({
url: '../user/report/index'
diff --git a/miniprogram/pages/user/index.wxml b/miniprogram/pages/user/index.wxml
index 6753b8c..13d7499 100644
--- a/miniprogram/pages/user/index.wxml
+++ b/miniprogram/pages/user/index.wxml
@@ -5,22 +5,32 @@
<!-- <text class="font-name">闈掗槼缁忎睛</text> -->
</view>
<view class="box-title">
- <view class="box1" bindtap="getGroup">
+
+ <!-- <view class="box1" bindtap="getGroup">
<image class="icon" src="../icon/16_jinhuodl.png"></image>
<text class="font-wenzi">缇ょ粍鑱婂ぉ</text>
</view>
<view class="box1" bindtap="getPublicty">
<image class="icon" src="../icon/25_zhanghumx.png"></image>
<text class="font-wenzi">鍏叡瀹ｄ紶</text>
- </view>
- <view class="box1" bindtap="getReport">
+ </view> -->
+ <!-- <view class="box1" bindtap="getReport">
<image class="icon" src="../icon/9_baoanguangli.png"></image>
<text class="font-wenzi">鍙楁崯浜哄憳</text>
<text class="font-wenzi">淇℃伅鐧昏</text>
- </view>
- <view class="box1" bindtap="getAudi">
+ </view> -->
+ <!-- <view class="box1" bindtap="getAudi">
<image class="icon" src="../icon/3_xiaji.png"></image>
<text class="font-wenzi">涓汉涓績</text>
+ </view> -->
+ <view class="box2" bindtap="getReport">
+ <text class="font-wenzi">鍙楁崯浜哄憳淇℃伅鐧昏</text>
+ </view>
+ <view class="box2 box3" bindtap="toDetailedInformation">
+ <text class="font-wenzi">鎶ユ璇︽儏</text>
+ </view>
+ <view class="box2" bindtap="toManage">
+ <text class="font-wenzi">妗堜欢绠＄悊</text>
</view>
</view>
<!-- <view class="container3">
diff --git a/miniprogram/pages/user/index.wxss b/miniprogram/pages/user/index.wxss
index 8705e1c..29d089b 100644
--- a/miniprogram/pages/user/index.wxss
+++ b/miniprogram/pages/user/index.wxss
@@ -47,6 +47,9 @@
}
.box-title {
+ /* position: fixed;
+ top: 2rem; */
+ height: 4rem;
display: flex;
justify-content: space-between;
}
@@ -65,27 +68,18 @@
}
.box2 {
- display: inline-grid;
+ flex: 1;
+ align-items: center;
+ /* border: 1px solid #CCC; */
+ border-radius: 1rem;
+ background: -webkit-linear-gradient(left,#C0DEFE,#BFDEFD,#D9ECFB,#C0DEFE);
+ display: flex;
align-items: center;
justify-content: center;
- float: right;
- height: 70px;
- margin-top: 50%;
- margin-right: -8%;
- width: 145px;
- /* border: 1px solid rgba(0,0,0,0.2); */
}
.box3 {
- display: inline-grid;
- align-items: center;
- justify-content: center;
- float: left;
- /* margin-right: 15px; */
- margin-left: -8%;
- height: 70px;
- width: 145px;
- /* border: 1px solid rgba(0,0,0,0.2); */
+ margin: 0 1rem;
}
.box4 {
@@ -106,6 +100,7 @@
.font-wenzi {
/* margin-left: 20px; */
font-size: 13px;
+ font-weight: 900;
}
diff --git a/miniprogram/pages/user/report/submitReport/index.ts b/miniprogram/pages/user/report/submitReport/index.ts
index 673a373..5eb26a5 100644
--- a/miniprogram/pages/user/report/submitReport/index.ts
+++ b/miniprogram/pages/user/report/submitReport/index.ts
@@ -4,6 +4,7 @@
import { formatTime } from 'miniprogram/utils/util';
Page({
data: {
+ phoneDisab:true,
isInGroup:'',
remarks: '',
addFig:false,
@@ -81,6 +82,11 @@
getuserIdCard(e) {
this.setData({
userIdCard: e.detail
+ })
+ },
+ getuserPhone(e){
+ this.setData({
+ phone: e.detail
})
},
getLocation(e) {
@@ -273,6 +279,22 @@
// })
// return
// }
+ if (wx.getStorageSync('role')==1) {
+ wx.request(
+ {
+ url: submitReport.globalData.url + "/wx/user/policeAddReport",
+ method: this.data.addFig?"PUT":"POST",
+ data: this.data.reportDetail,
+ header: {
+ 'token': wx.getStorageSync('token'),
+ 'content-type': 'application/json'
+ }, success: (res) => {
+ wx.reLaunch({
+ url: '../../report/index'
+ })
+ }
+ })
+ }else{
wx.request(
{
url: submitReport.globalData.url + "/wx/user/addReport",
@@ -287,10 +309,18 @@
})
}
})
+ }
+
},
onLoad:function(e) {
console.log(e);
let that = this
+ let role = wx.getStorageSync('role')
+ if (role==1) {
+ that.setData({
+ phoneDisab :false
+ })
+ }
let phone = wx.getStorageSync('phone')
that.setData({
phone: phone
diff --git a/miniprogram/pages/user/report/submitReport/index.wxml b/miniprogram/pages/user/report/submitReport/index.wxml
index 6048364..56ce44d 100644
--- a/miniprogram/pages/user/report/submitReport/index.wxml
+++ b/miniprogram/pages/user/report/submitReport/index.wxml
@@ -30,7 +30,7 @@
</view>
<van-field bind:input="getuserIdCard" required value="{{ userIdCard }}" label="韬唤璇�" placeholder="璇疯緭鍏ヨ韩浠借瘉" />
- <van-field disabled required value="{{ phone }}" label="鑱旂郴鐢佃瘽" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ <van-field disabled="{{phoneDisab}}" bind:input="getuserPhone" required value="{{ phone }}" label="鑱旂郴鐢佃瘽" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
<van-field bind:input="getLocation" required value="{{ Location }}" label="鐜颁綇鍧�" placeholder="璇疯緭鍏ョ幇浣忓潃" />
<van-field bind:input="getworkingLocation" required value="{{ workingLocation }}" label="宸ヤ綔鍗曚綅" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
<view class="cause">
diff --git a/project.config.json b/project.config.json
index 128ccc2..6a7802d 100644
--- a/project.config.json
+++ b/project.config.json
@@ -27,7 +27,9 @@
"packNpmManually": true
},
"simulatorType": "wechat",
- "simulatorPluginLibVersion": {},
+ "simulatorPluginLibVersion": {
+ "wxext14566970e7e9f62": "2.27.3"
+ },
"condition": {},
"srcMiniprogramRoot": "miniprogram/",
"editorSetting": {
--
Gitblit v1.8.0