From fc393ecd64189976e0aac9bab9a755e481a1221d Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 5 Jul 2021 17:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/goodsDetail/ShowGoods.vue |  8 ++++++++
 .../components/goodsDetail/ShowGoodsDetail.vue |  9 ++++-----
 .../src/pages/home/memberCenter/Favorites.vue  |  7 ++-----
 manager/src/config/index.js                    | 16 ++++++++--------
 .../page/article-manage/ArticleCategory.vue    |  2 ++
 .../goods/goods-seller/goodsOperation.vue      | 18 +++++++-----------
 6 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
index 4419ac19..35ec9fe7 100644
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -29,6 +29,9 @@
             {{ skuDetail.goodsName }}
           </p>
         </div>
+        <div class="sell-point">
+          {{skuDetail.sellingPoint}}
+        </div>
         <!-- 限时秒杀 -->
         <Promotion v-if="promotionMap['SECKILL']" :time="promotionMap['SECKILL'].endTime"></Promotion>
         <!-- 商品详细 价格、优惠券、促销 -->
@@ -655,5 +658,10 @@ export default {
     }
   }
 }
+.sell-point {
+  font-size: 12px;
+  color: red;
+  margin-bottom: 5px;
+}
 /******************商品图片及购买详情结束******************/
 </style>
diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index ab2ca565..c52ac831 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -92,7 +92,7 @@
                   <span class="ml_10">{{item.groupName}}</span>
                   <table class="mb_10" cellpadding='0' border="1" cellspacing="0" >
                     <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
-                      <td style="text-align:right">{{param.paramName}}</td><td>{{param.paramValue}}</td>
+                      <td style="text-align: center">{{param.paramName}}</td><td>{{param.paramValue}}</td>
                     </tr>
                   </table>
                 </div>
@@ -492,14 +492,14 @@ table{
   border-color:#efefef;
   color: #999;
   min-width: 30%;
-  margin-left: 10px;
+  margin-left: 30px;
   font-size: 12px;
   tr{
     td:nth-child(1){
-      min-width: 70px;
+      width: 100px;
     }
     td:nth-child(2){
-      padding-left: 10px;
+      padding-left: 20px;
     }
   }
   td{
@@ -508,7 +508,6 @@ table{
 }
 .goods-params {
   display: flex;
-  align-items: center;
   border-bottom: 1px solid #eee;
   margin-left: 30px;
   span{color:#999}
diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue
index d63fcd2b..f57a6b94 100644
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -5,11 +5,8 @@
     <div v-if="list.length">
       <template v-for="(item) in list">
         <div class="goodsItem" :key="item.skuId">
-          <div class="goodsImg hover-pointer">
-            <img
-              :src="params.type === 'GOODS'? item.image : item.logo"
-              alt=""
-            />
+          <div class="goodsImg hover-pointer" v-if="params.type === 'GOODS'">
+            <img :src="item.image" />
           </div>
           <div class="goodsTitle hover-pointer">
             {{params.type === 'GOODS'? item.goodsName : item.storeName}}
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 8b6b162f..47d48b7a 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,14 +17,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.105:8890',
+    // buyer: 'http://192.168.0.105:8888',
+    // seller: 'http://192.168.0.105:8889',
+    // manager: 'http://192.168.0.105:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue
index 84c46072..f6ab4b0b 100644
--- a/manager/src/views/page/article-manage/ArticleCategory.vue
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@@ -141,12 +141,14 @@
                 this.modalVisible = true;
             },
             edit(v) {
+                console.log(v);
                 this.modalType = 1;
                 this.modalTitle = "编辑";
                 this.formAdd.id = v.id;
                 this.formAdd.articleCategoryName = v.articleCategoryName;
                 this.formAdd.level = v.level;
                 this.formAdd.parentId = v.parentId;
+                this.formAdd.sort = v.sort;
                 this.showParent = false;
                 this.modalVisible = true;
             },
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index d5d32241..fdc33182 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -167,7 +167,6 @@
                   <Icon type="ios-camera" size="20"></Icon>
                 </div>
               </Upload>
-              <!-- <upload-pic-thumb v-model="baseInfoForm.goodsGalleryFiles" :multiple="true"></upload-pic-thumb> -->
 
               <Modal title="View Image" v-model="goodsPictureVisible">
                 <img :src="previewGoodsPicture" v-if="goodsPictureVisible" style="width: 100%"/>
@@ -227,7 +226,7 @@
                           .ivu-table-overflowX {
                             overflow-x: hidden;
                           }
-                        " :span-method="handleSpan">
+                        ">
                         <template slot-scope="{ row }" slot="sn">
                           <Input v-model="row.sn" placeholder="请输入货号" @on-change="updateSkuTable(row, 'sn')"/>
                         </template>
@@ -886,6 +885,7 @@ export default {
         this.baseInfoForm.goodsGalleryFiles.filter((i) => i.url !== file.url);
     },
     updateSkuPicture() {
+      this.baseInfoForm.regeneratorSkuFlag = true;
       let _index = this.selectedSku._index;
       this.skuTableData[_index] = this.selectedSku;
     },
@@ -900,11 +900,10 @@ export default {
         this.previewPicture = file.url;
       }
     },
-    handleSuccessGoodsPicture(res, file) {
-      if (file.response) {
-        file.url = file.response.result;
-        this.baseInfoForm.goodsGalleryFiles.push(file);
-      }
+    handleSuccessGoodsPicture(res, file, fileList) {
+      console.log(res, file, fileList);
+      file.url = res.result;
+      this.baseInfoForm.goodsGalleryFiles = fileList;
     },
     handleFormatError(file) {
       this.$Notice.warning({
@@ -1365,13 +1364,10 @@ export default {
         }
       }
     },
-   
-    // 规格表格操作
-    handleSpan({row, column, rowIndex, columnIndex}) {
-    },
     /** 数据改变之后 抛出数据 */
     updateSkuTable(row, item) {
       let index = row._index;
+      this.baseInfoForm.regeneratorSkuFlag = true;
       // this.skuTableData[index][item] = row[item];
       /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
       if (item === "weight") {