Merge branch 'dev-1.4.5' into test

.env.js

 ;(function() {
   let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
   let ENV_VAR = null
-  let VERSION_NUMBER = '1.4.0' //版本号
+  let VERSION_NUMBER = '1.4.1' //版本号
   //小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频
   if (process.env.NODE_ENV === 'development') {
     if (NODE_ENV === 'dev') {

src/components/order/index.vue

@@ -299,7 +299,7 @@ export default {
 					待预约	orderStatus == 31  and appointmentDatetime == null								工单状态等于30并且预约时间为空
 					待签到	orderStatus == 31  and appointmentDatetime is not null							工单状态等于30并且预约时间不为空
 					待完工	orderStatus >31 and orderStatus < 80											工单状态大于31 小于80
-					审核中	orderStatus ==85 or  orderStatus == 87	 or  orderStatus == 88					工单状态 等于85 或者 等于有87
+					审核中	orderStatus ==85 or  orderStatus == 87	 or  orderStatus == 88					工单状态 等于85 或者 等于87 或者 等于88
 					异常		orderStatus ==86																工单状态 等于86
 					已完工	orderStatus in(80,81,89,110)													工单状态 等于80 or 81 or 89 or 110
 				*/

src/components/order/performanceRecord.vue

@@ -3,12 +3,24 @@
     <view class="top-item">
       <text>履约记录</text>
     </view>
-		<view v-if="orderRecords.length == 0" class="no-record-view">当前暂无履约记录</view>
-		<view v-else :class="['record-list-view', {'short': orderRecords.length <= showLenght}]">
+    <view v-if="orderRecords.length == 0" class="no-record-view"
+      >当前暂无履约记录</view
+    >
+    <view
+      v-else
+      :class="[
+        'record-list-view',
+        { short: orderRecords.length <= showLenght },
+      ]"
+    >
       <view class="record-right-view">
         <view class="dashed-line-view"></view>
         <view class="order-list">
-					<view v-for="(record,index) in showOrderRecords" :key="record.operationContent" :class="['order-cell', {'first': index == 0}]">
+          <view
+            v-for="(record, index) in showOrderRecords"
+            :key="record.operationContent"
+            :class="['order-cell', { first: index == 0 }]"
+          >
             <view class="node-view">
               <view class="node-border-view">
                 <view class="node-middle-view"></view>
@@ -16,28 +28,47 @@
             </view>
             <view class="right-view">
               <view class="line-view-top">
-								<text>{{$u.timeFormat(record.operationDatetime, 'yyyy.mm.dd &nbsp hh:MM:ss')}}</text>
-								<text style="color: red;">{{record.overTime?'超时':''}}{{record.overTime && record.exception ? '/' : ''}}{{record.exception?'异常':''}}</text>
-								<text style="color: #2272FF;" v-show="record.isTrace">跟进</text>
+                <text>{{
+                  $u.timeFormat(
+                    record.operationDatetime,
+                    'yyyy.mm.dd &nbsp hh:MM:ss'
+                  )
+                }}</text>
+                <text style="color: red;"
+                  >{{ record.overTime ? '超时' : ''
+                  }}{{ record.overTime && record.exception ? '/' : ''
+                  }}{{ record.exception ? '异常' : '' }}</text
+                >
+                <text style="color: #2272FF;" v-show="record.isTrace"
+                  >跟进</text
+                >
               </view>
               <view class="line-view-item">
                 <view>
-									<text>{{record.operationTypeText}}</text>
+                  <text>{{ record.operationTypeText }}</text>
                 </view>
                 <view class="item-operation-view" v-show="record.isTrace">
-									<text class="item-label" >{{record.traceLabel + "："}}</text>
-									<text class="item-content">{{record.traceTime}}</text>
+                  <text class="item-label">{{ record.traceLabel + '：' }}</text>
+                  <text class="item-content">{{ record.traceTime }}</text>
                 </view>
-								<view class="item-operation-view" v-show="record.operationContent">
+                <view
+                  class="item-operation-view"
+                  v-show="record.operationContent"
+                >
                   <text class="item-label">备注：</text>
-									<text class="item-content">{{ record.operationContent }}</text>
+                  <text class="item-content">{{
+                    record.operationContent
+                  }}</text>
                 </view>
               </view>
             </view>
           </view>
         </view>
       </view>
-			<view v-if="orderRecords && orderRecords.length > showLenght" @click="readMoreRecord = !readMoreRecord">
+      <view
+        v-if="orderRecords && orderRecords.length > showLenght"
+        @click="readMoreRecord = !readMoreRecord"
+      >
         <view v-if="readMoreRecord" class="read-more-toggle">
           <u-icon name="arrow-down"></u-icon>
           <text class="read-more-text">查看更多</text>
@@ -49,19 +80,18 @@
       </view>
       <view v-else style="height: 10rpx;"></view>
     </view>
-
   </view>
 </template>
 
 <script>
-	export default {
+export default {
   props: {
     // 履约记录
     orderRecords: {
       type: Array,
-				default () {
+      default() {
         return []
-				}
+      },
     },
   },
   data() {
@@ -72,18 +102,22 @@
   },
   computed: {
     showOrderRecords() {
-				if (this.readMoreRecord && this.orderRecords && this.orderRecords.length > 0) {
+      if (
+        this.readMoreRecord &&
+        this.orderRecords &&
+        this.orderRecords.length > 0
+      ) {
         return this.orderRecords.slice(0, this.showLenght)
       } else {
         return this.orderRecords
       }
     },
   },
-	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.order-record-view {
+.order-record-view {
   .top-item {
     font-size: 32rpx;
     color: #333333;
@@ -111,7 +145,7 @@
       .dashed-line-view {
         position: absolute;
         width: 2rpx;
-					border-left: 1px dashed #2272FF;
+        border-left: 1px dashed #2272ff;
         height: 100%;
         top: 14rpx;
         left: 11rpx;
@@ -134,21 +168,21 @@
             z-index: 1;
 
             .node-border-view {
-								border: 2rpx solid #2272FF;
-								border-radius: 11rpx;
+              border: 2rpx solid #2272ff;
+              border-radius: 50%;
               width: 22rpx;
               height: 22rpx;
-								// display: flex;
-								// align-items: center;
-								// justify-content: center;
-								padding: 5rpx;
-								background-color: #FFFFFF;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              // padding: 6rpx;
+              background-color: #ffffff;
 
               .node-middle-view {
                 width: 10rpx;
                 height: 10rpx;
-									background-color: #2272FF;
-									border-radius: 6rpx;
+                background-color: #2272ff;
+                border-radius: 50%;
               }
             }
           }
@@ -173,7 +207,7 @@
               .item-operation-view {
                 margin-top: 20rpx;
                 .item-label {
-										color: #2272FF;
+                  color: #2272ff;
                 }
                 .item-content {
                   word-break: break-all;
@@ -181,7 +215,6 @@
               }
             }
           }
-
         }
       }
     }
@@ -189,7 +222,7 @@
 
   .read-more-toggle {
     text-align: center;
-			color: #2272FF;
+    color: #2272ff;
     font-size: 26rpx;
     padding-top: 30rpx;
     padding-bottom: 30rpx;
@@ -205,11 +238,10 @@
     text-align: right;
 
     .line-view {
-				background-color: #F4F5F7;
+      background-color: #f4f5f7;
       height: 2rpx;
       margin-bottom: 20rpx;
     }
-
-		}
   }
+}
 </style>