修改样式

common/helper.js

@@ -42,19 +42,19 @@ const getUserAllRoles = (item) => {
 }
 const setAudit = (item) => {
 	let _list = uni.getStorageSync("copyTaskInfo")
-	let _isShowbtn =true
-	if(_list.length==0){
+	let _isShowbtn = true
+	if (_list.length == 0) {
 		_isShowbtn = false
 	}
 	for (let i = 0; i < _list.length; i++) {
 		if (_list[i].businessId == item.id) {
 			_list.splice(i, 1)
-			uni.setStorageSync("copyTaskInfo",_list)
-		} 
+			uni.setStorageSync("copyTaskInfo", _list)
+		}
 	}
-	if(_list.length > 0) {
+	if (_list.length > 0) {
 		uni.navigateTo({
-			url: _list[0].itemUrl+'&isShowbtn='+_isShowbtn,
+			url: _list[0].itemUrl + '&isShowbtn=' + _isShowbtn,
 		})
 	}
 	console.log(item)

pages.json

@@ -766,7 +766,7 @@
             "path" : "pages/grain_pulse/distribution/distribution",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "分布",
                 "enablePullDownRefresh": false
             }
             

pages/grain_pulse/details.vue

@@ -2,11 +2,10 @@
 	<view class="main_content">
 		<view v-if='sitePhotoAddress.length>0' class='swiper'>
 			<swiper class="screen-swiper header-swiper" ::class="dotStyle?'square-dot':'round-dot'"
-				:indicator-dots="false" :circular="true"  interval="5000" 
-				 :current="status" @change="topSwiperTab">
+				:indicator-dots="false" :circular="true" interval="5000" :current="status" @change="topSwiperTab">
 				<swiper-item class="swiper-item" v-for="(item,index) in sitePhotoAddress" :key="index"
 					:class="status==index?'text-white':''" @click="preview(sitePhotoAddress,index)">
-					<image  :src="item"></image>
+					<image :src="item"></image>
 					<!-- 	<view style='position:absolute;top:50%;left:50%;transform: translate(-50%,-50%);'>11111</view> -->
 				</swiper-item>
 			</swiper>
@@ -15,7 +14,9 @@
 			</view>
 			<view class='functionality'>
 				<image @click='show=true' class='jubao' src="../../static/img/liangmai/jubao.png" mode=""></image>
-				<image @click='collect' class='collect' :src="companylist.collectionCompanyList.length>0?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/shoucang-2.png'" mode=""></image>
+				<image @click='collect' class='collect'
+					:src="companylist.collectionCompanyList.length>0?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/shoucang-2.png'"
+					mode=""></image>
 			</view>
 		</view>
 		<view class='company'>
@@ -23,24 +24,25 @@
 				<view style='font-size:24px;' class='Medium'>{{companylist.compName}}</view>
 				<view style='margin-top:3px;' class='flex'>
 					<view class='aptitude'>
-						<image class='aptitudeImage' :src="aptiutudeStatus?'../../static/img/liangmai/bg_no_check.png':'../../static/img/liangmai/bg_check.png'" mode=""></image>
+						<image class='aptitudeImage'
+							:src="aptiutudeStatus?'../../static/img/liangmai/bg_no_check.png':'../../static/img/liangmai/bg_check.png'"
+							mode=""></image>
 						<text class='aptitudeText Medium'>资质</text>
 					</view>
-					<view class='Regular' style='font-size:13px;'>主营：<text style='display:inline-block;margin:3px;' v-for='item in mainBusiness'> {{item}} </text></view>
+					<view class='Regular' style='font-size:13px;'>主营：<text style='display:inline-block;margin:3px;'
+							v-for='item in mainBusiness'> {{item}} </text></view>
 				</view>
 				<view style='margin:12.5px 0;' class='flex'>
 					<view v-for='item in label' class="tag Regular">
 						{{item}}
 					</view>
 				</view>
-				
-				
 			</view>
 			<view class="generalSituation">
 				<view class="title Medium">企业概况</view>
 				<view class="content Regular">
 					{{companylist.companyContant}}
-					</view>
+				</view>
 			</view>
 			<view class='contactWay'>
 				<view class="title Medium">联系方式</view>
@@ -50,7 +52,8 @@
 						<view style='flex:3;'>
 							<view class='Regular linkmanItem' v-for='item in companylist.settledCompanyContacts'>
 								<view @click="contactUs(item)">
-									{{item.contacts}} <image class="phone" src="../../static/img/liangmai/dianhau.png" mode=""></image>
+									{{item.contacts}}
+									<image class="phone" src="../../static/img/liangmai/dianhau.png" mode=""></image>
 								</view>
 							</view>
 						</view>
@@ -76,9 +79,9 @@
 				</view>
 			</view>
 		</view>
-		<u-picker mode="selector" v-model="show"  @confirm='selecttype' :range="selector"></u-picker>
+		<u-picker mode="selector" v-model="show" @confirm='selecttype' :range="selector" confirm-color='rgb(34, 197, 114)'></u-picker>
 	</view>
-	
+
 </template>
 
 <script>
@@ -86,125 +89,153 @@
 		mapState
 	} from 'vuex';
 	export default {
-	    components: {
-	        
-	    },
+		components: {
+
+		},
 		data() {
 			return {
-				imagelist:[
-					{url:'../../static/img/authentication/banklow(2).png'},
-					{url:'../../static/img/authentication/banklow(2).png'},
-					{url:'../../static/img/authentication/banklow(2).png'}
+				imagelist: [{
+						url: '../../static/img/authentication/banklow(2).png'
+					},
+					{
+						url: '../../static/img/authentication/banklow(2).png'
+					},
+					{
+						url: '../../static/img/authentication/banklow(2).png'
+					}
 				],
-				linkmanList:[
-					{name:'廖经理',phone:'18513069273'},
-					{name:'廖经理',phone:'18513069273'},
-					{name:'廖经理',phone:'18513069273'},
-					{name:'廖经理',phone:'18513069273'},
+				linkmanList: [{
+						name: '廖经理',
+						phone: '18513069273'
+					},
+					{
+						name: '廖经理',
+						phone: '18513069273'
+					},
+					{
+						name: '廖经理',
+						phone: '18513069273'
+					},
+					{
+						name: '廖经理',
+						phone: '18513069273'
+					},
 				],
-				id:0,
+				id: 0,
 				dotStyle: false,
 				status: 0,
-				companylist:{
-					settledCompanyContacts:[]
+				companylist: {
+					settledCompanyContacts: []
 				},
-				show:false,
-				mainBusiness:[],
-				label:[],
-				sitePhotoAddress:[],
-				selector:['纠错','举报'],
-				aptiutudeStatus:false,
-				iscollect:false
+				show: false,
+				mainBusiness: [],
+				label: [],
+				sitePhotoAddress: [],
+				selector: ['纠错', '举报'],
+				aptiutudeStatus: false,
+				iscollect: false
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
-		onLoad(options){
-			this.id=options.id
+		onLoad(options) {
+			this.id = options.id
 		},
-		onShow(){
-			var that=this
-			this.$nextTick(function(){
-				that.$api.doRequest('get','/settledCompanyInfo/getSettledCompanyInfo',{id:that.id,pcFlag:2}).then(res => {
-				if(res.data.code==200){
-					that.companylist=res.data.data
-					that.mainBusiness=res.data.data.mainBusinessType.split(',')
-					if(res.data.data.label){
-						that.label=res.data.data.label.split(',')
-					}
-					that.sitePhotoAddress = []
-					if(res.data.data.attachmentAddress){
-						that.sitePhotoAddress.push(res.data.data.attachmentAddress)
-					}
-					if(res.data.data.sitePhotoAddress){
-						var tmp=res.data.data.sitePhotoAddress.split(',')
-						for(var i=0;i<tmp.length;i++){
-							if(tmp[i] && tmp[i] != res.data.data.attachmentAddress){
-								that.sitePhotoAddress.push(tmp[i])
+		onShow() {
+			var that = this
+			this.$nextTick(function() {
+				that.$api.doRequest('get', '/settledCompanyInfo/getSettledCompanyInfo', {
+					id: that.id,
+					pcFlag: 2
+				}).then(res => {
+					if (res.data.code == 200) {
+						that.companylist = res.data.data
+						that.mainBusiness = res.data.data.mainBusinessType.split(',')
+						if (res.data.data.label) {
+							that.label = res.data.data.label.split(',')
+						}
+						that.sitePhotoAddress = []
+						if (res.data.data.attachmentAddress) {
+							that.sitePhotoAddress.push(res.data.data.attachmentAddress)
+						}
+						if (res.data.data.sitePhotoAddress) {
+							var tmp = res.data.data.sitePhotoAddress.split(',')
+							for (var i = 0; i < tmp.length; i++) {
+								if (tmp[i] && tmp[i] != res.data.data.attachmentAddress) {
+									that.sitePhotoAddress.push(tmp[i])
+								}
 							}
+							console.log("that.sitePhotoAddress", that.sitePhotoAddress)
 						}
-						console.log("that.sitePhotoAddress",that.sitePhotoAddress)
 					}
-				}
+				})
 			})
-			})
-			
+
 		},
 		methods: {
-			preview(img,index){
-				console.log("preview",img,index)
+			preview(img, index) {
+				console.log("preview", img, index)
 				uni.previewImage({
-				    urls: img,
-				    current:index
+					urls: img,
+					current: index
 				});
 			},
 			contactUs(item) {
 				const that = this
 				uni.makePhoneCall({
-				 	// 手机号
-				    phoneNumber: item.contactsPhone, 
-				
+					// 手机号
+					phoneNumber: item.contactsPhone,
+
 					// 成功回调
 					success: (res) => {
-						console.log('调用成功!')	
+						console.log('调用成功!')
 					},
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
 						that.contactUs()
 					}
-				  });		
+				});
 			},
 			topSwiperTab(e) {
 				var that = this;
 				this.status = Number(e.target.current);
 			},
-			collect(){
-				var that=this
-				if(this.companylist.collectionCompanyList.length>0){
-					this.$api.doRequest('post','/settledCompanyInfo/api/collectionNot',{id:this.companylist.id,loginPhone:this.userInfo.phone}).then(res => {
-						if(res.data.code==200){
-								uni.showToast({
-									title: '取消收藏',
-									icon: 'none',
-									duration: 2000
-								})
-							that.$api.doRequest('get','/settledCompanyInfo/getSettledCompanyInfo',{id:that.id,pcFlag:2}).then(res => {
-								if(res.data.code==200){
-									that.companylist=res.data.data
-									that.mainBusiness=res.data.data.mainBusinessType.split(',')
-									if(res.data.data.label){
-										that.label=res.data.data.label.split(',')
+			collect() {
+				var that = this
+				//取消收藏
+				if (this.companylist.collectionCompanyList.length > 0) {
+					this.$api.doRequest('post', '/settledCompanyInfo/api/collectionNot', {
+						id: this.companylist.id,
+						loginPhone: this.userInfo.phone
+					}).then(res => {
+						if (res.data.code == 200) {
+							debugger
+							uni.showToast({
+								title: '取消收藏',
+								icon: 'none',
+								duration: 2000
+							})
+							that.$api.doRequest('get', '/settledCompanyInfo/getSettledCompanyInfo', {
+								id: that.id,
+								pcFlag: 2
+							}).then(res => {
+								if (res.data.code == 200) {
+									that.companylist = res.data.data
+									that.mainBusiness = res.data.data.mainBusinessType.split(',')
+									if (res.data.data.label) {
+										that.label = res.data.data.label.split(',')
 									}
 									that.sitePhotoAddress = []
-									if(res.data.data.attachmentAddress){
+									if (res.data.data.attachmentAddress) {
 										that.sitePhotoAddress.push(res.data.data.attachmentAddress)
 									}
-									if(res.data.data.sitePhotoAddress){
-										var tmp=res.data.data.sitePhotoAddress.split(',')
-										for(var i=0;i<tmp.length;i++){
-											if(tmp[i] && tmp[i] != res.data.data.attachmentAddress){
+									if (res.data.data.sitePhotoAddress) {
+										var tmp = res.data.data.sitePhotoAddress.split(',')
+										for (var i = 0; i < tmp.length; i++) {
+											if (tmp[i] && tmp[i] != res.data.data
+												.attachmentAddress) {
 												that.sitePhotoAddress.push(tmp[i])
 											}
 										}
@@ -213,29 +244,38 @@
 							})
 						}
 					})
-				}else{
-					this.$api.doRequest('post','/settledCompanyInfo/api/collection',{id:this.companylist.id,compName:this.companylist.compName,loginPhone:this.userInfo.phone}).then(res => {
-						if(res.data.code==200){
+				} else {
+					//添加收藏
+					this.$api.doRequest('post', '/settledCompanyInfo/api/collection', {
+						id: this.companylist.id,
+						compName: this.companylist.compName,
+						loginPhone: this.userInfo.phone
+					}).then(res => {
+						if (res.data.code == 200) {
 							uni.showToast({
 								title: '收藏成功',
 								icon: 'none',
 								duration: 2000
 							})
-							that.$api.doRequest('get','/settledCompanyInfo/getSettledCompanyInfo',{id:that.id,pcFlag:2}).then(res => {
-								if(res.data.code==200){
-									that.companylist=res.data.data
-									that.mainBusiness=res.data.data.mainBusinessType.split(',')
-									if(res.data.data.label){
-										that.label=res.data.data.label.split(',')
+							that.$api.doRequest('get', '/settledCompanyInfo/getSettledCompanyInfo', {
+								id: that.id,
+								pcFlag: 2
+							}).then(res => {
+								if (res.data.code == 200) {
+									that.companylist = res.data.data
+									that.mainBusiness = res.data.data.mainBusinessType.split(',')
+									if (res.data.data.label) {
+										that.label = res.data.data.label.split(',')
 									}
 									that.sitePhotoAddress = []
-									if(res.data.data.attachmentAddress){
+									if (res.data.data.attachmentAddress) {
 										that.sitePhotoAddress.push(res.data.data.attachmentAddress)
 									}
-									if(res.data.data.sitePhotoAddress){
-										var tmp=res.data.data.sitePhotoAddress.split(',')
-										for(var i=0;i<tmp.length;i++){
-											if(tmp[i] && tmp[i] != res.data.data.attachmentAddress){
+									if (res.data.data.sitePhotoAddress) {
+										var tmp = res.data.data.sitePhotoAddress.split(',')
+										for (var i = 0; i < tmp.length; i++) {
+											if (tmp[i] && tmp[i] != res.data.data
+												.attachmentAddress) {
 												that.sitePhotoAddress.push(tmp[i])
 											}
 										}
@@ -244,140 +284,176 @@
 							})
 						}
 					})
-				}	
+				}
 			},
-			selecttype(e){
+			selecttype(e) {
 				console.log(e)
-				if(e[0]==1){
+				if (e[0] == 1) {
 					uni.navigateTo({
-						url:'/pages/grain_pulse/jubao?id='+this.companylist.id+'&compName='+this.companylist.compName
+						url: '/pages/grain_pulse/jubao?id=' + this.companylist.id + '&compName=' + this
+							.companylist
+							.compName
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'/pages/grain_pulse/errorcorrection?id='+this.companylist.id+'&compName='+this.companylist.compName
+						url: '/pages/grain_pulse/errorcorrection?id=' + this.companylist.id +
+							'&compName=' + this
+							.companylist.compName
 					})
 				}
 			},
-			jubao(){
-				
+			jubao() {
+
 			},
 		}
 	}
 </script>
 
 <style lang='scss' scoped>
-	.main_content{
-		margin-top: 30rpx;
+	.main_content {
+		/* margin-top: 30rpx; */
 	}
+
 	/* 《--轮播 */
-	.swiper{
-		position:relative;
-		height:281.5px;
+	.swiper {
+		position: relative;
+		height: 281.5px;
 	}
-	.screen-swiper{
-		height:281.5px;
+
+	.screen-swiper {
+		height: 281.5px;
 	}
-	.swiper .dots{
-		position:absolute;
-		bottom:53px;
+
+	.swiper .dots {
+		position: absolute;
+		bottom: 53px;
 		background: rgba(255, 255, 255, 0.4);
 		border-radius: 0px 11px 11px 0px;
 		width: 58.5px;
 		height: 23px;
-		line-height:23px;
-		text-align:center;
-		padding:3px;
-		color:#FFFFFF;
+		line-height: 23px;
+		text-align: center;
+		padding: 3px;
+		color: #FFFFFF;
 	}
-	.functionality{
+
+	.functionality {
 		position: absolute;
-		right:0;
-		bottom:53px;
+		right: 0;
+		bottom: 53px;
 	}
-	.jubao{
-		width:22px;height:19px;
-		margin-right:25px;
+
+	.jubao {
+		width: 44rpx;
+		height: 44rpx;
+		margin-right: 25px;
 	}
-	.collect{
-		width:22px;height:22px;
-		margin-right:19.5px;
+
+	.collect {
+		width: 22px;
+		height: 22px;
+		margin-right: 19.5px;
 	}
+
 	/* 轮播--》 */
 	/*《--公司 */
-	.company{
+	.company {
 		background: linear-gradient(180deg, #FFFFFF 0%, #F7F8FC 100%);
-		height:550px;
-		border-radius:20px;
-		margin-top:-38px;
+		height: 550px;
+		border-radius: 20px;
+		margin-top: -38px;
 		position: relative;
 		z-index: 3;
 	}
-	.aptitude,.aptitudeImage{
+
+	.aptitude,
+	.aptitudeImage {
 		width: 38px;
-		height:20px;
+		height: 20px;
 	}
-	.aptitude{
-		position:relative;
-		margin-right:5px;
+
+	.aptitude {
+		position: relative;
+		margin-right: 5px;
 	}
-	.aptitudeText{
-		color:#8B511E;
-		position:absolute;
-		left:0;
-		width:40px;
-		top:0;
-		text-align:center;
-		width:100%;
+
+	.aptitudeText {
+		color: #8B511E;
+		position: absolute;
+		left: 0;
+		width: 40px;
+		top: 0;
+		text-align: center;
+		width: 100%;
 		line-height: 20px;
-		font-size:11px;
-		height:100%;
+		font-size: 11px;
+		height: 100%;
 	}
-	.tag{
-		background:#F5F6F9;
-		padding:2.5px 6.5px;
-		border-radius:3px;
-		font-size:11px;
-		margin-right:11.5px;
+
+	.tag {
+		background: #F5F6F9;
+		padding: 2.5px 6.5px;
+		border-radius: 3px;
+		font-size: 11px;
+		margin-right: 11.5px;
 	}
-	.generalSituation{
-		background:#fff;
-		margin:9px;
-		padding:12px;
-		border-radius:10px;
-		.title{
-			font-size:16px;
-			margin:0 0 9.5px;
+
+	.generalSituation {
+		background: #fff;
+		margin: 9px;
+		padding: 12px;
+		/* border-radius: 10px; */
+
+		.title {
+			font-size: 16px;
+			margin: 0 0 9.5px;
 		}
-		.content{
-			font-size:12px;
-			color:#676E80;
+
+		.content {
+			font-size: 12px;
+			color: #676E80;
 		}
 	}
-	.contactWay{
-		margin:9px;
-		padding:11.5px 13px;
-		background:#fff;
-		border-radius:10px;
-		>.title{
-			font-size:16px;
-			color:#333;
-			margin-bottom:12px;
+
+	.contactWay {
+		margin: 9px;
+		padding: 11.5px 13px;
+		background: #fff;
+		border-radius: 10px;
+
+		>.title {
+			font-size: 16px;
+			color: #333;
+			margin-bottom: 12px;
 		}
-		.contactWayContent{
-			.linkman>.title,.mailbox>.title,.fax>.title,.address>.title{
-				color:#676E80;
-				font-size:14px;
+
+		.contactWayContent {
+
+			.linkman>.title,
+			.mailbox>.title,
+			.fax>.title,
+			.address>.title {
+				color: #676E80;
+				font-size: 14px;
 			}
-			.mailbox,.fax,.address{
-				margin-bottom:10px;
+
+			.mailbox,
+			.fax,
+			.address {
+				margin-bottom: 10px;
 			}
-			.linkmanItem{
-				margin-bottom:10px;
+
+			.linkmanItem {
+				margin-bottom: 10px;
 			}
-			.phone{
-				width:22rpx;height:22rpx;margin-left:6px;
+
+			.phone {
+				width: 22rpx;
+				height: 22rpx;
+				margin-left: 6px;
 			}
 		}
 	}
+
 	/* 公司--》 */
 </style>

pages/grain_pulse/distribution/distribution.nvue

@@ -2,18 +2,16 @@
 	<view class="container">
 		<view class="header">
 			<view class="now-location">
-				<image class='location' src="/static/img/liangmai/icon_ditu.png" mode=""></image>
+				<image class='location' src="/static/img/liangmai/icon_ditu@2x.png" mode=""></image>
 				<!-- <u-icon name="map" size="36" class="icon"></u-icon> -->
 				<text class="text Medium title">{{position.name}}</text>
 			</view>
 			<view class="selectType">
-				
 				<picker @change="bindPickerChange" :value="index" :range="typeList">
 					<text class="uni-input header-type">{{typeList[index]}}</text>
 				</picker>
+				<image class='location' src="/static/img/liangmai/xiala-2@2x.png" mode=""></image>
 			</view>
-
-
 		</view>
 		<view class="uni-common-mt">
 			<view class="content">
@@ -32,27 +30,24 @@
 				</view>
 				<scroll-view :scroll-top="scrollTop" :scroll-y="isscroll" @scrolltoupper="upper" @scrolltolower="lower"
 					@scroll="scroll" :class="{'active':isActive}" class="scroll-style">
-					<view class="bottom-list-item" v-for="(item,index) in datalist" @click='coordinate(item)' :key="index">
+					<view class="bottom-list-item" v-for="(item,index) in datalist" @click='coordinate(item)'
+						:key="index">
 						<view class='left'>
 							<img class="left-img" :src="item.attachmentAddress" alt="">
 							<view class="middle">
 								<text class="title Medium">{{item.title}}</text>
 								<text
-								class="localtion Regular">{{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</text>
+									class="localtion Regular">{{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</text>
 							</view>
 						</view>
-						
 						<text class="line"></text>
 						<view class="right">
 							<img class="right-img" src="/static/img/dizhi.png" alt="">
 							<text class="right-bottom Regular">{{metreList[index]}}</text>
 						</view>
 					</view>
-
 				</scroll-view>
-
 			</view>
-
 		</view>
 
 	</view>
@@ -77,11 +72,11 @@
 					longitude: 116.39747,
 				},
 				showType: false,
-				mainBusinessType:'',
+				mainBusinessType: '',
 				enterpriseList: [],
 				// typeStr: '全部类型',
 				index: 0,
-				typeList: ['全部类型', '粮仓', '加工厂','烘干塔','饲料厂','养殖场','粮贸','期货'],
+				typeList: ['全部类型', '粮仓', '加工厂', '烘干塔', '饲料厂', '养殖场', '粮贸', '期货'],
 				title: 'map',
 				covers: [{
 					id: 0,
@@ -104,7 +99,7 @@
 			this.getList()
 		},
 		methods: {
-			coordinate(item){
+			coordinate(item) {
 				// this.nowLocation.latitude = item.latitude
 				// this.nowLocation.longitude = item.longitude
 				this.getList()
@@ -120,40 +115,37 @@
 				getApp().nvueRequst('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
 					pageSize: 10000,
 					currentPage: 1,
-					detailedAddress:detailedAddress,
-					mainBusinessType:this.mainBusinessType,
+					detailedAddress: detailedAddress,
+					mainBusinessType: this.mainBusinessType,
 					searchType: 2,
-					location:that.position.cityname
+					location: that.position.cityname
 				}).then(res => {
-					let newmarker =[];
-					var id=1;
-						console.log('res',res)
+					let newmarker = [];
+					var id = 1;
 					if (res.data.code == 200) {
-					
+
 						this.datalist = res.data.data.records
 						let lat1 = this.nowLocation.latitude
 						let lng1 = this.nowLocation.longitude
-						for(let i = 0;i<this.datalist.length;i++){
+						for (let i = 0; i < this.datalist.length; i++) {
 							let lat2 = this.datalist[i].latitude
 							let lng2 = this.datalist[i].longitude
-							let maker= {
+							let maker = {
 								id: id++,
 								latitude: this.datalist[i].latitude,
-								longitude:this.datalist[i].longitude,
+								longitude: this.datalist[i].longitude,
 								iconPath: '../../../static/img/location.png',
 								callout: {
-									content:this.datalist[i].title,
-									padding:10,
-									borderRadius:5,
+									content: this.datalist[i].title,
+									padding: 10,
+									borderRadius: 5,
 								}
 							}
 							newmarker.push(maker)
-							console.log("lat1,lng1,lat2,lng2",lat1,lng1,lat2,lng2)
-							let _metre = getApp().getDistance(lat1,lng1,lat2,lng2)
+							let _metre = getApp().getDistance(lat1, lng1, lat2, lng2)
 							this.metreList.push(_metre)
 						}
 						this.covers = newmarker
-						console.log(this.covers)
 					}
 				})
 			},
@@ -162,37 +154,31 @@
 				// this.isscroll = !this.isscroll
 			},
 			upper: function(e) {
-				console.log(e)
 			},
 			lower: function(e) {
-				console.log(e)
 			},
 			scroll: function(e) {
-				console.log(e)
 				this.old.scrollTop = e.detail.scrollTop
 			},
 			bindPickerChange: function(e) {
-				console.log('picker发送选择改变，携带值为', e.detail)
-				
-				if(e.detail.value=='0'){
-					this.mainBusinessType=''
-				}else{
-					this.mainBusinessType=this.typeList[this.index]
+				// console.log('picker发送选择改变，携带值为', e.detail)
+
+				if (e.detail.value == '0') {
+					this.mainBusinessType = ''
+				} else {
+					this.mainBusinessType = this.typeList[this.index]
 				}
 				this.index = e.detail.value
 				this.getList()
 			},
 			confirm() {
-				console.log('确定')
 				this.showType = false
 			},
 			cancel() {
-				console.log('取消')
 				this.showType = false
 			},
 			selectType() {
 				this.showType = true
-				console.log(1)
 			},
 			// typeConfirm(e) {
 			// 	console.log(e)
@@ -245,21 +231,29 @@
 				// });
 			},
 			getLst() {
-				console.log("加载数据")
+			},
+			markertap(e){
+				console.log('-------------------')
+				console.log(e)
+				console.log(this.covers) 
 			}
+			
 
 		}
 	}
 </script>
 <style scoped>
-	.now-location{
+	.now-location {
 		flex-direction: row;
+		align-items: center;
 	}
-	.location{
-		width:27rpx;
-		height:31rpx;
-		margin-right:10rpx;
+
+	.location {
+		width: 27rpx;
+		height: 31rpx;
+		margin-right: 10rpx;
 	}
+
 	.active {
 		height: 583rpx !important;
 	}
@@ -267,8 +261,8 @@
 	.header {
 		flex-direction: row;
 		justify-content: space-between;
-		margin-bottom: 20rpx;
 		padding: 20rpx;
+		background: white;
 	}
 
 	.title {
@@ -306,6 +300,7 @@
 		font-size: 26rpx;
 		font-weight: 400;
 		color: #333333;
+		margin-right: 20rpx;
 	}
 
 	.alert {
@@ -364,21 +359,23 @@
 		margin-top: 20rpx;
 		border-bottom: 1px solid #EEEEEE;
 	}
-	.line{
-		border-right:1px solid #EEEEEE;
-		height:100rpx;
+
+	.line {
+		border-right: 1px solid #EEEEEE;
+		height: 100rpx;
 	}
+
 	.left {
 		flex-direction: row;
-		flex:3;
+		flex: 3;
 
 	}
 
 	.left-img {
 		width: 102rpx;
 		height: 106rpx;
-		margin-right:20rpx;
-		border-radius:20rpx;
+		margin-right: 20rpx;
+		border-radius: 20rpx;
 	}
 
 	.localtion {
@@ -401,7 +398,7 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		flex:1;
+		flex: 1;
 	}
 
 	.middle {
@@ -434,6 +431,10 @@
 	}
 
 	.scroll-style {
-		height: 230rpx;
+		height: 130rpx;
+	/* 	background: red; */
+	}
+	.selectType{
+		flex-direction: row;
 	}
 </style>

pages/grain_pulse/dynamic.vue

@@ -34,8 +34,8 @@
 				<view class="title">{{item.title}}</view>
 				<view class="titleText">
 					<!-- {{item.content}} -->
-					<u-read-more show-height="200" :shadow-style="shadowStyle" :toggle="true" close-text="展开">
-						<rich-text :nodes="item.content"></rich-text>
+					<u-read-more color='#22C572' show-height="140" :index="index" :shadow-style="shadowStyle" :toggle="true" close-text="展开阅读更多内容" @open='open' @close='close'>
+						<rich-text :nodes="item.content" class="rich-item"></rich-text>
 						<!-- @load="parseLoaded" -->
 						<!-- <u-parse :html="item.content" ></u-parse> -->
 					</u-read-more>
@@ -49,7 +49,7 @@
 				<view class="flex">
 					<view class="address flex" style="margin: 30rpx;">
 						<image src='../../static/img/location.png'
-							style="width: 26rpx;height: 30rpx;top: 8rpx;margin: 0 10rpx;"></image>
+							style="width: 30rpx;height: 30rpx;top: 8rpx;margin: 0 10rpx;"></image>
 						{{item.city}}
 					</view>
 				</view>
@@ -86,7 +86,7 @@
 				shadowStyle: {
 					backgroundImage: "none",
 					paddingTop: "0",
-					marginTop: "20rpx"
+					marginTop: "20rpx",
 				},
 				scrollTop: 0,
 			}
@@ -122,6 +122,12 @@
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			open(e){
+				console.log(e)
+			},
+			close(e){
+				console.log(e)
+			},
 			preview(img, index) {
 				uni.previewImage({
 					urls: img,
@@ -352,4 +358,7 @@
 		background: #fff;
 		padding: 10px;
 	}
+	.rich-item{
+		line-height: 44rpx;
+	}
 </style>

pages/grain_pulse/enter.vue

@@ -8,7 +8,7 @@
 			请填写入驻信息
 		</view>
 		<u-form class="forList">
-			<view style='padding-bottom:20px;' class="modular">
+			<view style='padding-bottom:20px;' class="modular content1-card">
 				<u-form-item label="公司名称" label-width="30%" class="title Regular">
 					<u-input maxlength='25' v-model="deptList.compName" input-align="right" class="write Medium"
 						placeholder="请输入公司名称" />
@@ -32,15 +32,14 @@
 				<u-form-item label-position='top' label="公司简介" label-width="30%" class="title Regular">
 					<!-- <u-input  input-align="right"  type="textarea"
 						 /> -->
-						 <view class='companyProfilewrap'>
-							 <textarea class="write Regular companyProfile" 
-							 maxlength="60" 
-							 placeholder="请输入企业简介，如经营项目、产品类型、企业规模等，10-60个字"
-							  v-model="deptList.companyProfile" name="" id="" cols="10" rows="3">
+					<view class='companyProfilewrap'>
+						<textarea class="write Regular companyProfile" maxlength="60"
+							placeholder="请输入企业简介，如经营项目、产品类型、企业规模等，10-60个字" v-model="deptList.companyProfile" name=""
+							id="" cols="10" rows="3">
 							  </textarea>
-							  <view class='companyProfilecontent'>{{deptList.companyProfile.length}}/60个字</view>
-						 </view>
-						
+						<view class='companyProfilecontent'>{{deptList.companyProfile.length}}/60个字</view>
+					</view>
+
 				</u-form-item>
 			</view>
 			<view class="modular">
@@ -52,15 +51,16 @@
 				<u-form-item label="所在区域" label-width="30%" class="title Regular">
 					<view style='text-align:right;width:100%;padding-right:10px;' v-if='position.province!=undefined'>
 						{{position.province}}
-					{{position.city}}
-					{{position.district}}
+						{{position.city}}
+						{{position.district}}
 					</view>
 					<view style='text-align:right;width:100%;padding-right:10px;' v-if='position.pname!=undefined'>
 						{{position.pname}}
-					{{position.cityname}}
-					{{position.adname}}
+						{{position.cityname}}
+						{{position.adname}}
 					</view>
-					<view style='text-align:right;width:100%;padding-right:10px;' v-if='position.pname==undefined&&position.province==undefined'>
+					<view style='text-align:right;width:100%;padding-right:10px;'
+						v-if='position.pname==undefined&&position.province==undefined'>
 						未上传坐标
 					</view>
 				</u-form-item>
@@ -72,19 +72,19 @@
 					<view class="title Regular" style="margin-top: 15rpx;">上传图片</view>
 					<view v-if="license1 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-							:size-type="['compressed']" @on-success="getImgUrl" 
-							 @on-uploaded="isAdd = true" :before-upload="filterFileType"
-							:options="uploadOptions" customBorder='2px dashed #D8DEF7' customBtnFontSize="14" customBtnColor="#6A7282" :customBtnHeight='custombtnheight'
-							 :customBtnWidth='custombtnwidth' customBack='#F9FAFE' :customBtnImage="custombtnimage" :customBtn='custombtn'
-							  :custom="uploadCustom" ></upload>
+							:size-type="['compressed']" @on-success="getImgUrl" @on-uploaded="isAdd = true"
+							:before-upload="filterFileType" :options="uploadOptions" customBorder='2px dashed #D8DEF7'
+							customBtnFontSize="14" customBtnColor="#6A7282" :customBtnHeight='custombtnheight'
+							:customBtnWidth='custombtnwidth' customBack='#F9FAFE' :customBtnImage="custombtnimage"
+							:customBtn='custombtn' :custom="uploadCustom"></upload>
 					</view>
 					<view v-if="license2 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-							:size-type="['compressed']" @on-success="getImgUrl1"
-							 @on-uploaded="isAdd = true" :before-upload="filterFileType"
-							:options="uploadOptions1"  customBack='#FEF9FA' customBorder='2px dashed #F9D5DC' customBtnFontSize="14" customBtnColor="#6A7282" :customBtnHeight='custombtnheight'
-							 :customBtnWidth='custombtnwidth' :customBtnImage="custombtnimage" :customBtn='custombtn'
-							  :custom="uploadCustom" ></upload>
+							:size-type="['compressed']" @on-success="getImgUrl1" @on-uploaded="isAdd = true"
+							:before-upload="filterFileType" :options="uploadOptions1" customBack='#FEF9FA'
+							customBorder='2px dashed #F9D5DC' customBtnFontSize="14" customBtnColor="#6A7282"
+							:customBtnHeight='custombtnheight' :customBtnWidth='custombtnwidth'
+							:customBtnImage="custombtnimage" :customBtn='custombtn' :custom="uploadCustom"></upload>
 					</view>
 				</view>
 			</view>
@@ -135,12 +135,12 @@
 				mainBusinessType: [],
 				uploadCustom: true,
 				deptList: {
-					compName:'',
-					title:'',
-					companyProfile:'',
-					province:'',
-					city:'',
-					area:''
+					compName: '',
+					title: '',
+					companyProfile: '',
+					province: '',
+					city: '',
+					area: ''
 				},
 				management: [{
 						name: "粮库",
@@ -175,31 +175,31 @@
 				show: false,
 				// anNiuCss:"types",
 				anNiuCss: [],
-				position:{
-					province:''
+				position: {
+					province: ''
 				},
-				custombtn:true,
-				custombtnimage:'../../static/img/liangmai/ic_shanchuan@3x.png',
-				custombtnwidth:50,
-				custombtnheight:50,
+				custombtn: true,
+				custombtnimage: '../../static/img/liangmai/ic_shanchuan@3x.png',
+				custombtnwidth: 50,
+				custombtnheight: 50,
 				license1: "../../static/img/authentication/business@3x.png",
 				license2: "../../static/img/authentication/business@3x.png",
 
 			}
 		},
 		onLoad(options) {
-			
-			if(options.position){
-				this.position=JSON.parse(options.position)
-				this.position.city=this.position.city.toString()
+
+			if (options.position) {
+				this.position = JSON.parse(options.position)
+				this.position.city = this.position.city.toString()
 			}
 		},
 		onShow() {
 			var that = this
 			try {
-			    this.position = uni.getStorageSync('position');
+				this.position = uni.getStorageSync('position');
 			} catch (e) {
-			    // error
+				// error
 			}
 			uni.getStorage({
 				key: 'setPosition',
@@ -208,30 +208,30 @@
 					that.position = res.data
 					that.position.longitude = res.data.location.split(',')[0];
 					that.position.latitude = res.data.location.split(',')[1];
-					
+
 					console.log(that.position.longitude)
 					console.log(that.position.latitude)
 					// uni.removeStorage({
 					// 	key: 'setLocaltion'
 					// })
 				},
-			
+
 			})
-			if(this.$store.state.enter.companyProfile){
-				this.deptList.companyProfile=this.$store.state.enter.companyProfile
+			if (this.$store.state.enter.companyProfile) {
+				this.deptList.companyProfile = this.$store.state.enter.companyProfile
 			}
-			if(this.$store.state.enter.compName){
-				this.deptList.compName=this.$store.state.enter.compName
+			if (this.$store.state.enter.compName) {
+				this.deptList.compName = this.$store.state.enter.compName
 			}
-			if(this.$store.state.enter.title){
-				this.deptList.title=this.$store.state.enter.title
+			if (this.$store.state.enter.title) {
+				this.deptList.title = this.$store.state.enter.title
 			}
-			if(this.$store.state.enter.mainBusinessType){
-				this.mainBusinessType=this.$store.state.enter.mainBusinessType.split(',')
-				if(this.mainBusinessType.length>0){
-					for(var i=0;i<this.management.length;i++){
-						if(this.mainBusinessType.indexOf(this.management[i].name)!=-1){
-							this.management[i].checked=true
+			if (this.$store.state.enter.mainBusinessType) {
+				this.mainBusinessType = this.$store.state.enter.mainBusinessType.split(',')
+				if (this.mainBusinessType.length > 0) {
+					for (var i = 0; i < this.management.length; i++) {
+						if (this.mainBusinessType.indexOf(this.management[i].name) != -1) {
+							this.management[i].checked = true
 						}
 					}
 				}
@@ -248,21 +248,21 @@
 			},
 			naviageToPage(item) {
 				// console.log(this.enter)
-				var data={
-					compName:this.deptList.compName,
-					title:this.deptList.title,
-					mainBusinessType:this.mainBusinessType.toString(),
-					companyProfile:this.deptList.companyProfile,
+				var data = {
+					compName: this.deptList.compName,
+					title: this.deptList.title,
+					mainBusinessType: this.mainBusinessType.toString(),
+					companyProfile: this.deptList.companyProfile,
 				}
 				console.log(this.$store)
-				this.$store.commit('enterchange',data)
+				this.$store.commit('enterchange', data)
 				// this.$store.dispatch('enterchange',data)
 				// this.enterchange()
-				var mainBusinessType=this.mainBusinessType.toString()
+				var mainBusinessType = this.mainBusinessType.toString()
 				uni.navigateTo({
 					url: item
 				})
-				
+
 			},
 			getImgUrl1(res) {
 				console.log(res)
@@ -272,10 +272,10 @@
 				if (this.mainBusinessType.indexOf(item.name) == -1) {
 					this.mainBusinessType.push(item.name)
 					item.checked = true
-				}else{
+				} else {
 					for (var i = 0; i < this.mainBusinessType.length; i++) {
-						if(this.mainBusinessType[i]==item.name){
-							this.mainBusinessType.splice(i,1)
+						if (this.mainBusinessType[i] == item.name) {
+							this.mainBusinessType.splice(i, 1)
 						}
 					}
 					item.checked = false
@@ -296,10 +296,9 @@
 			navBack() {
 				uni.setStorage({
 					key: 'setPosition',
-					data:{},
-					success: (res) => {
-					}
-				
+					data: {},
+					success: (res) => {}
+
 				})
 				uni.navigateBack()
 			},
@@ -325,9 +324,9 @@
 				})
 			},
 			perfect() {
-				this.show=false
+				this.show = false
 				uni.navigateTo({
-					url: `/pages/grain_pulse/perfect?deptList=`+JSON.stringify(this.deptList)
+					url: `/pages/grain_pulse/perfect?deptList=` + JSON.stringify(this.deptList)
 				})
 			},
 			submit() {
@@ -336,7 +335,7 @@
 					this.$api.msg('公司名称不能为空')
 					return
 				}
-				if (this.mainBusinessType.length==0) {
+				if (this.mainBusinessType.length == 0) {
 					this.$api.msg('至少选择一个主营类型')
 					return
 				}
@@ -348,7 +347,7 @@
 					this.$api.msg('企业简介不能为空')
 					return
 				}
-				if (!this.position.longitude&&!this.position.latitude) {
+				if (!this.position.longitude && !this.position.latitude) {
 					this.$api.msg('上传坐标不能为空')
 					return
 				}
@@ -364,38 +363,38 @@
 					this.$api.msg('营业执照不能为空')
 					return
 				}
-				if (this.deptList.compName.length<2||this.deptList.compName.length>25) {
+				if (this.deptList.compName.length < 2 || this.deptList.compName.length > 25) {
 					this.$api.msg('公司名称输入错误')
 					return
 				}
-				if (this.deptList.title.length<2||this.deptList.title.length>16) {
+				if (this.deptList.title.length < 2 || this.deptList.title.length > 16) {
 					this.$api.msg('标题长度2-16个字')
 					return
 				}
-				if (this.deptList.companyProfile.length<10||this.deptList.companyProfile.length>60) {
+				if (this.deptList.companyProfile.length < 10 || this.deptList.companyProfile.length > 60) {
 					this.$api.msg('简介长度10-60个字')
 					return
 				}
-				if (this.deptList.detailedAddress.length<2||this.deptList.detailedAddress.length>12) {
+				if (this.deptList.detailedAddress.length < 2 || this.deptList.detailedAddress.length > 12) {
 					this.$api.msg('详细地址2-12个字')
 					return
 				}
 				// this.show = true
 				// return
-				this.deptList.mainBusinessType=this.mainBusinessType.toString()
-				this.deptList.longitude=this.position.longitude
-				this.deptList.latitude=this.position.latitude
-				if(this.position.province!=undefined){
-					this.deptList.province=this.position.province
-					this.deptList.city=this.position.city
-					this.deptList.area=this.position.district
-				}else if(this.position.pname!=undefined){
-					this.deptList.province=this.position.pname
-					this.deptList.city=this.position.cityname
-					this.deptList.area=this.position.adname
+				this.deptList.mainBusinessType = this.mainBusinessType.toString()
+				this.deptList.longitude = this.position.longitude
+				this.deptList.latitude = this.position.latitude
+				if (this.position.province != undefined) {
+					this.deptList.province = this.position.province
+					this.deptList.city = this.position.city
+					this.deptList.area = this.position.district
+				} else if (this.position.pname != undefined) {
+					this.deptList.province = this.position.pname
+					this.deptList.city = this.position.cityname
+					this.deptList.area = this.position.adname
 				}
-				
-				this.deptList.createPhone=this.userInfo.phone
+
+				this.deptList.createPhone = this.userInfo.phone
 				uni.showModal({
 					content: "确定提交企业信息？",
 					showCancel: true,
@@ -403,35 +402,36 @@
 					success: function(res) {
 						if (res.confirm) {
 							uni.showLoading({
-								title:"正在提交",
-								mask:true
+								title: "正在提交",
+								mask: true
 							})
-							that.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyInfo',that.deptList).then(res => {
-								//成功后
-								console.log("提交企业信息",res)
-								if (res.data.code == 200) {
-									that.deptList.id = res.data.data
-									var data={
-										compName:'',
-										title:'',
-										mainBusinessType:'',
-										companyProfile:'',
+							that.$api.doRequest('post', '/settledCompanyInfo/api/addSettledCompanyInfo', that
+									.deptList).then(res => {
+									//成功后
+									console.log("提交企业信息", res)
+									if (res.data.code == 200) {
+										that.deptList.id = res.data.data
+										var data = {
+											compName: '',
+											title: '',
+											mainBusinessType: '',
+											companyProfile: '',
+										}
+										that.$store.commit('enterchange', data)
+										that.show = true
 									}
-									that.$store.commit('enterchange',data)
-									that.show = true
-								}
-								uni.hideLoading()
-							})
-							.catch(res => {
-								console.log("系统异常",res)
-								uni.hideLoading()
-								uni.showToast({
-									title: "系统异常，请联系管理员",
-									icon: 'none',
-									duration: 2000
+									uni.hideLoading()
 								})
-							})
-							
+								.catch(res => {
+									console.log("系统异常", res)
+									uni.hideLoading()
+									uni.showToast({
+										title: "系统异常，请联系管理员",
+										icon: 'none',
+										duration: 2000
+									})
+								})
+
 						}
 					},
 				})
@@ -446,14 +446,17 @@
 		width: 100vw;
 		height: 100vh;
 		overflow: scroll;
-		position:relative;z-index:2;
+		position: relative;
+		z-index: 2;
 	}
-	.bg{
-		position:absolute;
-		width:100%;
+
+	.bg {
+		position: absolute;
+		width: 100%;
 		left: 0;
-		top:0;
+		top: 0;
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -510,6 +513,7 @@
 	.choice {
 		margin-top: 10px;
 		display: inline-block;
+		width: 25%;
 	}
 
 	.title {
@@ -521,7 +525,7 @@
 		text-align: center;
 		border-radius: 20px;
 		margin-left: 5px;
-		padding:8px 19px;
+		padding: 16rpx 20rpx;
 	}
 
 	.types1 {
@@ -546,8 +550,9 @@
 		background-color: #FFFFFF;
 		border-radius: 10px;
 		margin-top: 10px;
-		position:relative;z-index:2;
-		padding:0 12.5px;
+		position: relative;
+		z-index: 2;
+		padding: 0 12.5px;
 	}
 
 	.forList {
@@ -560,7 +565,7 @@
 		margin-top: 80px;
 		margin-left: 10px;
 		position: relative;
-		z-index:2;
+		z-index: 2;
 	}
 
 	.upload {
@@ -586,21 +591,31 @@
 		margin: 0 auto;
 		font-size: 16px;
 	}
-	.companyProfilewrap{
-		position:relative;
-		width:90%;
+
+	.companyProfilewrap {
+		position: relative;
+		width: 100%;
+	}
+
+	.companyProfile {
+		width: 100%;
+		height: 138px;
+		background: #F9F9FA;
+		font-size: 13px;
+		padding: 13px;
+		border-radius: 5px;
+		border: 1px solid #eeeeee;
 	}
-	.companyProfile{
-		width:100%;height:138px;
-		background:#F9F9FA;
-		font-size:13px;
-		padding:13px;
-		border-radius:5px;
+
+	.companyProfilecontent {
+		position: absolute;
+		bottom: 0px;
+		right: 20px;
+		font-size: 13px;
 	}
-	.companyProfilecontent{
-		position:absolute;
-		bottom:10px;
-		right:0px;
-		font-size:13px;
+
+	.content1-card {
+		background: linear-gradient(202deg, #D0FAE6 0%, #FFFFFF 100%);
+		height: 391rpx;
 	}
 </style>

pages/grain_pulse/home.vue

@@ -14,7 +14,7 @@
 					分布
 				</view>
 			</view>
-			<u-search :show-action="true" action-text="搜索" :animation="true"></u-search>
+			<u-search bg-color='#F5F6F9' :show-action="true" action-text="搜索" :animation="true"></u-search>
 			<!-- <view class="cu-bar search">
 				<view class="search-form round" @click="naviageToPage('/pages/grain_pulse/search')">
 					<image class='icon-scarch' src="../../static/img/liangmai/sousuo.png" mode=""></image>
@@ -241,7 +241,7 @@
 
 				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 						currentPage: 1,
-						pageSize: 3,
+						pageSize: 4,
 						searchKeyWord: this.keyword,
 						searchType: 2
 					})
@@ -413,7 +413,7 @@
 <style scoped>
 	/* 《--头部 */
 	.header {
-		padding: 0 12.5px;
+		padding: 0 25rpx 20rpx 25rpx;
 		background: #fff;
 		border-radius: 0 0 10px 10px;
 	}
@@ -422,7 +422,7 @@
 	/* 《--定位 */
 	.location {
 		width: 30rpx;
-		height: 35rpx;
+		height: 30rpx;
 		margin-right: 10rpx;
 	}
 
@@ -476,7 +476,7 @@
 	.friendcircle {
 		background: #fff;
 		margin: 0 9px;
-		border-radius: 4px;
+		border-radius: 20rpx;
 	}
 
 	.friendcircle .title {
@@ -491,8 +491,8 @@
 	}
 
 	.bg {
-		width: 200rpx;
-		height: 200rpx;
+		width: 220rpx;
+		height: 248rpx;
 	}
 
 	.friendcircle-content {
@@ -506,7 +506,7 @@
 	.friendcircle-content-right-item {
 		background: linear-gradient(90deg, #F5F6FA 0%, #FFFFFF 100%);
 		border-radius: 15rpx;
-		margin-bottom: 20rpx;
+		margin-bottom: 10rpx;
 		width: 420rpx;
 		font-size: 12px;
 		padding: 3px 0;
@@ -531,7 +531,7 @@
 	}
 
 	.typeitem {
-		margin: 10px;
+		margin: 20rpx 28rpx;
 		position: relative;
 		display: inline-block;
 		padding-top: 8px;
@@ -560,6 +560,7 @@
 		background: #fff;
 		margin: 10px;
 		padding: 15px 19px;
+		border-radius: 20rpx;
 	}
 
 	.listitem-left {
@@ -588,6 +589,8 @@
 		border-radius: 15px;
 		font-size: 12px;
 		/* width: 65%; */
+		background: #F5F6FA;
+		padding:8rpx 14rpx ;
 	}
 
 	.distance {

pages/grain_pulse/localtion/coordinate.nvue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="content">
 			<view class='address' @click='naviageToPage("/pages/grain_pulse/position/position")'>
-				<image class='location' src="@/static/img/liangmai/icon_ditu.png" mode=""></image>
+				<image class='location' src="@/static/img/liangmai/icon_ditu@2x.png" mode=""></image>
 				<text v-if="position.name" class="title-style">{{position.name}}</text>
 				<text v-else class="title-style">点击定位</text>
 			</view>
@@ -13,7 +13,7 @@
 		</view>
 		<view class="bottom">
 			<view class="bottom-left">
-				<text class="bottom-content">经度：{{position.longitude}}</text>
+				<text class="bottom-content bottom-content1">经度：{{position.longitude}}</text>
 				<text class="bottom-content">纬度：{{position.latitude}}</text>
 			</view>
 			<text class="config-btn" @click="config">确定</text>
@@ -173,6 +173,7 @@
 	.content {
 		flex: 1;
 		width: 750rpx;
+		background: white;
 	}
 
 	.bottom {
@@ -215,8 +216,17 @@
 	}
 	.address{
 		flex-direction: row;
-		margin-left: 80rpx;
+		align-items: center;
+		margin: 20rpx;
+		/* margin-left: 80rpx;
 		margin-top: 10rpx;
-		margin-bottom: 20rpx;
+		margin-bottom: 20rpx; */
+	}
+	.bottom-left{
+		flex-direction: row;
+		justify-content: space-between;
+	}
+	.bottom-content1{
+		margin-right: 40rpx;
 	}
 </style>

pages/grain_pulse/position/position.vue

@@ -5,7 +5,7 @@
 				<view class="select-city" @click="loadCity">{{city}}</view>
 				<u-icon size="20rpx" name="arrow-down"></u-icon>
 			</view>
-			<u-search input-align="left" @change="searchAddress" :show-action="false" height="70" placeholder="请输入位置信息"
+			<u-search bg-color='#F5F6F9' input-align="left" @change="searchAddress" :show-action="false" height="70" placeholder="请输入位置信息"
 				v-model="addressName"></u-search>
 		</view>
 		<view class="header2">
@@ -14,7 +14,7 @@
 			</view>
 			<view class="header2-content">
 				<view class="left Medium" @click="selectPosition">
-					<image style="width: 30rpx;height:30rpx;margin-top: 15rpx;" src="../../../static/img/liangmai/dingwei.png"></image>
+					<image style="width: 22rpx;height:22rpx;margin-top: 15rpx;" src="../../../static/img/liangmai/dingwei.png"></image>
 					<view style="padding-left: 15rpx;">{{address}}</view>
 					<view class="" v-if="isposition">{{text}}</view>
 				</view>

pages/user/user.vue

@@ -30,7 +30,7 @@
 				<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 					<image :src="item.src" class="sign"></image>
 
-					<text>{{item.name}}</text>
+					<text style="color: #333333;">{{item.name}}</text>
 				</view>
 			</view>
 		</view>
@@ -44,7 +44,7 @@
 							<text v-if='item.num==4&&taskTip' class='badge_user'>{{taskTip}}</text>
 							<image :src="item.src" class="sign1"></image>
 						</view>
-						<text>{{item.name}}</text>
+						<text style="color: #333333;">{{item.name}}</text>
 					</view>
 				</view>
 			</view>
@@ -707,12 +707,13 @@
 	.company {
 		position: fixed;
 		right: 0;
-		top: 13%;
+		top: 10%;
 		background: url('../../static/img/qiyebeijing.png');
 		background-size: 100%;
 		font-size: 11px;
 		padding-bottom: 5px;
 		padding-left: 10px;
+		border-radius: 40rpx 0 0 40rpx;
 	}
 
 	.company .icon {
@@ -734,6 +735,7 @@
 		background: url('~@/static/img/login/bg_slices/bg@3x.png');
 		background-size: 100% 100%;
 		margin: 0 auto;
+		height: calc(100vh - 0px);
 	}
 
 	.cu-tag.badge {
@@ -1082,8 +1084,8 @@
 	}
 
 	.headPortrait {
-		width: 75px;
-		height: 75px;
+		width: 112rpx;
+		height: 112rpx;
 		border-radius: 40px;
 		border: 2px solid #ffffff;
 	}
@@ -1096,7 +1098,7 @@
 	.information {
 		font-size: 15px;
 		font-weight: 600;
-		height: 36px;
+		height: 60rpx;
 	}
 
 	.indexlow {