加上图标

components/company/company.vue

@@ -33,6 +33,8 @@
 				<view class="cards">
 
 					<view class="cards_head">
+						<u--image src="../../static/img/company/company.png" width="33.29rpx" height="33.29rpx"
+							style="margin-right:20rpx"></u--image>
 						<text style="font-size: 32rpx">公司基本信息</text>
 					</view>
 					<view class="cards_content">
@@ -60,7 +62,10 @@
 					</view>
 
 					<view class="cards_head">
+						<u--image src="../../static/img/company/LXR.png" width="33.29rpx" height="33.29rpx"
+							style="margin-right:20rpx"></u--image>
 						<text style="font-size: 32rpx">公司联系人</text>
+						<!-- <text style="font-size: 32rpx">公司联系人</text> -->
 					</view>
 					<view class="cards_content">
 						<view class="right">
@@ -142,7 +147,10 @@
 				<view class="cards">
 
 					<view class="cards_head">
+						<u--image src="../../static/img/company/HT.png" width="33.29rpx" height="33.29rpx"
+							style="margin-right:20rpx"></u--image>
 						<text style="font-size: 32rpx">电子合同</text>
+						<!-- <text style="font-size: 32rpx">公司联系人</text> -->
 					</view>
 					<view class="cards_content">
 						<view class="right">
@@ -273,7 +281,10 @@
 				<view class="cards">
 
 					<view class="cards_head">
+						<u--image src="../../static/img/company/GSZZ.png" width="33.29rpx" height="33.29rpx"
+							style="margin-right:20rpx"></u--image>
 						<text style="font-size: 32rpx">公司资质信息</text>
+						<!-- <text style="font-size: 32rpx"></text> -->
 					</view>
 					<view class="cards_content">
 						<view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;">
@@ -487,8 +498,9 @@
 				background-color: $theme-oa-color;
 				color: white;
 				height: 100rpx;
+				line-height: 30rpx;
 				display: flex;
-				justify-content: space-between;
+				// justify-content: space-between;
 			}
 
 			.cards_content {

subpkg/archivesDetail/archivesDetail.vue

@@ -83,7 +83,7 @@
 				<view class="personnel_list">
 					<view class="cards">
 						<view class="card_head">
-							<text style="font-size: 34rpx;">人员姓名: {{formData.name}}</text>
+							<text>人员姓名: {{formData.name}}</text>
 						</view>
 						<view class="card_content">
 							<view class="right">
@@ -148,7 +148,7 @@
 
 					<view class="cards" v-for="(item, index) in formData.family" :key="'user'+index">
 						<view class="card_head">
-							<text style="font-size: 34rpx;">常住人口</text>
+							<text>常住人口</text>
 						</view>
 						<view class="card_content">
 							<view class="right">
@@ -188,7 +188,7 @@
 					<view class="cards" v-if="formData.child>0" v-for="(item,index) in formData.child_arr"
 						:key="'child'+index">
 						<view class="card_head">
-							<text style="font-size: 34rpx;">婴幼儿信息</text>
+							<text>婴幼儿信息</text>
 						</view>
 						<view class="card_content" v-if='item.age>4'>
 							<view class="right">
@@ -204,7 +204,7 @@
 									<text>是否补课 :</text>
 									<u-radio-group v-model="item.is_lesson" style="margin: 16rpx;" :disabled="readonly">
 										<u-radio :customStyle="{marginRight: '16px'}"
-											v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]"
+											v-for="(item, index) in [{value:'1',label:'是'},{value:'0',label:'否'}]"
 											:key="index" :label="item.label" :name="item.value">
 										</u-radio>
 									</u-radio-group>
@@ -218,10 +218,6 @@
 									<text>{{item.notes}}</text>
 								</view>
 							</view>
-
-
-
-
 						</view>
 						<view class="card_content" v-else>
 							<view class="right">
@@ -231,10 +227,10 @@
 								</view>
 
 								<view class="check_view">
-									<text>喂养方式 :</text>
+									<text>喂养方式 {{item.feeding}} :</text>
 									<u-radio-group v-model="item.feeding" :disabled="readonly" style="margin: 16rpx;">
 										<u-radio :customStyle="{marginRight: '16px'}"
-											v-for="(item, index) in [{value:1,label:'母乳'},{value:0,label:'奶粉'}]"
+											v-for="(item, index) in [{value:'1',label:'母乳'},{value:'0',label:'奶粉'}]"
 											:key="index" :label="item.label" :name="item.value">
 										</u-radio>
 									</u-radio-group>

subpkg/companyInfo/companyInfo.vue

@@ -44,7 +44,11 @@
 				<view class="cards" v-for="item in companyList" :key="item.id">
 
 					<view class="cards_head">
-						<text style="font-size: 32rpx;width:70vw">{{item.company_name}}</text>
+						<view class="cards_head_top">
+							<text><u--image src="../../static/img/company/company.png" width="33.29rpx"
+									height="33.29rpx" style="margin-right:20rpx"></u--image></text>
+							<text>{{item.company_name}}</text>
+						</view>
 						<text @click="navTo('/subpkg/companySign/companySign?id='+item.id)">详情 <uni-icons type="forward"
 								style="margin-left: 10rpx;" color="white"></uni-icons></text>
 					</view>
@@ -86,7 +90,12 @@
 
 				<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
 					:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-				<mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')"></mybtn>
+				<!-- <mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')"></mybtn> -->
+				<u-button class="btns" @click="navTo('/subpkg/companyUnsign/companyUnsign')">
+					<u-icon name="plus" color="white" size="18" style="margin-right: 10rpx;"></u-icon>
+					新建签约
+				</u-button>
+				<!-- <u-button class="btns" type="primary" icon="plus" text="新建签约"></u-button> -->
 			</view>
 			<view class="company_info" v-show="current==2">
 				<companyFinance></companyFinance>
@@ -211,6 +220,15 @@
 <style lang="scss">
 	page {}
 
+	.btns {
+		position: fixed;
+
+		bottom: 0;
+		color: white;
+		background-color: $theme-oa-color;
+
+	}
+
 	.cards {
 
 		margin: 28rpx 0;
@@ -227,6 +245,10 @@
 
 			display: flex;
 			justify-content: space-between;
+
+			.cards_head_top {
+				display: flex;
+			}
 		}
 
 		.cards_content {

subpkg/companySign/companySign.vue

@@ -5,10 +5,10 @@
 			<view class="title">电子合同</view>
 			<picker v-if="company.contract&&company.contract.check_status==0||!company.contract"
 				:range="contractTypeList" range-key="name" @change="changeType">
-				<button class="btn">
+				<u-button class="btns">
-					<!-- <image src="../../static/img/contract/FQHT.png" width="35rpx" height="35rpx" mode="widthFix">
+					<u-icon name="../../static/img/company/HT.png" size="20" style="margin-right: 10rpx;"></u-icon>
-					</image> -->发起合同
+					发起合同
-				</button>
+				</u-button>
 				<!-- <mybtn text="生成合同" position="false"></mybtn> -->
 			</picker>
 			<view v-if="company.contract&&company.contract.check_status==1">
@@ -245,6 +245,12 @@
 </script>
 
 <style lang="scss">
+	.btns {
+		color: white;
+		background-color: $theme-oa-color;
+
+	}
+
 	.need_contract {
 		padding-bottom: 30rpx;
 

subpkg/companyUnsign/companyUnsign.vue

@@ -30,7 +30,12 @@
 			<view class="personnel_list" v-for="item in companyList" :key="item.id">
 				<view class="cards">
 					<view class="cards_head" @click="navTo('/subpkg/companySign/companySign?id='+item.id)">
-						<text style="font-size: 32rpx">{{item.company_name}}</text>
+						<!-- <text style="font-size: 32rpx">{{item.company_name}}</text> -->
+						<view style="display: flex;">
+							<text><u--image src="../../static/img/company/company.png" width="33.29rpx"
+									height="33.29rpx" style="margin-right:20rpx"></u--image></text>
+							<text>{{item.company_name}}</text>
+						</view>
 
 						<text>选择<u-icon style="display: inline-block;margin-left: 10rpx;" color="white"
 								name="arrow-right"></u-icon></text>