From 01600616a46129724343c6c275e8cdad653a8bd8 Mon Sep 17 00:00:00 2001
From: ztt <835303992@qq.com>
Date: Fri, 22 Mar 2024 00:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E7=AD=89=E7=BA=A7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=95=86=E5=93=81=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/backend/shopro/commission/level.js     | 20 +++++++++----------
 public/assets/js/backend/shopro/coupon.js     | 10 +++++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/public/assets/js/backend/shopro/commission/level.js b/public/assets/js/backend/shopro/commission/level.js
index 405d201..0fcff14 100755
--- a/public/assets/js/backend/shopro/commission/level.js
+++ b/public/assets/js/backend/shopro/commission/level.js
@@ -339,11 +339,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     }
 
                     function onSelectCoupon1() {
-                        // let ids = [];
-                        // form.model.coupon_rules.programme_1.forEach((i) => {
-                        //     ids.push(i.id);
-                        // });
-                        Fast.api.open(`shopro/coupon/select?multiple=true&status=normal`, "选择商品", {
+                        let ids = [];
+                        form.model.coupon_rules.programme_1.forEach((i) => {
+                            ids.push(i.id);
+                        });
+                        Fast.api.open(`shopro/coupon/select?multiple=true&status=normal&use_scope=goods&ids=${ids.join(',')}`, "选择商品", {
                             callback(data) {
                                 console.log(data)
                                 form.model.coupon_rules.programme_1 = data;
@@ -352,11 +352,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     }
 
                     function onSelectCoupon2() {
-                        // let ids = [];
-                        // form.model.coupon_rules.programme_2.forEach((i) => {
-                        //     ids.push(i.id);
-                        // });
-                        Fast.api.open(`shopro/coupon/select?multiple=true&status=normal`, "选择商品券", {
+                        let ids = [];
+                        form.model.coupon_rules.programme_2.forEach((i) => {
+                            ids.push(i.id);
+                        });
+                        Fast.api.open(`shopro/coupon/select?multiple=true&status=normal&use_scope=goods&ids=${ids.join(',')}`, "选择商品券", {
                             callback(data) {
                                 console.log(data)
                                 form.model.coupon_rules.programme_2 = data;
diff --git a/public/assets/js/backend/shopro/coupon.js b/public/assets/js/backend/shopro/coupon.js
index f390192..020d311 100755
--- a/public/assets/js/backend/shopro/coupon.js
+++ b/public/assets/js/backend/shopro/coupon.js
@@ -383,13 +383,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     const state = reactive({
                         multiple: new URLSearchParams(location.search).get('multiple') || false,
                         status: new URLSearchParams(location.search).get('status'),
+                        use_scope: new URLSearchParams(location.search).get('use_scope'),
+                        ids: new URLSearchParams(location.search).get('ids'), // 选中的优惠券id
                         data: [],
                         selected: [],
                     })
 
                     function getData() {
                         let tempSearch = {
-                            status: state.status
+                            status: state.status,
+                            use_scope: state.use_scope,
                         };
                         let search = composeFilter(tempSearch);
                         Fast.api.ajax({
@@ -422,15 +425,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     }
 
                     function onConfirm() {
-                        // let ids = state.ids.join(',')
+                        let ids = state.ids.join(',')
                         Fast.api.ajax({
                             url: 'shopro/coupon/select',
                             type: 'GET',
                             data: {
                                 type: 'select',
-                                search: JSON.stringify({ use_scope: 'goods','status':'normal' })
+                                search: JSON.stringify({ use_scope: ['goods','='],status:['normal','='],id: [ids, 'in'] })
                             },
                         }, function (ret, res) {
+                            Fast.api.close(state.selected)
                             Fast.api.close(res.data)
                             return false
                         }, function (ret, res) { })