Merge branch 'jeffrey/feat/coupon-center' of http://git.ahamu.cn:9202/xing.li/share_activity into jeffrey/feat/coupon-center

pages/welfareMall/feedback/feedback.wxss

@@ -39,7 +39,7 @@ textarea{
   width: 659rpx;
   height: 320rpx;
   background: #FFFFFF;
-  border: 1px solid #3E3E3E;
+  border: 1px solid #EFEFEF;
   border-radius: 10rpx;
   z-index: 1;
   padding-left: 33rpx;
@@ -88,7 +88,7 @@ textarea{
 .explain-img-preview{
   width: 154rpx;
   height: 154rpx;
-  border: 1px solid #3E3E3E;
+  border: 1px solid #e0dada;
   border-radius: 10rpx;
   z-index: 1;
   justify-content: center;

pages/welfareMall/index/index.js

@@ -77,7 +77,7 @@ Page({
 
   },
   swiperChange: function(e) {
-    if (e.detail.current != this.data.currentSwiper) {
+    if (e.target.source == 'autoplay' || e.target.source == 'touch') {
       this.setData({
         currentSwiper: e.detail.current
       })

pages/welfareMall/index/index.wxml

@@ -1,6 +1,6 @@
 <view class="{{grayTheme?'page':''}}">
   <view class='swiper_box'>
-    <swiper class="swiper" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" current="{{currentSwiper}}" bindchange="swiperChange">
+    <swiper class="swiper" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" current="{{currentSwiper}}" animationfinish="swiperChange">
       <block wx:for="{{bannerList}}" wx:key="unique">
         <swiper-item>
           <view class="swiper-item swiper1">

pages/welfareMall/order/orderCompletion.wxss

@@ -119,8 +119,8 @@ page{
 
 .content-line{
   width: 679rpx;
-  height: 1rpx;
-  background: #A0A0A0;
+  height: 1px;
+  background: #EFEFEF;
 }
 
 .content-lower{