修改冲突

pages/activitySign/activitySign.js

@@ -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(',')
+            data.activityImageArray = 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
-            }
             self.setData({
               dataMap: data
             })
+            console.log(self.data.dataMap)
           }
       }, function() {
 

pages/activitySign/activitySign.wxml

@@ -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>