发货物流

.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
- VUE_APP_BASE_API = 'http://192.168.1.22:8108'
+ VUE_APP_BASE_API = 'http://192.168.1.22:9104'
 #VUE_APP_BASE_API = 'http://127.0.0.1:8108'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
@@ -14,3 +14,4 @@ ENV = 'development'
 # Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+ 

src/views/dashboard/admin/components/BarChart.vue

@@ -66,9 +66,9 @@ export default {
           }
         },
         legend: {
-          show: false,
+          show: true,
           top: 0,
-          right: 0
+          right: '5%'
         },
         grid: {
           left: '3%',
@@ -88,7 +88,7 @@ export default {
           }
         }],
         series: [{
-          name: '销售总额',
+          name: '销售总额(元)',
           type: 'line',
           smooth: true,
           symbolSize: 3,

src/views/login/index.vue

@@ -43,11 +43,6 @@
       </el-form-item>
 
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
-
-      <!-- <div class="tips">
-        <span style="margin-right:20px;">account: admin</span>
-        <span> password: any</span>
-      </div> -->
       <div class="footer"><p>copyrigh © 2019星范商城后台V1.0.0</p></div>
     </el-form>
   </div>

src/views/order/logistics.vue

@@ -7,11 +7,11 @@
       </router-link>
     </div>
     <el-card class="box-card">
-      <div v-for="(itemData,index) in logisticsInfoVos" :key="index" class="order-item">
+      <div v-for="(data,index) in logisticsInfoVos" :key="index" class="order-item">
         <el-row :gutter="24" class="box-row">
-          <el-col :span="24"><b>发货时间:</b> 2020-01-01:02:20:00</el-col>
+          <el-col :span="24"><b>发货时间:{{ data.logisticsBatch.deliveryTime }}</b></el-col>
         </el-row>
-        <el-row v-for="Record in itemData.logisticsRecordList" :key="Record.id" :gutter="22" class="product-row">
+        <el-row v-for="Record in data.logisticsRecordList" :key="Record.id" :gutter="22" class="product-row">
           <el-col :span="2"><img :src="Record.image" width="75" height="75" alt=""></el-col>
           <el-col :span="22">
             <el-row style="margin-bottom: 10px;"><b>{{ Record.productName }}</b></el-row>
@@ -22,13 +22,17 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="box-row"><el-col :span="24" style="color:#417DE6;font-weight: bold;">物流详情</el-col></el-row>
-        <div v-for="logistics in itemData.logisticsInformationList" :key="logistics.orderID" :gutter="22" class="product-row" style="padding: 0 12px;background: #fff;">
+        <div v-for="logistics in data.logisticsInformationList" :key="logistics.orderID" :gutter="22" class="product-row" style="padding: 0 12px;background: #fff;">
           <el-collapse accordion>
             <el-collapse-item>
               <template slot="title">
-                <span class="nu-span">快递公司:{{ logistics.logisticsCompanyName }}</span>
-                <span class="nu-span">物流单号:{{ logistics.nu }}</span>
+                <span class="nu-span">快递公司：{{ logistics.logisticsCompanyName }}</span>
+                <span class="nu-span">物流单号：{{ logistics.nu }}</span>
               </template>
+              <div v-if="logistics.logisticsDetailVos === null" class="none-logistice">暂无物流详情</div>
+              <div v-for="(Detail, logIndex) in logistics.logisticsDetailVos" v-else :key="logIndex" class="logistics-item">
+                <div><span>{{ Detail.time }}</span> <span>{{ Detail.desc }}</span></div>
+              </div>
             </el-collapse-item>
           </el-collapse>
         </div>
@@ -70,10 +74,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .el-collapse-item__header{
-    color: #E68341 !important;
-    font-size: 16px !important;
-  }
   .app-title{
     float: left;
     line-height: 36px;
@@ -111,14 +111,23 @@ export default {
   .product-row{
     padding: 10px 0;
     background: #EBEEF5;
-    border-top: 1px dashed #DCDFE6;
+    border-top: 1px solid #e6ebf5;
+    .el-collapse{
+      border-top: none;
+      border-bottom: none;
+    }
   }
   .op-item{
     padding: 5px 0;
   }
   .nu-span{
+    font-size: 14px;
     color: #E68341;
     margin-right: 15px;
   }
+  .none-logistice{
+    color: #999999;
+    font-size: 12px;
+  }
 </style>