Merge branch 'dev_wy' into dev2.0

@@ -405,7 +405,7 @@
 <view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
   <text class='text_modal_title'>请选择扣除方式</text>
   <view class='divide_line_f5f5f5'></view>
-  <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
+  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
     <view wx:for="{{reducetypeData}}" wx:for-index="idx">
       <view wx:if="{{selected_reduceindex==idx}}">
         <text class='text_item_blue float_left'>{{item}}</text>
@@ -416,6 +416,18 @@
       </view>
       <view class='divide_line_f5f5f5'></view>
     </view>
+  </view> -->
+  <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
+    <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
+      <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
+        <view class='text_item_blue float_left'>{{item}}</view>
+        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
+      </view>
+      <view wx:else style='display:flex'>
+        <text class='text_item_black float_left'>{{item}}</text>
+      </view>
+      <view class='divide_line_f5f5f5'></view>
+    </view>
   </view>
   <view class='divide_line_f5f5f5'></view>
 
@@ -430,7 +442,7 @@
 <view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
   <text class='text_modal_title'>{{modalData.title}}</text>
   <view class='divide_line_f5f5f5'></view>
-  <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
+  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
     <block wx:for="{{modalData.datas}}" wx:for-index="idx">
       <view wx:if="{{idx==selected_addindex}}">
         <text class='text_item_blue float_left'>{{item.name}}</text>
@@ -441,6 +453,18 @@
       </view>
       <view class='divide_line_f5f5f5'></view>
     </block>
+  </view> -->
+  <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
+    <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
+      <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
+        <text class='text_item_blue float_left'>{{item.name}}</text>
+        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
+      </view>
+      <view wx:else style='display:flex'>
+        <text class='text_item_black float_left'>{{item.name}}</text>
+      </view>
+      <view class='divide_line_f5f5f5'></view>
+    </view>
   </view>
   <view class='divide_line_f5f5f5'></view>
   <view style='width:100%;display: flex;'>

@@ -253,6 +253,12 @@ page {
   letter-spacing: 0;
   line-height: 18px;
   padding: 30rpx;
+  
+  width: 500rpx;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .text_item_black {
@@ -262,6 +268,12 @@ page {
   letter-spacing: 0;
   line-height: 18px;
   padding: 30rpx;
+
+  width: 500rpx;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .declare_style {