From e318fe5be002cdeb4199b48c668adb5a586fdbd9 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 2 Jul 2021 09:50:25 +0800
Subject: [PATCH] =?UTF-8?q?pc=E9=A6=96=E9=A1=B5margin=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexDecorate/modelFormItem.vue           | 17 ++++++++---------
 .../indexDecorate/modelList/carousel.vue      |  1 -
 seller/src/config/index.js                    | 16 ++++++++--------
 seller/src/views/order/order/orderList.vue    | 19 +++++++++++++------
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/buyer/src/components/indexDecorate/modelFormItem.vue b/buyer/src/components/indexDecorate/modelFormItem.vue
index efd266fd..e43149e4 100644
--- a/buyer/src/components/indexDecorate/modelFormItem.vue
+++ b/buyer/src/components/indexDecorate/modelFormItem.vue
@@ -2,11 +2,11 @@
   <div class="model-item" v-if="element && element.key">
     <!-- 轮播图模块，包括个人信息，快捷导航模块 -->
     <template v-if="element.type == 'carousel'">
-      <model-carousel :data="element"></model-carousel>
+      <model-carousel :data="element" class="mb_20"></model-carousel>
     </template>
     <!-- 热门广告 -->
     <template v-if="element.type == 'hotAdvert'">
-      <div>
+      <div class="mb_20">
         <img
           style="display: block"
           class="hover-pointer"
@@ -36,7 +36,7 @@
     <!-- 折扣广告 -->
     <template v-if="element.type == 'discountAdvert'">
       <div
-        class="discountAdvert"
+        class="discountAdvert mb_20"
         :style="{
           'background-image': 'url(' + element.options.bgImg.img + ')',
         }"
@@ -66,28 +66,28 @@
 
     <!-- 好货推荐 -->
     <template v-if="element.type == 'recommend'">
-      <recommend :data="element"></recommend>
+      <recommend :data="element" class="mb_20"></recommend>
     </template>
     <!-- 新品排行 -->
     <template v-if="element.type == 'newGoodsSort'">
-      <new-goods-sort :data="element"></new-goods-sort>
+      <new-goods-sort :data="element" class="mb_20"></new-goods-sort>
     </template>
     <!-- 首页广告 -->
     <template v-if="element.type == 'firstAdvert'">
-      <first-page-advert :data="element"></first-page-advert>
+      <first-page-advert :data="element" class="mb_20"></first-page-advert>
     </template>
     <!-- 横幅广告 -->
     <template v-if="element.type == 'bannerAdvert'">
       <img
         width="1200"
-        class="hover-pointer"
+        class="hover-pointer mb_20"
         @click="linkTo(element.options.url)"
         :src="element.options.img"
         alt=""
       />
     </template>
     <template v-if="element.type == 'notEnough'">
-      <not-enough :data="element"></not-enough>
+      <not-enough :data="element" class="mb_20"></not-enough>
     </template>
   </div>
 </template>
@@ -122,7 +122,6 @@ export default {
 <style lang="scss" scoped>
 .model-item {
   position: relative;
-  margin-bottom: 20px;
   background-color: #fff;
 }
 
diff --git a/buyer/src/components/indexDecorate/modelList/carousel.vue b/buyer/src/components/indexDecorate/modelList/carousel.vue
index 182c0051..45c6be95 100644
--- a/buyer/src/components/indexDecorate/modelList/carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/carousel.vue
@@ -94,7 +94,6 @@ export default {
   width: 1200px;
   height: 340px;
   overflow: hidden;
-  margin-top: -20px;
 }
 
 /* 导航主体 */
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index ec12ba69..8dfd55fa 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn',
-    // common: 'http://192.168.0.109:8890',
-    // buyer: 'http://192.168.0.109:8888',
-    // seller: 'http://192.168.0.109:8889',
-    // manager: 'http://192.168.0.109:8887'
+    // common: 'https://common-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'https://admin-api.pickmall.cn',
+    common: 'http://192.168.0.109:8890',
+    buyer: 'http://192.168.0.109:8888',
+    seller: 'http://192.168.0.109:8889',
+    manager: 'http://192.168.0.109:8887'
 
   },
   api_prod: {
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 6b197f29..e43832de 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -63,7 +63,7 @@ export default {
   },
   data() {
     return {
-      orderCode: "",
+      orderCode: "", // 虚拟订单核验码
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
@@ -289,12 +289,19 @@ export default {
         storeId: userInfo.id
       }
       const res = await API_Order.queryExportOrder(params)
-      for (let i=0; i<res.result.length; i++) {
-        res.result[i].index = i+1;
-        res.result[i].consigneeAddress = 
-          res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail
+      if (res.success) {
+        if (res.result.length === 0) {
+          this.$Message.warning('暂无待发货订单')
+          return []
+        }
+        for (let i=0; i<res.result.length; i++) {
+          res.result[i].index = i+1;
+          res.result[i].consigneeAddress = 
+            res.result[i].consigneeAddressPath.replace(/,/g, "") + res.result[i].consigneeDetail
+        }
+        return res.result
       }
-      return res.result
+      
     },
     // 查看订单详情
     detail(v) {