1.移除不用图片

2.引入订单详情新图片
3.部分组件图片替换
4.更改地图是否显示判断逻辑

src/assets/img/u546.svg

-<svg t="1605589546788" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12447" width="200" height="200"><path d="M23.897 132.197h662.565c11.671 0 21.158 9.546 21.158 21.321v62.559c-0.221 1.001-0.607 1.962-0.607 3.024v404.857h-20.549v1.679h-662.566v-1.679h-21.115v-470.442c0-11.774 9.445-21.318 21.115-21.318v0 0z" fill="#ea9518" p-id="12448"></path><path d="M735.846 735.761c12.054-31.639 37.873-56.494 70.096-66.836 10.659-3.415 21.965-5.298 33.678-5.298 11.755 0 23.061 1.883 33.699 5.298 32.221 10.339 58.038 35.197 70.096 66.836 2.59 6.825 4.517 13.961 5.756 21.339 1.014 6.095 1.66 12.325 1.66 18.689 0 0.897-0.105 1.756-0.121 2.612-1.401 60.647-50.62 109.6-111.091 109.6-60.47 0-109.668-48.953-111.090-109.6 0-0.857-0.121-1.717-0.121-2.612 0-6.359 0.649-12.593 1.68-18.689 1.218-7.378 3.164-14.511 5.757-21.339v0 0zM793.296 778.403c1.397 24.688 21.52 44.374 46.326 44.374 24.802 0 44.946-19.683 46.324-44.374 0.080-0.863 0.283-1.696 0.283-2.619 0-6.623-1.42-12.916-3.913-18.685-3.851-8.911-10.432-16.268-18.641-21.339-7.030-4.297-15.22-6.95-24.051-6.95-8.812 0-17.001 2.653-24.050 6.95-8.171 5.072-14.734 12.425-18.602 21.339-2.497 5.769-3.914 12.059-3.914 18.685-0.005 0.918 0.197 1.756 0.24 2.619v0 0z" fill="#ea9518" p-id="12449"></path><path d="M340.933 668.924c-7.277-6.278-15.178-11.854-23.65-16.558h403.833c3.363 0 6.363-1.349 8.777-3.351-0.023-0.489-0.143-0.933-0.143-1.428h1.74c2.231-2.494 3.711-5.765 3.711-9.404v-350.77c3.87-4.374 9.421-7.175 15.684-7.175h169.999c4.641 0 9.142 1.534 12.841 4.393 3.45 2.656 84.022 66.348 84.022 189.561v159.291c3.283 3.759 5.41 8.686 5.41 14.102v109.517c0 11.778-9.462 21.301-21.133 21.301h-23.142c0.036-0.86 0.139-1.717 0.139-2.619 0-6.336-0.544-12.549-1.397-18.683-0.953-7.28-2.396-14.429-4.42-21.341-7.778-26.33-23.020-49.422-43.246-66.843-10.006-8.62-21.235-15.82-33.412-21.335-9.018-4.091-18.545-7.319-28.515-9.403-9.154-1.965-18.661-2.985-28.412-2.985-9.727 0-19.25 1.019-28.41 2.985-9.949 2.084-19.455 5.312-28.517 9.403-12.096 5.477-23.262 12.63-33.252 21.175 0.506 0.039 0.973 0.161 1.44 0.161h-1.584c-20.222 17.419-35.461 40.516-43.242 66.843-2.049 6.913-3.488 14.060-4.442 21.341-0.831 6.129-1.397 12.346-1.397 18.683 0 0.899 0.1 1.759 0.117 2.619h-310.473c0.039-0.86 0.143-1.717 0.143-2.619 0-6.336-0.566-12.549-1.401-18.683-0.971-7.28-2.39-14.429-4.439-21.341-7.75-26.323-23.009-49.424-43.232-66.835v0 0zM772.020 447.639h201.812c-8.19-69.986-46.706-111.743-60.774-124.763h-141.038v124.763z" fill="#ea9518" p-id="12450"></path><path d="M146.842 735.761c12.052-31.639 37.873-56.494 70.095-66.836 10.619-3.415 21.925-5.298 33.678-5.298 11.753 0 23.042 1.883 33.682 5.298 32.221 10.339 58.037 35.197 70.094 66.836 2.593 6.825 4.537 13.961 5.756 21.339 1.054 6.095 1.683 12.325 1.683 18.689 0 0.897-0.102 1.756-0.121 2.612-1.398 60.647-50.62 109.6-111.089 109.6-60.47 0-109.673-48.953-111.090-109.6-0.023-0.857-0.121-1.717-0.121-2.612 0-6.359 0.646-12.593 1.686-18.689 1.228-7.378 3.169-14.511 5.747-21.339v0 0zM204.29 778.403c1.378 24.688 21.539 44.374 46.326 44.374 24.807 0 44.948-19.683 46.326-44.374 0.041-0.863 0.24-1.696 0.24-2.619 0-6.623-1.415-12.916-3.89-18.685-3.869-8.911-10.433-16.268-18.621-21.339-7.054-4.297-15.22-6.95-24.054-6.95-8.835 0-16.978 2.653-24.032 6.95-8.206 5.072-14.795 12.425-18.639 21.339-2.496 5.769-3.914 12.059-3.914 18.685-0.010 0.918 0.217 1.756 0.256 2.619v0 0z" fill="#ea9518" p-id="12451"></path><path d="M195.047 646.948c-0.464 0.187-0.889 0.453-1.377 0.638-3.284 1.514-6.567 3.024-9.724 4.779-8.475 4.701-16.359 10.281-23.63 16.558-20.243 17.412-35.483 40.512-43.244 66.836-2.065 6.913-3.487 14.064-4.46 21.343-0.81 6.132-1.397 12.346-1.397 18.686 0 0.897 0.142 1.756 0.142 2.614h-44.582c-11.673 0-21.114-9.523-21.114-21.3v-109.519c0-0.206 0.061-0.429 0.061-0.635h149.323z" fill="#ea9518" p-id="12452"></path></svg>

src/assets/styles/variable.scss

@@ -36,7 +36,7 @@ $txtGray9: #999999;
 $txtGrayL: #D3D3D3;
 //订单状态颜色
 $orderReturn:#D9001B;
-$orderJm:#02a7f0;
-$orderCold:#4b7902;
+$orderJm:#4b7902;
+$orderCold:#02a7f0;
 
 

src/views/myOrder/components/goodsSimpleItem.vue

@@ -5,11 +5,12 @@
 <!--      <span class="state-type order-type-tip-cold">{{item.goodsType}}</span>-->
 <!--    </div>-->
     <div class="goods-info">
-      <van-icon :name="goodsIcon.pill" />
+<!--      <van-icon :name="goodsIcon.pill" style="font-size:38px"/>-->
+      <img :src="goodsIcon.pill" style="width:40px;height:40px"/>
       <div class="goods-info-text">
         <div class="goods-name">{{ calGoodsName() }}</div>
         <div class="goods-num-price">
-          <span class="price-num">¥{{item.taxPrice}}</span>
+          <span class="price-num">¥{{moneyFormat(item.taxPrice)}}</span>
           <span class="pkg-num">订单数量: {{item.packageNum}}</span>
         </div>
       </div>
@@ -18,12 +19,13 @@
 </template>
 
 <script>
+import { AmountNumFormat } from '@/utils/common'
 export default {
   name: 'goodsSimpleItem',
   data () {
     return {
       goodsIcon: {
-        pill: require('@/assets/img/u47.svg'),
+        pill: require('@/assets/img/order.png'),
         normal: require('@/assets/img/u90.svg')
       }
     }
@@ -51,6 +53,9 @@ export default {
     }
   },
   methods: {
+    moneyFormat(num) {
+      return AmountNumFormat(num)
+    },
     calGoodsName() {
       return '【' + this.item.goodsCode + '】' +
         this.item.goodsName +
@@ -64,7 +69,7 @@ export default {
 <style lang="scss" scoped>
   .goods-simple-content {
     border-bottom: 1px solid #eeeeee;
-    padding:10px;
+    padding:10px 5px;
     //.goods-company {
     //  margin-top:5px;
     //  display: flex;
@@ -94,7 +99,7 @@ export default {
         font-size:30px;
       }
       .goods-info-text {
-        margin-left: 5px;
+        margin-left: 10px;
         flex: 1;
         width: 80%;
         .goods-name {

src/views/myOrder/components/stepItem.vue

@@ -12,7 +12,7 @@
     </div>
     <div class="step-content ">
       <div class="step-type">{{stepInfo.type}}</div>
-      <div class="step-text">{{stepInfo.text}}</div>
+      <div class="step-text" >{{stepInfo.text}}</div>
     </div>
   </div>
 </template>

src/views/myOrder/detail/goodsInfo.vue

@@ -51,10 +51,6 @@ export default {
       //   error: false,
       refreshing: false,
       showHighSearch: false,
-      icons: {
-        inDelivery: require("@/assets/img/u546.svg"),
-        copy: require("@/assets/img/u533.svg"),
-      },
       orderItem: this.$route.query,
       detailData: [],
       moreSearchInfo: {

src/views/myOrder/detail/logisticsDetail.vue

@@ -3,7 +3,7 @@
     <van-empty description="暂无数据"
                v-if="!shippingInfo&&!shippingInfo.shippingNo&&
                (!stepList|| stepList.length<0)&&(!mapPointList||mapPointList.length < 0)"/>
-    <a-map-view :transport="(this.shippingInfo.signTime === '')" :point-list="mapPointList" :drive-point="driveLine" v-if="mapPointList&&mapPointList.length > 0"/>
+    <a-map-view :transport="sendType" :point-list="mapPointList" :drive-point="driveLine" v-if="mapPointList&&mapPointList.length > 0"/>
     <div class="logistics-header" v-if="shippingInfo&&shippingInfo.shippingNo">
       <div class="header-title">
         <van-icon class="logistic-logo" :name="icons.logo"/>
@@ -21,7 +21,7 @@
             <span class="logistic-values">{{ shippingInfo.deliveryMan }} {{ shippingInfo.deliveryManPhone }}</span>
           </div>
           <div class="header-order-info" style="margin-top:2px;margin-bottom:8px"
-               v-if="shippingInfo.estimatedArrivalTime">
+               v-if="shippingInfo.estimatedArrivalTime && stepInfo && stepInfo.currentOrderStatusCode < 400">
             <span class="logistic-name">预计到达时间:</span>
             <span class="logistic-values">{{ shippingInfo.estimatedArrivalTime }}</span>
           </div>
@@ -59,6 +59,7 @@ export default {
       },
       shippingInfo: {},
       mapPointList: [],
+      sendType: false,
       driveLine: {
         startPoint: {
           address: '',
@@ -71,6 +72,7 @@ export default {
           latitude: 0
         }
       },
+      stepInfo: {},
       stepList: []
     }
   },
@@ -127,7 +129,11 @@ export default {
           this.driveLine.endPoint.address = this.shippingInfo.clientAddress
           this.driveLine.endPoint.longitude = parseFloat(this.shippingInfo.longitude)
           this.driveLine.endPoint.latitude = parseFloat(this.shippingInfo.latitude)
+
+          if (this.orderInfo.orderStatusCode > 300) {
+            this.sendType = this.orderInfo.orderStatusCode === '310'
             this.getGpsPoint()
+          }
         } else {
           console.log('运单信息', '请求无数据')
         }
@@ -152,16 +158,16 @@ export default {
       getTrackInfo(data).then(res => {
         if (res.code === 200 && res.data && res.data.code === '00000' &&
           res.data.entity && res.data.entity.logisticsTrackingInfoList) {
-          let trackData = res.data.entity.logisticsTrackingInfoList
+          this.stepInfo = res.data.entity.logisticsTrackingInfoList
           let tempStep = []
-          trackData.orderStatusInfoVoList.forEach((item, index) => {
+          this.stepInfo.orderStatusInfoVoList.forEach((item, index) => {
             tempStep.push({
               date: item.opDate.split(' ')[0],
               time: item.opDate.split(' ')[1],
               type: item.orderStatus,
               typeCode: item.orderStatusCode,
               text: item.statusMsg,
-              showLine: index !== (trackData.orderStatusInfoVoList.length - 1)
+              showLine: index !== (this.stepInfo.orderStatusInfoVoList.length - 1)
             })
           })
           this.stepList = tempStep
@@ -194,13 +200,14 @@ export default {
 
 <style lang="scss" scoped>
 .logistics-content {
-  background-color: #fff;
+  background-color:#f2f3f5;
   height: calc(100vh - 46px);
   overflow: scroll;
 
   .logistics-header {
     border-bottom: 1px solid $line;
     padding: 10px;
+    background-color: #fff;
 
     .header-title {
       display: flex;
@@ -223,12 +230,14 @@ export default {
       }
 
       .logistic-type {
-        border: 1px solid $orderJm;
-        color: $orderJm;
+        border: 1px solid $orderCold;
+        color: $orderCold;
         padding: 0 8px;
         transform: scale(0.8);
         height: 100%;
         margin-top: 3px;
+        background-color: #02a7f014;
+        border-radius: 2px;
       }
     }
 
@@ -252,6 +261,8 @@ export default {
     height: 150px;
     overflow: hidden;
     position: relative;
+    background-color:#fff;
+    padding:1px;
 
     .show-more {
       display: block;
@@ -262,10 +273,13 @@ export default {
       text-align: center;
       background: #fff;
       z-index: 999;
+      line-height: 30px;
     }
   }
 
   .logistics-step-line_show {
+    background-color:#fff;
+    padding: 1px 1px 10px 1px;
     .show-more {
       display: none;
     }

src/views/myOrder/detail/orderDetail.vue

@@ -38,7 +38,7 @@
     <!--  订单基本信息  -->
     <div class="order-common order-info">
       <div class="info-content">
-        <van-icon name="orders-o" class="order-icon info-icon"/>
+        <van-icon :name="icons.order" class="order-icon info-icon"/>
         <div class="info-text">
           <div style="display: flex">
             <span class="order-code">{{ detailData.orderNo }}</span>
@@ -64,7 +64,8 @@
     <!--  订单物流信息  -->
     <div class="order-common order-logistics">
       <div class="logistics-content" @click="openLogistics()">
-        <van-icon :name="icons.inDelivery" class="order-icon logistics-icon"/>
+<!--        <van-icon :name="icons.inDelivery" class="order-icon logistics-icon"/>-->
+        <img :src="icons.inDelivery" class="order-icon logistics-icon"/>
         <div class="logistics-text">
           <div style="display:flex">
             <span class="logistics-speak">{{ !trackData.orderStatusInfoVoList[0].statusMsg?'暂无数据':trackData.orderStatusInfoVoList[0].statusMsg }}</span>
@@ -74,7 +75,8 @@
         </div>
       </div>
       <div class="location-content">
-        <van-icon name="location-o" class="order-icon location-icon"/>
+<!--        <van-icon :name="icons.location" class="order-icon location-icon"/>-->
+        <img :src="icons.location" class="order-icon location-icon"/>
         <div class="location-text">
           <div class="location-client">{{ detailData.clientName }}</div>
           <div class="location-receive">{{ detailData.shippingAdress }}</div>
@@ -85,7 +87,8 @@
     <div class="goods-all" @click="openGoodsList()">
       <span class="all-title">商品明细</span>
       <span class="title-more">更多</span>
-      <van-icon class="title-arrow" name="arrow"/>
+<!--      <van-icon class="title-arrow" :name="icons.nextArrow" size="15"/>-->
+      <img class="title-arrow"  :src="icons.nextArrow" style="width:15px"/>
     </div>
     <div class="order-common " style="padding-top: 0">
       <goods-simple-item v-for="(item,index) in detailData.goodsInfos" :key="item.goodsId" :item="item"
@@ -136,7 +139,10 @@ export default {
       },
       invoiceData: {},
       icons: {
-        inDelivery: require('@/assets/img/u546.svg'),
+        order: require('@/assets/img/icon_od_xx.png'),
+        inDelivery: require('@/assets/img/icon_od_xs.png'),
+        location: require('@/assets/img/icon_od_dz.png'),
+        nextArrow: require('@/assets/img/icon_od_arrow_right.png'),
         copy: require('@/assets/img/u533.svg')
       }
     }
@@ -383,7 +389,7 @@ export default {
     .order-icon {
       width: 40px;
       height: 40px;
-      font-size: 24px;
+      font-size: 38px;
       text-align: center;
       line-height: 40px;
       border-radius: 20px;
@@ -405,8 +411,8 @@ export default {
       align-items: center;
       /*主信息图标*/
       .info-icon {
-        background-color: #c0e9fc;
-        color: #1296db;
+        //background-color: #c0e9fc;
+        //color: #1296db;
       }
 
       /*主信息文本*/
@@ -489,8 +495,8 @@ export default {
       padding-bottom: 6px;
       /*物流图标*/
       .logistics-icon {
-        background-color: #fbdbb0;
-        color: #ea9518;
+        //background-color: #fbdbb0;
+        //color: #ea9518;
       }
 
       /*物流说明*/
@@ -525,8 +531,8 @@ export default {
       margin-top: 10px;
       /*物流图标*/
       .location-icon {
-        background-color: #c0e9fc;
-        color: #1c9bdd;
+        //background-color: #c0e9fc;
+        //color: #1c9bdd;
       }
 
       /*物流说明*/