系统订单-关联赠品

src/components/shop/dialog.vue

@@ -870,7 +870,7 @@
                 })
             },
             getRelationGift() {
-                relationGiftApi().then(res => {
+                relationGiftApi({status: 1}).then(res => {
                     this.relation_gift = res.list;
                 });
             }

src/components/teacherDetail/giftDeliverDialog.vue

@@ -3,7 +3,8 @@
     :title="dialogObj.title"
     center
     append-to-body
-    :visible.sync="dialogObj.show">
+    :visible.sync="dialogObj.show"
+    :close-on-click-modal="false">
     <div v-if="dialogObj.gift_deliver" class="dialog-content">
       <div class="dialog-text">物流已发货，不能修改赠品信息！</div>
       <span slot="footer" class="dialog-footer">
@@ -59,6 +60,13 @@
                 relationGiftApi({goods_id: this.dialogObj.goods_id}).then(res => {
                     this.selectedGiftList = res.list;
                 });
+                relationGiftApi({out_trade_no: this.dialogObj.out_trade_no}).then(res => {
+                    let giftListArr = [];
+                    res.list.forEach(i => {
+                        giftListArr.push(i.id);
+                    });
+                    this.form.selectedGiftList = giftListArr;
+                });
             },
             sub() {
                 this.$refs['form'].validate((valid) => {