Merge branch 'dev_wy' into dev2.0

@@ -11,9 +11,9 @@
     </view> -->
     <text class='text_black_30' style='padding-left:30rpx'>选择专项附加扣除项</text>
 
-    <view wx:for="{{selectIndex}}" class="multi-selection" style='padding:0 30rpx'>
+    <view wx:for="{{selectIndex}}" class="multi-selection" style='padding:0 30rpx' >
       <view class='float_left'>
-        <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" data-selectIndex="{{index}}" bindtap="selectRep" style='margin-top:20rpx' />
+        <image src="{{selectIndex[index].sureid? '/images/selected.png' : '/images/unselected.png'}}" class="multi-img" data-selectIndex="{{index}}"  style='margin-top:20rpx' bindtap="selectRep"/>
       </view>
       <text class="{{selectIndex[index].sureid?'select_blue_28':'select_666_28'}}" style='line-height:80rpx;margin-left: 34rpx;'>{{item.message}}</text>
     </view>

@@ -64,21 +64,21 @@ Page({
         if (res.statusCode == 200) {
           that.handleData(res.data);
         } else {
-          wx.showModal({
-            title: res.data.message,
-            content: '',
-            showCancel: false,
-            success: function (res) {
-              if (res.confirm) {
-                console.log('用户点击确定')
-                wx.redirectTo({
-                  url: '../../getPhone/getPhone',
-                })
-              } else if (res.cancel) {
-                console.log('用户点击取消')
-              }
-            }
-          })
+          // wx.showModal({
+          //   title: res.data.message,
+          //   content: '',
+          //   showCancel: false,
+          //   success: function (res) {
+          //     if (res.confirm) {
+          //       console.log('用户点击确定')
+          //       wx.redirectTo({
+          //         url: '../../getPhone/getPhone',
+          //       })
+          //     } else if (res.cancel) {
+          //       console.log('用户点击取消')
+          //     }
+          //   }
+          // })
         }
       },
       fail(res) {