Merge branch 'showroom-order'

api/reservation/reservation-request.js

@@ -9,6 +9,7 @@ import {
 //const baseUrl = 'https://feihe.jzvcode.com/feihe';
 //const baseUrl = 'https://factory-walk-test.feihe.com/feihe';
 const baseUrl = 'https://factory-walk.feihe.com/feihe';
+//const baseUrl = 'https://factory-walk-uat.feihe.com/feihe';
 
 const request = (options = {}) => {
   // 对options.data 进行一些处理 

reservation/home/index.less

@@ -81,8 +81,8 @@
     height: 200rpx;
     overflow: hidden;
     image {
-      width: 54rpx;
-      height: 54rpx;
+      width: 58rpx;
+      height: 58rpx;
     }
   }
 }

reservation/home/index.vue

@@ -24,13 +24,13 @@
       <view class="footer-item blur-bg" @click="gofeihe()">
         <view>
           <image
-            style="width: 59rpx; height: 59rpx"
-            src="@/assets/reservation-images/twitter.png"
+            style="width: 64rpx; height: 64rpx"
+            src="@/assets/reservation-images/twitter_new.png"
             mode="widthFix"
           >
           </image>
         </view>
-        <view>了解飞鹤</view>
+        <view style="margin-top:4rpx;">了解飞鹤</view>
       </view>
       <view
         class="footer-item blur-bg"
@@ -38,11 +38,11 @@
       >
         <view>
           <image
-            src="@/assets/reservation-images/briefcase.png"
+            src="@/assets/reservation-images/briefcase_new.png"
             mode="widthFix"
           ></image>
         </view>
-        <view>现在预约</view>
+        <view style="margin-top:4rpx;">现在预约</view>
       </view>
       <view
         class="footer-item blur-bg"
@@ -50,11 +50,11 @@
       >
         <view>
           <image
-            src="@/assets/reservation-images/calendar.png"
+            src="@/assets/reservation-images/calendar_new.png"
             mode="widthFix"
           ></image>
         </view>
-        <view>预约记录</view>
+        <view style="margin-top:4rpx;">预约记录</view>
       </view>
     </view>
     <!-- 底部箭头 -->
@@ -98,7 +98,6 @@ const changeCurrent = () => {
 
 const handleScrollChange = (e) => {
   console.log(e)
-  console.log(123)
   current.value = e.detail.current
 }