Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -1,10 +1,10 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.110.67:9100/',
+	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',

pageD/identity/companyIdentityThree.vue

@@ -440,7 +440,7 @@
 																				})
 																			} else {
 																				uni.showToast({
-																					title: "系统异常，请联系管理员",
+																					title: res.data.message?res.data.message:"系统异常，请联系管理员",
 																					icon: 'none',
 																					duration: 2000
 																				})

pages/reimbursement/request_funds.vue

@@ -22,7 +22,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="c-row" v-if="detailData.purpose == '库点费用'&&expensesType == '2'">
+			<view class="c-row" v-if="detailData.purpose == '库点费用'&&reType == 2">
 				<view class="title">仓储费</view>
 				<view class="con-list">
 					<view @click='show3=true'>{{detailData.flag}}
@@ -203,8 +203,8 @@
 					{value: "煤费"},
 					{value: "人工费"},
 				],
-				namelist:[{
-						name: "黑龙江中天昊元贸易有限公司"},
+				namelist:[
+					{name: "黑龙江中天昊元贸易有限公司"},
 					{name: "中天昊元-建发合营"},
 					{name: "中天昊元-六水香合营"},
 					{name: "中天昊元-昊友合营"},