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

App.vue

@@ -120,7 +120,7 @@
 
 <style lang='scss'>
 	@import 'static/css/common.css';
-	@import "static/css/font.css";
+	/* @import "static/css/font.css"; */
 	@import "static/iconfont/iconfont.css";
 	@import "components/colorui/main.css";
 	@import "components/colorui/icon.css";

pages/grain_pulse/perfect.vue

@@ -2,16 +2,17 @@
 	<view class="center">
 		<u-form>
 			<view class="modular">
-				<u-form-item label="公司名称" label-width="30%" class="title Regular" :border-bottom="topBorder">
+				<u-form-item label="公司名称" label-width="30%" class="title Medium" :border-bottom="topBorder">
 					<u-input v-model="deptList.name" input-align="right" class="write Regular" placeholder="请输入公司名称" />
 				</u-form-item>
 			</view>
 			<view class="modular">
-				<view class="title Regular">企业概况</view>
+				<view class="title Medium">企业概况</view>
+				<!-- <u-input v-model="value" :type="type"  :height="height" :auto-height="autoHeight" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300个字" /> -->
 				<textarea value="" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300个字" class="areaText Regular"
-					v-model="deptList.a" />
+					v-model="deptList.a" placeholder-style="color:#AFB3BF"/>
 				<view class="title Regular">添加标签（标签应突出企业特色，最多6个）</view>
-				<view class="flex">
+				<view class="flex" style="width: 100%;">
 					<view class="forLists" v-for="(item,index) in label" :Key="index">
 						<u-tag :text="item" mode="dark" class="forList Medium" shape="circle" :show="show"
 							:closeable="closeable" color="#22C572" @close="closeForList(index)" />
@@ -31,7 +32,7 @@
 					:max-count="9"></u-upload>
 			</view>
 			<view class="modular">
-				<view class="title Regular">联系方式</view>
+				<view class="title Medium">联系方式</view>
 				<view v-for="(item,index) in Persons">
 					<view class="information flex">
 						<view class="xinxi">
@@ -138,7 +139,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							
+
 						}
 					}
 				})
@@ -154,7 +155,7 @@
 
 	.title {
 		margin-left: 20rpx;
-		color: #71747C;
+		color: #333333;
 		line-height: 70rpx;
 	}
 
@@ -165,7 +166,7 @@
 
 	.modular {
 		background-color: #FFFFFF;
-		border-radius: 20px;
+		border-radius: 12px;
 		margin-top: 20px;
 	}
 
@@ -188,6 +189,7 @@
 		margin-left: 24rpx;
 		font-size: 30rpx;
 		font-weight: 600;
+		margin-bottom: 10rpx;
 	}
 
 	.forLists {
@@ -195,6 +197,7 @@
 	}
 
 	.forList {
+		height: 64rpx;
 		background-color: #F4FAF8;
 		padding: 20rpx 30rpx;
 		color: #22C572;
@@ -244,7 +247,7 @@
 		width: 96%;
 		height: 180rpx;
 		margin: 0 auto;
-		border: 2rpx dashed #22C572;
+		border: 1rpx dashed #22C572;
 		border-radius: 10rpx;
 		margin-top: 30rpx;
 	}