前端

components/bert-suggest/suggest.vue

@@ -1,11 +1,15 @@
 <template>
 	<view>
-		<uni-card class="box" :isFull="true" title="反馈意见" :thumbnail="contentIcon">
-			<textarea v-model="data.content" placeholder="您的反馈对我们非常重要,请在此输入."></textarea>
-		</uni-card>
-		<uni-card class="box" :isFull="true" title="联系方式" :thumbnail="contactIcon">
-			<input v-model="data.contact" placeholder="手机 QQ或e-mail,方便我们联系您" />
-		</uni-card>
+		<view style='background:#fff;margin:20px 10px 10px;border-radius:10px;'>
+			<uni-card class="box" :isFull="true" title="反馈意见" >
+				<textarea v-model="data.content" placeholder="您的反馈对我们非常重要,请在此输入."></textarea>
+				<view style='position:absolute;right:22px;bottom:16px;font-size:13px;'>{{data.content.length}}/150个字</view>
+			</uni-card>
+			<uni-card class="box contact" :isFull="true" title="联系方式" >
+				<input v-model="data.contact" placeholder="手机 QQ或e-mail,方便我们联系您" />
+			</uni-card>
+		</view>
+		
 		<button class="submit-btn" @click="submit">提交</button>
 	</view>
 </template>
@@ -58,9 +62,10 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.box {
-		margin-bottom: 20rpx;
+		margin-bottom: 10rpx;
+		position: relative;
 	}
 	.imgs {
 		position: relative;
@@ -92,7 +97,25 @@
 		}
 	}
 	.submit-btn {
-		background-color: #49abe8;
-		margin: 20rpx 0;
+		background-color: #22C572;
+		color:#fff;
+		border-radius:30px;
+		margin: 20rpx;
+		margin-top:30px;
+	}
+	textarea,input{
+		background:#F9F9FA;
+		border: 1px solid #eee;
+	}
+	textarea{
+		margin:0 auto;
+		padding:10px;
+		font-size:14px;
+	}
+	input{
+		padding:20px;
+	}
+	.contact{
+		padding-bottom:20px;
 	}
 </style>

components/uni-card/uni-card.vue

@@ -131,7 +131,7 @@
 		box-shadow: 0 0 0 rgba(0, 0, 0, 0);
 		/* #endif */
 		margin: $uni-spacing-col-lg $uni-spacing-row-lg;
-		background-color: $uni-bg-color;
+		// background-color: $uni-bg-color;
 		position: relative;
 		flex-direction: column;
 		border-radius: 5px;
@@ -161,7 +161,7 @@
 		left: 0;
 		top: 0;
 		right: 0;
-		border: 1px solid $uni-border-color;
+		// border: 1px solid $uni-border-color;
 		border-radius: 10px;
 		box-sizing: border-box;
 		width: 200%;
@@ -191,7 +191,7 @@
 		left: 0;
 		top: 0;
 		right: 0;
-		border-bottom: 1px solid $uni-border-color;
+		// border-bottom: 1px solid $uni-border-color;
 		box-sizing: border-box;
 		width: 200%;
 		height: 200%;
@@ -377,7 +377,7 @@
 	}
 
 	.uni-card__content--pd {
-		padding: $uni-spacing-col-lg;
+		padding:5px 12px 10px;
 	}
 
 	.uni-card__content-extra {

components/upload.vue

@@ -6,12 +6,17 @@
 				height: width + 'rpx'
 			}">
 			<view v-if="deletable" class="u-delete-icon" @tap.stop="deleteItem(index)" :style="{
-					background: delBgColor
+					background: delBgColor,
 				}">
-				<u-icon class="u-icon" :name="delIcon" size="20" :color="delColor"></u-icon>
+				<u-icon class="u-icon" :name="delIcon" :size="delIconSize" :color="delColor"></u-icon>
 			</view>
-			<u-line-progress v-if="showProgress && item.progress > 0 && !item.error" :show-percent="false" height="16"
-				class="u-progress" :percent="item.progress"></u-line-progress>
+			<view v-if="showProgress && item.progress > 0 && !item.error" class="u-check-icon" @tap.stop="deleteItem(index)" :style="{
+					background: checkBgColor,
+				}">
+				<u-icon class="u-icon" :name="checkIcon" :size="checkIconSize" :color="checkColor"></u-icon>
+			</view>
+			<!-- <u-line-progress v-if="showProgress && item.progress > 0 && !item.error" :show-percent="false" height="16"
+				class="u-progress" :percent="item.progress"></u-line-progress> -->
 			<view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view>
 			<image @tap.stop="doPreviewImage(item.url || item.path, index)" class="u-preview-image" v-if="!item.isImage"
 				:src="item.url || item.path" :mode="imageMode"></image>
@@ -110,6 +115,11 @@
 				type: [String, Number],
 				default: 52,
 				},
+			// 删除图标大小
+			delIconSize:{
+				type: String,
+				default: '20'
+			},
 			//  是否显示进度条
 			showProgress: {
 				type: Boolean,
@@ -157,6 +167,26 @@
 					return ['album', 'camera'];
 				}
 			},
+			// 成功背景颜色
+			checkBgColor:{
+				type: String,
+				default: '#22C572'
+			},
+			// 成功icon颜色
+			checkColor:{
+				type: String,
+				default: '#fff'
+			},
+			// 成功icon颜色
+			checkIcon:{
+				type: String,
+				default: 'checkbox-mark'
+			},
+			// 成功icon颜色
+			checkIconSize:{
+				type: String,
+				default: '20'
+			},
 			// 是否在点击预览图后展示全屏图片预览
 			previewFullImage: {
 				type: Boolean,
@@ -633,11 +663,11 @@
 
 	.u-delete-icon {
 		position: absolute;
-		top: 10rpx;
-		right: 10rpx;
+		top: 0rpx;
+		right: 0rpx;
 		z-index: 10;
 		background-color: $u-type-error;
-		border-radius: 100rpx;
+		border-radius:0 0 0 10rpx;
 		width: 44rpx;
 		height: 44rpx;
 		display: flex;
@@ -785,4 +815,17 @@
 	   width:100%;height:100%;
 	   z-index:10000;
 	}
+	.u-check-icon{
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx;
+		z-index: 10;
+		background-color: $u-type-error;
+		border-radius:0 0 0 10rpx;
+		width: 44rpx;
+		height: 44rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 </style>

config/index.js

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

pageD/identity/companyIdentity.vue

@@ -9,7 +9,7 @@
 				<!-- 公司营业执照上传 -->
 				<view v-if="license1 != ''">
 					<upload :file-list='businesslicense' v-if="consentStatus == true" class="upload" ref="upload" :action="action"
-						:max-size="maxSize" :max-count="1" :size-type="['compressed']" @on-success="getImgUrl"
+						:max-size="maxSize" delIconSize='30' delBgColor='rgba(0,0,0,0.4)' delIcon="trash" :max-count="1" :size-type="['compressed']" @on-success="getImgUrl"
 						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						:options="uploadOptions" :custom="uploadCustom"></upload>
 				</view>
@@ -35,12 +35,12 @@
 				<view>
 					<!-- <image src="../../static/img/authentication/business.png" mode=""></image> -->
 					<!-- 个人身份证正面 -->
-					<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
+					<upload class="upload" ref="upload1" delIcon="trash" :action="action" :max-size="maxSize" :max-count="1"
 						:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
 						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 						:custom="uploadCustom1"></upload>
 					<!-- 个人身份证反面 -->
-					<upload class="upload" ref="upload2" :action="action" :max-size="maxSize" :max-count="1"
+					<upload class="upload" ref="upload2" delIcon="trash" :action="action" :max-size="maxSize" :max-count="1"
 						:size-type="['compressed']" @on-success="getImgUrl2" @on-remove="onRemove"
 						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 						:custom="uploadCustom2"></upload>

pages/attestation/indexTwo.vue

@@ -42,7 +42,7 @@
 
 			</view>
 
-			<view class="flex number">
+			<view class="flex number justify-between">
 				<view class="yuan flex">
 					<view v-bind:class="defaults1" @click.stop="select(item)" v-if="item.basis == 'false'"></view>
 					<view v-bind:class="defaults2" @click.stop="select(item)" v-if="item.basis == 'true'">✓</view>
@@ -476,7 +476,7 @@
 	}
 
 	.company {
-		font-size: 16px;
+		font-size: 18px;
 		font-weight: 600;
 		margin-top: 10px;
 		display: inline-block;
@@ -504,7 +504,7 @@
 	.but {
 		border: 1px solid #CDCDCD;
 		border-radius: 20px;
-		padding: 15rpx 30rpx;
+		padding: 8rpx 30rpx;
 		text-align: center;
 		margin-left: 20px;
 		font-size: 14px;
@@ -529,7 +529,7 @@
 		background-color: #E9F8F0;
 		color: #22C572;
 		text-align: center;
-		line-height: 70rpx;
+		line-height: 75rpx;
 		padding: 0 4rpx;
 		border-radius: 6rpx;
 		display: inline-block;

pages/erpbusiness/examine_quality_testing.vue

@@ -40,8 +40,11 @@
 			</view>
 			<view v-if="gridList.paramType != '1'" class="c-row ">
 				<view class="title">扣重比</view>
+				<view class="con-list">
+					{{gridList.buckleWeightRatio}}
+				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row ">
+			<view v-else class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
 					{{gridList.buckleMiscellaneous}}
@@ -117,7 +120,7 @@
 					<view class="con-list">
 						<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
 							name="input"></input>
-						<input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
+						<input v-model='gridList.reWaterContent' placeholder="复检水分" @input="waterContentChange"
 							name="input"></input>
 					</view>
 					<view class="con-list">