diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue
index f386aee..70bec1d 100644
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -180,25 +180,25 @@
               <div class="flexbox" style="justify-content: space-between;">
                 <div class="td1 flexbox" style="width:600px; align-items: flex-start; flex-wrap: wrap;">
                   <div v-show="fitem.orderType == 'order'" class="flexbox orderProducts"
-                    :class="{ nobottomBorder: fitem.goodsList.length <= 3 }"
-                    v-for="(children, index2) in fitem.goodsList" :key="children.id" style="width: 50%;">
-                    <el-tooltip class="item" v-if="children.expressInfo && children.expressInfo.expressOrderSn != null"
+                    :class="{ nobottomBorder: fitem.productList.length <= 3 }"
+                    v-for="(children, index2) in fitem.productList" :key="children.id" style="width: 50%;">
+                    <el-tooltip class="item" v-if="children.expressOrderId>0 && children.expressOrder != null"
                       effect="light"
-                      :content="`快递信息：${children.expressInfo.expressCompany} ${children.expressInfo.expressOrderSn}`"
+                      :content="`快递信息：${children.expressOrder.expressOrderSn}`"
                       placement="right">
                       <span class="normal hasDeliver"></span>
                     </el-tooltip>
                     <div class=" productItem k4545">
                       <img
-                        :class="children.expressInfo && children.expressInfo.expressOrderSn != null ? 'greeyImg' : 'lightImg'"
-                        :src="children.productImage" width="60px" height="60px">
+                        :class="children.expressOrderId>0 && children.expressOrder != null ? 'greeyImg' : 'lightImg'"
+                        :src="children.product.productImages" width="60px" height="60px">
                     </div>
                     <div class="price " style="flex:1">
-                      <div class="bookName">{{ children.productName }} &nbsp;
-                        <i v-if="children.books && children.books.length > 0" @click.stop="seeBooks(children.books)"
+                      <div class="bookName">{{ children.product.productName }} &nbsp;
+                        <i v-if="children.product.books && children.product.books.length > 0" @click.stop="seeBooks(children.product.books)"
                           class="el-icon-view" style="color:#409eff; cursor: pointer;"></i>
                       </div>
-                      <div><span>￥{{ children.productPrice }}</span> × {{ children.quantity }} </div>
+                      <div><span>￥{{ children.product.price }}</span> × {{ children.quantity }} </div>
 
                     </div>
                   </div>
@@ -225,9 +225,9 @@
                   <!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png"  width="60px" height="60px">  -->
                 </div>
                 <div class="total td2 xcenter">
-                  <div class="tabName">商品合计：<em>￥{{ fitem.orderPrice }}</em></div>
-                  <div class="tabName">运费：<em>￥{{ fitem.shippingPrice }}</em></div>
-                  <div class="tabName">实收：<em>￥{{ fitem.realPrice }}</em></div>
+                  <div class="tabName">商品合计：<em>￥{{ fitem.orderMoney }}</em></div>
+                  <div class="tabName">运费：<em>￥{{ fitem.shippingMoney }}</em></div>
+                  <div class="tabName">实收：<em>￥{{ fitem.realMoney }}</em></div>
                   <div class="tabContent">
                     <div></div>
                     <!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> -->
@@ -241,10 +241,10 @@
                 <div class="buier td3 xcenter">
                   <div class="tabName">收货信息：
                     <div style="color: #515a6e;"><span
-                        style="color: #515a6e;">{{ fitem.consignee.consigneeName }}</span>&nbsp;&nbsp;&nbsp;<span
-                        style="color: #515a6e;">{{ fitem.consignee.consigneeMobile }}</span></div>
+                        style="color: #515a6e;">{{ fitem.shippingUser }}</span>&nbsp;&nbsp;&nbsp;<span
+                        style="color: #515a6e;">{{ fitem.userPhone }}</span></div>
                     <div style="color: #515a6e;">
-                      {{ fitem.consignee.province }}-{{ fitem.consignee.city }}-{{ fitem.consignee.county }}-{{ fitem.consignee.address }}
+                      {{ fitem.province }}-{{ fitem.city }}-{{ fitem.district }}-{{ fitem.address }}
                     </div>
                     <div style="margin-bottom:10px">
                       <el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收货信息</el-button>
@@ -310,16 +310,16 @@
       <el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息">
         <template slot-scope="scope">
           <span
-            v-if="scope.row.consignee.consigneeName && scope.row.consignee.consigneeName != ''">{{scope.row.consignee.consigneeName}}</span>
+            v-if="scope.row.shippingUser && scope.row.shippingUser != ''">{{scope.row.shippingUser}}</span>
           <span v-else>暂无</span>
-          -<span>{{scope.row.consignee.consigneeMobile}}</span><br />
-          <span>{{scope.row.consignee.province}}</span>
+          -<span>{{scope.row.userPhone}}</span><br />
+          <span>{{scope.row.province}}</span>
           <span
-            v-if="scope.row.consignee.city && scope.row.consignee.city != ''">-</span><span>{{scope.row.consignee.city}}</span>
+            v-if="scope.row.city && scope.row.city != ''">-</span><span>{{scope.row.city}}</span>
           <span
-            v-if="scope.row.consignee.county && scope.row.consignee.county != ''">-</span><span>{{scope.row.consignee.county}}</span>
+            v-if="scope.row.district && scope.row.district != ''">-</span><span>{{scope.row.district}}</span>
           <span
-            v-if="scope.row.consignee.address && scope.row.consignee.address != ''">-</span><span>{{scope.row.consignee.address}}</span>
+            v-if="scope.row.address && scope.row.address != ''">-</span><span>{{scope.row.address}}</span>
         </template>
       </el-table-column>
       <!--<el-table-column
@@ -365,11 +365,11 @@
       <el-table-column prop="realMoney" header-align="center" align="center" label="实收金额">
         <template slot-scope="scope">
           <div class="detailsFonts">
-            <span v-if="scope.row.shippingPrice">商品合计：￥{{scope.row.orderPrice}}</span>
+            <span v-if="scope.row.shippingMoney">商品合计：￥{{scope.row.orderMoney}}</span>
             <!-- <span v-if="scope.row.couponId">优惠券：-</span> -->
-            <span v-if="scope.row.shippingPrice">运费：￥{{scope.row.shippingPrice}}</span>
+            <span v-if="scope.row.shippingMoney">运费：￥{{scope.row.shippingMoney}}</span>
             <!-- <span >积分抵扣：-</span> -->
-            <span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realPrice}}</b></span>
+            <span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realMoney}}</b></span>
           </div>
         </template>
       </el-table-column>
@@ -381,18 +381,18 @@
       </el-table-column> -->
       <el-table-column prop="createTime" header-align="center" align="center" label="下单时间">
       </el-table-column>
-      <el-table-column prop="goodsList" header-align="center" align="center" label="下单商品" width="500">
+      <el-table-column prop="productList" header-align="center" align="center" label="下单商品" width="500">
         <template slot-scope="scope">
           <!-- {{scope.row.goodsList}} -->
-          <div v-for="(item, index) in scope.row.goodsList" :key="index">
+          <div v-for="(item, index) in scope.row.productList" :key="index">
             <div class="flexbox" style="align-items:center; margin-bottom:10px">
               <div class="img">
-                <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.productImage"
+                <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.product.productImages"
                   width="40px" height="40px">
               </div>
               <div>
-                <span>{{item.productName}} [ ￥{{item.productPrice}} × {{item.quantity}} ]
-                  <i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view"
+                <span>{{item.product.productName}} [ ￥{{item.product.price}} × {{item.quantity}} ]
+                  <i v-if="item.product.books && item.product.books.length > 0" @click.stop="seeBooks(item.product.books)" class="el-icon-view"
                     style="color:#409eff; cursor: pointer;"></i></span>
               </div>
             </div>
@@ -418,7 +418,7 @@
             :to="{ path: 'order-buyorderdetail', query: { orderSn: scope.row.orderSn, ordertype: scope.row.orderStatus} }">
             <el-button type="text" size="small">订单详情</el-button>
           </router-link>
-          <el-button type="text" size="small" @click="deleteOrder(scope.row)" v-if="tabChange.tabActiveName ==0"
+          <el-button type="text" size="small" @click="deleteOrder(scope.row)" v-if="tabChange.tabActiveName == 0&&tabChange.tabActiveName != ''"
             style="color: #f11f3b;">删除</el-button>
           <!-- <span v-if="scope.row.orderStatus">
             <el-button type="text" size="small" @click="deliverDetail(scope.row)"
@@ -812,15 +812,15 @@
           if (data.code == 0) {
             this.addressForm.orderSn = val.orderSn
             this.provinceEntity = data.provinceEntity
-            this.addressForm.addressXX = val.consignee.address
-            this.addressForm.provinceCode = val.consignee.provinceCode
-            this.addressForm.cityCode = val.consignee.cityCode
-            this.addressForm.countyCode = val.consignee.countyCode
-            this.addressForm.provinceName = val.consignee.provinceCode
-            this.addressForm.cityName = val.consignee.city
-            this.addressForm.countyName = val.consignee.county
-            this.addressForm.name = val.consignee.consigneeName
-            this.addressForm.tel = val.consignee.consigneeMobile
+            this.addressForm.addressXX = val.address
+            this.addressForm.provinceCode = val.consigneeVo.provinceCode
+            this.addressForm.cityCode = val.consigneeVo.cityCode
+            this.addressForm.countyCode = val.consigneeVo.countyCode
+            this.addressForm.provinceName = val.province
+            this.addressForm.cityName = val.city
+            this.addressForm.countyName = val.district
+            this.addressForm.name = val.shippingUser
+            this.addressForm.tel = val.userPhone
             this.cityEntity = this.provinceEntity.find((val, index, arr) => {
               return val.regionCode == this.addressForm.provinceCode
             })
@@ -957,8 +957,8 @@
         }) => {
           // console.log(data,'列表数据')
           if (data && data.code === 0) {
-            this.dataList = data.result.data
-            this.totalPage = data.result.totalDataSize
+            this.dataList = data.result.records
+            this.totalPage = data.result.total
             if (this.tabChange.tabActiveName === '1') { // 判断可选按钮是否可用
               this.isMultipleDisabled()
             }
@@ -1044,7 +1044,6 @@
       },
       // 删除订单
       deleteOrder(row) {
-        console.log(row)
         this.$confirm(`确定对订单编号${row.orderSn}进行删除操作?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index 9c21c1b..d70262f 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -10,20 +10,22 @@
     <div>
       <ul class="list">
         <div v-if="orderDetails.userInfo">
-        <div class="liName">用户信息</div>
-        <li><span class="infoTitle">用户名：</span><span>{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}}</span></li>
-        <!-- <li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li> -->
-        <li><span class="infoTitle">联系电话：</span><span>{{orderDetails.userInfo.userPhone}}</span></li>
-        <li style="clear:both"></li>
-        <!-- <li><span class="infoTitle">电 话：</span><span>187898544875</span></li> -->
-        <!-- <li><span class="infoTitle">地 址：</span><span>天津市天津市天津市天津市天津市天津市</span></li> -->
-        <li class="line"></li>
+          <div class="liName">用户信息</div>
+          <li><span
+              class="infoTitle">用户名：</span><span>{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}}</span>
+          </li>
+          <!-- <li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li> -->
+          <li><span class="infoTitle">联系电话：</span><span>{{orderDetails.userInfo.userPhone}}</span></li>
+          <li style="clear:both"></li>
+          <!-- <li><span class="infoTitle">电 话：</span><span>187898544875</span></li> -->
+          <!-- <li><span class="infoTitle">地 址：</span><span>天津市天津市天津市天津市天津市天津市</span></li> -->
+          <li class="line"></li>
         </div>
         <div class="liName">订单信息</div>
         <li><span class="infoTitle">订单ID：</span><span>{{orderDetails.orderSn}}</span></li>
         <li><span class="infoTitle">订单状态：</span>
           <span v-if="orderDetails.orderStatus == 0" class="hightLight">待付款</span>
-         <span v-if="orderDetails.orderStatus == 1" class="hightLight">待发货</span>
+          <span v-if="orderDetails.orderStatus == 1" class="hightLight">待发货</span>
           <span v-if="orderDetails.orderStatus == 2" class="hightLight">已发货</span>
           <span v-if="orderDetails.orderStatus == 3" class="hightLight">已完成</span>
           <!-- <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发货</el-button>           -->
@@ -32,23 +34,26 @@
         <li><span class="infoTitle">订单金额：</span><span>￥{{orderDetails.orderPrice}}</span></li>
         <li><span class="infoTitle">交付邮费：</span><span>￥{{orderDetails.shippingPrice}}</span></li>
 
-        <li v-if="orderDetails.orderStatus > 0"><span class="infoTitle" >实际支付金额：</span><span>￥{{orderDetails.realPrice}}</span></li>
+        <li v-if="orderDetails.orderStatus > 0"><span
+            class="infoTitle">实际支付金额：</span><span>￥{{orderDetails.realPrice}}</span></li>
         <li><span class="infoTitle">创建时间：</span><span>{{orderDetails.createTime}}</span></li>
-        <li><span class="infoTitle" v-if="orderDetails.orderStatus > 0">支付时间：</span><span>{{orderDetails.paymentDate}}</span></li>
+        <li v-if="orderDetails.orderStatus > 0"><span
+            class="infoTitle">支付时间：</span><span>{{orderDetails.paymentDate}}</span></li>
         <li style="width: 100%;" v-if="orderDetails.orderStatus > 0"><span class="infoTitle">支付方式：</span>
           <span v-if="orderDetails.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span>
           <span v-if="orderDetails.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> <span>微信支付</span></span>
-          <span v-if="orderDetails.paymentMethod == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px"> <span>天医币支付</span></span>
+          <span v-if="orderDetails.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px"
+              height="22px"> <span>天医币支付</span></span>
           <span v-if="orderDetails.paymentMethod == 3">
             <!-- <icon-svg name="zhifubao"></icon-svg>  -->
             <span>IOS内购</span>
           </span>
         </li>
-        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2">
+        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2&&orderDetails.orderStatus > 0">
           <span class="infoTitle">商家订单号：</span>
           <span>{{orderDetails.outTradeNo}}</span>
         </li>
-        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2">
+        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2&&orderDetails.orderStatus > 0">
           <span class="infoTitle">支付宝订单号：</span>
           <span>{{orderDetails.tradeNo}}</span>
         </li>
@@ -64,133 +69,130 @@
         <div style="clear:both"></div>
         <!-- 订单商品 -->
         <div class="liName">商品信息</div>
-        <el-table :data="orderDetails.goodsList"
-      style="width: 100%">
-      <el-table-column
-        label="商品名"
-        width="280">
-        <template slot-scope="scope">
-          <div class="flexbox">
-            <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="scope.row.productImage" width="30px" height="30px">
-            <div class="proname">{{ scope.row.productName}}
-              <i v-if="scope.row.books && scope.row.books.length > 0" @click.stop="seeBooks(scope.row.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="productPrice"
-        label="价格"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="quantity"
-        label="数量" width="80">
-      </el-table-column>
-    </el-table>
-    <div v-if="orderDetails.consignee" style="margin-top:20px">
-        <div class="liName">物流信息  <a href="#" @click="changeAddressShow" v-if="orderDetails.orderStatus <= 1"><i class="el-icon-edit"></i>修改收货信息</a></div>
-        <div style="background:#f9f9f9; padding:5px; overflow:hidden; ">
-          <li><span class="infoTitle">收货人：</span><span>{{orderDetails.consignee.consigneeName}}</span>&nbsp;&nbsp;&nbsp;<span>{{orderDetails.consignee.consigneeMobile}}</span></li>
-          <li><span class="infoTitle">收货地址：</span><span>{{orderDetails.consignee.province}}-{{orderDetails.consignee.city}}-{{orderDetails.consignee.county}}-{{orderDetails.consignee.address}}</span></li>
-        </div>
-      </div>
-        <!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info">
-        </el-alert> -->
-        <li class="flexbox deliverBox" style="width: 100%;"  v-if="orderDetails.orderStatus > 0 && sheetList && sheetList.length > 0">
-          <el-row :gutter="20" style="flex-wrap:wrap; width: 100%;" class="flexbox">
-            <el-col  :md="12" :lg="12" class="item" v-for="(item, index) in sheetList" :key="index">
-            <div class="deliver_heade">
-              <!-- <div><span class="infoTitle">物流公司：</span><span>{{item.expressCompanyName}}</span></div> -->
-              <div>
-                <span class="infoTitle">快递包裹 {{index+1}} 运单号：</span><span style="margin-right:10px">{{item.expressOrderSn}}</span>
-                <span v-if="item.showProduct" style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item, index)">
-                  <i   class="el-icon-arrow-up myicon" ></i>隐藏包裹内商品</span>
-                <span v-else style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item,index)">
-                  <i   class="el-icon-arrow-down myicon" ></i>显示包裹内商品</span>
-                <el-button  type="primary" size="mini" plain @click="seeSheetDetails(item)" style="margin-left:10px">查看物流进度</el-button>
-                <!-- 包含的订单商品信息 -->
-                <div class=""  v-if="showChange && item.showProduct" style="margin-top:15px; overflow:hidden; background:#f9f9f9; padding:10px;">
-                  <ul class="sheetOrdersUl" style="overflow:hidden" >
-                    <li  style="flex-wrap:wrap; margin-bottom:10px; width: 100%;">
-                      <!-- <div style="width:100%" v-if="showChange">订单编号：{{item.orderSn}}</div>   -->
-                      <div >
-                      <div class="flexbox" v-for="item2 in item.products" :key="item2.productId"  style="align-items:center; margin-bottom:10px">
-                        <div class="img">
-                          <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item2.productImages" width="60px" height="60px">
-                        </div>
-                        <div>
-                          <div><span>{{item2.productName}} [ ×{{item2.quantity}} ]</span> </div>
-                          <div style="color:#999">所属订单：{{item2.orderSn}}</div>
-                        </div>
-                      </div></div>
-                    </li>
-                  </ul>
+        <el-table :data="orderDetails.goodsList" style="width: 100%">
+          <el-table-column label="商品名" width="280">
+            <template slot-scope="scope">
+              <div class="flexbox">
+                <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="scope.row.productImage"
+                  width="30px" height="30px">
+                <div class="proname">{{ scope.row.productName}}
+                  <i v-if="scope.row.books && scope.row.books.length > 0" @click.stop="seeBooks(scope.row.books)"
+                    class="el-icon-view" style="color:#409eff; cursor: pointer;"></i>
                 </div>
               </div>
-            </div>
-          </el-col>
+            </template>
+          </el-table-column>
+          <el-table-column prop="productPrice" label="价格" width="180">
+          </el-table-column>
+          <el-table-column prop="quantity" label="数量" width="80">
+          </el-table-column>
+        </el-table>
+        <div v-if="orderDetails.consignee" style="margin-top:20px">
+          <div class="liName">物流信息 <a href="#" @click="changeAddressShow" v-if="orderDetails.orderStatus <= 1"><i
+                class="el-icon-edit"></i>修改收货信息</a></div>
+          <div style="background:#f9f9f9; padding:5px; overflow:hidden; ">
+            <li><span
+                class="infoTitle">收货人：</span><span>{{orderDetails.consignee.consigneeName}}</span>&nbsp;&nbsp;&nbsp;<span>{{orderDetails.consignee.consigneeMobile}}</span>
+            </li>
+            <li><span
+                class="infoTitle">收货地址：</span><span>{{orderDetails.consignee.province}}-{{orderDetails.consignee.city}}-{{orderDetails.consignee.county}}-{{orderDetails.consignee.address}}</span>
+            </li>
+          </div>
+        </div>
+        <!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info">
+        </el-alert> -->
+        <li class="flexbox deliverBox" style="width: 100%;"
+          v-if="orderDetails.orderStatus > 0 && sheetList && sheetList.length > 0">
+          <el-row :gutter="20" style="flex-wrap:wrap; width: 100%;" class="flexbox">
+            <el-col :md="12" :lg="12" class="item" v-for="(item, index) in sheetList" :key="index">
+              <div class="deliver_heade">
+                <!-- <div><span class="infoTitle">物流公司：</span><span>{{item.expressCompanyName}}</span></div> -->
+                <div>
+                  <span class="infoTitle">快递包裹 {{index+1}} 运单号：</span><span
+                    style="margin-right:10px">{{item.expressOrderSn}}</span>
+                  <span v-if="item.showProduct" style="color:#409eff; cursor: pointer;"
+                    @click.stop="showProducts(item, index)">
+                    <i class="el-icon-arrow-up myicon"></i>隐藏包裹内商品</span>
+                  <span v-else style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item,index)">
+                    <i class="el-icon-arrow-down myicon"></i>显示包裹内商品</span>
+                  <el-button type="primary" size="mini" plain @click="seeSheetDetails(item)"
+                    style="margin-left:10px">查看物流进度</el-button>
+                  <!-- 包含的订单商品信息 -->
+                  <div class="" v-if="showChange && item.showProduct"
+                    style="margin-top:15px; overflow:hidden; background:#f9f9f9; padding:10px;">
+                    <ul class="sheetOrdersUl" style="overflow:hidden">
+                      <li style="flex-wrap:wrap; margin-bottom:10px; width: 100%;">
+                        <!-- <div style="width:100%" v-if="showChange">订单编号：{{item.orderSn}}</div>   -->
+                        <div>
+                          <div class="flexbox" v-for="item2 in item.products" :key="item2.productId"
+                            style="align-items:center; margin-bottom:10px">
+                            <div class="img">
+                              <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;"
+                                :src="item2.productImages" width="60px" height="60px">
+                            </div>
+                            <div>
+                              <div><span>{{item2.productName}} [ ×{{item2.quantity}} ]</span> </div>
+                              <div style="color:#999">所属订单：{{item2.orderSn}}</div>
+                            </div>
+                          </div>
+                        </div>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+              </div>
+            </el-col>
 
-        </el-row>
+          </el-row>
         </li>
         <li class="line" style="margin:10px 0;"></li>
+        <li style="text-align: right;width: 100%;" v-if="orderDetails.orderStatus==0||orderDetails.orderStatus==1">
+          <el-button type="danger" style="" size="mini" plain @click="deleteOrder()">删除订单</el-button>
+        </li>
+
       </ul>
     </div>
     <!-- 抽屉 -->
-    <el-dialog
-    title="物流详情"
-    :visible.sync="tracesShow"
-    @close="drawerHandleClose">
-    <div class="deliver_info">
-                <div>运单信息：{{currentSheet.expressCompanyName}} - {{currentSheet.expressOrderSn}}</div>
-                <div class="scroll" style="padding: 10px;" v-if="traces && traces.length > 0">
-                  <el-timeline :reverse="reverse">
-                    <el-timeline-item  v-for="(activity, index2) in traces" :key="index2" :icon="activity.icon"
-                      :timestamp="activity.acceptTime">
-                      {{ activity.acceptStation }}
-                    </el-timeline-item>
-                  </el-timeline>
-                </div>
-                <div v-else  class="noinfo">-暂无物流信息-</div>
-              </div>
-  </el-dialog>
-    <el-dialog
-      title="修改收货信息"
-      :visible.sync="changeAddVisible"
-      width="500"
-      :close="changeAddHandleClose">
+    <el-dialog title="物流详情" :visible.sync="tracesShow" @close="drawerHandleClose">
+      <div class="deliver_info">
+        <div>运单信息：{{currentSheet.expressCompanyName}} - {{currentSheet.expressOrderSn}}</div>
+        <div class="scroll" style="padding: 10px;" v-if="traces && traces.length > 0">
+          <el-timeline :reverse="reverse">
+            <el-timeline-item v-for="(activity, index2) in traces" :key="index2" :icon="activity.icon"
+              :timestamp="activity.acceptTime">
+              {{ activity.acceptStation }}
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+        <div v-else class="noinfo">-暂无物流信息-</div>
+      </div>
+    </el-dialog>
+    <el-dialog title="修改收货信息" :visible.sync="changeAddVisible" width="500" :close="changeAddHandleClose">
       <div>
         <el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule">
-        <el-form-item label="收货人:" prop="name">
-          <el-input v-model="addressForm.name"></el-input>
-        </el-form-item>
-        <el-form-item label="收货联系电话:" prop="tel">
-          <el-input v-model="addressForm.tel"></el-input>
-        </el-form-item>
-        <el-form-item label="收货地址:">
-          <!-- <el-input v-model="addressForm.address"></el-input> -->
+          <el-form-item label="收货人:" prop="name">
+            <el-input v-model="addressForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="收货联系电话:" prop="tel">
+            <el-input v-model="addressForm.tel"></el-input>
+          </el-form-item>
+          <el-form-item label="收货地址:">
+            <!-- <el-input v-model="addressForm.address"></el-input> -->
             <!-- 省市区-->
             <!-- 省 -->
-            <el-select  v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px" @change="provinceChange">
-              <el-option
-                v-for="item in provinceEntity"
-                :key="item.regionCode"
-                :label="item.provName"
+            <el-select v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px"
+              @change="provinceChange">
+              <el-option v-for="item in provinceEntity" :key="item.regionCode" :label="item.provName"
                 :value="item.regionCode">
               </el-option>
             </el-select>
             <el-select v-model="addressForm.cityCode" placeholder="请选择市" @change="cityChange">
-              <el-option
-                v-for="item in cityEntity.cityList"
-                :key="item.regionCode"
-                :label="item.cityName"
+              <el-option v-for="item in cityEntity.cityList" :key="item.regionCode" :label="item.cityName"
                 :value="item.regionCode">
               </el-option>
             </el-select>
             <el-select v-model="addressForm.countyCode" placeholder="请选择区" @change="countyChange">
-              <el-option
-                v-for="item in countyEntity.countyList"
-                :key="item.regionCode"
-                :label="item.countyName"
+              <el-option v-for="item in countyEntity.countyList" :key="item.regionCode" :label="item.countyName"
                 :value="item.regionCode">
               </el-option>
             </el-select>
@@ -205,17 +207,14 @@
         <el-button type="primary" @click="changeAddress">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog center
-      title="商品包含的书籍信息"
-      :visible.sync="booksShow"
-      width="500"
-      :close="booksHandleClose">
+    <el-dialog center title="商品包含的书籍信息" :visible.sync="booksShow" width="500" :close="booksHandleClose">
       <div>
         <span>该商品共包含了 {{currBookLIst.length}} 个书籍</span>
         <ul class="booksUl ">
           <li class="flexbox" v-for="item in currBookLIst" :key="item.id">
             <div class="img">
-              <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px" height="100px">
+              <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px"
+                height="100px">
             </div>
             <div>
               <span>{{item.name}}[{{item.id}}]</span>
@@ -234,226 +233,240 @@
 </template>
 
 <script>
-import AddOrUpdate from './buyorderdetail-add-or-update'
-import setDeliverDialog from './set-deliver-dialog'
-export default {
-  data() {
-    return {
-      orderList:[],
-      dataForm: {
-        key: ''
-      },
-      traces:[],      // 物流轨迹
-      tracesShow:false,
-      currentSheet:{},
+  import AddOrUpdate from './buyorderdetail-add-or-update'
+  import setDeliverDialog from './set-deliver-dialog'
+  export default {
+    data() {
+      return {
+        orderList: [],
+        dataForm: {
+          key: ''
+        },
+        traces: [], // 物流轨迹
+        tracesShow: false,
+        currentSheet: {},
 
-      reverse: true,
-      activities: [ ],
-      deliverData: [],  // 物流信息
+        reverse: true,
+        activities: [],
+        deliverData: [], // 物流信息
 
-      setDeliverVisible: false,
-      dataListLoading: false,
-      dataListSelections: [],
-      // addOrUpdateVisible: false,
-      query: {
-        orderSn: 0,
-        ordertype:null
-      },
-      changeAddVisible: false,
-      orderDetails:{},
-      addressForm:{
-        provinceCode:null,  //省份串码
-        provinceName:null,
-        cityCode:null,  //市区串码
-        cityName:null,
-        countyCode:null, //省份串码
-        countyName:null,
-        name:'',
-        tel:'',
-        addressXX:''
-      },
-      provinceEntity:[], // 城市列表
-      cityEntity:[], // 市
-      countyEntity:[], // 区
-      optionProps: {
-        checkStrictly: true,
-        value: "regionCode",
-        label: "provName",
-        children: "children"
-      },
-      addressFormRule:{
-        name: [
-            { required: true, message: '请输入收货人信息', trigger: 'blur' }
-          ],
-          tel: [
-            { required: true, message: '请输入收货联系电话信息', trigger: 'blur' }
-          ],
-          county: [
-            { required: true, message: '请选择收货地址', trigger: 'blur' }
-          ],
-          addressXX: [
-            { required: true, message: '请输入详细地址信息', trigger: 'blur' }
-          ],
-      },
-      sheetList:[],       // 面单列表
-      currBookLIst:[],
-      booksShow: false,
-      showChange:true,
-    }
-  },
-  components: {
-    AddOrUpdate
-  },
-  activated() {
-    this.query.orderSn = this.$route.query.orderSn;
-    this.query.ordertype = this.$route.query.ordertype;
-    // console.log(this.$route.query.orderSn)
-    this.getData()
-    // this.getOrderSheetList()
-  },
-  methods: {
-    showProducts(item,index){
-      this.showChange = false
-       this.sheetList[index].showProduct = !item.showProduct
-       this.showChange = true
-    //  console.log(this.sheetList,'this.sheetList[index].showProduct')
+        setDeliverVisible: false,
+        dataListLoading: false,
+        dataListSelections: [],
+        // addOrUpdateVisible: false,
+        query: {
+          orderSn: 0,
+          ordertype: null
+        },
+        changeAddVisible: false,
+        orderDetails: {},
+        addressForm: {
+          provinceCode: null, //省份串码
+          provinceName: null,
+          cityCode: null, //市区串码
+          cityName: null,
+          countyCode: null, //省份串码
+          countyName: null,
+          name: '',
+          tel: '',
+          addressXX: ''
+        },
+        provinceEntity: [], // 城市列表
+        cityEntity: [], // 市
+        countyEntity: [], // 区
+        optionProps: {
+          checkStrictly: true,
+          value: "regionCode",
+          label: "provName",
+          children: "children"
+        },
+        addressFormRule: {
+          name: [{
+            required: true,
+            message: '请输入收货人信息',
+            trigger: 'blur'
+          }],
+          tel: [{
+            required: true,
+            message: '请输入收货联系电话信息',
+            trigger: 'blur'
+          }],
+          county: [{
+            required: true,
+            message: '请选择收货地址',
+            trigger: 'blur'
+          }],
+          addressXX: [{
+            required: true,
+            message: '请输入详细地址信息',
+            trigger: 'blur'
+          }],
+        },
+        sheetList: [], // 面单列表
+        currBookLIst: [],
+        booksShow: false,
+        showChange: true,
+      }
     },
-    seeBooks(arr){
-      this.currBookLIst = arr
-      this.booksShow = true
+    components: {
+      AddOrUpdate
     },
-    booksHandleClose(){
-      this.currBookLIst = []
-      this.booksShow = false
+    activated() {
+      this.query.orderSn = this.$route.query.orderSn;
+      this.query.ordertype = this.$route.query.ordertype;
+      // console.log(this.$route.query.orderSn)
+      this.getData()
+      // this.getOrderSheetList()
     },
-    drawerHandleClose(){
-      // console.log('关闭')
-      this.traces = []
-      this.tracesShow = false
-      this.currentSheet = {}
-    },
-    // 获取某一快递的物流进度
-    seeSheetDetails(item){
-      // console.log('正在查询快递进度',item)
-      this.currentSheet = item
-      let loading = this.$loading({
-                lock: true,
-                text: '正在获取物流信息...',
-                spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.7)'
-            });
-      // var mobileLeng = this.orderDetails.consignee.consigneeMobile.length
-      this.$http({
-        url: this.$http.adornUrl('/book/buyOrder/searchExpress'),
-        method: 'get',
-        params: this.$http.adornParams({
-          'expressOrderSn': item.expressOrderSn,
-          // 'expressCompanyCode': item.expressCompanyCode,
-          // 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng)
-        })
-      }).then(({ data }) => {
-        if(data.code == 0){
-          if(data.express.traces.length > 0){
-            this.traces = data.express.traces
-            this.tracesShow = true
-            // console.log(data,'data')
-            loading.close()
-          }else{
-            this.$message('暂无物流信息哦~');
-            loading.close()
+    methods: {
+      showProducts(item, index) {
+        this.showChange = false
+        this.sheetList[index].showProduct = !item.showProduct
+        this.showChange = true
+        //  console.log(this.sheetList,'this.sheetList[index].showProduct')
+      },
+      seeBooks(arr) {
+        this.currBookLIst = arr
+        this.booksShow = true
+      },
+      booksHandleClose() {
+        this.currBookLIst = []
+        this.booksShow = false
+      },
+      drawerHandleClose() {
+        // console.log('关闭')
+        this.traces = []
+        this.tracesShow = false
+        this.currentSheet = {}
+      },
+      // 获取某一快递的物流进度
+      seeSheetDetails(item) {
+        // console.log('正在查询快递进度',item)
+        this.currentSheet = item
+        let loading = this.$loading({
+          lock: true,
+          text: '正在获取物流信息...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        // var mobileLeng = this.orderDetails.consignee.consigneeMobile.length
+        this.$http({
+          url: this.$http.adornUrl('/book/buyOrder/searchExpress'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'expressOrderSn': item.expressOrderSn,
+            // 'expressCompanyCode': item.expressCompanyCode,
+            // 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng)
+          })
+        }).then(({
+          data
+        }) => {
+          if (data.code == 0) {
+            if (data.express.traces.length > 0) {
+              this.traces = data.express.traces
+              this.tracesShow = true
+              // console.log(data,'data')
+              loading.close()
+            } else {
+              this.$message('暂无物流信息哦~');
+              loading.close()
+            }
           }
-        }
 
-      }).catch(({e}) => {
-        console.log(e,'e')
-        loading.close()
-      })
-    },
-    countyChange(e){
-      // console.log(e,'countyName')
-      this.countyEntity.countyList.find((val,index,arr)=>{
-        this.addressForm.countyName = val.countyName
+        }).catch(({
+          e
+        }) => {
+          console.log(e, 'e')
+          loading.close()
+        })
+      },
+      countyChange(e) {
+        // console.log(e,'countyName')
+        this.countyEntity.countyList.find((val, index, arr) => {
+          this.addressForm.countyName = val.countyName
           return val.regionCode == e
         })
         // console.log('this.addressForm.countyName', this.addressForm)
-    },
-    cityChange(e){
-    //  console.log('修改了市',e)
-      this.addressForm.countyCode = null
-      this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
-        this.addressForm.cityName = val.cityName
+      },
+      cityChange(e) {
+        //  console.log('修改了市',e)
+        this.addressForm.countyCode = null
+        this.countyEntity = this.cityEntity.cityList.find((val, index, arr) => {
+          this.addressForm.cityName = val.cityName
           return val.regionCode == e
         })
-      // console.log(' this.addressForm.cityName',  this.addressForm.cityName)
-    },
-    provinceChange(e){
-      // console.log('修改了省份',e)
-      this.addressForm.cityCode = null;
-      this.addressForm.countyCode = null
-      this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
+        // console.log(' this.addressForm.cityName',  this.addressForm.cityName)
+      },
+      provinceChange(e) {
+        // console.log('修改了省份',e)
+        this.addressForm.cityCode = null;
+        this.addressForm.countyCode = null
+        this.cityEntity = this.provinceEntity.find((val, index, arr) => {
           this.addressForm.provinceName = val.provName
           return val.regionCode == e
         })
         // console.log('this.addressForm.provinceName',this.addressForm.provinceName)
-    },
-    changeAddHandleClose(){
-      this.changeAddVisible = false
-      this.addressForm.provinceCode = null
-      this.addressForm.cityCode = null;
-      this.addressForm.countyCode = null
-      this.addressForm.provinceName = null
-      this.addressForm.cityName = null;
-      this.addressForm.countyName = null
-      this.provinceEntity = []
-      this.cityEntity = []
-      this.countyEntity = []
-      this.$refs['addressFormRef'].clearValidate()
-      this.$nextTick(() => {
-        this.addressForm.name = ''
-        this.addressForm.tel = ''
-        this.addressForm.addressXX = ''
-      // this.$refs['addressFormRef'].resetFields();
-      })
-      // $refs[formName].resetFields()
-      // console.log('关闭了', this.addressForm)
-    },
-    changeAddressShow(){
-      this.$http({
-        url: this.$http.adornUrl('/api/province/getProvince'),
-        method: 'post',
-        // params: this.$http.adornParams({
-        //   'orderId': this.query.orderId
-        // })
-      }).then(({ data }) => {
-        // console.log('获取地址三级列表', data)
-        if(data.code == 0){
-          this.provinceEntity = data.provinceEntity
-          this.addressForm.addressXX = this.orderDetails.consignee.address
-          this.addressForm.provinceCode = this.orderDetails.consignee.provinceCode
-          this.addressForm.cityCode = this.orderDetails.consignee.cityCode
-          this.addressForm.countyCode = this.orderDetails.consignee.countyCode
-          this.addressForm.provinceName = this.orderDetails.consignee.provinceCode
-          this.addressForm.cityName = this.orderDetails.consignee.cityCode
-          this.addressForm.countyName = this.orderDetails.consignee.countyCode
-          this.addressForm.name = this.orderDetails.consignee.consigneeName
-          this.addressForm.tel = this.orderDetails.consignee.consigneeMobile
-          // console.log(this.provinceEntity,'this.provinceEntity')
-          this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
-          return val.regionCode == this.addressForm.provinceCode
+      },
+      changeAddHandleClose() {
+        this.changeAddVisible = false
+        this.addressForm.provinceCode = null
+        this.addressForm.cityCode = null;
+        this.addressForm.countyCode = null
+        this.addressForm.provinceName = null
+        this.addressForm.cityName = null;
+        this.addressForm.countyName = null
+        this.provinceEntity = []
+        this.cityEntity = []
+        this.countyEntity = []
+        this.$refs['addressFormRef'].clearValidate()
+        this.$nextTick(() => {
+          this.addressForm.name = ''
+          this.addressForm.tel = ''
+          this.addressForm.addressXX = ''
+          // this.$refs['addressFormRef'].resetFields();
         })
-        this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
-          return val.regionCode == this.addressForm.cityCode
+        // $refs[formName].resetFields()
+        // console.log('关闭了', this.addressForm)
+      },
+      changeAddressShow() {
+        this.$http({
+          url: this.$http.adornUrl('/api/province/getProvince'),
+          method: 'post',
+          // params: this.$http.adornParams({
+          //   'orderId': this.query.orderId
+          // })
+        }).then(({
+          data
+        }) => {
+          // console.log('获取地址三级列表', data)
+          if (data.code == 0) {
+            this.provinceEntity = data.provinceEntity
+            this.addressForm.addressXX = this.orderDetails.consignee.address
+            this.addressForm.provinceCode = this.orderDetails.consignee.provinceCode
+            this.addressForm.cityCode = this.orderDetails.consignee.cityCode
+            this.addressForm.countyCode = this.orderDetails.consignee.countyCode
+            this.addressForm.provinceName = this.orderDetails.consignee.provinceCode
+            this.addressForm.cityName = this.orderDetails.consignee.cityCode
+            this.addressForm.countyName = this.orderDetails.consignee.countyCode
+            this.addressForm.name = this.orderDetails.consignee.consigneeName
+            this.addressForm.tel = this.orderDetails.consignee.consigneeMobile
+            // console.log(this.provinceEntity,'this.provinceEntity')
+            this.cityEntity = this.provinceEntity.find((val, index, arr) => {
+              return val.regionCode == this.addressForm.provinceCode
+            })
+            this.countyEntity = this.cityEntity.cityList.find((val, index, arr) => {
+              return val.regionCode == this.addressForm.cityCode
+            })
+          }
+        }).catch(e => {
+          console.log(e, 'e')
         })
-        }
-      }).catch( e => {
-        console.log(e,'e')
-      })
-      this.changeAddVisible = true
-      // console.log('显示修改收货地址')
-    },
-    // 修改收货信息
-    changeAddress(){
-      this.$refs['addressFormRef'].validate((valid) => {
+        this.changeAddVisible = true
+        // console.log('显示修改收货地址')
+      },
+      // 修改收货信息
+      changeAddress() {
+        this.$refs['addressFormRef'].validate((valid) => {
           if (valid) {
             // console.log('修改收货地址')
             this.$http({
@@ -461,230 +474,324 @@ export default {
               method: 'post',
               data: this.$http.adornData({
                 'orderSn': this.query.orderSn,
-               // 'province': this.addressForm.provinceName,
-               // 'city':  this.addressForm.cityName,
-              //  'county':  this.addressForm.countyName,
-                'address':  this.addressForm.addressXX,
-                'consigneeName':  this.addressForm.name,
-                'consigneeMobile':  this.addressForm.tel,
+                // 'province': this.addressForm.provinceName,
+                // 'city':  this.addressForm.cityName,
+                //  'county':  this.addressForm.countyName,
+                'address': this.addressForm.addressXX,
+                'consigneeName': this.addressForm.name,
+                'consigneeMobile': this.addressForm.tel,
                 "provinceCode": this.addressForm.provinceCode,
                 "cityCode": this.addressForm.cityCode,
                 "countyCode": this.addressForm.countyCode,
                 //'orderId': this.addressForm.orderId
 
               })
-              }).then(({ data }) => {
-                // console.log('修改地址返回值', data)
-                this.$message.success('修改地址成功！')
-                this.changeAddHandleClose()
-                this.getData()
+            }).then(({
+              data
+            }) => {
+              // console.log('修改地址返回值', data)
+              this.$message.success('修改地址成功！')
+              this.changeAddHandleClose()
+              this.getData()
 
-              }).catch( e => {
-                console.log(e,'e')
-              })
+            }).catch(e => {
+              console.log(e, 'e')
+            })
           } else {
             return false;
           }
         });
-    },
+      },
 
-    // 获取数据列表
-    getData() {
-      this.dataListLoading = true
-      this.$http({
-        // url: this.$http.adornUrl(`/book/buyOrder/appGetOrderInfo/${this.query.ordertype}`),
-        url: this.$http.adornUrl(`/book/buyOrder/orderDetail`),
-        method: 'get',
-        params: this.$http.adornParams({
-          'orderSn': this.query.orderSn,
+      // 获取数据列表
+      getData() {
+        this.dataListLoading = true
+        this.$http({
+          // url: this.$http.adornUrl(`/book/buyOrder/appGetOrderInfo/${this.query.ordertype}`),
+          url: this.$http.adornUrl(`/book/buyOrder/orderDetail`),
+          method: 'get',
+          params: this.$http.adornParams({
+            'orderSn': this.query.orderSn,
+          })
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            // console.log(data.result,'data.result')
+            this.orderDetails = data.result
+            if (data.result.expressOrders) {
+              data.result.expressOrders.forEach(element => {
+                element.showProduct = false
+              });
+              this.sheetList = data.result.expressOrders
+            }
+
+          
+          } else {
+            this.orderDetails = {}
+            return this.$message.error('商品详情获取失败，请重试')
+          }
+          this.dataListLoading = false
         })
-      }).then(({ data }) => {
-        if (data && data.code === 0) {
-          // console.log(data.result,'data.result')
-          this.orderDetails = data.result
-          data.result.expressOrders.forEach(element => {
-            element.showProduct = false
-          });
-          this.sheetList = data.result.expressOrders
-        } else {
-          this.orderDetails = {}
-          return this.$message.error('商品详情获取失败，请重试')
-        }
-        this.dataListLoading = false
-      })
+      },
+      closeDeliverDialog(val) {
+        this.setDeliverVisible = false
+        this.getData()
+      },
+      // 去发货
+      godeliver() {
+        this.orderList[0] = this.query.orderSn
+        this.setDeliverVisible = true
+      },
+
+      // 删除订单
+      deleteOrder() {
+        this.$confirm(`确定对订单进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/book/buyOrder/orderDel'),
+            method: 'post',
+            params: this.$http.adornParams({
+              'orderSn': this.orderDetails.orderSn
+            })
+          }).then(({
+            data
+          }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '删除成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.$router.push({
+                    path: "/order-buyorder",
+                  });
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        })
+      }
     },
-    closeDeliverDialog(val) {
-      this.setDeliverVisible = false
-      this.getData()
-    },
-    // 去发货
-    godeliver() {
-      this.orderList[0] = this.query.orderSn
-      this.setDeliverVisible = true
+    components: {
+      setDeliverDialog
     }
-  },
-  components: {
-    setDeliverDialog
   }
-}
 </script>
 
 <style lang="less" scoped>
-.myicon{border: 1px solid #409eff; margin-right: 5px;}
-.booksUl{ overflow: hidden; margin-top: 15px; padding-left: 0;
-  li{list-style: none; width: 50%; float: left; align-items: center; margin-bottom: 15px;}
-}
-.sheetOrdersUl{padding-left: 0;
-  li{width: 100%;}
-}
-.orderType{
-  overflow: hidden; margin-bottom: 20px;
-  .item{
-    color: #fff;
-    display: inline-block;
-    padding: 10px;
-    border-radius: 0 20px 20px 0;
+  .myicon {
+    border: 1px solid #409eff;
+    margin-right: 5px;
   }
-  .hightLight0{
-    background-color: #e6a23c;
+
+  .booksUl {
+    overflow: hidden;
+    margin-top: 15px;
+    padding-left: 0;
+
+    li {
+      list-style: none;
+      width: 50%;
+      float: left;
+      align-items: center;
+      margin-bottom: 15px;
+    }
   }
-  .hightLight1{
-    background-color: #409eff;
+
+  .sheetOrdersUl {
+    padding-left: 0;
+
+    li {
+      width: 100%;
+    }
   }
-  .hightLight2{
-    background-color: #f56c6c;
+
+  .orderType {
+    overflow: hidden;
+    margin-bottom: 20px;
+
+    .item {
+      color: #fff;
+      display: inline-block;
+      padding: 10px;
+      border-radius: 0 20px 20px 0;
+    }
+
+    .hightLight0 {
+      background-color: #e6a23c;
+    }
+
+    .hightLight1 {
+      background-color: #409eff;
+    }
+
+    .hightLight2 {
+      background-color: #f56c6c;
+    }
+
+    .hightLight3 {
+      background-color: #67c23a;
+    }
   }
-  .hightLight3{
-    background-color: #67c23a;
-  }
-}
-.noinfo {
+
+  .noinfo {
     color: #ddd;
     text-align: center;
     padding: 20px;
-}
-.scroll{margin-top: 15px; height: 300px;}
-.deliverBox{
-  flex-wrap: wrap; justify-content: space-between;
-  .item{padding-right: 15px; min-width: 300px;
-    .deliver_heade{margin-top: 15px;}
-  }
-}
-.el-timeline{
-  li{
-    float: none;
-  }
-}
-.flexbox {
-  display: flex;
-}
-.deliver_info{border-radius: 10px;}
-.infoTitle {
-  display: inline;
-}
-
-ul.list {
-  overflow: hidden;
-  color: #515a6e;
-
-  li {
-    list-style: none;
-    width: 50%;
-    line-height: 26px;
-    float: left;
-    font-size: 12px;
-
   }
 
-  .hightLight {
-    color: #f56c6c;
+  .scroll {
+    margin-top: 15px;
+    height: 300px;
   }
 
-  .line {
-    width: 100%;
-    border-bottom: 1px solid #eee;
-    margin: 10px 0;
-  }
-}
+  .deliverBox {
+    flex-wrap: wrap;
+    justify-content: space-between;
 
-.liName {
-  font-size: 12px;
-  margin-bottom: 10px;
-  font-weight: bold;
-}
+    .item {
+      padding-right: 15px;
+      min-width: 300px;
 
-.text_button {
-  padding: 0;
-}
-.el-icon-truck:before {
-    content: "\e740";
-}
-
-.el-timeline-item:first-child {
-    .el-timeline-item__node {
-        background-color: rgb(11, 189, 135);
+      .deliver_heade {
+        margin-top: 15px;
+      }
     }
-    color:  rgb(11, 189, 135) !important;
-}
+  }
 
-.el-timeline-item {
+  .el-timeline {
+    li {
+      float: none;
+    }
+  }
+
+  .flexbox {
+    display: flex;
+  }
+
+  .deliver_info {
+    border-radius: 10px;
+  }
+
+  .infoTitle {
+    display: inline;
+  }
+
+  ul.list {
+    overflow: hidden;
+    color: #515a6e;
+
+    li {
+      list-style: none;
+      width: 50%;
+      line-height: 26px;
+      float: left;
+      font-size: 12px;
+
+    }
+
+    .hightLight {
+      color: #f56c6c;
+    }
+
+    .line {
+      width: 100%;
+      border-bottom: 1px solid #eee;
+      margin: 10px 0;
+    }
+  }
+
+  .liName {
+    font-size: 12px;
+    margin-bottom: 10px;
+    font-weight: bold;
+  }
+
+  .text_button {
+    padding: 0;
+  }
+
+  .el-icon-truck:before {
+    content: "\e740";
+  }
+
+  .el-timeline-item:first-child {
+    .el-timeline-item__node {
+      background-color: rgb(11, 189, 135);
+    }
+
+    color: rgb(11, 189, 135) !important;
+  }
+
+  .el-timeline-item {
     width: 100%;
     position: relative;
     padding-bottom: 20px;
-}
+  }
 
-.el-timeline-item__node--large {
+  .el-timeline-item__node--large {
     left: -2px;
     width: 14px;
     height: 14px;
-}
+  }
 
-.el-timeline-item__node {
+  .el-timeline-item__node {
     position: absolute;
     background-color: #e4e7ed;
     border-radius: 50%;
     display: flex;
     justify-content: center;
     align-items: center;
-}
+  }
 
-.el-timeline-item__node--normal {
+  .el-timeline-item__node--normal {
     left: -1px;
     width: 12px;
     height: 12px;
-}
+  }
 
-.el-timeline-item__wrapper {
+  .el-timeline-item__wrapper {
     position: relative;
     padding-left: 28px;
     top: -3px;
-}
+  }
 
-.el-timeline li {
+  .el-timeline li {
     list-style: none;
-}
+  }
 
-.el-timeline-item__tail {
+  .el-timeline-item__tail {
     position: absolute;
     left: 4px;
     height: 100%;
     border-left: 2px solid #e4e7ed;
-}
+  }
 
-.el-timeline .el-timeline-item:last-child .el-timeline-item__tail {
+  .el-timeline .el-timeline-item:last-child .el-timeline-item__tail {
     display: none;
-}
+  }
 
-.el-timeline-item__timestamp {
+  .el-timeline-item__timestamp {
     color: #c3c3c3;
     font-size: 14px;
     ;
-}
- /deep/ .el-select-dropdown{width: 200px !important;}
-:deep(.el-select-dropdown__list) {
-  width: 200px !important;
-}
- /deep/ .el-select-dropdown__list{width: 200px !important;}
+  }
 
+  /deep/ .el-select-dropdown {
+    width: 200px !important;
+  }
 
-</style>
+  :deep(.el-select-dropdown__list) {
+    width: 200px !important;
+  }
+
+  /deep/ .el-select-dropdown__list {
+    width: 200px !important;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/order/orderdeliver-split.vue b/src/views/modules/order/orderdeliver-split.vue
index 63c62e7..85f13a3 100644
--- a/src/views/modules/order/orderdeliver-split.vue
+++ b/src/views/modules/order/orderdeliver-split.vue
@@ -27,13 +27,13 @@
                         <div class="item_body">
                             <div class="flexbox" style="justify-content: space-between;">
                                 <div class="td1 flexbox" style="align-items: flex-start;">
-                                    <div class="flexbox orderProducts" v-for="products in productsCodeList" :key="products.productId">
+                                    <div class="flexbox orderProducts" v-for="products in productsCodeList" :key="products.product.productId">
                                         <div class="flexbox productItem" style="">
                                             <!-- <el-checkbox :label="products.allOrderId"></el-checkbox> -->
-                                            <img :src="products.productImage" width="30px" height="30px" :class="products.expressInfo && products.expressInfo.expressOrderSn != null ? 'gray' : ''" >
+                                            <img :src="products.product.productImages" width="30px" height="30px" :class="products.expressOrderId>0 && products.expressOrder != null ? 'gray' : ''" >
                                             <div class="" style="align-items: center;">
-                                                <div class="bookName" style="margin-left:0">{{ products.productName }}</div>
-                                                <div style="width:100%; color:#17B3A3; font-size:12px" v-if="products.expressInfo && products.expressInfo.expressOrderSn != null">快递信息：{{products.expressInfo.expressCompany}}-{{products.expressInfo.expressOrderSn}}</div>
+                                                <div class="bookName" style="margin-left:0">{{ products.product.productName }}</div>
+                                                <div style="width:100%; color:#17B3A3; font-size:12px" v-if="products.expressOrderId>0 && products.expressOrder != null">快递信息：{{products.expressOrder.expressOrderSn}}</div>
                                             </div>
                                         </div>
                                         <div class="flexbox">
@@ -232,7 +232,7 @@ export default {
                     this.productsCodeList.splice(index, 1)
                     // console.log(index)
                 }
-                this.productsIdsList = this.productsCodeList.map( item => item.buyOrderProductId)
+                this.productsIdsList = this.productsCodeList.map( item => item.id)
             })
         },
         //
@@ -371,7 +371,7 @@ export default {
         orderitem: {
             handler(val, oldVal) {
                 // console.log('变化',val)
-                this.productsCodeList = val.goodsList
+                this.productsCodeList = val.productList
                 this.getNewProducts()
                 // console.log('productsIdsList',this.productsIdsList)
                 this.getMixDeliverOrderList()