From 4139482e75000140f6e28a95c550e76620b88a60 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 12 四月 2023 10:06:17 +0800
Subject: [PATCH] 首页修改
---
miniprogram/image/bacjc.jpg | 0
miniprogram/pages/manager/group/message/index.wxss | 3 +
miniprogram/pages/user/pubulicty/index.wxss | 4 ++
miniprogram/pages/user/pubulicty/index.ts | 28 +++++++++++++
miniprogram/pages/user/index.ts | 39 ++++++++++++++++++-
miniprogram/pages/user/index.wxss | 16 ++++----
miniprogram/pages/user/pubulicty/index.wxml | 13 +++---
miniprogram/app.json | 2
miniprogram/pages/user/index.wxml | 11 +++--
9 files changed, 92 insertions(+), 24 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index f0d55d7..9178cd6 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -58,7 +58,7 @@
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "闈掔緤鍒嗗眬缁忎睛澶ч槦",
+ "navigationBarTitleText": "闈掔緤鍏畨缁忎睛澶ч槦",
"navigationBarTextStyle": "black"
},
"tabBar": {
diff --git a/miniprogram/image/bacjc.jpg b/miniprogram/image/bacjc.jpg
new file mode 100644
index 0000000..3cc45ff
--- /dev/null
+++ b/miniprogram/image/bacjc.jpg
Binary files differ
diff --git a/miniprogram/pages/manager/group/message/index.wxss b/miniprogram/pages/manager/group/message/index.wxss
index 87065b9..07a028e 100644
--- a/miniprogram/pages/manager/group/message/index.wxss
+++ b/miniprogram/pages/manager/group/message/index.wxss
@@ -66,11 +66,12 @@
}
.low{
position: fixed;
- bottom: 2rem;
+ bottom: 0;
width: 100%;
background-color: white;
/* height: 7%; */
height: 50px;
+ padding-bottom: 2rem;
}
.list{
height: 60px;
diff --git a/miniprogram/pages/user/index.ts b/miniprogram/pages/user/index.ts
index 65a3ffc..2d56001 100644
--- a/miniprogram/pages/user/index.ts
+++ b/miniprogram/pages/user/index.ts
@@ -4,6 +4,8 @@
Page({
data: {
+ videoheight:'',
+ autoplay:true,
role:0,
swcurrent: 0,
isShow: false,
@@ -17,7 +19,12 @@
url: '../logs/logs',
})
},
-
+ resizeVideo(e){
+ console.log(e);
+ this.setData({
+ videoheight:e.detail.height
+ })
+ },
onLoad() {
@@ -42,17 +49,38 @@
this.setData({
role:wx.getStorageSync('role')
})
+
res.data.data.map(i => {
+ 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)
+
+
+ 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,"/")
})
this.setData({
causeList: res.data.data,
})
-
+ console.log(this.data.causeList);
+
}
})
@@ -66,6 +94,13 @@
},
+ videoplay(e){
+ console.log(e);
+
+ this.setData({
+ autoplay:false
+ })
+ },
toDetailedInformation(){
console.log('鎶ユ璇︽儏');
wx.navigateTo({
diff --git a/miniprogram/pages/user/index.wxml b/miniprogram/pages/user/index.wxml
index 5d6df01..e93546a 100644
--- a/miniprogram/pages/user/index.wxml
+++ b/miniprogram/pages/user/index.wxml
@@ -1,7 +1,7 @@
<!--index.wxml-->
<view class="container">
<view class="imageView">
- <image style="width:100%;" class="indexImage" src="../../image/test3.jpg"></image>
+ <image style="width:100%;" class="indexImage" src="../../image/bacjc.jpg"></image>
<!-- <text class="font-name">闈掗槼缁忎睛</text> -->
</view>
<view class="box-title">
@@ -29,7 +29,7 @@
<view wx:if="{{role==1}}" class="box2 box3" bindtap="toDetailedInformation">
<text class="font-wenzi">鎶ユ璇︽儏</text>
</view>
- <view wx:if="{{role==1}}" class="box2" bindtap="toManage">
+ <view wx:if="{{role==1}}" class="box2 box4" bindtap="toManage">
<text class="font-wenzi">妗堜欢绠＄悊</text>
</view>
</view>
@@ -48,10 +48,11 @@
<view class="more" bindtap="more">鏇村 >></view>
</view>
<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 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 >
- <image lazy-load="true" src="{{i}}" mode="widthFix" class="top-img"/>
+ <video class="swiper-video" onloadedmetadata="resizeVideo" bindplay="videoplay" wx:if="{{i.type=='mp4'}}" object-fit='contain' data-pic="{{i}}" id="{{i.url}}" src="{{i.url}}"controls ></video>
+ <image lazy-load="true" wx:else src="{{i.url}}" mode="widthFix" class="top-img"/>
</swiper-item>
</block>
</swiper>
diff --git a/miniprogram/pages/user/index.wxss b/miniprogram/pages/user/index.wxss
index e03e758..7a8f4d2 100644
--- a/miniprogram/pages/user/index.wxss
+++ b/miniprogram/pages/user/index.wxss
@@ -44,6 +44,7 @@
.container {
width: 100%;
+ background-color: #F5F5F5;
}
.box-title {
@@ -51,6 +52,7 @@
top: 2rem; */
height: 4rem;
display: flex;
+ padding: 0.5rem 0.5rem;
justify-content: space-between;
}
@@ -80,17 +82,11 @@
.box3 {
margin: 0 1rem;
+ background: -webkit-linear-gradient(left,#D8EFDE,#F1FFF0,#D8EFDE,#F1FFF0);
}
.box4 {
- display: inline-grid;
- align-items: center;
- justify-content: center;
- float: right;
- margin-right: -8%;
- height: 70px;
- width: 145px;
- /* border: 1px solid rgba(0,0,0,0.2); */
+ background: -webkit-linear-gradient(left,#E2D8F3,#E8DEFE,#FDFBFF,#E2D8F3);
}
.container3 {
@@ -161,6 +157,10 @@
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
width: 100%;
}
+.lists .swiper-video{
+ height: 100%;
+ width: 100%;
+}
.lists:last-child{
margin-bottom: 1rem;
}
diff --git a/miniprogram/pages/user/pubulicty/index.ts b/miniprogram/pages/user/pubulicty/index.ts
index a3db613..b91ad15 100644
--- a/miniprogram/pages/user/pubulicty/index.ts
+++ b/miniprogram/pages/user/pubulicty/index.ts
@@ -4,6 +4,7 @@
Page({
data: {
+ autoplay:true,
cardFig:true,
swcurrent: 0,
causeList: [],
@@ -75,15 +76,40 @@
// header: { 'token': wx.getStorageSync('token') },
success: (res) => {
res.data.data.map(i => {
+ let imgarr=[]
if (i.photoStr != null) {
i.photoStr = i.photoStr.split(",").map(i => userCause.globalData.imageUrl + "/img/" + i),
this.data.images = i.photoStr
+ 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
}
+ i.releaseTime = i.releaseTime.replace(/-/g,"/")
})
this.setData({
causeList: res.data.data
})
}
})
- }
+ },
+ videoplay(e){
+ console.log(e);
+
+ this.setData({
+ autoplay:false
+ })
+ },
})
diff --git a/miniprogram/pages/user/pubulicty/index.wxml b/miniprogram/pages/user/pubulicty/index.wxml
index 0946492..c32d856 100644
--- a/miniprogram/pages/user/pubulicty/index.wxml
+++ b/miniprogram/pages/user/pubulicty/index.wxml
@@ -1,7 +1,7 @@
<!--index.wxml-->
<view class="container">
<view class="imageView">
- <image style="width:100%;" class="indexImage" src="../../../image/test3.jpg"></image>
+ <image style="width:100%;" class="indexImage" src="../../../image/bacjc.jpg"></image>
<!-- <text class="font-name">闈掗槼缁忎睛</text> -->
</view>
<van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{causeList.length === 0}}">
@@ -9,10 +9,11 @@
</van-empty>
<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 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 >
- <image lazy-load="true" src="{{i}}" mode="widthFix" class="top-img"/>
+ <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>
+ <image lazy-load="true" wx:else src="{{i.url}}" mode="widthFix" class="top-img"/>
</swiper-item>
</block>
</swiper>
@@ -23,9 +24,9 @@
<view class="lists-content">{{item.text}}</view>
</view>
</view>
- <view class="buttonView" wx:if="{{cardFig}}">
+ <!-- <view class="buttonView" wx:if="{{cardFig}}">
<navigator class="button" url="../loginInfo/index">鎴� 瑕� 娉� 鍐�</navigator>
- </view>
+ </view> -->
<!-- <view class="buttonView"> <button class="button" bindtap="register">鎴� 瑕� 娉� 鍐�</button></view> -->
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/pubulicty/index.wxss b/miniprogram/pages/user/pubulicty/index.wxss
index 1e191f6..0e15cd3 100644
--- a/miniprogram/pages/user/pubulicty/index.wxss
+++ b/miniprogram/pages/user/pubulicty/index.wxss
@@ -65,3 +65,7 @@
margin: 0.5rem;
margin-bottom: 0.5rem;
}
+.lists .swiper-video{
+ height: 100%;
+ width: 100%;
+}
\ No newline at end of file
--
Gitblit v1.8.0