From d1fdbcb720a3857374a3da7510b2896471823035 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Sat, 25 Nov 2023 18:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E6=9D=83=E9=87=8D?= =?UTF-8?q?=E5=80=BC=E4=B8=AD=E5=BF=83=E5=92=8C=E6=96=87=E5=88=9B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=BF=83=E6=B5=B7=E6=8A=A5=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=9C=A8=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AE=BE=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/admin/IndexController.php | 3 +++ .../cultural-space/src/api/IndexController.php | 2 ++ .../cultural-space/views/index/set.blade.php | 16 +++++++++++++--- .../weight-value/src/admin/IndexController.php | 3 +++ .../weight-value/src/api/IndexController.php | 2 ++ plugins/weight-value/views/index/set.blade.php | 17 +++++++++++++++++ 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/plugins/cultural-space/src/admin/IndexController.php b/plugins/cultural-space/src/admin/IndexController.php index 658ffc53..ebf09f42 100644 --- a/plugins/cultural-space/src/admin/IndexController.php +++ b/plugins/cultural-space/src/admin/IndexController.php @@ -4,6 +4,7 @@ namespace Yunshop\CulturalSpace\admin; use app\common\components\BaseController; use app\common\facades\Setting; use Yunshop\CulturalSpace\models\ContributionBonusLog; +use Yunshop\NewPoster\models\Poster; class IndexController extends BaseController{ @@ -30,9 +31,11 @@ class IndexController extends BaseController{ }else{ // 获取信息 $set = Setting::get('plugin.cultural_space_set'); + $poster = Poster::uniacid()->select(['id','title'])->get()->toArray(); return view('Yunshop\CulturalSpace::index.set',[ 'set' => $set, + 'poster_list' => $poster, ])->render(); } } diff --git a/plugins/cultural-space/src/api/IndexController.php b/plugins/cultural-space/src/api/IndexController.php index 9bc44606..4cd2e5ce 100644 --- a/plugins/cultural-space/src/api/IndexController.php +++ b/plugins/cultural-space/src/api/IndexController.php @@ -36,8 +36,10 @@ class IndexController extends ApiController{ public function getCenterData(){ $data = []; $uid = \YunShop::app()->getMemberId(); + $set = Setting::get('plugin.cultural_space_set'); // 获取等级信息 $data['level_name'] = '管理'; + $data['poster_id'] = $set['poster_id']; // 获取当前用户信息 $user = Member::getMemberById($uid,['uid','nickname','realname','avatar']); $data['user'] = $user ? $user->toArray() : []; diff --git a/plugins/cultural-space/views/index/set.blade.php b/plugins/cultural-space/views/index/set.blade.php index 06ccedab..2037091b 100644 --- a/plugins/cultural-space/views/index/set.blade.php +++ b/plugins/cultural-space/views/index/set.blade.php @@ -17,6 +17,18 @@
+
+
+
基本设置
+
+
+ + + + + +
+
贡献值设置
@@ -42,7 +54,6 @@
周期销售额的N%用作分红总金额,根据每个人当前贡献值比例进行分红;0或者空则无贡献值奖励
-
基金规则
@@ -101,8 +112,6 @@
- - {{--保存按钮--}} 保存 @@ -121,6 +130,7 @@ is_give_contribution: 0, is_open_contribution_bonus: 0, }, + poster_list: JSON.parse('{!! json_encode($poster_list) !!}') || {}, } }, created() {}, diff --git a/plugins/weight-value/src/admin/IndexController.php b/plugins/weight-value/src/admin/IndexController.php index 22487346..0a7caa4a 100644 --- a/plugins/weight-value/src/admin/IndexController.php +++ b/plugins/weight-value/src/admin/IndexController.php @@ -5,6 +5,7 @@ use app\common\components\BaseController; use app\common\helpers\PaginationHelper; use app\common\models\Order; use Illuminate\Support\Facades\DB; +use Yunshop\NewPoster\models\Poster; use Yunshop\TeamDividend\models\TeamDividendLevelModel; use Yunshop\TeamDividend\models\Uplog; use Yunshop\WeightValue\models\WeightValue; @@ -120,9 +121,11 @@ class IndexController extends BaseController{ }else{ // 获取信息 $set = Setting::get('plugin.weight_value'); + $poster = Poster::uniacid()->select(['id','title'])->get()->toArray(); return view('Yunshop\WeightValue::index.set',[ 'set' => $set, + 'poster_list' => $poster, ])->render(); } } diff --git a/plugins/weight-value/src/api/IndexController.php b/plugins/weight-value/src/api/IndexController.php index 6aec1951..20b0ef3d 100644 --- a/plugins/weight-value/src/api/IndexController.php +++ b/plugins/weight-value/src/api/IndexController.php @@ -28,8 +28,10 @@ class IndexController extends ApiController{ $data = []; $uid = \YunShop::app()->getMemberId(); $teamLevelId = request()->input('team_level_id');// 经销商等级id + $set = Setting::get('plugin.weight_value'); // 获取等级信息 $data['level_name'] = TeamDividendLevelModel::uniacid()->where('id',$teamLevelId)->value('level_name'); + $data['poster_id'] = $set['poster_id']; // 获取当前用户信息 $user = Member::getMemberById($uid,['uid','nickname','realname','avatar']); $data['user'] = $user ? $user->toArray() : []; diff --git a/plugins/weight-value/views/index/set.blade.php b/plugins/weight-value/views/index/set.blade.php index 198de67e..1e0ee1ff 100644 --- a/plugins/weight-value/views/index/set.blade.php +++ b/plugins/weight-value/views/index/set.blade.php @@ -36,6 +36,23 @@ 转赠是否需要密码
+
+ +
+ +
+
+ + + + + + + {{--提交按钮--}}