feat:样式修改

pages/order/order-detail.js

@@ -239,5 +239,10 @@ Page({
       eventChannel.emit("updateData")
       that.getData()
     })
+  },
+  callPhone(){
+    wx.makePhoneCall({
+      phoneNumber: this.data.data.phone,
+    })
   }
 })
\ No newline at end of file

pages/order/order-detail.wxml

@@ -59,7 +59,7 @@
     </view>
     <view class="g-row">
       <view class="i-t1">联系电话:</view>
-      <view class="i-t2">{{data.phone}}</view>
+      <view class="i-t2" bindtap="callPhone">{{data.phone}}</view>
     </view>
   </view>
 </view>

pages/order/order-service.wxml

@@ -54,7 +54,7 @@
   <view class="agreement-wrapper">
     <image class="agreement-icon" src="{{read ? '/assets/order/agreement-selected.png' : '/assets/order/agreement-unselected.png'}}" bindtap="readAction"/>
     <view class="agreement-text" bindtap="readAction">我已阅读</view>
-    <view class="agreement-text" style="color: #437CFD;" bindtap="agreementAction">《家政服务协议》</view>
+    <view class="agreement-text" style="color: #437CFD;" bindtap="agreementAction">《服务协议》</view>
   </view>
   <rich-text class="node-class" nodes="{{tips}}"></rich-text>
   <view class="bmt">

pages/service/service.js

@@ -13,7 +13,8 @@ Page({
   data: {
     list: [],
     selected: 0,
-    children: []
+    children: [],
+    height: 0
   },
 
   /**

pages/service/service.json

 {
   "usingComponents": {},
-  "navigationBarTitleText": "全部服务"
+  "navigationBarTitleText": "全部服务",
+  "disableScroll": true
 }
\ No newline at end of file

pages/service/service.wxml

@@ -8,11 +8,13 @@
     <scroll-view class="sc-left" enable-flex scroll-y>
       <view class="cate-left-item {{index == selected ? 'item-selected' : ''}}" wx:for="{{list}}" wx:key="*this" data-index="{{index}}" bindtap="leftClickAction">{{item.serviceName}}</view>
     </scroll-view>
-    <scroll-view class="sc-right" enable-flex scroll-y>
-      <view class="cate-right-item" wx:for="{{children}}" wx:key="*this" bindtap="rightClickAction" data-index="{{index}}">
+    <scroll-view class="sc-right" enable-flex scroll-y >
+      <view class="sc-wrapper">
+        <view class="cate-right-item" wx:for="{{children}}" wx:key="*this" bindtap="rightClickAction" data-index="{{index}}">
         <image class="cate-image" src="{{item.img}}" mode="aspectFill"/>
         <view class="child-name">{{item.serviceName}}</view>
       </view>
+      </view>
     </scroll-view>
   </view>
 </view>
\ No newline at end of file

pages/service/service.wxss

@@ -17,6 +17,7 @@ page {
   display: flex;
   flex-direction: row;
   align-items: center;
+  flex-shrink: 0;
 }
 
 .flex-1 {
@@ -30,13 +31,23 @@ page {
 .sc-left {
   width: 170rpx;
   background: #F7FBFC;
-  height: 100%;
+  height: calc(100vh - 112rpx);
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
 }
 
 .sc-right {
-  flex: 1;
   background: white;
-  height: 100%;
+  height: calc(100vh - 112rpx);
+  flex: 1;
+}
+
+.sc-wrapper{
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
 }
 
 .search-icon {
@@ -71,9 +82,9 @@ page {
 
 .cate-right-item {
   width: 154rpx;
-  height: 192rpx;
+  height: 214rpx;
   background: #FFFFFF;
-  display: inline-block;
+  display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
@@ -94,17 +105,21 @@ page {
 }
 
 .cate-image {
+  display: flex;
   width: 136rpx;
   height: 136rpx;
-  margin-left: 8rpx;
+  margin-left: 9rpx;
 }
 
 .child-name {
-  height: 34rpx;
+  height: 68rpx;
   font-size: 24rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8B8B8B;
   line-height: 34rpx;
   text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
\ No newline at end of file