From a8cf20bd911709571446d20fb619ff5e9ebe4eee Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 06 三月 2023 18:10:25 +0800
Subject: [PATCH] 修改图片轮播
---
miniprogram/app.ts | 6 +-
miniprogram/pages/user/pubulicty/index.wxss | 4 +
miniprogram/pages/user/pubulicty/index.ts | 9 ++
miniprogram/pages/manager/report/detail/index.wxml | 2
miniprogram/pages/manager/report/detail/index.wxss | 14 ++++
miniprogram/pages/user/index.wxss | 4 +
miniprogram/pages/user/report/submitReport/index.wxss | 2
miniprogram/pages/user/report/detail/index.wxss | 2
miniprogram/pages/user/report/detail/index.wxml | 4
miniprogram/pages/user/index.wxml | 9 ++
miniprogram/pages/user/report/index.wxss | 3
miniprogram/pages/user/report/index.wxml | 3
miniprogram/pages/user/report/detail/index.ts | 31 +++++----
miniprogram/pages/manager/index.wxss | 27 ++++----
miniprogram/pages/user/index.ts | 18 ++++-
miniprogram/pages/user/pubulicty/index.wxml | 8 ++
miniprogram/app.json | 5 +
miniprogram/pages/manager/index.wxml | 15 ++--
18 files changed, 111 insertions(+), 55 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 4c81b33..10fbb05 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -32,7 +32,10 @@
"van-button": "@vant/weapp/button/index",
"van-empty": "@vant/weapp/empty/index",
"van-cell": "@vant/weapp/cell/index",
- "van-cell-group": "@vant/weapp/cell-group/index"
+ "van-cell-group": "@vant/weapp/cell-group/index",
+ "van-grid": "@vant/weapp/grid/index",
+ "van-grid-item": "@vant/weapp/grid-item/index",
+ "van-icon": "@vant/weapp/icon/index"
},
"window": {
"backgroundTextStyle": "light",
diff --git a/miniprogram/app.ts b/miniprogram/app.ts
index 69a1079..e7fe5a9 100644
--- a/miniprogram/app.ts
+++ b/miniprogram/app.ts
@@ -1,10 +1,10 @@
// 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:'http://qyqjzdd.cdqingyang.gov.cn/minio'
+ imageUrl:'https://qyqjzdd.cdqingyang.gov.cn/minio'
},
onLaunch() {
// 灞曠ず鏈湴瀛樺偍鑳藉姏
diff --git a/miniprogram/pages/manager/index.wxml b/miniprogram/pages/manager/index.wxml
index cef25bc..3df66e0 100644
--- a/miniprogram/pages/manager/index.wxml
+++ b/miniprogram/pages/manager/index.wxml
@@ -1,16 +1,15 @@
<!--index.wxml-->
-<view class="container">
- <view class="imageView" >
- <!-- <div style="width: 100%;background-color: blue;" class="indexImage"></div> -->
- <!-- <image style="width: 100%;" class="indexImage" src="../../image/5f9c1ee836fbee333ca3a0088e53d2f.png"></image> -->
+<view class="manager">
+ <view class="imageView">
+ <image style="width:100%;" class="indexImage" src="../../image/test3.jpg"></image>
<!-- <text class="font-name">闈掗槼缁忎睛</text> -->
</view>
- <view>
+ <view class="container3">
<view class="box1" bindtap="getReport">
<image class="icon" src="../icon/13_shouquan.png"></image>
<text class="font-wenzi">鎶ユ璇︽儏</text>
</view>
- <view class="box2" bindtap="getGroup">
+ <view class="box1" bindtap="getGroup">
<image class="icon" src="../icon/16_jinhuodl.png"></image>
<text class="font-wenzi">缇ょ粍鑱婂ぉ</text>
</view>
@@ -20,11 +19,11 @@
</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="box4" bindtap="getAudi">
+ <view class="box1" 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 d8bd251..bd719ed 100644
--- a/miniprogram/pages/manager/index.wxss
+++ b/miniprogram/pages/manager/index.wxss
@@ -10,10 +10,7 @@
/* margin-bottom: 100%; */
}
.imageView{
- position:absolute;
- top: 0;
- left: 0;
- right: 0;
+
}
/* 棣栭〉鍥炬爣
.reportIcon{
@@ -34,7 +31,7 @@
.icon{
height: 30px;
width: 30px;
- margin-top: 15px;
+ /* margin-top: 15px; */
margin-left: 20px;
}
.container{
@@ -42,19 +39,21 @@
}
.box1{
- float:left;
+ display: flex;
+ align-items: center;
+ /* float:left;
margin-top: 50%;
- margin-left: -8%;
+ margin-left: -8%; */
/* margin-right: 15px; */
height: 70px;
width: 145px;
border: 1px solid rgba(0,0,0,0.2);
}
.box2{
- float:right;
+ /* float:right;
height: 70px;
margin-top: 50%;
- margin-right: -8%;
+ margin-right: -8%; */
width: 145px;
border: 1px solid rgba(0,0,0,0.2);
}
@@ -65,9 +64,9 @@
height: 70px;
width: 145px;
border: 1px solid rgba(0,0,0,0.2); */
- float:left;
+ /* float:left; */
/* margin-top: 50%; */
- margin-left: -8%;
+ /* margin-left: -8%; */
/* margin-right: 15px; */
height: 70px;
width: 145px;
@@ -79,15 +78,17 @@
height: 70px;
width: 145px;
border: 1px solid rgba(0,0,0,0.2); */
- float:right;
+ /* float:right; */
height: 70px;
/* margin-top: 50%; */
- margin-right: -8%;
+ /* margin-right: -8%; */
width: 145px;
border: 1px solid rgba(0,0,0,0.2);
}
.container3{
margin-top: 10px;
+ display: flex;
+ justify-content: space-evenly;
}
.font-wenzi{
margin-left: 20px;
diff --git a/miniprogram/pages/manager/report/detail/index.wxml b/miniprogram/pages/manager/report/detail/index.wxml
index ced5f47..af2977d 100644
--- a/miniprogram/pages/manager/report/detail/index.wxml
+++ b/miniprogram/pages/manager/report/detail/index.wxml
@@ -56,7 +56,7 @@
<view class="font-wenzi">鍏宠仈妗堜欢</view>
</view>
<view class="button">
- <!-- <button size="mini" class="button2" bindtap="deny">椹� 鍥�</button> -->
+ <button size="mini" class="button3" bindtap="deny">椹� 鍥�</button>
<button class="button2" size="mini" bindtap="pass">閫� 杩�</button>
<button class="button1" size="mini" bindtap="cancel">鍙� 娑�</button>
</view>
diff --git a/miniprogram/pages/manager/report/detail/index.wxss b/miniprogram/pages/manager/report/detail/index.wxss
index d26b478..7de6b99 100644
--- a/miniprogram/pages/manager/report/detail/index.wxss
+++ b/miniprogram/pages/manager/report/detail/index.wxss
@@ -1,5 +1,6 @@
/**index.wxss**/
.list1{
+ padding: 0 1rem;
font-size: 14px;
border-bottom: 1px solid rgba(0,0,0,0.1);
}
@@ -21,15 +22,24 @@
margin-left: 15%;
}
.button1{
- margin-left:50%;
+ /* margin-left:50%; */
color: black;
font-size: 14px;
font-weight:normal;
font-style: normal;
background:rgba(255, 255, 255, 0.7);
- border: black solid 1px;
+ border: #ccc solid 1px;
+}
+.button3{
+ margin-right: 1rem;
+ background: red;
+ font-size: 14px;
+ font-weight:normal;
+ font-style: normal;
+ color: #ffffff;
}
.button2{
+ margin-right: 1rem;
background: #6699ff;
font-size: 14px;
font-weight:normal;
diff --git a/miniprogram/pages/user/index.ts b/miniprogram/pages/user/index.ts
index e33d4a3..4c62a6f 100644
--- a/miniprogram/pages/user/index.ts
+++ b/miniprogram/pages/user/index.ts
@@ -4,9 +4,11 @@
Page({
data: {
+ swcurrent: 0,
isShow: false,
userInfo: {},
- causeList: []
+ causeList: [],
+ images: []
},
// 浜嬩欢澶勭悊鍑芥暟
bindViewTap() {
@@ -28,10 +30,18 @@
method: "GET",
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
- console.log(res)
- this.setData({
- causeList: res.data.data
+
+ res.data.data.map(i => {
+ if (i.photoStr != null) {
+ i.photoStr = i.photoStr.split(",").map(i => user.globalData.imageUrl + "/img/" + i),
+ this.data.images = i.photoStr
+ }
})
+ this.setData({
+ causeList: res.data.data,
+ })
+
+
}
})
},
diff --git a/miniprogram/pages/user/index.wxml b/miniprogram/pages/user/index.wxml
index 9637a29..6a8b8cd 100644
--- a/miniprogram/pages/user/index.wxml
+++ b/miniprogram/pages/user/index.wxml
@@ -36,7 +36,14 @@
<view class="font-wenzi1">鍏叡瀹ｄ紶</view>
<view class="more" bindtap="more">鏇村 >></view>
</view>
- <view class="lists" wx:for="{{causeList}}" wx:key="id">
+ <view class="lists" wx:for="{{causeList}}" wx:key="id" wx:for-item="item">
+ <swiper indicator-dots autoplay wx:if="{{item.photoStr!=null}}" current="{{swcurrent}}">
+ <block wx:for="{{item.photoStr}}" wx:for-item="i" wx:for-index="indexs" wx:key="indexs">
+ <swiper-item >
+ <image lazy-load="true" src="{{i}}" mode="widthFix" class="top-img"/>
+ </swiper-item>
+ </block>
+ </swiper>
<view class="lists-top">
<view class="lists-top-title">{{item.publicityTitle}}</view>
<view class="lists-top-time">{{item.releaseTime}}</view>
diff --git a/miniprogram/pages/user/index.wxss b/miniprogram/pages/user/index.wxss
index 19bf5b4..1ad6dfb 100644
--- a/miniprogram/pages/user/index.wxss
+++ b/miniprogram/pages/user/index.wxss
@@ -164,7 +164,9 @@
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
width: 100%;
}
-
+.top-img{
+ width: 100%;
+}
.lists .lists-top {
display: flex;
justify-content: space-between;
diff --git a/miniprogram/pages/user/pubulicty/index.ts b/miniprogram/pages/user/pubulicty/index.ts
index 7f880b5..1c1aef5 100644
--- a/miniprogram/pages/user/pubulicty/index.ts
+++ b/miniprogram/pages/user/pubulicty/index.ts
@@ -4,6 +4,7 @@
Page({
data: {
+ swcurrent: 0,
causeList: [],
isShow: false
},
@@ -15,7 +16,13 @@
method: "GET",
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
- console.log(res)
+
+ res.data.data.map(i => {
+ if (i.photoStr != null) {
+ i.photoStr = i.photoStr.split(",").map(i => userCause.globalData.imageUrl + "/img/" + i),
+ this.data.images = i.photoStr
+ }
+ })
this.setData({
causeList: res.data.data
})
diff --git a/miniprogram/pages/user/pubulicty/index.wxml b/miniprogram/pages/user/pubulicty/index.wxml
index ab54d16..ad895bb 100644
--- a/miniprogram/pages/user/pubulicty/index.wxml
+++ b/miniprogram/pages/user/pubulicty/index.wxml
@@ -5,7 +5,15 @@
<!-- <text class="font-name">闈掗槼缁忎睛</text> -->
</view>
<view class="content" style="width:100%;">
+
<view class="lists" wx:for="{{causeList}}" wx:key="id">
+ <swiper indicator-dots autoplay wx:if="{{item.photoStr!=null}}" current="{{swcurrent}}">
+ <block wx:for="{{item.photoStr}}" wx:for-item="i" wx:for-index="indexs" wx:key="indexs">
+ <swiper-item >
+ <image lazy-load="true" src="{{i}}" mode="widthFix" class="top-img"/>
+ </swiper-item>
+ </block>
+ </swiper>
<view class="lists-top">
<view class="lists-top-title">{{item.publicityTitle}}</view>
<view class="lists-top-time">{{item.releaseTime}}</view>
diff --git a/miniprogram/pages/user/pubulicty/index.wxss b/miniprogram/pages/user/pubulicty/index.wxss
index c968cfe..d7da3a2 100644
--- a/miniprogram/pages/user/pubulicty/index.wxss
+++ b/miniprogram/pages/user/pubulicty/index.wxss
@@ -1,7 +1,9 @@
.imageView {
width: 100%;
}
-
+.top-img{
+ width: 100%;
+}
.container {
width: 100%;
}
diff --git a/miniprogram/pages/user/report/detail/index.ts b/miniprogram/pages/user/report/detail/index.ts
index 88c9525..e9e4978 100644
--- a/miniprogram/pages/user/report/detail/index.ts
+++ b/miniprogram/pages/user/report/detail/index.ts
@@ -1,4 +1,7 @@
// index.ts
+
+import { imageProps } from "miniprogram/miniprogram_npm/@vant/weapp/uploader/shared"
+
// 鑾峰彇搴旂敤瀹炰緥
const userDetail = getApp()
@@ -17,31 +20,31 @@
})
},
- onLoad(e) {
- wx.request(
+ onLoad(e) {
+ wx.request(
{
- url: userDetail.globalData.url+"/report/" + e.id,
+ url: userDetail.globalData.url + "/report/" + e.id,
method: "GET",
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
console.log(res)
- if(res.data.data.reportMaterials!=null){
+ if (res.data.data.reportMaterials != null) {
this.setData({
- images:res.data.data.reportMaterials.split(",")
+ images: res.data.data.reportMaterials.split(",").map(i=>userDetail.globalData.imageUrl + "/img/" +i)
})
}
this.setData({
reportDetail: res.data.data
})
- 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]
- }
- }
- this.setData({
- images:this.data.images
- })
- console.log(this.data.images);
+ // 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]
+ // }
+ // }
+ // this.setData({
+ // images: this.data.images
+ // })
+ console.log(this.data.images)
}
})
diff --git a/miniprogram/pages/user/report/detail/index.wxml b/miniprogram/pages/user/report/detail/index.wxml
index f3caeac..753d9f1 100644
--- a/miniprogram/pages/user/report/detail/index.wxml
+++ b/miniprogram/pages/user/report/detail/index.wxml
@@ -25,8 +25,8 @@
</view>
<view class="list1">
<view class="font-wenzi">鎶ユ鏉愭枡</view>
- <view class="imagess" wx:for="{{images}}" wx:key="index" >
- <image class="image" style="width: 100%;" src="{{item}}" mode="aspectFill"></image>
+ <view class="imagess" wx:for="{{images}}" wx:key="index" wx:for-item="item">
+ <image class="image" lazy-load="true" style="width: 100%;" src="{{item}}" mode="aspectFill"></image>
</view>
</view>
diff --git a/miniprogram/pages/user/report/detail/index.wxss b/miniprogram/pages/user/report/detail/index.wxss
index cf73fa2..cf10960 100644
--- a/miniprogram/pages/user/report/detail/index.wxss
+++ b/miniprogram/pages/user/report/detail/index.wxss
@@ -1,5 +1,7 @@
/**index.wxss**/
.list1{
+ margin: 1rem 0 ;
+ padding: 0 1rem;
font-size: 14px;
border-bottom: 1px solid rgba(0,0,0,0.1);
}
diff --git a/miniprogram/pages/user/report/index.wxml b/miniprogram/pages/user/report/index.wxml
index 2848c2c..beddc40 100644
--- a/miniprogram/pages/user/report/index.wxml
+++ b/miniprogram/pages/user/report/index.wxml
@@ -6,7 +6,8 @@
<view class="inGroup" wx:if="{{item.isInGroup==1}}">宸茶繘缇�</view>
<view class="noInGroup" wx:if="{{item.isInGroup==0}}">鏈繘缇�</view>
<view class="font-name"> {{item.reportDescription}} </view>
- <view class="font-wenzi">></view>
+ <!-- <view class="font-wenzi">></view> -->
+ <van-icon name="arrow" class="font-wenzi"/>
<view class="font-qita"> {{item.ctime}} </view>
</view>
</view>
diff --git a/miniprogram/pages/user/report/index.wxss b/miniprogram/pages/user/report/index.wxss
index 1715b70..8f864cc 100644
--- a/miniprogram/pages/user/report/index.wxss
+++ b/miniprogram/pages/user/report/index.wxss
@@ -19,11 +19,12 @@
.font-qita {
font-size: 13px;
- margin-bottom: 2%;
+ margin-bottom: 1rem;
margin-left: 2%;
}
.conter {
+ margin-top: 1rem;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
diff --git a/miniprogram/pages/user/report/submitReport/index.wxss b/miniprogram/pages/user/report/submitReport/index.wxss
index 84aa725..bcfb901 100644
--- a/miniprogram/pages/user/report/submitReport/index.wxss
+++ b/miniprogram/pages/user/report/submitReport/index.wxss
@@ -38,7 +38,7 @@
font-weight:normal;
font-style: normal;
background-color: white;
- border: 1px solid #000000;
+ border: 1px solid #CCC;
}
.button2{
background: #6699ff;
--
Gitblit v1.8.0