Merge branch 'bug修复/发推明细重复问题' into 楚楚/楚楚master

# 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;" />

utils/Http.js

@@ -4,7 +4,14 @@ class HTTP {
 		if (ENV === 'release') { // 正式版
 			this.baseUrl = "https://cucu.cnyunl.com:8079";
 		} else {
+<<<<<<< HEAD
 			this.baseUrl = "http://61.164.207.46:8200";
+=======
+			// this.baseUrl = "https://lsa.cnyunl.com";
+			// this.baseUrl = "http://61.164.207.46:8300";
+			this.baseUrl = "http://61.164.207.46:8200";
+			// this.baseUrl = "https://cucu.cnyunl.com:8079";
+>>>>>>> bug修复/发推明细重复问题
 		}
 		console.log("接口地址:", this.baseUrl)
 	}