1

src/common/global.css

@@ -46,6 +46,8 @@
 .a-self-stretch{ align-self:stretch; }
 .a-self-baseline{ align-self:baseline; }
 
+.f-16{ font-size: 14px; }
+.f-18{ font-size: 16px; }
 /* 宽度 */
 .w-100{ width:100% }
 .w-50{ width:50% }

src/common/request.js

@@ -1,9 +1,10 @@
-// const baseUrl =  'http://81.70.84.72:30046'
+const baseUrl =  'http://81.70.84.72:30046'
 // const baseUrl =  'http://172.18.0.24:30046'
-const baseUrl =  'http://39.100.230.190:30046'
+// const baseUrl =  'http://39.100.230.190:30046'
 
 // 文件上传地址
-const fileUrl =  'http://39.100.230.190:30045'
+// const fileUrl =  'http://39.100.230.190:30045'
+const fileUrl =  'http://81.70.84.72:30045'
 
 
 // import { showLoading,hideLoading } from './loading.js'

src/components/dj-navbar.vue

@@ -1,21 +1,21 @@
 <template>
-	<u-navbar :is-back="false" :border-bottom="false" style="font-size: 14px;">
+	<u-navbar :is-back="false" :border-bottom="false">
 		<view class="slot-wrap">
 			<u-row class="d-flex j-sb a-center w-100" style="height: 52px;">
 				<u-col :span="colSlice[0]" class="d-flex">
 					<dj-image src="/static/fanhui.png" widthImg="33" heightImg="33" @click.native="back"></dj-image>
 				</u-col>
-				<u-col :span="colSlice[1]" class="d-flex u-font-xl" justify="center" v-if="fixTitle">
+				<u-col :span="colSlice[1]" class="d-flex f-18" justify="center" v-if="fixTitle">
 					<text>{{ fixTitle }}</text>
 				</u-col>
 				<u-col :span="colSlice[1]" class="d-flex" justify="center" v-else>
 					<view class="d-flex a-center flex-1 j-center" @click="change_shift">
-						<view class="u-m-r-10 u-font-xl">班次:{{ title ?  title : '无'}}</view>
+						<view class="u-m-r-10 f-18">班次:{{ title ?  title : '无'}}</view>
 						<!-- <img src="/static/xiala.png" style="width:18rpx;height:15rpx;" /> -->
 						<dj-image src="/static/xiala.png" widthImg="18" heightImg="12" style="line-height: 10rpx;"></dj-image>
 					</view>
 					<view class="d-flex a-center flex-1 j-center" @click="change_press">
-						<view class="u-m-r-10 u-font-xl">类型:{{ pressType ?  pressType : '无'}}</view>
+						<view class="u-m-r-10 f-18">类型:{{ pressType ?  pressType : '无'}}</view>
 						<!-- <img src="/static/xiala.png" style="width:18rpx;height:15rpx;" /> -->
 						<dj-image src="/static/xiala.png" widthImg="18" heightImg="12" style="line-height: 10rpx;"></dj-image>
 					</view>

src/components/dj-swipe-action.vue

@@ -1,20 +1,20 @@
 <template>
 	<view class="main-content">
-		<view class="d-flex u-m-b-14 a-center j-sb">
+		<view class="d-flex u-m-b-14 a-center j-sb f-18">
 			<!-- <view class="main-content-number u-font-21">{{ item.mouldId }}</view> -->
-			<view class="main-content-name u-font-26">模具名：{{ item.mouldName }}</view>
-			<view class="main-content-status u-font-21" :style="status_change[1]">{{ status_change[0] }}</view>
+			<view class="main-content-name ">模具名：{{ item.mouldName }}</view>
+			<view class="main-content-status " :style="status_change[1]">{{ status_change[0] }}</view>
 		</view>
-		<view class="u-m-b-12">
-			<text class="main-content-person u-m-r-48 u-font-21">责任人：{{ item.principalUsername }}</text>
-			<text class="main-content-type u-font-21" >类型：{{ item.pressTypeValue }}</text>
+		<view class="u-m-b-12 f-18">
+			<text class="main-content-person u-m-r-48 ">责任人：{{ item.principalUsername }}</text>
+			<text class="main-content-type " >类型：{{ item.pressTypeValue }}</text>
 		</view>
-		<view class="d-flex a-center">
+		<view class="d-flex a-center f-18">
 			<view style="width: 90%;">
-				<view class="u-m-b-10 u-font-21">备注：{{ item.action }}</view>
-				<view class="d-flex u-font-21">
+				<view class="u-m-b-10 ">备注：{{ item.action }}</view>
+				<view class="d-flex ">
 					<text class="u-m-r-40">开始日期：{{ item.startDate }}</text>
-					<text>开始日期：{{ item.endDate }}</text>
+					<text>结束日期：{{ item.endDate }}</text>
 				<!-- 	<text>开始时间：{{ item.startTime | filter_time }}</text>
 					<text>结束时间：{{ item.endTime | filter_time }}</text> -->
 				</view>
@@ -78,23 +78,23 @@
 		padding:15rpx;
 	}
 	.main-content-number {
-		width: 106rpx;
-		height: 34rpx;
+		width: 120rpx;
+		height: 40rpx;
 		background: $dj-primary-color;
 		text-align: center;
-		line-height: 34rpx;
+		line-height: 40rpx;
 		color: $dj-white-color;
 	}
 	.main-content-name {
 		color: $dj-primary-color;
 	}
 	.main-content-status {
-		width: 106rpx;
-		height: 34rpx;
+		width: 120rpx;
+		height: 40rpx;
 		border-radius: 17rpx;
 		background: $dj-primary-color;
 		text-align: center;
-		line-height: 34rpx;
+		line-height: 40rpx;
 		color: $dj-white-color;
 	}
 	.main-content-person {

src/components/dj-tabbar.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="d-flex w-100 tabbar">
+	<view class="d-flex w-100 tabbar f-18">
 		<view class="flex-1 d-flex a-center j-center" v-show="!commitInfo.name" @click="submit">主保养人</view>
 		<view class="flex-1 d-flex a-center j-center flex-column" v-show="commitInfo.name" @click="submit">
 			<view class="u-m-b-8">保养人:{{ commitInfo.name }}</view>

src/pages.json

@@ -30,6 +30,7 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"rpxCalcMaxDeviceWidth": 0
 	}
 }

src/pages/index/addUpkeep.vue

@@ -366,6 +366,9 @@
 		background-color: $dj-white-color;
 		min-height: 100%;
 		height: 100vh;
-		overflow: hidden;
+		// overflow: hidden;
+	}
+	/deep/ .u-input__input[data-v-460c1d26] {
+		font-size: 18px;
 	}
 </style>

src/pages/index/upKeepInfo.vue

@@ -2,10 +2,10 @@
 	<view class="content">
 		<dj-navbar :fixTitle="title" ifThisAppJump />
 		<template v-if="noticeInfo.length">
-			<view style="overflow-y: auto;" id="service" :style="serviceHeight">
+			<view style="overflow-y: auto;" id="service" :style="serviceHeight" class="f-16">
 				<view class="serviceContent" v-for="(item,index) in noticeInfo" :key="index">
 					<view class="d-flex j-sb a-center">
-						<view class="u-font-xl">{{ item.projectName }}: {{ item.projectValue }}</view>
+						<view class="f-18">{{ item.projectName }}: {{ item.projectValue }}</view>
 						<view class="d-flex">
 							<dj-button v-if="item.status === '' || item.status === '1'" class="u-m-r-12" content="NOK" borderRadius="0" ifPlain width="111" height="53" bColor="#fff" color="#FE0000" border="#FE0000" @click.native="btn_click(index,false)"></dj-button>
 							<dj-button v-else class="u-m-r-12" content="NOK" width="111" height="53" bColor="#FE0000" borderRadius="0" color="#fff" border="#FE0000"></dj-button>

src/uview-ui/components/u-form-item/u-form-item.vue

@@ -351,8 +351,8 @@
 	.u-form-item {
 		@include vue-flex;
 		// align-items: flex-start;
-		padding: 20rpx 0;
-		font-size: 28rpx;
+		padding: 10rpx 0;
+		font-size: 18px;
 		color: $u-main-color;
 		box-sizing: border-box;
 		line-height: $u-form-item-height;