From 4b48bacef8646cee8b66f5e10b0ed7124534e93e Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期五, 12 五月 2023 17:10:47 +0800
Subject: [PATCH] 首页修改
---
miniprogram/pages/user/pubulicty/detail/index.json | 3
miniprogram/pages/user/pubulicty/detail/index.wxml | 17 ++++
miniprogram/pages/user/pubulicty/index.wxss | 17 +++
miniprogram/pages/user/pubulicty/index.ts | 6 +
miniprogram/pages/user/index.ts | 6 +
miniprogram/pages/user/pubulicty/detail/index.ts | 102 +++++++++++++++++++++++++
miniprogram/pages/user/index.wxss | 11 ++
miniprogram/pages/user/pubulicty/index.wxml | 7 +
miniprogram/app.json | 4
miniprogram/pages/user/pubulicty/detail/index.wxss | 15 +++
miniprogram/pages/user/index.wxml | 9 +
11 files changed, 188 insertions(+), 9 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 52c5aba..2f9cae0 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -28,8 +28,8 @@
"pages/manager/group/message/records/detail/index",
"pages/user/group/index",
"pages/user/group/message/index",
- "pages/user/group/message/publicty/index"
-
+ "pages/user/group/message/publicty/index",
+ "pages/user/pubulicty/detail/index"
],
"usingComponents": {
"van-button": "@vant/weapp/button/index",
diff --git a/miniprogram/pages/user/index.ts b/miniprogram/pages/user/index.ts
index 2459cb0..4a59772 100644
--- a/miniprogram/pages/user/index.ts
+++ b/miniprogram/pages/user/index.ts
@@ -19,6 +19,12 @@
url: '../logs/logs',
})
},
+ detalnew(e){
+ console.log(e)
+ wx.navigateTo({
+ url: '/pages/user/pubulicty/detail/index?id='+e.currentTarget.dataset.id,
+ })
+ },
resizeVideo(e) {
console.log(e);
this.setData({
diff --git a/miniprogram/pages/user/index.wxml b/miniprogram/pages/user/index.wxml
index 5189834..1e54ba7 100644
--- a/miniprogram/pages/user/index.wxml
+++ b/miniprogram/pages/user/index.wxml
@@ -52,17 +52,20 @@
</view>
<view class="lists" wx:for="{{causeList}}" wx:key="id" wx:for-item="item">
<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">
+ <block wx:for="{{item.imagarr}}" wx:for-item="i" wx:for-index="indexs" wx:key="indexs" >
<swiper-item >
<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"/>
+ <image bindtap="detalnew" data-id="{{item.id}}" lazy-load="true" wx:else src="{{i.url}}" mode="widthFix" class="top-img"/>
</swiper-item>
</block>
</swiper>
+ <view bindtap="detalnew" data-id="{{item.id}}">
<view class="lists-top">
<view class="lists-top-title">{{item.publicityTitle}}</view>
<view class="lists-top-time">{{item.releaseTime}}</view>
</view>
- <view class="lists-content">{{item.text}}</view>
+ <view class="lists-content" >{{item.text}}</view>
+ </view>
+
</view>
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/index.wxss b/miniprogram/pages/user/index.wxss
index 07c9069..9457a4b 100644
--- a/miniprogram/pages/user/index.wxss
+++ b/miniprogram/pages/user/index.wxss
@@ -185,10 +185,21 @@
margin-left: 0.5rem;
word-wrap: normal;
width: 50%;
+ overflow:hidden;/*鍐呭瓒呭嚭鍚庨殣钘�*/
+
+ text-overflow: ellipsis;/* 瓒呭嚭鍐呭鏄剧ず涓虹渷鐣ュ彿 */
+
+ white-space: nowrap;/* 鏂囨湰涓嶈繘琛屾崲琛� */
}
.lists .lists-content {
font-size: 11px;
margin: 0.5rem;
margin-bottom: 0.5rem;
+ width: 90%;
+ overflow:hidden;/*鍐呭瓒呭嚭鍚庨殣钘�*/
+
+ text-overflow: ellipsis;/* 瓒呭嚭鍐呭鏄剧ず涓虹渷鐣ュ彿 */
+
+ white-space: nowrap;/* 鏂囨湰涓嶈繘琛屾崲琛� */
}
diff --git a/miniprogram/pages/user/pubulicty/detail/index.json b/miniprogram/pages/user/pubulicty/detail/index.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/miniprogram/pages/user/pubulicty/detail/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/user/pubulicty/detail/index.ts b/miniprogram/pages/user/pubulicty/detail/index.ts
new file mode 100644
index 0000000..10d1784
--- /dev/null
+++ b/miniprogram/pages/user/pubulicty/detail/index.ts
@@ -0,0 +1,102 @@
+// pages/user/announcement/announcelist/index.ts
+const userGroups = getApp()
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ id:'',
+ groupList:{}
+ },
+ getList(){
+ wx.request(
+ {
+ url: userGroups.globalData.url + "/wx/publicity/"+this.data.id,
+ method: "GET",
+ header: { 'token': wx.getStorageSync('token') },
+ success: (res) => {
+ console.log(res)
+ let arr= []
+ // res.data.data.media = userGroups.globalData.imageUrl+'/img/'+ res.data.data.media
+ res.data.data.photoStr = res.data.data.photoStr.split(',')
+ res.data.data.photoStr.map(item=>{
+ let str = item.slice(-3)
+ let obj = {
+ url:userGroups.globalData.imageUrl+'/img/'+item,
+ sli:str
+ }
+
+ arr.push(obj)
+ })
+ res.data.data.photoStr =arr
+ console.log(res.data.data.photoStr,arr );
+
+ 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/pubulicty/detail/index.wxml b/miniprogram/pages/user/pubulicty/detail/index.wxml
new file mode 100644
index 0000000..dd6cdec
--- /dev/null
+++ b/miniprogram/pages/user/pubulicty/detail/index.wxml
@@ -0,0 +1,17 @@
+<view>
+ <view class="t-title">
+ <p>{{groupList.publicityTitle}}</p>
+ </view>
+ <view class="t-time">
+ {{groupList.releaseTime}}
+ </view>
+ <view wx:for="{{groupList.photoStr}}" wx:key="id">
+
+ <video class="t-video" wx:if="{{item.sli =='mp4'}}" src="{{item.url}}"></video>
+ <van-image wx:else width="100%" height="100%" fit="widthFix" src="{{item.url}}" />
+
+ </view>
+ <view class="t-text">
+ {{groupList.text}}
+ </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/pubulicty/detail/index.wxss b/miniprogram/pages/user/pubulicty/detail/index.wxss
new file mode 100644
index 0000000..5f2d778
--- /dev/null
+++ b/miniprogram/pages/user/pubulicty/detail/index.wxss
@@ -0,0 +1,15 @@
+/* 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;
+}
+.t-video{
+ width: 100%;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/user/pubulicty/index.ts b/miniprogram/pages/user/pubulicty/index.ts
index b91ad15..ff80cec 100644
--- a/miniprogram/pages/user/pubulicty/index.ts
+++ b/miniprogram/pages/user/pubulicty/index.ts
@@ -14,6 +14,12 @@
console.log(e);
},
+ detalnew(e){
+ console.log(e)
+ wx.navigateTo({
+ url: '/pages/user/pubulicty/detail/index?id='+e.currentTarget.dataset.id,
+ })
+ },
getMobile(){
// 鑾峰彇鎵嬫満鍙�
wx.request(
diff --git a/miniprogram/pages/user/pubulicty/index.wxml b/miniprogram/pages/user/pubulicty/index.wxml
index 2c06902..e468ba6 100644
--- a/miniprogram/pages/user/pubulicty/index.wxml
+++ b/miniprogram/pages/user/pubulicty/index.wxml
@@ -13,15 +13,18 @@
<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='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"/>
+ <image bindtap="detalnew" data-id="{{item.id}}" lazy-load="true" wx:else src="{{i.url}}" mode="widthFix" class="top-img"/>
</swiper-item>
</block>
</swiper>
- <view class="lists-top">
+ <view bindtap="detalnew" data-id="{{item.id}}">
+ <view class="lists-top">
<view class="lists-top-title">{{item.publicityTitle}}</view>
<view class="lists-top-time">{{item.releaseTime}}</view>
</view>
<view class="lists-content">{{item.text}}</view>
+ </view>
+
</view>
</view>
<!-- <view class="buttonView" wx:if="{{cardFig}}">
diff --git a/miniprogram/pages/user/pubulicty/index.wxss b/miniprogram/pages/user/pubulicty/index.wxss
index 0e15cd3..627ff6e 100644
--- a/miniprogram/pages/user/pubulicty/index.wxss
+++ b/miniprogram/pages/user/pubulicty/index.wxss
@@ -51,19 +51,32 @@
margin-bottom: 1%;
color: rgba(0, 0, 0, 0.5);
margin-right: 0.5rem;
+ /* width: 100%; */
}
.lists .lists-top .lists-top-title {
font-size: 14px;
- margin-right: 40%;
+ /* margin-right: 40%; */
font-weight: bold;
- margin-left: 0.5rem;
+ /* margin-left: 0.5rem; */
+ width: 35%;
+ overflow:hidden;/*鍐呭瓒呭嚭鍚庨殣钘�*/
+
+ text-overflow: ellipsis;/* 瓒呭嚭鍐呭鏄剧ず涓虹渷鐣ュ彿 */
+
+ white-space: nowrap;/* 鏂囨湰涓嶈繘琛屾崲琛� */
}
.lists .lists-content {
font-size: 11px;
margin: 0.5rem;
margin-bottom: 0.5rem;
+ width: 90%;
+ overflow:hidden;/*鍐呭瓒呭嚭鍚庨殣钘�*/
+
+ text-overflow: ellipsis;/* 瓒呭嚭鍐呭鏄剧ず涓虹渷鐣ュ彿 */
+
+ white-space: nowrap;/* 鏂囨湰涓嶈繘琛屾崲琛� */
}
.lists .swiper-video{
height: 100%;
--
Gitblit v1.8.0