修改冲突

This commit is contained in:
Renpc-kilig 2020-07-15 17:41:54 +08:00
parent 5e7ef3bf1f
commit 72a7a813fe
2 changed files with 8 additions and 9 deletions

View File

@ -6,6 +6,7 @@ Page({
* 页面的初始数据
*/
data: {
activityUrl: app.activityUrl,
token: '',
dataMap: {},
phone: '',
@ -112,17 +113,11 @@ Page({
}
}, function(code, data) {
if('200' == code) {
var imageArr = data.activityImage.split(',')
if(imageArr.length > 1) {
for(var item of data.activityImage.split(',')) {
item = app.activityUrl + '/route/file/downloadfile/true/' + item
}
}else {
data.activityImage = app.activityUrl + '/route/file/downloadfile/true/' + data.activityImage
}
data.activityImageArray = data.activityImage.split(',');
self.setData({
dataMap: data
})
console.log(self.data.dataMap)
}
}, function() {

View File

@ -1,6 +1,10 @@
<view class="activity">
<view class="activity-img">
<image src="{{dataMap.activityImage}}"></image>
<swiper indicator-dots="false" autoplay="true" >
<swiper-item class="swiper-item" wx:for="{{dataMap.activityImageArray}}" wx:for-index="idx" wx:for-item="item" wx:key="activityImageArray">
<image src="{{activityUrl}}/route/file/downloadfile/true/{{item}}"></image>
</swiper-item>
</swiper>
</view>
<view class="activity-info">
<view class="activity-title">{{dataMap.activityTitle}}</view>