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 @@
 		                <label>{{$data.home_site_telecom_license.name}}<span class="am-form-group-label-tips">{{$data.home_site_telecom_license.describe}}</span></label>
 		                <input type="text" name="{{$data.home_site_telecom_license.only_tag}}" placeholder="{{$data.home_site_telecom_license.describe}}" data-validation-message="{{$data.home_site_telecom_license.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_site_telecom_license.value}}"{{/if}} />
 		            </div>
+
+		            <div class="am-form-group">
+		                <label>{{$data.home_site_company_license.name}}<span class="am-form-group-label-tips">{{$data.home_site_company_license.describe}}</span></label>
+		                <input type="text" name="{{$data.home_site_company_license.only_tag}}" placeholder="{{$data.home_site_company_license.describe}}" data-validation-message="{{$data.home_site_company_license.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_site_company_license.value}}"{{/if}} />
+		            </div>
                 </div>
             </div>
 
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 @@
 						</a>
 					</p>
 				{{/if}}
+				{{if !empty($home_site_company_license)}}
+					<b>|</b>
+					<p class="footer-icp">
+						<a href="{{$home_site_company_license}}" target="_blank">
+							<img src="{{$attachment_host}}/static/common/images/beian-company-license-icon.png" alt="电子营业执照亮照" />
+							电子营业执照亮照
+						</a>
+					</p>
+				{{/if}}
 				{{if !empty($home_site_telecom_license)}}
 					<b>|</b>
 					<p class="footer-icp">
diff --git a/app/layout/view/public/modal/modal_module_pages_select.html b/app/layout/view/public/modal/modal_module_pages_select.html
index 76f4a5c7d..0b3c196ee 100644
--- a/app/layout/view/public/modal/modal_module_pages_select.html
+++ b/app/layout/view/public/modal/modal_module_pages_select.html
@@ -64,9 +64,11 @@
                                             <p>2. 小程序以/pages开始</p>
                                             <p>3. 例如：/pages/user/user</p>
                                             <p>4. 支持带参数 ?x=xx</p>
-                                            <p>
-                                                <a href="{{if empty($layout_pages_custom_doc_url)}}https://ask.shopxo.net/article/106{{else /}}{{$layout_pages_custom_doc_url}}{{/if}}" target="_blank">小程序页面地址配置说明 <i class="am-icon-external-link"></i></a>
-                                            </p>
+                                            {{if !empty($site_store_links) and !empty($site_store_links['app_mini_pages'])}}
+                                                <p>
+                                                    <a href="{{$site_store_links.app_mini_pages}}" target="_blank">小程序页面地址配置说明 <i class="am-icon-external-link"></i></a>
+                                                </p>
+                                            {{/if}}
                                         </div>
                                     </div>
                                 </div>
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 000000000..8f3929000
Binary files /dev/null and b/public/static/common/images/beian-company-license-icon.png differ