From 4f2f6e8d20604226713061408118e94a62760f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 29 Sep 2021 16:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A5=BC=E5=B1=82=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E9=80=80=E5=8D=95=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=A0=8D=E4=BB=B7=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=95=86=E5=93=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexDecorate/ModelFormItem.vue           |  5 +-
 .../kanjia/kanjiaActivityAddGoods.vue         | 48 +++++++++----------
 .../after-order/reurnGoodsOrderDetail.vue     |  2 +-
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/buyer/src/components/indexDecorate/ModelFormItem.vue b/buyer/src/components/indexDecorate/ModelFormItem.vue
index f2a7b312..4d948c53 100644
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -81,14 +81,17 @@
       <first-page-advert :data="element" class="mb_20 width_1200_auto"></first-page-advert>
     </template>
     <!-- 横幅广告 -->
-    <template v-if="element.type == 'bannerAdvert'">
+    <template  v-if="element.type == 'bannerAdvert'">
+      <div style="width:100%; text-align: center;">
       <img
         width="1200"
         class="hover-pointer mb_20"
+      
         @click="linkTo(element.options.url)"
         :src="element.options.img"
         alt=""
       />
+      </div>
     </template>
     <template v-if="element.type == 'notEnough'">
       <not-enough :data="element" class="mb_20 width_1200_auto"></not-enough>
diff --git a/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue b/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
index 0bdd2fe0..24863082 100644
--- a/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
+++ b/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
@@ -8,8 +8,8 @@
 
             <FormItem label="选择商品" prop="scopeType">
               <Button type="primary" @click="openSkuList">选择商品</Button>
-              <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除
-              </Button>
+              <!-- <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除
+              </Button> -->
             </FormItem>
 
             <FormItem astyle="width: 100%">
@@ -292,28 +292,28 @@ export default {
       // 已选商品批量选择
       this.selectedGoods = e;
     },
-    delSelectGoods() {
-      // 多选删除商品
-      if (this.selectedGoods.length <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选商品吗?",
-        onOk: () => {
-          let ids = [];
-          this.selectedGoods.forEach(function (e) {
-            ids.push(e.id);
-          });
-          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
-            (item) => {
-              return !ids.includes(item.id);
-            }
-          );
-        },
-      });
-    },
+    // delSelectGoods() {
+    //   // 多选删除商品
+    //   if (this.selectedGoods.length <= 0) {
+    //     this.$Message.warning("您还未选择要删除的数据");
+    //     return;
+    //   }
+    //   this.$Modal.confirm({
+    //     title: "确认删除",
+    //     content: "您确认要删除所选商品吗?",
+    //     onOk: () => {
+    //       let ids = [];
+    //       this.selectedGoods.forEach(function (e) {
+    //         ids.push(e.id);
+    //       });
+    //       this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+    //         (item) => {
+    //           return !ids.includes(item.id);
+    //         }
+    //       );
+    //     },
+    //   });
+    // },
     delGoods(index) {
       // 删除商品
       this.form.promotionGoodsList.splice(index, 1);
diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
index 1d758761..2a53296d 100644
--- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
+++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
@@ -91,7 +91,7 @@
                 <dt>申请退款金额</dt>
                 <dd>{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}</dd>
               </dl>
-              <dl>
+              <dl v-if="params.serviceStatus == 'PASS'">
                 <dt>实际退款金额</dt>
                 <dd>
                   <Input v-model="params.actualRefundPrice" style="width:260px" />