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

config/index.js

@@ -1,7 +1,7 @@
 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/',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.152",
-    "versionCode" : 21152,
+    "versionName" : "2.1.153",
+    "versionCode" : 21153,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/dataReport/breakdownofprofit.vue

@@ -1,13 +1,14 @@
 <template>
 	<view>
-		<view class='fixedbox' :style='{"top":customBar+"px"}'>
+		<view class='fixedbox'>
 			<view class='search'>
 				<u-search placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'
 					:clearabled="true" :show-action='false'></u-search>
 			</view>
 			<view style='background:#fff;'>
 				<view class='contracttypewrap'>
-					<view :class='agreementType=="销售合同"?"active":""' @click='contractclick("销售合同")' class='item left'>销售</view>
+					<view :class='agreementType=="销售合同"?"active":""' @click='contractclick("销售合同")' class='item left'>销售
+					</view>
 					<view :class='agreementType=="采购合同"?"active":""' @click='contractclick("采购合同")' class='item'>采购
 					</view>
 					<view :class='agreementType=="收购合同"?"active":""' @click='contractclick("收购合同")' class='item'>收购
@@ -15,7 +16,7 @@
 					<view :class='agreementType=="代收合同"?"active":""' @click='contractclick("代收合同")' class='item'>代收
 					</view>
 					<view :class='agreementType=="代储合同"?"active":""' @click='contractclick("代储合同")' class='item right'>
-					代储</view>
+						代储</view>
 				</view>
 			</view>
 		</view>
@@ -128,7 +129,7 @@
 		},
 		methods: {
 			contractclick(status) {
-				this.contractList=[]
+				this.contractList = []
 				this.currentPage = 1
 				this.agreementType = status
 				this.getList()

pages/dataReport/contractdetails/contractdetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class='fixedbox' :style='{"top":customBar+"px"}'>
+		<view class='fixedbox'>
 			<view class='search'>
 				<u-search placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'
 					:clearabled="true" :show-action='false'></u-search>
@@ -54,7 +54,7 @@
 				</view>
 				<view v-if="item.priceType!='随行就市'" class='flex contractwrap-item'>
 					<view class="title">合同总价（元）</view>
-					<view >{{item.totalContractPrice?item.totalContractPrice:0}}</view>
+					<view>{{item.totalContractPrice?item.totalContractPrice:0}}</view>
 				</view>
 				<view class='flex contractwrap-item'>
 					<view class="title">已付款（元）</view>

pages/dataReport/costbreakdown.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class='fixedbox' :style='{"top":customBar+"px"}'>
+		<view class='fixedbox'>
 			<view class='search'>
 				<u-search @search='getList' v-model='expenseName' placeholder='可按费用名称查找' search-icon-color='#AFB3BF'
 					bg-color='#F5F6F9' :shape='"round"' :clearabled="true" :show-action='false'></u-search>
@@ -204,7 +204,9 @@
 					searchType: this.searchType,
 					expenseName: this.expenseName,
 					startDate: this.expenseInfo.startDate,
-					endDate: this.expenseInfo.endDate
+					endDate: this.expenseInfo.endDate,
+					compId: uni.getStorageSync("pcUserInfo").compId
+
 				}).then(res => {
 					if (res.data.code) {
 						uni.hideLoading()