Style：UI优化

components/DateRangePicker/DateRangePicker.vue

@@ -3,9 +3,12 @@
     <u-popup :show="show" @close="handleClose" mode="center" round="16" closeable>
       <view class="picker-container">
         <view class="picker-header">
-          <text class="title">选择日期范围</text>
+          <text class="title">查看可预约日期</text>
+        </view>
+        <view class="v12-my-3">
+          <text class="v12-font-28 v12-dark-text v12-mr-3">请选择入住日期</text>
+          <text class="v12-font-28 v12-primary-text">{{ `  共计${minBookingDays}天  ` }}</text>
         </view>
-
         <view class="calendar">
           <view class="calendar-header">
             <view class="month-nav">
@@ -14,7 +17,7 @@
               <text class="nav-btn" @click="changeMonth(1)">〉</text>
             </view>
             <view class="weekdays">
-              <text v-for="day in ['日', '一', '二', '三', '四', '五', '六']" :key="day" class="weekday">
+              <text v-for="day in ['日', '一', '二', '三', '四', '五', '六']" :key="day" class="weekday v12-dark-text">
                 {{ day }}
               </text>
             </view>
@@ -496,7 +499,7 @@ export default {
       .month-nav {
         display: flex;
         align-items: center;
-        justify-content: space-between;
+        justify-content: space-evenly;
         margin-bottom: 20rpx;
         padding: 0 20rpx;
 

pkg_product/views/groupBuyDetails.vue

@@ -78,7 +78,12 @@
           <view class="v12-mt-3">
             <view v-for="(c, i) in detail.packageDetails" :key="i" class="package-item v12-mb-2">
               <view class="grid-txt v12-justify-between v12-align-center">
-                <view class="v12-px-2 v12-py-1"><u-icon name="home"></u-icon></view>
+                <view class="v12-px-2 v12-py-1">
+                  <u-icon v-if="c.type === 'steward'" :name="webUrl + '/home/我.png'"></u-icon>
+                  <u-icon v-if="c.type === 'hotel'" :name="webUrl + '/home/1home.png'"></u-icon>
+                  <u-icon v-if="c.type === 'food'" :name="webUrl + '/home/coffee.png'"></u-icon>
+                  <u-icon v-if="c.type === 'ride'" :name="webUrl + '/home/che.png'"></u-icon>
+                </view>
                 <view class="v12-px-2 v12-py-1 v12-white v12-radius-100">{{ c.title }}</view>
               </view>
               <swiper 
@@ -106,7 +111,10 @@
 
       <view class="v12-px-3 v12-mt-3">
         <view class="section v12-radius-60 v12-white v12-px-3 v12-pt-3">
-          <view class="v12-font-bold v12-font-36">套餐亮点</view>
+          <view class="v12-mt-2 v12-pl-2 v12-font-bold v12-font-36 v12-align-center title-wrap">
+            <text class="v12-mr-1">预定必读</text>
+            <u-icon bold size="18" color="#333" name="info-circle"></u-icon>
+          </view>
           <view class="v12-mt-3 v12-font-26">
             <rich-text :nodes="rules"></rich-text>
           </view>
@@ -307,13 +315,13 @@ export default {
     contactService() {
       uni.showModal({
         title: '商家电话',
-        content: this.detail.phone || '暂无电话',
+        content: this.detail.merPhone || '暂无电话',
         confirmText: '立即拨打',
         cancelText: '取消',
         success: (res) => {
-          if (res.confirm && this.detail.phone) {
+          if (res.confirm && this.detail.merPhone) {
             uni.makePhoneCall({
-              phoneNumber: this.detail.phone,
+              phoneNumber: this.detail.merPhone,
               fail: () => {
                 uni.showToast({
                   title: '拨打电话失败',
@@ -692,4 +700,17 @@ export default {
 .table-cell:last-child {
   border-right: 0;
 }
+.title-wrap{
+  position: relative;
+  &::after{
+    content: '';
+    position: absolute;
+    bottom: 4rpx;
+    left: 0;
+    width: 6rpx;
+    height: 80%;
+    border-radius: 10rpx;
+    background: #CE4852;
+  }
+}
 </style>

pkg_product/views/housekeeperDetail.vue

@@ -49,7 +49,7 @@
           {{ record.intro }}
         </view>
         <view class="v12-mt-3 service-wrap v12-pa-3">
-          <view>
+          <view class="title-wrap" style="padding-left: 12rpx;">
             <text class="v12-font-30 v12-font-bold">金牌管家</text>
             <text class="v12-font-24" style="color: #666">/ 服务保障</text>
           </view>
@@ -60,9 +60,11 @@
         <view class="v12-mt-3">
           <view class="v12-font-bold v12-font-32 v12-dark-text">TA能帮你</view>
           <view class="v12-pa-3 icon-grid">
-            <view v-for="item in 8" :key="item" class="service-icon-item">
+            <view v-for="(item, index) in record.travelStewardServiceList" :key="index" class="service-icon-item">
-              <view class="service-icon"></view>
+              <view class="service-icon">
-              <view class="v12-font-24 v12-mt-2 v12-weight-500">设计行程</view>
+                <u-icon :name="item.serviceIcon" size="30"></u-icon>
+              </view>
+              <view class="v12-font-24 v12-mt-2 v12-weight-500">{{ item.serviceName }}</view>
             </view>
           </view>
         </view>
@@ -275,6 +277,9 @@ export default {
   height: 88rpx;
   background: #FADE9F;
   border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .icon-grid{
   display: grid;
@@ -306,4 +311,17 @@ export default {
   align-items: center;
   justify-content: center;
 }
+.title-wrap{
+  position: relative;
+  &::after{
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 6rpx;
+    height: 80%;
+    border-radius: 10rpx;
+    background: #CE4852;
+  }
+}
 </style>

pkg_product/views/sojoumStore.vue

@@ -1306,12 +1306,13 @@ export default {
   right: 0;
   margin: auto;
   text-align: center;
+  background: rgba(0,0,0,0.3);
 }
 .gg{
   border-radius: 120rpx;
   background: #FADE9F;
   padding: 6rpx 5rpx;
   color: #333;
-  translate: 0% -10%;
+  margin-top: -28rpx;
 }
 </style>

pkg_product/views/submitOrder.vue

@@ -203,7 +203,25 @@ export default {
       return `${y}-${m}-${day}`
     },
     contactMerchant() {
-      uni.showToast({ title: '已为您接入管家', icon: 'none' })
+      uni.showModal({
+        title: '商家电话',
+        content: this.form.merPhone || '暂无电话',
+        confirmText: '立即拨打',
+        cancelText: '取消',
+        success: (res) => {
+          if (res.confirm && this.detail.merPhone) {
+            uni.makePhoneCall({
+              phoneNumber: this.detail.merPhone,
+              fail: () => {
+                uni.showToast({
+                  title: '拨打电话失败',
+                  icon: 'none'
+                })
+              }
+            })
+          }
+        }
+      })
     },
     submitOrder() {
       if (!this.form.name || !this.form.phone) {