achao 1 рік тому
батько
коміт
d38de26c4d

+ 2 - 2
uni_applet/config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.110.72:8182',
 	// baseUrlNew: 'http://192.168.110.138:8182',
-	baseUrlNew: 'http://192.168.110.138:8183',
-	// baseUrlNew: 'http://192.168.110.82:8182',
+	// baseUrlNew: 'http://192.168.110.138:8183',
+	baseUrlNew: 'http://192.168.110.82:8183',
 	// baseUrlNew: 'https://cardapi.eliangeyun.com',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 2 - 2
uni_applet/pageA/food/detailMap.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<map style="width: 100%; height: 100vh;" :show-location='true' ref="map" id="map" :latitude="latitude"
-			:longitude="longitude" :markers="marker" :scale="scale" :polyline="polyline" @callouttap='toDL(dataObj)'>
+		<map style="width: 100%; height: 100vh;" :show-location='true' ref="map" id="map" :latitude="dataObj.latitude"
+			:longitude="dataObj.longitude" :markers="marker" :scale="scale" :polyline="polyline" @callouttap='toDL(dataObj)'>
 			<cover-view slot="callout">
 				<block v-for="(item,index) in marker" :key="index">
 					<cover-view class="customCallout" :marker-id="item.id">

+ 62 - 45
uni_applet/pageA/food/menu.vue

@@ -1,23 +1,24 @@
 <template>
 	<view class="content">
-
-		<view class="">
-			<view style='margin:20rpx;'>
+		<view style="padding: 20rpx;">
+			<view>
 				<u-search placeholder="搜索美食" v-model="keyword" clearabled :show-action='false'></u-search>
 			</view>
-			
+
 			<view class="head flex">
 				<image :src="dataObj.coverImage" style="width:60rpx;height:60rpx;border-radius:50%;"></image>
 				<view class="right">
 					{{dataObj.shopNames}}
 				</view>
 			</view>
-			<view class="wrap" v-if="dataObj.dishClassifyInfoList&&dataObj.dishClassifyInfoList.length>0">
-				<view class="item1" v-for="item in dataObj.dishClassifyInfoList" v-if="item.foodDishesInfoList&&item.foodDishesInfoList.length>0">
+			<view class="wrap1" v-if="dataObj.dishClassifyInfoList&&dataObj.dishClassifyInfoList.length>0">
+				<view class="item1" v-for="item in dataObj.dishClassifyInfoList"
+					v-if="item.foodDishesInfoList&&item.foodDishesInfoList.length>0">
 					<view style='font-weight:600;' class="row">
 						{{item.classifyName}}
 					</view>
-					<view style='flex-wrap: wrap;' class="flex" v-if="item.foodDishesInfoList&&item.foodDishesInfoList.length>0">
+					<view style='flex-wrap: wrap;' class="flex"
+						v-if="item.foodDishesInfoList&&item.foodDishesInfoList.length>0">
 						<view class="item2" v-for="item1 in item.foodDishesInfoList">
 							<image :src="item1.dishImage" mode="" class="img"></image>
 							<view class="bottom">
@@ -31,7 +32,7 @@
 									暂无价格
 								</view>
 							</view>
-							
+
 						</view>
 					</view>
 				</view>
@@ -42,9 +43,9 @@
 				<text>营业时间:</text>
 				<text>{{dataObj.startDate}}~{{dataObj.startDate}}</text>
 			</view>
-			<view @click='toTel' v-if='dataObj.contactsPhone'  class="right flex align-item-center">
-				<view style='position:relative;top:4rpx;'><u-icon name="phone" color='#fff'></u-icon></view>
-				<view>电话订餐</view>
+			<view @click='toTel' v-if='dataObj.contactsPhone' class="right flex align-item-center">
+				<view style=''><u-icon name="phone" color='#fff' size="20"></u-icon></view>
+				<view style="font-size: 36rpx;">电话订餐</view>
 			</view>
 		</view>
 	</view>
@@ -69,26 +70,33 @@
 
 		},
 		methods: {
-			toTel(){
+			toTel() {
 				that.$request.baseRequest('admin.tourism.phoneRecordInfo', 'add', {
-					commonId:uni.getStorageSync("userInfo").id,
-					phone:this.dataObj.contactsPhone
-				
+					phoneRecordInfo: JSON.stringify({
+						commonId: uni.getStorageSync("userInfo").id,
+						phone: this.dataObj.contactsPhone
+					})
 				}, failres => {
 					uni.showToast({
 						icon: "none",
 						title: failres.errmsg,
 						duration: 3000
 					});
-				
+
 				}).then(res => {
-					
-				
+					uni.makePhoneCall({
+						phoneNumber: this.dataObj.contactsPhone, // 成功回调
+						success: (res) => {
+							console.log('调用成功!')
+						},
+						// 失败回调
+						fail: (res) => {
+							console.log('调用失败!')
+						}
+					})
+
 				})
-				// uni.makePhoneCall({phoneNumber: this.dataObj.contactsPhone, // 成功回调
-				// success: (res) => {console.log('调用成功!')	},
-				// // 失败回调
-				// fail: (res) => {console.log('调用失败!')}})
+
 			},
 			init() {
 				uni.showLoading({
@@ -118,86 +126,95 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	page {
 		background: #fff;
 	}
 
 	.content {
 		box-sizing: border-box;
+		background: #fff;
+		padding-bottom: 200rpx;
+
 	}
 
 	.head {
-		padding: 20rpx;
+		padding: 20rpx 0;
 
 		.right {
 			margin-left: 20rpx;
 		}
 	}
 
-	.wrap {
-		.item1{
-			// margin-bottom: 20rpx;
-		}
-		.item1 .row{
+	.wrap1 {
+		.item1 .row {
 			position: relative;
 			padding-left: 20rpx;
 			margin: 20rpx;
 		}
-		.item1 .row:before{
+
+		.item1 .row:before {
 			position: absolute;
 			content: '';
 			background: #fbb612;
 			width: 6rpx;
 			height: 40rpx;
-			    top: 2px;
-			    left: 0px;
+			top: 2px;
+			left: 0px;
 		}
+
 		.item2 {
 			display: inline-block;
-			width: calc(50vw - 60rpx);
+			width: calc(50vw - 40rpx);
 			margin: 10rpx;
 			box-shadow: 0px 1px 2px 0px #ccc;
 			border-radius: 20rpx;
-			.bottom{
+
+			.bottom {
 				padding: 20rpx;
-				.name{
+
+				.name {
 					margin-bottom: 20rpx;
 				}
-				.price{
+
+				.price {
 					color: #fbb612;
 				}
 			}
 		}
 
 		.img {
-			border-radius: 20rpx 20rpx 0 0 ;
-			width: calc(50vw - 60rpx);
-			height: calc(50vw - 60rpx);
+			border-radius: 20rpx 20rpx 0 0;
+			width: calc(50vw - 40rpx);
+			height: calc(50vw - 40rpx);
 			// width: 344rpx;
 			// height: 344rpx;
 		}
 
 	}
-	.bottom-wrap{
+
+	.bottom-wrap {
 		position: fixed;
 		width: 100vw;
 		bottom: 0;
 		display: flex;
-		.left{
-			
+		background-color: red;
+
+		.left {
+
 			padding: 40rpx;
 			background: #f7f4ed;
 			width: 60vw;
 			box-sizing: border-box;
-			
+
 		}
-		.right{
+
+		.right {
 			box-sizing: border-box;
 			padding: 40rpx;
 			width: 40vw;
 			background: #fbb612;
-			color:#fff;
+			color: #fff;
 		}
 	}
 </style>

+ 6 - 3
uni_applet/pages/food/food.vue

@@ -52,7 +52,7 @@
 
 						</view>
 					</view>
-					<view class="tag-type flex">
+					<view class="tag-type1 flex">
 						<text class="text" v-for='item1 in item.labels'> {{item1}}</text>
 					</view>
 					<view class='address flex justify-space-between'>
@@ -507,6 +507,7 @@
 			// margin-top: 30rpx;
 			width: 100%;
 			color: #393733;
+			// margin-top: 20rpx;
 		}
 		.img{
 			margin: 10rpx;
@@ -577,9 +578,11 @@
 			font-size: 24rpx;
 		}
 	}
-
+	.tag-type1{
+		margin: 20rpx 0
+	}
 	.tag-type {
-		margin: 20rpx 0;
+		// margin: 20rpx 0;
 		.text {
 			border-radius: 4px;
 			background-color: #FDF2E5;