From 76b3319fa8e3befd0d6e294cbe890e226bdce579 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 七月 2024 18:01:33 +0800
Subject: [PATCH] 提交
---
wechat_staff/pages/promotion/index.wxml | 37 ++++++++++++++++---------------------
admin/src/components/business/OperaNewsDzWindow.vue | 2 +-
wechat_staff/pages/promotion/index.wxss | 10 +++++++++-
admin/src/components/business/OperaNewsWindow.vue | 4 ++--
4 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/admin/src/components/business/OperaNewsDzWindow.vue b/admin/src/components/business/OperaNewsDzWindow.vue
index 5bccdbe..b788708 100644
--- a/admin/src/components/business/OperaNewsDzWindow.vue
+++ b/admin/src/components/business/OperaNewsDzWindow.vue
@@ -20,7 +20,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="鍒楄〃鍥�/瑙嗛" prop="files" >
- <upload width="100px" height="100px" :max-length="1" @dele="delFile" :list="form.fileList" accept=".png,.jpg,.jpeg,.mp4" folder="news" @loading="loading = true" @success="fileResult($event)" />
+ <upload width="100px" height="100px" :max-length="1" @dele="delFile" :list="form.fileList" accept=".png,.jpg,.jpeg,.mp4" folder="spokesman" @loading="loading = true" @success="fileResult($event)" />
</el-form-item>
<el-form-item label="璺宠浆绫诲瀷" prop="linkType" required>
<el-radio-group v-model="form.linkType" >
diff --git a/admin/src/components/business/OperaNewsWindow.vue b/admin/src/components/business/OperaNewsWindow.vue
index 548f327..633c667 100644
--- a/admin/src/components/business/OperaNewsWindow.vue
+++ b/admin/src/components/business/OperaNewsWindow.vue
@@ -32,10 +32,10 @@
</el-radio-group>
</el-form-item>
<el-form-item label="鍥鹃泦涓婁紶 锛堟渶澶�9寮狅級" v-if="form.fileType !=1">
- <upload width="100px" height="100px" :max-length="9" @dele="delFile" :list="fileImgList" accept=".png,.jpg,.jpeg" folder="news" @loading="loading = true" @success="fileResult($event)" />
+ <upload width="100px" height="100px" :max-length="9" @dele="delFile" :list="fileImgList" accept=".png,.jpg,.jpeg" folder="spokesman" @loading="loading = true" @success="fileResult($event)" />
</el-form-item>
<el-form-item label="瑙嗛涓婁紶锛堝崟涓級" v-if="form.fileType === 1">
- <upload width="100px" height="100px" :max-length="1" @dele="delFile" :list="fileVideoList" accept=".mp4" folder="news" @loading="loading = true" @success="fileResult($event)" />
+ <upload width="100px" height="100px" :max-length="1" @dele="delFile" :list="fileVideoList" accept=".mp4" folder="spokesman" @loading="loading = true" @success="fileResult($event)" />
</el-form-item>
<el-form-item label="鎺掑簭鐮侊紙鍗囧簭锛�" prop="sortnum">
<el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
diff --git a/wechat_staff/pages/promotion/index.wxml b/wechat_staff/pages/promotion/index.wxml
index 49f0495..993cebc 100644
--- a/wechat_staff/pages/promotion/index.wxml
+++ b/wechat_staff/pages/promotion/index.wxml
@@ -1,28 +1,23 @@
<view class="container">
<view class="home_title">鎺ㄥ箍鍙戝竷</view>
- <view class="content">
- <view class="time">2022/22/22</view>
- <view class="text">鎳傜敓娲伙紝浼氳璁★紝鎰忓紡绠�绾﹀崟浜烘矙鍙戞锛屼负鎮ㄥ垱閫犲绉嶅彲鑳界殑鐢熸椿鏂瑰紡</view>
- <view class="imgs">
- <view class="img_wrap">
- <image class="img" mode="widthFix" src=""></image>
- <!-- <image class="icon" src="../../static/ic_top1@2x.png" mode="widthFix"></image> -->
+ <view>
+ <view class="content" data-id="{{ item.id }}" wx:for="{{ list }}" wx:for-item="item" >
+ <view class="time" >{{ item.createDate }}</view>
+ <view class="text">{{item.title }}</view>
+ <view class="imgs">
+ <video controls wx:if="{{item.fileType ==1 && item.fileList &&item.fileList.length}}" src="{{item.fileList[0].fileurlFull}}" class="video"></video>
+ <view wx:if="{{item.fileType !=1 && item.fileList}}" data-id="{{ item.id }}" wx:for-item="item1" wx:for="{{ item.fileList }}" class="img_wrap">
+ <image class="img" mode="widthFix" src="{{item1.fileurlFull}}"></image>
+ </view>
</view>
- <view class="img_wrap">
- <image class="img" mode="widthFix" src=""></image>
- <!-- <image class="icon" src="../../static/ic_top2@2x.png" mode="widthFix"></image> -->
+ <view class="footer">
+ <view class="left">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <text>{{item.donwloadNum}}</text>
+ </view>
+ <view class="btn" bind:tap="downfile" data-index="{{item}}">绔嬪嵆鍒嗕韩</view>
</view>
- <view class="img_wrap">
- <image class="img" mode="widthFix" src=""></image>
- <!-- <image class="icon" src="../../static/ic_top3@2x.png" mode="widthFix"></image> -->
- </view>
- </view>
- <view class="footer">
- <view class="left">
- <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
- <text>123123</text>
- </view>
- <view class="btn">绔嬪嵆鍒嗕韩</view>
</view>
</view>
+
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/promotion/index.wxss b/wechat_staff/pages/promotion/index.wxss
index c696933..06c5da7 100644
--- a/wechat_staff/pages/promotion/index.wxss
+++ b/wechat_staff/pages/promotion/index.wxss
@@ -13,6 +13,7 @@
background: #F7F7F7;
border-radius: 8rpx;
padding: 34rpx 40rpx 40rpx;
+ margin-bottom: 40rpx;
}
.content .time {
font-weight: 500;
@@ -30,6 +31,8 @@
}
.content .imgs {
display: flex;
+ width: 100%;
+ flex-wrap: wrap;
}
.content .imgs .img_wrap {
width: 184rpx;
@@ -38,13 +41,18 @@
border: 1px solid;
position: relative;
margin-right: 20rpx;
+ margin-bottom: 20rpx;
}
.content .imgs .img_wrap:nth-of-type(3n) {
margin-right: 0;
}
.content .imgs .img_wrap .img {
width: 100%;
- height: 100%;
+ max-height: 100%;
+}
+.content .imgs .video {
+ width: 100%;
+ max-height: 100%;
}
.content .imgs .img_wrap .icon {
position: absolute;
--
Gitblit v1.9.3