From bca0c42c3b27e745d1b22bf21316101f42f77fb2 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Tue, 31 Oct 2023 14:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=95=BF=E5=9B=BE=E6=94=B9?=
=?UTF-8?q?=E5=8A=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../web/controller/store/merchant.ctrl.php | 15 ++++++-------
.../web/view/default/store/userEdit.html | 22 ++++++++++++++-----
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php b/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
index 113e159..6330330 100644
--- a/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
+++ b/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
@@ -288,6 +288,7 @@ class Merchant_WeliamController {
$member['id'] = $_GPC['storemid'];
}
$register = $_GPC['register'];
+ $entData = $_GPC['ent_data'];
if(empty($register['groupid']) && !is_store()){
wl_message('请设置商户所属套餐');
}
@@ -308,9 +309,6 @@ class Merchant_WeliamController {
$register['album'] = serialize($register['album']);
$register['tag'] = serialize($register['tag']);
$register['storename'] = trim($register['storename']);
- $cc_id = $register['cc_id'];
- $recommend = $register['recommend'];
- unset($register['cc_id'],$register['recommend']);
if (!empty($register['endtime'])) {
$register['endtime'] = strtotime($register['endtime']);
}
@@ -424,7 +422,7 @@ class Merchant_WeliamController {
if ($noticeflag) {
Member::returnIdentity($oldMid);
}
- MerchantDataEnt::saveData(['cc_id' => $cc_id,'recommend' => $recommend],$id);
+ MerchantDataEnt::saveData($entData,$id);
if ($result) {
if (!empty($id)) {
//处理分类
@@ -527,13 +525,14 @@ class Merchant_WeliamController {
}
# 企业分类
$category = Category::getChildCategoryAll(8,'*',true);
- $register['cc_id'] = 0;
- $register['recommend'] = 0;
+ $entData = ['cc_id' => 0, 'recommend' => 0, 'business' => '', 'advantage' => ''];
if ($id) {
$merchantDataEnt = MerchantDataEnt::getStoreEntData($id);
if ($merchantDataEnt) {
- $register['cc_id'] = $merchantDataEnt['cc_id'];
- $register['recommend'] = $merchantDataEnt['recommend'];
+ $entData['cc_id'] = $merchantDataEnt['cc_id'];
+ $entData['recommend'] = $merchantDataEnt['recommend'];
+ $entData['business'] = $merchantDataEnt['business'];
+ $entData['advantage'] = $merchantDataEnt['advantage'];
}
}
diff --git a/addons/weliam_smartcity/web/view/default/store/userEdit.html b/addons/weliam_smartcity/web/view/default/store/userEdit.html
index 2c29c14..c53770b 100644
--- a/addons/weliam_smartcity/web/view/default/store/userEdit.html
+++ b/addons/weliam_smartcity/web/view/default/store/userEdit.html
@@ -47,9 +47,9 @@
+
+