From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件
---
admin/app/shop/model/branch/Branch.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/app/shop/model/branch/Branch.php b/admin/app/shop/model/branch/Branch.php
index 6dd8ae0..c95aba0 100644
--- a/admin/app/shop/model/branch/Branch.php
+++ b/admin/app/shop/model/branch/Branch.php
@@ -29,7 +29,7 @@
// 查询列表数据
return $model->with(['superUser'])
->where('is_delete', '=', '0')
- ->order(['create_time' => 'desc'])
+ ->order(['sort' => 'desc', 'create_time' => 'desc'])
->paginate($params);
}
@@ -119,7 +119,7 @@
// 修改登录用户
$user_model = $this['superUser'];
$user_data = [
- // 'user_id' => $branch['user_id'],
+ 'user_id' => $branch['user_id'],
'user_name' => $branch['user_name']
];
if (isset($branch['password']) && !empty($branch['password'])) {
--
Gitblit v1.9.2