Merge branch 'bug修复/发推明细重复问题(已更新楚楚)' into 德莱宝测试除了手机登录不合并

# Conflicts:
#	utils/Http.js

packageA/dispatchBill/sentandback.wxml

@@ -18,7 +18,7 @@
 		</view>
 		<view class="product">
 			<Item userrole='{{userrole}}' item="{{item}}" />
-			<Item userrole='{{userrole}}' borderTop wx:for="{{item.productList}}" wx:for-item="it" item="{{it}}" />
+			<!-- <Item userrole='{{userrole}}' borderTop wx:for="{{item.productList}}" wx:for-item="it" item="{{it}}" /> -->
 		</view>
 	</navigator>
 	<view style="height:150rpx;" />