From c5c20dbb5211c622b88e8c3b0ad42063188bf90b Mon Sep 17 00:00:00 2001
From: gongfuxiang
Date: Thu, 20 Jan 2022 19:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E5=AD=90=E8=90=A5?=
=?UTF-8?q?=E4=B8=9A=E6=89=A7=E7=85=A7=E4=BA=AE=E8=AF=81+=E7=BB=86?=
=?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/view/default/site/base/index.html | 5 +++++
app/index/controller/Common.php | 1 +
app/index/view/default/public/footer_nav.html | 9 +++++++++
.../public/modal/modal_module_pages_select.html | 8 +++++---
app/service/ConfigService.php | 1 +
app/service/StoreService.php | 3 ++-
app/service/SystemBaseService.php | 2 ++
.../common/images/beian-company-license-icon.png | Bin 0 -> 1498 bytes
8 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 public/static/common/images/beian-company-license-icon.png
diff --git a/app/admin/view/default/site/base/index.html b/app/admin/view/default/site/base/index.html
index c55b40981..756873d16 100755
--- a/app/admin/view/default/site/base/index.html
+++ b/app/admin/view/default/site/base/index.html
@@ -122,6 +122,11 @@
+
+
+
+
+
diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php
index e74e5beed..b697f6f51 100755
--- a/app/index/controller/Common.php
+++ b/app/index/controller/Common.php
@@ -300,6 +300,7 @@ class Common extends BaseController
MyViewAssign('home_site_security_record_name', MyC('home_site_security_record_name'));
MyViewAssign('home_site_security_record_url', MyC('home_site_security_record_url'));
MyViewAssign('home_site_telecom_license', MyC('home_site_telecom_license'));
+ MyViewAssign('home_site_company_license', MyC('home_site_company_license'));
// 布局样式+管理
MyViewAssign('is_load_layout', 0);
diff --git a/app/index/view/default/public/footer_nav.html b/app/index/view/default/public/footer_nav.html
index c3a7f4b99..3a92caa1a 100755
--- a/app/index/view/default/public/footer_nav.html
+++ b/app/index/view/default/public/footer_nav.html
@@ -104,6 +104,15 @@
{{/if}}
+ {{if !empty($home_site_company_license)}}
+ |
+
+ {{/if}}
{{if !empty($home_site_telecom_license)}}
|
2. 小程序以/pages开始
3. 例如:/pages/user/user
4. 支持带参数 ?x=xx
-
- 小程序页面地址配置说明
-
+ {{if !empty($site_store_links) and !empty($site_store_links['app_mini_pages'])}}
+
+ 小程序页面地址配置说明
+
+ {{/if}}
diff --git a/app/service/ConfigService.php b/app/service/ConfigService.php
index 864df5d84..8ec229c6c 100755
--- a/app/service/ConfigService.php
+++ b/app/service/ConfigService.php
@@ -45,6 +45,7 @@ class ConfigService
'admin_email_login_template',
'home_email_login_template',
'home_site_security_record_url',
+ 'home_site_company_license',
];
// 附件字段列表
diff --git a/app/service/StoreService.php b/app/service/StoreService.php
index 07210e867..7867ec405 100644
--- a/app/service/StoreService.php
+++ b/app/service/StoreService.php
@@ -131,6 +131,7 @@ class StoreService
}
// 保存商店帐号信息
+ $params['common_store_password'] = htmlspecialchars_decode($params['common_store_password']);
$ret = ConfigService::ConfigSave($params);
if($ret['code'] != 0)
{
@@ -294,7 +295,7 @@ class StoreService
// 请求校验
$data = [
'accounts' => $accounts,
- 'authdata' => $password,
+ 'authdata' => htmlspecialchars_decode($password),
'host' => __MY_HOST__,
'url' => __MY_URL__,
'ver' => APPLICATION_VERSION,
diff --git a/app/service/SystemBaseService.php b/app/service/SystemBaseService.php
index 2b5af6507..390d10ef5 100644
--- a/app/service/SystemBaseService.php
+++ b/app/service/SystemBaseService.php
@@ -104,6 +104,8 @@ class SystemBaseService
'home_site_icp' => MyC('home_site_icp', null, true),
'home_site_security_record_name' => MyC('home_site_security_record_name', null, true),
'home_site_security_record_url' => MyC('home_site_security_record_url', null, true),
+ 'home_site_company_license' => MyC('home_site_company_license', null, true),
+ 'home_site_telecom_license' => MyC('home_site_telecom_license', null, true),
// css/js版本值
'home_static_cache_version' => MyC('home_static_cache_version', null, true),
diff --git a/public/static/common/images/beian-company-license-icon.png b/public/static/common/images/beian-company-license-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f3929000d7867869ad462fb9cd0d470ccd2f151
GIT binary patch
literal 1498
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBDAAG{;hE;^%b*2hb1<+n
z3NbJPS&Tr)z$nE4G7ZRL@M4sPvx68lplX;H7}_%#SfFa6fHVkr05M1pgl1mAh%j*h
z6I`{x0%imor0saV%ts)_S>O>_%)r1c48n{Iv*t(uO^eJ7i71Ki^|4CM&(%vz$xlkv
ztH>>0+>{umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)DJW
ziJpOy9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)Btk
zRH0j3nOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXGvxn!lt}p
zsJDO~)CbAv8|oS8!_5Y2wE>A*`4?rT0&NDFZ)a!&R*518wZ}#uWI2*!AU*|)0=;U-
zWup%dHajk#L+X(X49wA|Hr^eZwtaU=^qnZ~+$@Kz-i^N;
zE=>`;&!h5)x$|ME=Yb>ayk7(>f)qaXnjD(_(NV7E%fT7bj!c-L5hUP~Gx0*&&8Q90|G!K=bXG$Cc+h;`bh|BkijSV;i;u|PYPfXQ!R0sa-}rY*>gbNO4<%#r_o@F+
z(R|%&t9j+_+w9lR<8}%h|HhcFmoFZ?bE0(KW<@v61LDl5pZ$p6wajsDJfoZVjX8UI
z&hIULs5et<{<#^x<?(>B|l%-Q!n#BTa&Bh6}d-&EfX)fx9LvR$=V
z!QS84yMLis?Us5*-$(mqZBt%1h3nJHHwzx$SpKtLPL}y{>$b1!_KI}!c`#g@EAS>G
zNM2x3eo1p5^PpLz`NETCq^s-d?en3I=lkma)86cz!JA#W*0XV@%%&;r@!t~s)?_Lj_#e7j^To6d
zhKJui@6b9rSDvs!eUizt`vz+1BPNlR7
zT`4TLueogTn!0;?yIb7sI|)W-^6u_`{`}bY+p_1IUwl(wW=v0+e@w8cZ@Go}ieFDQ
zR@CMl3}MR;nKwnfBC%|t)VpcZHmH{_{#Md_^JP!IM4Rp&sirXD!1K&s4!Ai@NK|jy
za9i!v62Z#7pOfADb}Xr0B|JgMIy(MS;}M}-vKd!xAO7~~a@fAje$7O+UY*lk0am>C
zOV_I%