fix: 打卡加设备信息记录，部分ui间距

lxf
1 parent 4064fd15
Showing 9 changed files with 50 additions and 50 deletions Show diff stats
common/api.js
components/card/payee.vue
config/request.js
pages/me/index.vue
pages/order/arrival-car.vue
pages/order/card.vue
pages/order/detail.vue
pages/order/start-car.vue
styles/common.scss
@@ -151,5 +151,8 @@ module.exports = (vm) =&gt; {
       buildMaQrcode:params => vm.$u.http.get( freightAdmin + '/woss/freightOrder/buildMaQrcode', {params}),
       supplementTrailerVehicle: params => vm.$u.http.get( freightAPI + '/freightOrder/supplementTrailerVehicle', params), // 绑定车挂
     },
+    freightMaRecord: {
+      add: params => vm.$u.http.post( freightAPI + '/freightMaRecord/add', params,{custom: {toast:true}}), // 出发到达记录日志
+    }
   };
 }
@@ -65,6 +65,6 @@ export default {
 	  min-width: 70rpx;
 	  float: right;
   }
-  margin-bottom: $padding-sm;
+  margin: $padding-sm 0;
 }
 </style>
 import config from '@/config/index.js';
+import store from '@/store/index.js';
 const apiHost = config.apiHost;
 const systemInfo = wx.getSystemInfoSync();
@@ -32,7 +32,7 @@
           {{ freightInfo.enterpriseName || '' }}
         </view>
         <view class="tag-job" v-if="freightInfo.id">
-          <render-dict v-if="freightInfo.job" v-else dict="FREIGHT_ENTERPRISE_EMPLOYEE_JOB" :value="freightInfo.job"></render-dict>
+          <render-dict v-if="freightInfo.job" dict="FREIGHT_ENTERPRISE_EMPLOYEE_JOB" :value="freightInfo.job"></render-dict>
           <text v-else-if="freightInfo.enterpriseAdmin">管理员</text>
         </view>
         <!-- #ifdef MP-WEIXIN -->
@@ -88,10 +88,12 @@ export default {
         uni.showToast({ title: '到达时间不能小于发车时间', icon: 'none' });
         return;
       }
+      let driverInfo = uni.getDeviceInfo();
       uni.$u.api.freightOrder
         .arrive({ codeList: [this.item.code], ...this.form })
         .then(res => {
           if (res.success) {
+            uni.$u.api.freightMaRecord.add({ orderCode: this.item.code, operateType: 'ARRIVE', ...driverInfo });
             uni.showToast({ title: '操作成功', icon: 'none' });
             this.getOpenerEventChannel().emit('refreshData');
             setTimeout(() => uni.navigateBack(), 500);
@@ -256,6 +256,7 @@ export default {
           font-style: normal;
         }
         .address {
+          margin-top: $padding-xs;
           font-weight: 400;
           font-size: 24upx;
           color: #999999;
@@ -21,7 +21,7 @@
               <view style="flex: 1">
                 <view class="city">{{ item.waypoints[0].cityName }}-{{ item.waypoints[0].areaName }}</view>
                 <view class="address">{{ item.waypoints[0].address }}</view>
-                <view class="address">
+                <view v-if="item.waypoints[0].contactName || item.waypoints[0].contactMobile" class="address">
                   <text>{{ item.waypoints[0].contactName ? item.waypoints[0].contactName : '' }}</text>
                   <text>{{ item.waypoints[0].contactMobile ? item.waypoints[0].contactMobile : '' }}</text>
                 </view>
@@ -38,7 +38,7 @@
               <view style="flex: 1">
                 <view class="city">{{ item.waypoints[1].cityName }}-{{ item.waypoints[1].areaName }}</view>
                 <view class="address">{{ item.waypoints[1].address }}</view>
-                <view class="address">
+                <view v-if="item.waypoints[1].contactName || item.waypoints[1].contactMobile" class="address">
                   <text>{{ item.waypoints[1].contactName ? item.waypoints[1].contactName : '' }}</text>
                   <text>{{ item.waypoints[1].contactMobile ? item.waypoints[1].contactMobile : '' }}</text>
                 </view>
@@ -128,7 +128,7 @@
           <view class="card__item_field">收款人</view>
           <view class="card__item_content">
             <view class="text">
-              <text>{{ item.payee ? item.payee : '' }}</text>
+              <text v-if="item.payee">{{ item.payee ? item.payee : '' }}</text>
               <text>
                 {{ item.payeeMobile ? item.payeeMobile : '' }}
                 <text v-if="item.payeeMobile && item.bindBankCardNoFlag === false" class="card__item--warning">未绑卡</text>
@@ -437,7 +437,6 @@ export default {
       font-weight: 400;
       font-size: 32rpx;
       color: #2b2a27;
-      line-height: 45px;
       text-align: left;
       font-style: normal;
     }
@@ -485,14 +484,12 @@ export default {
         font-weight: 400;
         font-size: 28upx;
         color: #999999;
-        line-height: 28upx;
         text-align: left;
       }
       .number {
         font-weight: 600;
         font-size: 28upx;
         color: #2b2a27;
-        line-height: 28upx;
         text-align: center;
         font-style: normal;
       }
@@ -532,7 +529,6 @@ export default {
       &_field {
         font-weight: 400;
         font-size: 28upx;
-        line-height: 28upx;
         color: #999999;
         width: 170upx;
         text-align: left;
@@ -541,7 +537,6 @@ export default {
         flex: 1;
         font-weight: 400;
         font-size: 28upx;
-        line-height: 28upx;
         color: #2b2a27;
         text-align: left;
         font-style: normal;
@@ -550,14 +545,12 @@ export default {
         &_text {
           font-weight: 400;
           font-size: 28upx;
-          line-height: 28upx;
           text-align: left;
           font-style: normal;
         }
         &_action {
           font-weight: 400;
           font-size: 28upx;
-          line-height: 28upx;
           color: #2673fb;
           text-align: right;
           font-style: normal;
@@ -588,15 +581,14 @@ export default {
             font-weight: 500;
             font-size: 32upx;
             color: #2b2a27;
-            line-height: 32upx;
             text-align: left;
             font-style: normal;
           }
           .address {
+            margin-top: $padding-xs;
             font-weight: 400;
             font-size: 24upx;
             color: #999999;
-            line-height: 33upx;
             text-align: left;
             font-style: normal;
             text + text {
@@ -604,10 +596,10 @@ export default {
             }
           }
           .address_action {
+            margin-top: $padding-xs;
             font-weight: 400;
             font-size: 24upx;
             color: #2673fb;
-            line-height: 33upx;
             text-align: left;
             font-style: normal;
             display: flex;
@@ -630,8 +622,7 @@ export default {
       color: #2b2a27;
     }
     .action {
-      font-weight: 400;
-      font-size: 28rpx;
+      font-size: 26rpx;
       color: #007aff;
     }
   }
@@ -72,10 +72,12 @@ export default {
         uni.showToast({ title: '发车时间不能大于当前时间', icon: 'none' });
         return;
       }
+      let driverInfo = uni.getDeviceInfo();
       uni.$u.api.freightOrder
         .depart({ codeList: [this.item.code], ...this.form })
         .then(res => {
           if (res.success) {
+            uni.$u.api.freightMaRecord.add({ orderCode: this.item.code, operateType: 'DEPART', ...driverInfo });
             uni.showToast({ title: '操作成功', icon: 'none' });
             this.getOpenerEventChannel().emit('refreshData');
             setTimeout(() => uni.navigateBack(), 500);
@@ -135,7 +135,7 @@ body {
   align-items: center;
   justify-content: center;
   background: $color-primary;
-  box-shadow: $shadow-normal
+  box-shadow: $shadow-normal;
   &::after {
     border: none;
   }
@@ -151,32 +151,32 @@ body {
 }
 /* 空白省略号 */
-.ellipsis {
-  width: 100%;
+.ellipsis {
+  width: 100%;
   overflow: hidden;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-}
-
-.checkbox {
-	width: $padding-md * 1.2;
-	height: $padding-md * 1.2;
-
-	&__wrapper {
-		border-radius: 100%;
-		width: $padding-md * 1.2;
-		height: $padding-md * 1.2;
-		box-sizing: border-box;
-		border: 1upx solid $color-text-placeholder;
+}
+
+.checkbox {
+	width: $padding-md * 1.2;
+	height: $padding-md * 1.2;
+
+	&__wrapper {
+		border-radius: 100%;
+		width: $padding-md * 1.2;
+		height: $padding-md * 1.2;
+		box-sizing: border-box;
+		border: 1upx solid $color-text-placeholder;
     display: inline-flex;
     align-items: center;
-    justify-content: center;
-		&--selected {
-			background-color: $u-primary;
-			border: 1upx solid $u-primary;
-		}
-	}
+    justify-content: center;
+		&--selected {
+			background-color: $u-primary;
+			border: 1upx solid $u-primary;
+		}
+	}
 }
 .link {
@@ -186,15 +186,15 @@ body {
 .color-primary {
   color: $color-primary;
 }
-
-.color-red {
-	color: $color-red;
-}
-
-.color-orange {
-	color: $color-zy-orange;
-}
-
-.color-placeholder {
-	color: $color-text-placeholder;
-}
+
+.color-red {
+	color: $color-red;
+}
+
+.color-orange {
+	color: $color-zy-orange;
+}
+
+.color-placeholder {
+	color: $color-text-placeholder;
+}
	@@ -65,6 +65,6 @@ export default {		@@ -65,6 +65,6 @@ export default {
65	min-width: 70rpx;	65	min-width: 70rpx;
66	float: right;	66	float: right;
67	}	67	}
68	- margin-bottom: $padding-sm;	68	+ margin: $padding-sm 0;
69	}	69	}
70	</style>	70	</style>
1	import config from '@/config/index.js';	1	import config from '@/config/index.js';
		2	+import store from '@/store/index.js';
2		3
3	const apiHost = config.apiHost;	4	const apiHost = config.apiHost;
4	const systemInfo = wx.getSystemInfoSync();	5	const systemInfo = wx.getSystemInfoSync();
	@@ -32,7 +32,7 @@		@@ -32,7 +32,7 @@
32	{{ freightInfo.enterpriseName \|\| '' }}	32	{{ freightInfo.enterpriseName \|\| '' }}
33	</view>	33	</view>
34	<view class="tag-job" v-if="freightInfo.id">	34	<view class="tag-job" v-if="freightInfo.id">
35	- <render-dict v-if="freightInfo.job" v-else dict="FREIGHT_ENTERPRISE_EMPLOYEE_JOB" :value="freightInfo.job"></render-dict>	35	+ <render-dict v-if="freightInfo.job" dict="FREIGHT_ENTERPRISE_EMPLOYEE_JOB" :value="freightInfo.job"></render-dict>
36	<text v-else-if="freightInfo.enterpriseAdmin">管理员</text>	36	<text v-else-if="freightInfo.enterpriseAdmin">管理员</text>
37	</view>	37	</view>
38	<!-- #ifdef MP-WEIXIN -->	38	<!-- #ifdef MP-WEIXIN -->