uni_applet/App.vue

@@ -71,7 +71,7 @@
 		justify-content: space-between;
 	}
 	.align-item-center{
-		align-items: center;
+		align-items: center !important;
 	}
 	.detailedAddress{
 		width:600rpx;

uni_applet/components/loginPopUp/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<u-modal :show="showAuthorizePhone" :showConfirmButton="false">
-		 	<view class="slot-content">
+		 	<view class="slot-content phone-wrap">
 		 		<view class="auth-card">
 		 			<view class="img">
 		 				<img class="avatar-img" src="@/static/logo.png" mode="widthFix">
@@ -31,7 +31,7 @@
 					<view class="content">邀请您补全个人信息<br></br>（昵称、头像）</view>
 					<view style="margin-left: 100rpx;margin-right: 100rpx">
 						<u-form :model="userInfo" ref="uForm">
-							<u-form-item label="头像">
+							<u-form-item :rightclass='"rightclass"' bodypadding='0' label="头像">
 								<button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"
 									slot="right">
 									<image class="avatar"
@@ -39,7 +39,7 @@
 									</image>
 								</button>
 							</u-form-item>
-							<u-form-item label="昵称">
+							<u-form-item bodypadding='0' label="昵称">
 								<u-input inputAlign='right' v-model="userInfo.nickname" class="weui-input"
 									@blur="userNameInput" placeholder="请输入昵称" border="false" />
 								<!-- <input type="nickname" :value="userInfo.nickname" class="weui-input" @blur="userNameInput" placeholder="请输入昵称"/> -->
@@ -120,6 +120,10 @@
 		  open(){
 			this.showAuthorizePhone=true
 		  },
+		useropen(user){
+			this.userInfo=user
+			this.showAuthorizeUser=true
+		  },
 		  toDetail(){
 			this.showAuthorizePhone = false
 			uni.navigateTo({
@@ -168,15 +172,17 @@
 
 <style lang='scss' scoped>
 	.auth-btncard {
+		width:80%;
+		margin:40rpx auto 0;
 		display: flex !important;
 		justify-content: space-between !important;
 	
 		.btn-unok {
-			width: 40%;
+			width: 45%;
 		}
 	
 		.btn-ok {
-			width: 40%;
+			width: 45%;
 		}
 	}
 	
@@ -185,6 +191,7 @@
 	
 		.avatar-img {
 			width: 200rpx;
+			margin-bottom:30rpx;
 		}
 	
 		.title {
@@ -195,10 +202,12 @@
 			font-size: 32rpx;
 			font-weight: bold;
 			color: #1A1A1A;
-			margin-bottom: 30rpx;
+			margin-bottom: 60rpx;
 		}
 	}
-	
+	.phone-wrap .content {
+			margin-bottom: 100rpx;
+		}
 	.avatar-wrapper {
 		color: #333 !important;
 		border: none !important;
@@ -212,8 +221,8 @@
 	}
 	
 	.avatar {
-		width: 100rpx;
-		height: 100rpx;
+		width: 80rpx;
+		height: 80rpx;
 		overflow: hidden;
 		border-radius: 100%;
 	}
@@ -227,4 +236,8 @@
 	.slot-content{
 		width: 100%;
 	}
+	button{
+		line-height: 1;;
+	}
+	
 </style>

uni_applet/components/text-over-flow/text-over-flow.vue

@@ -124,7 +124,7 @@ export default {
 .button-show {
   width: 70rpx;
   position: absolute;
-  right: 0;
+  right: 8px;
   bottom: 0;
   z-index: 0;
   text-align: right;
@@ -134,6 +134,11 @@ export default {
 
 .fold-hint {
   color: #E95700;
-  text-align: right
+  text-align: right;
+  position:relative;
+  right:12px;
+}
+.text-overflow-content{
+	letter-spacing:1px;
 }
 </style>

uni_applet/pageA/enter/enter.vue

@@ -525,9 +525,11 @@
 	/deep/.u-popup__content {
 		border-radius: 20rpx !important;
 	}
-
+	
 	/deep/.u-tabbar-item image {
 		width: 40rpx;
 		height: 40rpx;
 	}
-</style>
+
+	
+</style>

uni_applet/pageA/find/createLifeService.vue

@@ -47,14 +47,14 @@
 					<u-input type='digit' inputAlign='right' maxlength="15" placeholder='输入联系电话' border='none' v-model="form.phone"  />
 				</u-form-item>
 				<u-form-item v-if='form.mainBody=="商铺"' labelWidth='80' labelPosition='top' label="营业执照">
-					<u-upload height='208' width='320' :fileList="fileList2" @afterRead="afterRead($event,1)" @delete="deletePic" name="2" multiple
+					<u-upload height='208' width='320' customStyle='align-items:center;' :fileList="fileList2" @afterRead="afterRead($event,1)" @delete="deletePic" name="2" multiple
 						:maxCount="1">
 						<image style='width:594rpx;height:378rpx;' src="../../static/image/find/yingyezhizhao.png" mode=""></image>
 						</u-upload>
 				</u-form-item>
 				<view v-if='form.mainBody=="个人"' class='caution'>注：如提供风险类服务，请上传身份证信息</view>
 				<u-form-item  v-if='form.mainBody=="个人"' labelWidth='120' labelPosition='top' label="身份证头像面">
-					<u-upload height='208' width='320' :fileList="fileList4" @afterRead="afterRead($event,2)" @delete="deletePic" name="4" multiple
+					<u-upload height='208' width='320':diyAlignItems='"center"' :fileList="fileList4" @afterRead="afterRead($event,2)" @delete="deletePic" name="4" multiple
 						:maxCount="1">
 						<view class="bgc">
 							<image class='circle' style='width:123rpx;height:123rpx;' src="../../static/image/find/camera.png" mode=""></image>
@@ -63,7 +63,7 @@
 						</u-upload>
 				</u-form-item>
 				<u-form-item  v-if='form.mainBody=="个人"' labelWidth='120' labelPosition='top' label="身份证国徽面">
-					<u-upload  height='208' width='320' :fileList="fileList6" @afterRead="afterRead($event,3)" @delete="deletePic" name="6" multiple
+					<u-upload  height='208' width='320' :diyAlignItems='"center"' :fileList="fileList6" @afterRead="afterRead($event,3)" @delete="deletePic" name="6" multiple
 						:maxCount="1">
 						<view class="bgc1">
 							<image class='circle' style='width:123rpx;height:123rpx;' src="../../static/image/find/camera.png" mode=""></image>
@@ -122,25 +122,17 @@
 		},
 		onLoad() {
 			that = this
+			this.form.commonId = uni.getStorageSync("userInfo").id
 		},
 		onShow() {
 			
 		},
 		methods: {
 			submit(){
-				uni.showModal({
-					title:'123',
-					success: () => {
-							console.log(123)
-					}
-				})
-				
-				
-				
 				if(this.form.mainBody=='商铺'){
-					this.content='确定提交店铺信息'
+					this.content='确定提交店铺信息？'
 				}else{
-					this.content='确定提交服务信息'
+					this.content='确定提交服务信息？'
 				}
 				if(this.form.mainBody=='商铺'&&this.form.shopNames.length<2||this.form.mainBody=='商铺'&&this.form.shopNames.length>15){
 					uni.showToast({
@@ -386,4 +378,7 @@
  		font-size: 20px !important;
  	}
  }
+ /deep/view.align-item-center1{
+	 align-items: center !important;
+ }
 </style>

uni_applet/pageA/find/edit.vue

@@ -159,9 +159,9 @@
 			},
 			submit(){
 				if(this.form.mainBody=='商铺'){
-					this.content='确定修改店铺信息'
+					this.content='确定修改店铺信息？'
 				}else{
-					this.content='确定修改服务信息'
+					this.content='确定修改服务信息？'
 				}
 				if(this.form.mainBody=='商铺'&&this.form.shopNames.length<2||this.form.mainBody=='商铺'&&this.form.shopNames.length>15){
 					uni.showToast({

uni_applet/pageA/login/index.vue

@@ -23,6 +23,7 @@
 							class="path" hover-class="navigator-hover">用户服务协议和隐私政策</navigator>
 			</view>
 		</view>
+		<login-pop-up ref='loginpopup' :content='"手机登录后才能查看我的哦~"'></login-pop-up>
 		<u-modal :show="showAuthorizeUser" :showConfirmButton="false">
 			<view class="slot-content">
 				<view class="auth-card">
@@ -63,11 +64,15 @@
 
 <script>
 	var that
+	import loginPopUp from "@/components/loginPopUp/index.vue"
 	import {
 		pathToBase64,
 		base64ToPath
 	} from 'image-tools'
 	export default {
+		components: {
+			loginPopUp
+		},
 	 data() {
 	 	return {
 	 		userInfo: {
@@ -129,7 +134,8 @@
 				console.log(that.userInfo,1111)
 				that.userInfo.phone = await this.$request.getPhone(e, that.userInfo)
 				console.log(that.userInfo,2222)
-				this.showAuthorizeUser = true
+				this.$refs.loginpopup.useropen(that.userInfo)
+				// this.showAuthorizeUser = true
 		  },
 		  custom(){
 			  uni.showToast({
@@ -182,57 +188,6 @@
 	/deep/.u-radio-group{
 		flex: 0.7 !important;
 	}
-	.auth-btncard {
-		display: flex !important;
-		justify-content: space-between !important;
-	
-		.btn-unok {
-			width: 40%;
-		}
-	
-		.btn-ok {
-			width: 40%;
-		}
-	}
-	
-	.auth-card {
-		text-align: center;
-	
-		.avatar-img {
-			width: 200rpx;
-		}
-	
-		.title {
-			font-size: 20rpx;
-		}
-	
-		.content {
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #1A1A1A;
-			margin-bottom: 30rpx;
-		}
-	}
-	
-	.avatar-wrapper {
-		color: #333 !important;
-		border: none !important;
-		border-radius: 0 !important;
-		background-color: transparent !important;
-		padding: 0;
-	}
-	
-	.avatar-wrapper::after {
-		border: none !important;
-	}
-	
-	.avatar {
-		width: 80rpx;
-		height: 80rpx;
-		overflow: hidden;
-		border-radius: 100%;
-	}
-	
 	/deep/.u-popup__content {
 		border-radius: 20rpx !important;
 	}
@@ -242,4 +197,7 @@
 	/deep/.u-input{
 		padding:0 !important;
 	}
+	/deep/.u-form-item__body__right.rightclass{
+		flex:0.7  !important;
+	}
 </style>

uni_applet/pages/find/find.vue

@@ -31,39 +31,42 @@
 						</view>
 					</view>
 				</u-swiper>
-				<view class='findItem' v-for='item in findList'>
-					<view style='align-items: flex-start;' class='flex'>
-						<view class="left">
-							<view class='cover'>
-								<u--image radius='4' :showLoading="true" :src="item.coverImage" width="86px"
-									height="86px" @click="click"></u--image>
+				<view style='margin:20rpx 10rpx;'>
+					<view class='findItem' v-for='item in findList'>
+						<view style='align-items: flex-start;' class='flex'>
+							<view class="left">
+								<view class='cover'>
+									<u--image radius='4' :showLoading="true" :src="item.coverImage" width="86px"
+										height="86px" @click="imageclick(item.coverImage)"></u--image>
+								</view>
+							</view>
+							<view class="right">
+								<view class='flex'>
+									<view :class="item.mainBody=='商铺'?'main-body':'main-body1'">
+										{{item.mainBody=="商铺"?'商铺':'个人'}}
+									</view>
+									<!-- <view v-if='item.mainBody=="商铺"' class='iconfont applet-dianpu1'></view>
+									<u--image v-if='item.mainBody=="个人"' :showLoading="true" src="/static/image/find/geren.png" width="20px" height="20px"></u--image> -->
+									<view class='name'>{{item.shopNames}}</view>
+								</view>
+								<view class='description'>
+									<mote-lines-divide :dt="item.serviceDescription" :line="3" expandText="展开"
+										foldHint="收起" />
+								</view>
 							</view>
 						</view>
-						<view class="right">
+						<view class='address flex justify-space-between'>
 							<view class='flex'>
-								<view class="main-body">
-									{{item.mainBody=="商铺"?'商铺':'个人'}}
-								</view>
-								<!-- <view v-if='item.mainBody=="商铺"' class='iconfont applet-dianpu1'></view>
-								<u--image v-if='item.mainBody=="个人"' :showLoading="true" src="/static/image/find/geren.png" width="20px" height="20px"></u--image> -->
-								<view class='name'>{{item.shopNames}}</view>
+								<view class='iconfont applet-dizhi'></view>
+								<view @click.stop="toShopDetail(item)">{{item.detailedAddress}}</view>
 							</view>
-							<view class='description'>
-								<mote-lines-divide :dt="item.serviceDescription" :line="3" expandText="展开"
-									foldHint="收起" />
+							<view>{{item.distance1>1000?item.distance:item.distance1}}
+								<text style='font-weight:600;'>{{item.distance1>1000?'km':'m'}}</text>
 							</view>
 						</view>
 					</view>
-					<view class='address flex justify-space-between'>
-						<view class='flex'>
-							<view class='iconfont applet-dizhi'></view>
-							<view @click.stop="toShopDetail(item)">{{item.detailedAddress}}</view>
-						</view>
-						<view>{{item.distance1>1000?item.distance:item.distance1}}
-							<text style='font-weight:600;'>{{item.distance1>1000?'km':'m'}}</text>
-						</view>
-					</view>
 				</view>
+				
 			</mescroll-uni>
 			<!-- <mescroll-body ref="mescrollRef" :up="upOption" :down="downOption" @init="mescrollInit" @up="upCallback" @down="downCallback"></mescroll-body> -->
 		</view>
@@ -153,6 +156,13 @@
 			}
 		},
 		methods: {
+			imageclick(url){
+				console.log(1111)
+				uni.previewImage({
+					current: 0,
+					urls: [url]
+				})
+			},
 			swiperClick(e){
 				console.log(e)
 				if(e==0){
@@ -314,9 +324,9 @@
 						that.handleList[i].distance1 = JSON.parse(JSON.stringify(that.handleList[i].distance))
 						that.handleList[i].distance = (that.handleList[i].distance / 1000).toFixed(1)
 						console.log(that.handleList)
-						that.findList = that.handleList
 						that.loading = false
 					}
+					that.findList=that.findList.concat(that.handleList)
 				}
 				uni.hideLoading()
 				that.$nextTick(() => {
@@ -433,7 +443,7 @@
 		padding: 20rpx;
 		font-size: 32rpx;
 
-		.main-body {
+		.main-body,.main-body1 {
 			color: #E95700;
 			background: #FDF2E5;
 			font-size: 12px;
@@ -441,7 +451,10 @@
 			box-sizing: border-box;
 			border-radius: 10rpx;
 		}
-
+		.main-body1{
+			color: #FDB65C;
+			background: #F6F9E9;
+		}
 		.left {
 			margin-right: 20rpx;
 
@@ -458,7 +471,7 @@
 			white-space: nowrap;
 			width: 55vw;
 			font-weight: 600;
-			letter-spacing: 3rpx;
+			// letter-spacing: 3rpx;
 		}
 
 		.description {

uni_applet/pages/food/food.vue

@@ -43,7 +43,7 @@
 						<view class='name'>{{item.shopNames}}</view>
 					</view>
 					<view style='align-items: flex-start;' class='flex' >
-						<view style='width:100vw;' class="left flex">
+						<view style='width:100vw;' class="left flex " :class='item.foodDishesInfoList.length==4?"justify-space-between":""'>
 							<!-- @click.stop='previewImg(item1)' -->
 							<view v-for='item1 in item.foodDishesInfoList' class="img">
 								<u--image radius='4' :showLoading="true" :src="item1.dishImage" width="150rpx"
@@ -222,7 +222,7 @@
 			},
 			delSearchVal() {
 				this.searchVal = ''
-				uni.removetorageSync("search_food_val")
+				uni.removeStorageSync("search_food_val")
 				that.mescroll.resetUpScroll()
 			},
 			isdingwei() {
@@ -403,7 +403,8 @@
 							that.handleList[i].foodDishesInfoList = that.handleList[i].foodDishesInfoList.splice(0, 4)
 						}
 					}
-					that.findList = that.handleList
+					
+					that.findList = that.findList.concat(that.handleList)
 
 				} else {
 					uni.hideLoading()
@@ -512,6 +513,12 @@
 		.img{
 			margin: 10rpx;
 		}
+		.left .img:first-child{
+			margin-left:0;
+		}
+		.left .img:last-child{
+			margin-right:0;
+		}
 		.detailedAddress {
 			width: 70vw;
 			overflow: hidden;

uni_applet/uni_modules/uview-ui/components/u-form-item/props.js

@@ -9,10 +9,18 @@ export default {
 			type: String,
 			default: uni.$u.props.formItem.uclass
 		},
+		rightclass:{
+			type: String,
+			default: uni.$u.props.formItem.rightclass
+		},
         // 绑定的值
         prop: {
             type: String,
             default: uni.$u.props.formItem.prop
+        },
+		bodypadding: {
+            type: String,
+            default: uni.$u.props.formItem.bodypadding
         },
         // 是否显示表单域的下划线边框
         borderBottom: {

uni_applet/uni_modules/uview-ui/components/u-form-item/u-form-item.vue

@@ -5,7 +5,7 @@
 			@tap="clickHandler"
 			:style="[$u.addStyle(customStyle), {
 				flexDirection: (labelPosition || parentData.labelPosition) === 'left' ? 'row' : 'column'
-			}]"
+			,padding:bodypadding?bodypadding+'rpx':'10px 0'}]"
 		>
 			<!-- 微信小程序中，将一个参数设置空字符串，结果会变成字符串"true" -->
 			<slot name="label">
@@ -43,7 +43,7 @@
 					</view>
 				</view>
 			</slot>
-			<view class="u-form-item__body__right">
+			<view :class="'u-form-item__body__right '+rightclass">
 				<view class="u-form-item__body__right__content">
 					<view  class="u-form-item__body__right__content__slot">
 						<slot />

uni_applet/uni_modules/uview-ui/components/u-upload/props.js

@@ -14,6 +14,10 @@ export default {
         compressed: {
             type: Boolean,
             default: uni.$u.props.upload.compressed
+        },
+		diyAlignItems: {
+            type: String,
+            default: uni.$u.props.upload.diyAlignItems
         },
         // 当accept为video时生效，可选值为back或front
         camera: {

uni_applet/uni_modules/uview-ui/components/u-upload/u-upload.vue

@@ -90,9 +90,10 @@
 			</template>
 			
 			<template v-if="isInCount">
-				<view
-				    v-if="$slots.default || $slots.$default"
+				<view 
+				v-if="$slots.default || $slots.$default"
 				    @tap="chooseFile"
+				   
 				>
 					<slot />
 				</view>

uni_applet/util/util.js

@@ -65,6 +65,7 @@ export function throttle(fn, gapTime) {
 		}
 	}
 }
+ 
 
 export function authorizedLocation() {
 	return new Promise((resolve, reject) => {