前端

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/text-over-flow/text-over-flow.vue

@@ -134,7 +134,9 @@ export default {
 
 .fold-hint {
   color: #E95700;
-  text-align: right
+  text-align: right;
+  position:relative;
+  right:12px;
 }
 .text-overflow-content{
 	letter-spacing:1px;

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,6 +122,7 @@
 		},
 		onLoad() {
 			that = this
+			this.form.commonId = uni.getStorageSync("userInfo").id
 		},
 		onShow() {
 			
@@ -129,9 +130,9 @@
 		methods: {
 			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({
@@ -377,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/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="imageclick(item.coverImage)"></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>
@@ -321,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(() => {
@@ -440,7 +443,7 @@
 		padding: 20rpx;
 		font-size: 32rpx;
 
-		.main-body {
+		.main-body,.main-body1 {
 			color: #E95700;
 			background: #FDF2E5;
 			font-size: 12px;
@@ -448,7 +451,10 @@
 			box-sizing: border-box;
 			border-radius: 10rpx;
 		}
-
+		.main-body1{
+			color: #FDB65C;
+			background: #F6F9E9;
+		}
 		.left {
 			margin-right: 20rpx;
 
@@ -465,7 +471,7 @@
 			white-space: nowrap;
 			width: 55vw;
 			font-weight: 600;
-			letter-spacing: 3rpx;
+			// letter-spacing: 3rpx;
 		}
 
 		.description {

uni_applet/pages/food/food.vue

@@ -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()

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>