Merge branch 'master' of git.echepei.com:caojunjie/kaihegroup-Ui

src/views/contractPlacing/index.vue

@@ -184,7 +184,8 @@
           <div class="mainModules">
             <span>危险化学品</span>
             <el-input style="width:70%;margin-left:20px;top: 4px"/>
-            <el-button type="text" style="display: inline; color: red"><i class="el-icon-upload el-icon--right"></i>
+            <el-button type="text" style="display: inline; color: red">
+              <i class="el-icon-upload el-icon--right"></i>
             </el-button>
           </div>
           <div style="width: 72%;height: 100px;text-align: left;">
@@ -261,7 +262,7 @@
           </p>
         </div>
       </div>
-      <div class="confirmOrder" style="">
+      <div class="confirmOrder">
         确认下单
       </div>
     </div>
@@ -493,8 +494,12 @@ export default {
   height: 70px;
   margin-top: 20px;
   text-align: center;
-  line-height: 60px;
+  line-height: 70px;
   color: white;
   font-size: 20px;
 }
+
+.confirmOrder:hover{
+  cursor: pointer;
+}
 </style>

src/views/management/myorder.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 70%;height: 700px;margin: 0 auto;display:flex;justify-content: space-around">
+  <div style="width: 70%;margin: 0 auto;display:flex;justify-content: space-around">
     <div style="width: 20%;height: 392px; margin-top: 60px;border: 1px solid #e7e7e7">
       <el-menu
         default-active="3"
@@ -36,7 +36,7 @@
         </el-menu-item>
       </el-menu>
     </div>
-    <div style="width: 80%;border: 1px solid #f7f7f7;height: 290px;">
+    <div style="width: 80%;border: 1px solid #f7f7f7;background: #FFFFFF;box-shadow: 0px 4px 13px 0px rgba(200, 200, 200, 0.44);margin-bottom: 20px">
       <el-menu
         :default-active="activeIndex"
         class="el-menu-demo"
@@ -53,7 +53,7 @@
         <el-menu-item index="6">已驳回</el-menu-item>
         <el-menu-item index="7">运单变更</el-menu-item>
       </el-menu>
-      <div style="width: 100%;display:flex;justify-content: space-around">
+      <div style="width: 100%;display:flex;justify-content: space-around;">
         <div style="width: 20%;">
           <el-input placeholder="订舱单"></el-input>
           <el-input placeholder="船名"></el-input>
@@ -82,7 +82,7 @@
           </div>
         </div>
       </div>
-      <div style="width: 100%;display:flex;justify-content: space-between">
+      <div style="width: 100%;display:flex;justify-content: space-between;">
         <div style="display: flex;align-items: center;padding-left: 20px"><el-checkbox v-model="checked">全选</el-checkbox></div>
         <div style="margin-right: 20px">
           <el-button type="success" plain>装箱单下载</el-button>
@@ -116,9 +116,40 @@
           <el-button type="primary" icon="el-icon-search">查询</el-button>
         </div>
       </div>
-      <div style="margin-top: 20px">
-        <el-divider>列表数据</el-divider>
+      <div style="margin-top: 20px;background: #FFFFFF;box-shadow: 0px 4px 13px 0px rgba(200, 200, 200, 0.44);padding-top: 20px;">
+        <div style="left: 10px;display: flex;justify-content: space-between;border-bottom: 2px solid #EEEFEE;">
+          <div style="display: flex;padding-left:10px;">
+            <!-- `checked` 为 true 或 false -->
+            <el-checkbox v-model="checked" style="margin-top: -8px">
+              <span>单箱合计:</span>
+              <span>1990元</span>
+            </el-checkbox>
+          </div>
+          <div style="display: flex;flex-direction: column;align-items: flex-end;margin-right: -10px">
+            <div style="width:100px;background-color: red;height:30px;line-height: 30px;color: #fff;border-radius: 50px 0 0 50px;margin-top: -20px">已驳回</div>
+            <div style="width: 0px;height: 0px;border-color: #DA0000 white white #DA0000;border-width: 4px 4px 4px 4px;border-style: solid;margin-top:-2px"></div>
+          </div>
+        </div>
+        <div style="display:flex;">
+          <div style="width:85%;padding-left:20px;display: flex;justify-content: space-around;flex-wrap: wrap;text-align: left;border-right:2px solid #EEEFEE ">
+            <p style="width:25%"><span>订舱号：</span><span>111111</span></p>
+            <p style="width:25%"><span>石英石：</span><span>1111</span></p>
+            <p style="width:25%"><span>运输条款：</span><span>1111</span></p>
+            <p style="width:25%"><span>收货人：</span><span>111</span></p>
+            <p style="width:25%"><span>航线：</span><span>111</span></p>
+            <p style="width:25%"><span>箱型：</span><span>111</span></p>
+            <p style="width:25%"><span>箱量：</span><span>111</span></p>
+            <p style="width:25%"><span>装货时间：</span><span>111</span></p>
+          </div>
+          <div style="width:15%;display:flex;flex-direction: column;align-items: center;margin-top: 20px">
+            <el-button type="info" size="small" style="width:80%; margin-left: 4px">详情</el-button>
+            <el-button type="primary" size="small" style="width:80%;margin: 10px 0 0 4px">再来一单</el-button>
+          </div>
+        </div>
       </div>
+
+
+
     </div>
   </div>
 </template>
@@ -129,7 +160,7 @@ export default {
   data() {
     return {
       activeIndex: '1',
-      checked:true
+      checked:true,
     };
   },
   methods: {