更新

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.107:8090/',
-	//baseUrlNew: 'http://api.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.107:9100/',
+	baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pageB/contract/collectLook.vue

@@ -46,7 +46,7 @@
 				</view>
 				<view v-if="item.confirmFlag == 1" >
 					<view class="titles">磅单照片</view>
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+					<upload class="upload" ref="upload" :action="action"  :max-count="1"
 						:size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
 						@on-uploaded="isAdd = true" :before-upload="filterFileType"
 						v-if="item.loadPoundImg == null || item.loadPoundImg == '' "></upload>

pageD/identity/companyIdentity.vue

@@ -72,7 +72,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/companyIdentityEdit.vue

@@ -193,7 +193,7 @@
 
 				radios: 2,
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/companyIdentityThree.vue

@@ -94,7 +94,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/companyIdentityTwo.vue

@@ -41,7 +41,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/driverIdentity.vue

@@ -62,7 +62,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/identity/driverIdentityThree.vue

@@ -77,7 +77,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 2M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pageD/warehousings/ex_warehouse.vue

@@ -232,7 +232,7 @@
 				rutypes: '',
 				ruType: ['销售出库', '移库出库', '暂存出库', '贸易服务出库', '采购出库'],
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				imgUrls: [],
 				binNumber: [],

pageD/warehousings/warehousings.vue

@@ -229,7 +229,7 @@ import upload from '@/components/upload.vue';
 				warehouseIndex1:-1,
 				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024,//限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				imgUrls: [],
 				isAdd: true,

pages.json

@@ -22,12 +22,12 @@
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"
 			},
-			{
-				"pagePath": "pages/grain_pulse/home",
-				"iconPath": "static/img/liangmai.png",
-				"selectedIconPath": "static/img/liangmai_check.png",
-				"text": "粮脉"
-			},
+			// {
+			// 	"pagePath": "pages/grain_pulse/home",
+			// 	"iconPath": "static/img/liangmai.png",
+			// 	"selectedIconPath": "static/img/liangmai_check.png",
+			// 	"text": "粮脉"
+			// },
 			{
 				"pagePath": "pages/tran/tran",
 				"iconPath": "static/img/wuliu.png",

pages/business/business.vue

@@ -76,13 +76,13 @@
 						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 1">{{item.plannedSaleVolume}}吨
 						</view>
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
 						今日基差</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
 						采购价格</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
 					</view>
 				</view>
 			</view>
@@ -456,7 +456,7 @@
 
 	.tag1 {
 		background: #F5F6F9;
-		padding: 5px;
+		padding: 2px;
 		color: #333333;
 		display: inline-flex;
 		font-size: 22rpx;
@@ -749,17 +749,17 @@
 		height: 40px;
 		line-height: 40px;
 		flex: 2.5;
-		border-bottom: 1px solid #EEEEEE;
+		/* border-bottom: 1px solid #EEEEEE; */
 	}
 
 	.introduce-section .address {
 		color: #878C9C;
 		font-size: 12px;
-		padding: 10px 0 10px;
+		/* padding-left:10px; */
 	}
 
 	.introduce-section .price {
-		padding: 10px 0 10px;
+		/* padding-left:10px; */
 		color: #FD714F;
 		font-size: 19px;
 		font-weight: 700;

pages/grain_pulse/enter.vue

@@ -108,7 +108,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false,
 				isAdd: true,
 				uploadOptions: {

pages/grain_pulse/errorcorrection.vue

@@ -32,7 +32,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pages/grain_pulse/jubao.vue

@@ -32,7 +32,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
-				maxSize: 5 * 1024 * 1024, //限制文件大小 5M
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				imgUrls: [],

pages/tran/tran.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view :style="statusBarHeight" class="status_bar">
 		</view>
-		<scroll-view scroll-x class="nav">
+		<scroll-view scroll-x class="nav" style="margin-top: 20rpx;">
 			<view class="flex text-center">
 				<view class="cu-item flex-sub" :class="0==TabCur?'text-white':''" @tap="tabSelect" data-id="0">
 					<text>货源找车</text>

pages/user/user.vue

@@ -15,6 +15,10 @@
 				</view>
 			</view>
 		</view> -->
+		
+		<view style="position: absolute;width: 90%;padding-left: 85%;">
+			<image @click='setting' style='width:21px;height:21px;' src="../../static/img/sign/shezhi@3x.png" ></image>
+		</view>
 		<view class="indexUp flex justify-between">
 			<view class='flex'>
 				<image v-bind:src="headUrl" class="headPortrait"></image>
@@ -23,7 +27,6 @@
 					<view class="information">{{starUserphone}}</view>
 				</view>
 			</view>
-			<view><image @click='setting' style='width:21px;height:21px;' src="../../static/img/sign/shezhi@3x.png" ></image></view>
 
 		</view>
 		<view class="cover-container">