前端

uni_applet/pages.json

@@ -84,7 +84,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#fbb612",
+		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {},

uni_applet/pages/find/find.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style='padding-bottom:150rpx;'>
 		<view class="flex content1">
 			<view @click='placeSelect' class='address flex'>
 			<view class='detailedAddress'>{{detailedAddress}}</view>
@@ -19,7 +19,7 @@
 				</view>
 			</view>
 		</view>
-		<view style='margin-top:112rpx;'>
+		<view style='margin-top:106rpx;'>
 			<u-swiper :list="fileList"
 			autoplay
 			:height='height'
@@ -39,7 +39,7 @@
 		</view>
 		<view>
 			<mescroll-uni :up="upOption" :down="downOption" ref="mescrollRef" @init="mescrollInit"
-				@up="upCallback" @down="downCallback" height="960">
+				@up="upCallback" @down="downCallback" height="660">
 				<view class='findItem' v-for='item in findList'>
 					<view style='align-items: flex-start;' class='flex'>
 						<view class="left">
@@ -222,19 +222,15 @@
 						})
 						
 						var finddata=await that.getfindList(page)
-						console.log(finddata,0)
 						if (page.num == 1) that.findList = [],that.handleList = [];
 						that.curPageLen = finddata.data.items.length;
 						that.handleList = finddata.data.items
 						that.totalPage = finddata.data.total;
 						for(var i=0;i<that.handleList.length;i++){
-							console.log(111)
 							that.handleList[i].latitude=that.handleList[i].location.split(',')[0]
 							that.handleList[i].longitude=that.handleList[i].location.split(',')[1]
-							var data=await that.getDistance(that.handleList[i].latitude,that.handleList[i].longitude) 
-							console.log(222)
-							that.handleList[i].distance=(data.distance/1000).toFixed(2)
-							console.log(data,i==that.handleList.length-1,111111111111)
+							// var data=await that.getDistance(that.handleList[i].latitude,that.handleList[i].longitude) 
+							that.handleList[i].distance=(that.handleList[i].distance/1000).toFixed(2)
 							if(i==that.handleList.length-1){
 								setTimeout(()=>{
 									console.log(that.handleList)
@@ -301,7 +297,7 @@
 		top:0;
 		left:0;
 		padding: 20rpx;
-		background-color: #fbb612;
+		background-color: #fff;
 		z-index:99;
 		width:95vw;
 		.search {
@@ -333,8 +329,8 @@
 	}
 	.search-wrap{
 		width:78%;
-		background: #ffff;
-		border: 1px solid #f9d27d;
+		background: #f9f9f9;
+		// border: 1px solid #f9d27d;
 		border-radius: 50rpx;
 	}
 	.address{

uni_merchants_enter/manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx5d8906c2208c899f",
+        "appid" : "wxa88225ca7712d558",
         "setting" : {
             "urlCheck" : false
         },
@@ -60,7 +60,7 @@
                 "desc" : "为用户提供给接送服务，需要定位信息"
             }
         },
-		"requiredPrivateInfos" : [ "getLocation", "chooseLocation", "chooseAddress" ]
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation", "chooseAddress" ]
     },
     "mp-alipay" : {
         "usingComponents" : true

uni_merchants_enter/pageA/enter/myHomestay/index.vue

@@ -1,15 +1,31 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view class='wrap'>
+			<view></view>
+			<view>
+				
+			</view>
+		</view>
+		<view>
+			<view class='button'>一键刷新</view>
+			<view class='button'>添加民宿</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	var that
 	export default {
 		data() {
 			return {
 				
 			}
+		},
+		onLoad() {
+			that = this
+		},
+		onShow(){
+			
 		},
 		methods: {
 			

uni_merchants_enter/pages/enter/enter.vue

@@ -160,7 +160,7 @@
 								cuIcon: 'zufang',
 								color: 'blue',
 								name: '民宿',
-								url: '/pageA/enter/homestay'
+								url: '/pageA/enter/myHomestay/index'
 							},
 							{
 						        cuIcon: 'jiudian-38',

uni_merchants_enter/util/request.js

@@ -124,7 +124,7 @@ const wxlogin = () => {
 const getPhone = (e, userInfo) => {
 	let promise = new Promise(function(resolve, reject) {
 		if (e.mp.detail.errMsg === "getPhoneNumber:ok") {
-			let appId = 'wx5d8906c2208c899f'
+			let appId = 'wxa88225ca7712d558'
 			let sessionKey = userInfo.sessionKey
 			let encryptedData = e.mp.detail.encryptedData
 			let iv = e.mp.detail.iv