From 89470d761e2daef431c0f68355a973945607cfa8 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期五, 14 四月 2023 17:12:44 +0800
Subject: [PATCH] 警方公共
---
miniprogram/pages/user/announcement/announcelist/index.wxml | 15 +
miniprogram/pages/user/announcement/index.wxss | 54 ++++++
miniprogram/app.ts | 4
miniprogram/pages/user/announcement/index.wxml | 24 ++
miniprogram/pages/user/announcement/1.ts | 66 +++++++
miniprogram/pages/user/announcement/1.wxml | 2
miniprogram/pages/user/announcement/announcelist/index.wxss | 12 +
miniprogram/pages/user/announcement/index.ts | 42 ++++
miniprogram/pages/user/index.wxss | 31 +-
miniprogram/pages/manager/group/message/index.ts | 6
miniprogram/pages/user/report/submitReport/index.wxml | 2
miniprogram/pages/user/index.wxml | 7
miniprogram/image/laba.jpg | 0
miniprogram/pages/user/announcement/announcelist/index.json | 3
miniprogram/pages/user/index.ts | 96 +++++-----
miniprogram/pages/user/announcement/announcelist/index.ts | 88 +++++++++
miniprogram/pages/manager/report/detail/index.ts | 2
miniprogram/pages/manager/report/index.json | 2
miniprogram/pages/user/pubulicty/index.wxml | 2
miniprogram/app.json | 61 ++----
miniprogram/pages/user/announcement/index.json | 3
miniprogram/image/laba.jpeg | 0
22 files changed, 413 insertions(+), 109 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 9178cd6..52c5aba 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -12,6 +12,8 @@
"pages/user/pubulicty/index",
"pages/user/myself/index",
"pages/user/report/index",
+ "pages/user/announcement/index",
+ "pages/user/announcement/announcelist/index",
"pages/user/report/submitReport/index",
"pages/user/report/detail/index",
"pages/user/myself/detail/index",
@@ -27,6 +29,7 @@
"pages/user/group/index",
"pages/user/group/message/index",
"pages/user/group/message/publicty/index"
+
],
"usingComponents": {
"van-button": "@vant/weapp/button/index",
@@ -53,48 +56,34 @@
"van-dialog": "@vant/weapp/dialog/index",
"van-swipe-cell": "@vant/weapp/swipe-cell/index",
"van-action-sheet": "@vant/weapp/action-sheet/index"
-
},
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "闈掔緤鍏畨缁忎睛澶ч槦",
+ "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"
-
- }]
-
- },
+ "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 a9c5d3c..3c3747f 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/laba.jpeg b/miniprogram/image/laba.jpeg
new file mode 100644
index 0000000..400e20a
--- /dev/null
+++ b/miniprogram/image/laba.jpeg
Binary files differ
diff --git a/miniprogram/image/laba.jpg b/miniprogram/image/laba.jpg
new file mode 100644
index 0000000..a748570
--- /dev/null
+++ b/miniprogram/image/laba.jpg
Binary files differ
diff --git a/miniprogram/pages/manager/group/message/index.ts b/miniprogram/pages/manager/group/message/index.ts
index 1e7e9a3..10f4753 100644
--- a/miniprogram/pages/manager/group/message/index.ts
+++ b/miniprogram/pages/manager/group/message/index.ts
@@ -211,9 +211,9 @@
wx.setStorageSync('time', 'time')
} catch (e) { }
// wx.setStorageSync('time','time')
- this.setData({
- isInput: 2
- })
+ // this.setData({
+ // isInput: 2
+ // })
diff --git a/miniprogram/pages/manager/report/detail/index.ts b/miniprogram/pages/manager/report/detail/index.ts
index 8bb1c3c..532039f 100644
--- a/miniprogram/pages/manager/report/detail/index.ts
+++ b/miniprogram/pages/manager/report/detail/index.ts
@@ -48,7 +48,7 @@
success: (res) => {
console.log(res);
wx.reLaunch({
- url: '../../../manager/index'
+ url: '/pages/user/index'
})
}
})
diff --git a/miniprogram/pages/manager/report/index.json b/miniprogram/pages/manager/report/index.json
index a099d81..0ef7593 100644
--- a/miniprogram/pages/manager/report/index.json
+++ b/miniprogram/pages/manager/report/index.json
@@ -1,4 +1,4 @@
{
"usingComponents": {},
- "navigationBarTitleText": "鎶ユ瀹℃牳"
+ "navigationBarTitleText": "鐧昏瀹℃牳"
}
\ No newline at end of file
diff --git a/miniprogram/pages/user/announcement/1.ts b/miniprogram/pages/user/announcement/1.ts
new file mode 100644
index 0000000..41cb9eb
--- /dev/null
+++ b/miniprogram/pages/user/announcement/1.ts
@@ -0,0 +1,66 @@
+// pages/user/announcement/1.ts
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/user/announcement/1.wxml b/miniprogram/pages/user/announcement/1.wxml
new file mode 100644
index 0000000..ab45426
--- /dev/null
+++ b/miniprogram/pages/user/announcement/1.wxml
@@ -0,0 +1,2 @@
+<!--pages/user/announcement/1.wxml-->
+<text>pages/user/announcement/1.wxml</text>
diff --git a/miniprogram/pages/user/announcement/announcelist/index.json b/miniprogram/pages/user/announcement/announcelist/index.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/miniprogram/pages/user/announcement/announcelist/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/user/announcement/announcelist/index.ts b/miniprogram/pages/user/announcement/announcelist/index.ts
new file mode 100644
index 0000000..fcf593c
--- /dev/null
+++ b/miniprogram/pages/user/announcement/announcelist/index.ts
@@ -0,0 +1,88 @@
+// pages/user/announcement/announcelist/index.ts
+const userGroups = getApp()
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ id:'',
+ groupList:{}
+ },
+ getList(){
+ wx.request(
+ {
+ url: userGroups.globalData.url + "/policePublicity/"+this.data.id,
+ method: "GET",
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ console.log(res)
+ res.data.data.media = userGroups.globalData.imageUrl+'/img/'+ res.data.data.media
+ this.setData({
+ groupList: res.data.data
+ })
+ console.log(this.data.groupList);
+
+ }
+ })
+ },
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(e) {
+ console.log(e);
+ this.setData({
+ id:e.id
+ })
+ this.getList()
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/user/announcement/announcelist/index.wxml b/miniprogram/pages/user/announcement/announcelist/index.wxml
new file mode 100644
index 0000000..d79271d
--- /dev/null
+++ b/miniprogram/pages/user/announcement/announcelist/index.wxml
@@ -0,0 +1,15 @@
+<view>
+ <view class="t-title">
+ <p>{{groupList.title}}</p>
+ </view>
+ <view class="t-time">
+ {{groupList.ctime}}
+ </view>
+ <view>
+ <van-image width="100%" height="10rem" fit="widthFix" src="{{groupList.media}}" />
+
+ </view>
+ <view class="t-text">
+ {{groupList.text}}
+ </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/announcement/announcelist/index.wxss b/miniprogram/pages/user/announcement/announcelist/index.wxss
new file mode 100644
index 0000000..0754a1f
--- /dev/null
+++ b/miniprogram/pages/user/announcement/announcelist/index.wxss
@@ -0,0 +1,12 @@
+/* pages/user/announcement/announcelist/index.wxss */
+.t-title{
+ text-align: center;
+ font-size: 20px;
+ font-weight: 900;
+}
+.t-time{
+ text-align: center;
+}
+.t-text{
+ padding-bottom: 1.5rem;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/user/announcement/index.json b/miniprogram/pages/user/announcement/index.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/miniprogram/pages/user/announcement/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/user/announcement/index.ts b/miniprogram/pages/user/announcement/index.ts
new file mode 100644
index 0000000..657ee63
--- /dev/null
+++ b/miniprogram/pages/user/announcement/index.ts
@@ -0,0 +1,42 @@
+// index.ts
+// 鑾峰彇搴旂敤瀹炰緥
+const userGroup = getApp()
+
+Page({
+ data: {
+ groupList: []
+ },
+ toHome() {
+ wx.navigateBack()
+ },
+ onTabItemTap() {
+
+ this.getmessList()
+ },
+ openGroup(e) {
+ console.log(e);
+
+ wx.navigateTo({
+ url: '/pages/user/announcement/announcelist/index?id=' + e.currentTarget.id
+ // url: '../user/report/index'
+ // url: "../../manager/group/message/index?id=" + e.currentTarget.id
+ })
+ },
+ getmessList() {
+ wx.request(
+ {
+ url: userGroup.globalData.url + "/wx/policeAnnouncement/list",
+ method: "GET",
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ console.log(res)
+ this.setData({
+ groupList: res.data.data
+ })
+ }
+ })
+ },
+ onLoad() {
+ this.getmessList()
+ }
+})
diff --git a/miniprogram/pages/user/announcement/index.wxml b/miniprogram/pages/user/announcement/index.wxml
new file mode 100644
index 0000000..94304a4
--- /dev/null
+++ b/miniprogram/pages/user/announcement/index.wxml
@@ -0,0 +1,24 @@
+<!--index.wxml-->
+<view>
+ <view class="icon">
+ <view wx:for="{{groupList}}" wx:key="index">
+ <view class="conter" data-rptId="{{item.reportId}}" data-ban="{{item.ban}}" id="{{item.id}}" bindtap="openGroup">
+ <view class="conter-left">
+ <image class="icon1" src="../../../image/laba.jpeg"></image>
+ <view>
+ <view class="font-name"> {{item.title}} </view>
+ <!-- <view wx:if="{{item.text!=0&&item.text!=null}}" class="count">{{item.text}}</view> -->
+ <view wx:if="{{item.text!=''&&item.text!=null}}" class="font-qita">{{item.text}}</view>
+ </view>
+
+ </view>
+
+ <view wx:if="{{item.ctime!=''&&item.ctime!=null}}" class="font-wenzi">{{item.ctime}}</view>
+
+ </view>
+ </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-empty>
+</view>
diff --git a/miniprogram/pages/user/announcement/index.wxss b/miniprogram/pages/user/announcement/index.wxss
new file mode 100644
index 0000000..e6b16c1
--- /dev/null
+++ b/miniprogram/pages/user/announcement/index.wxss
@@ -0,0 +1,54 @@
+/**index.wxss**/
+.font-wenzi {
+ font-size: 13px;
+ color: rgba(0, 0, 0, 0.4);
+}
+
+.font-name {
+ font-size: 14px;
+
+}
+
+.font-qita {
+ font-size: 13px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ width: 6rem;
+}
+
+.conter {
+ height: 3rem;
+ display: flex;
+ align-items: center;
+ padding: 0 1rem;
+ justify-content: space-between;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+.conter-left{
+ display: flex;
+ flex: 1;
+ align-items: center;
+}
+.icon1 {
+ width: 35px;
+ height: 35px;
+
+}
+
+.count {
+ width: 15px;
+ height: 15px;
+ float: right;
+ font-size: 13px;
+ background-color: red;
+ text-align: center;
+ color: white;
+ border-radius: 50%;
+ margin-top: 1%;
+ margin-right: -30%;
+}
+
+.empty .bottom-button{
+ width: 8rem;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/user/index.ts b/miniprogram/pages/user/index.ts
index 2d56001..2459cb0 100644
--- a/miniprogram/pages/user/index.ts
+++ b/miniprogram/pages/user/index.ts
@@ -4,9 +4,9 @@
Page({
data: {
- videoheight:'',
- autoplay:true,
- role:0,
+ videoheight: '',
+ autoplay: true,
+ role: 0,
swcurrent: 0,
isShow: false,
userInfo: {},
@@ -19,17 +19,17 @@
url: '../logs/logs',
})
},
- resizeVideo(e){
+ resizeVideo(e) {
console.log(e);
this.setData({
- videoheight:e.detail.height
+ videoheight: e.detail.height
})
},
onLoad() {
-
+
wx.request({
- url: user.globalData.url+"/wx/login",
+ url: user.globalData.url + "/wx/login",
data: {
"phone": wx.getStorageSync('phone'),
},
@@ -38,7 +38,7 @@
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)
+ wx.setStorageSync('card', res.data.data.time)
wx.request(
{
@@ -47,77 +47,83 @@
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
this.setData({
- role:wx.getStorageSync('role')
+ role: wx.getStorageSync('role')
})
-
+
res.data.data.map(i => {
- let imgarr=[]
+ let imgarr = []
if (i.photoStr != null) {
-
+
i.photoStr = i.photoStr.split(",").map(i => user.globalData.imageUrl + "/img/" + i),
this.data.images = i.photoStr
- i.photoStr.map(j=>{
- let type=j.substring(j.lastIndexOf(".")+1)
+ i.photoStr.map(j => {
+ let type = j.substring(j.lastIndexOf(".") + 1)
-
- let obj={
- url: j,
- type:'png'
- }
- if (type=='mp4') {
- obj.type = 'mp4'
- }else{
- obj.type = 'png'
- }
- imgarr.push(obj)
- })
- i.imagarr=imgarr
+
+ let obj = {
+ url: j,
+ type: 'png'
+ }
+ if (type == 'mp4') {
+ obj.type = 'mp4'
+ } else {
+ obj.type = 'png'
+ }
+ imgarr.push(obj)
+ })
+ i.imagarr = imgarr
}
- i.releaseTime = i.releaseTime.replace(/-/g,"/")
+ i.releaseTime = i.releaseTime.replace(/-/g, "/")
})
this.setData({
causeList: res.data.data,
})
- console.log(this.data.causeList);
-
-
+ console.log(this.data.causeList);
+
+
}
})
- }})
+ }
+ })
if (wx.getStorageSync('info') == '') {
wx.redirectTo({
url: "pages/user/index"
})
}
-
-
-
+
+
+
},
- videoplay(e){
+ videoplay(e) {
console.log(e);
-
+
this.setData({
- autoplay:false
+ autoplay: false
})
},
- toDetailedInformation(){
+ toDetailedInformation() {
console.log('鎶ユ璇︽儏');
wx.navigateTo({
- url: '/pages/manager/report/index'
- })
+ url: '/pages/manager/report/index'
+ })
},
- toManage(){
+ toManage() {
console.log('妗堜欢绠＄悊');
- wx.navigateTo({
- url: '/pages/manager/cause/index'
- })
+ wx.navigateTo({
+ url: '/pages/manager/cause/index'
+ })
},
getReport() {
wx.navigateTo({
url: '../user/report/index'
})
},
+ getamoter() {
+ wx.navigateTo({
+ url: '../user/announcement/index'
+ })
+ },
getPublicty() {
console.log("publicty")
wx.navigateTo({
diff --git a/miniprogram/pages/user/index.wxml b/miniprogram/pages/user/index.wxml
index e93546a..5189834 100644
--- a/miniprogram/pages/user/index.wxml
+++ b/miniprogram/pages/user/index.wxml
@@ -23,11 +23,14 @@
<image class="icon" src="../icon/3_xiaji.png"></image>
<text class="font-wenzi">涓汉涓績</text>
</view> -->
- <view class="box2" bindtap="getReport">
+ <view class="box2 box-t" bindtap="getReport">
<text class="font-wenzi">鍙楁崯浜哄憳淇℃伅鐧昏</text>
</view>
+ <view class="box2 box1 box-t" bindtap="getamoter">
+ <text class="font-wenzi">璀︽柟鍏憡</text>
+ </view>
<view wx:if="{{role==1}}" class="box2 box3" bindtap="toDetailedInformation">
- <text class="font-wenzi">鎶ユ璇︽儏</text>
+ <text class="font-wenzi">鐧昏瀹℃牳</text>
</view>
<view wx:if="{{role==1}}" class="box2 box4" bindtap="toManage">
<text class="font-wenzi">妗堜欢绠＄悊</text>
diff --git a/miniprogram/pages/user/index.wxss b/miniprogram/pages/user/index.wxss
index 7a8f4d2..07c9069 100644
--- a/miniprogram/pages/user/index.wxss
+++ b/miniprogram/pages/user/index.wxss
@@ -50,28 +50,23 @@
.box-title {
/* position: fixed;
top: 2rem; */
- height: 4rem;
+ /* height: 10rem; */
display: flex;
padding: 0.5rem 0.5rem;
justify-content: space-between;
+ flex-wrap: wrap;
+
+}
+.box-t{
+ margin-bottom: 1rem;
}
-.box1 {
- display: inline-grid;
- align-items: center;
- justify-content: center;
- float: left;
- /* margin-top: 50%; */
- /* margin-left: -5%; */
- /* margin-right: 15px; */
- height: 70px;
- width: 100px;
- /* border: 1px solid rgba(0,0,0,0.2); */
-}
.box2 {
- flex: 1;
- align-items: center;
+ width: 10rem;
+ height: 4rem;
+ /* flex: 1; */
+ /* align-items: center; */
/* border: 1px solid #CCC; */
border-radius: 1rem;
background: -webkit-linear-gradient(left,#C0DEFE,#BFDEFD,#D9ECFB,#C0DEFE);
@@ -79,9 +74,11 @@
align-items: center;
justify-content: center;
}
-
+.box1 {
+ background: -webkit-linear-gradient(left,#FCCBCB,#FFE0E0,#FFF4F4,#FCCACA);
+}
.box3 {
- margin: 0 1rem;
+ /* margin: 0 1rem; */
background: -webkit-linear-gradient(left,#D8EFDE,#F1FFF0,#D8EFDE,#F1FFF0);
}
diff --git a/miniprogram/pages/user/pubulicty/index.wxml b/miniprogram/pages/user/pubulicty/index.wxml
index c32d856..2c06902 100644
--- a/miniprogram/pages/user/pubulicty/index.wxml
+++ b/miniprogram/pages/user/pubulicty/index.wxml
@@ -12,7 +12,7 @@
<swiper indicator-dots autoplay="{{autoplay}}" wx:if="{{item.photoStr!=null}}" current="{{swcurrent}}">
<block wx:for="{{item.imagarr}}" wx:for-item="i" wx:for-index="indexs" wx:key="indexs">
<swiper-item >
- <video class="swiper-video" bindplay="videoplay" wx:if="{{i.type=='mp4'}}" object-fit='fill' data-pic="{{i}}" id="myVideo+indexs" src="{{i.url}}"controls ></video>
+ <video class="swiper-video" bindplay="videoplay" wx:if="{{i.type=='mp4'}}" object-fit='contain' data-pic="{{i}}" id="myVideo+indexs" src="{{i.url}}"controls ></video>
<image lazy-load="true" wx:else src="{{i.url}}" mode="widthFix" class="top-img"/>
</swiper-item>
</block>
diff --git a/miniprogram/pages/user/report/submitReport/index.wxml b/miniprogram/pages/user/report/submitReport/index.wxml
index 56ce44d..722eda3 100644
--- a/miniprogram/pages/user/report/submitReport/index.wxml
+++ b/miniprogram/pages/user/report/submitReport/index.wxml
@@ -34,7 +34,7 @@
<van-field bind:input="getLocation" required value="{{ Location }}" label="鐜颁綇鍧�" placeholder="璇疯緭鍏ョ幇浣忓潃" />
<van-field bind:input="getworkingLocation" required value="{{ workingLocation }}" label="宸ヤ綔鍗曚綅" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
<view class="cause">
- <view class="font-wenzi-cause"> <span class="list-sure">*</span>鎻忚堪</view>
+ <view class="font-wenzi-cause"> <span class="list-sure">*</span>鎸変簨浠�</view>
<picker bindchange="pickCause" class="content" value="{{causeIndex}}" range="{{causeList}}" range-key="{{'name'}}" mode="selector">
<view class="picker-cause">
{{causeIndex==null?'璇烽�夋嫨':causeList[causeIndex].name}}>
--
Gitblit v1.8.0