From 81e587fb4853f18ef5e5f9c106001388a3c8350e Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 21 Feb 2022 23:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=BE=AE=E4=BF=A1=E5=9C=88?=
 =?UTF-8?q?=E5=AD=90=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/default/appmini/config.html    | 19 ------------
 app/service/AppMiniService.php                | 31 -------------------
 app/service/SystemBaseService.php             |  1 -
 .../common/lib/ueditor/dialogs/map/map.html   |  2 +-
 .../common/lib/ueditor/dialogs/map/show.html  |  2 +-
 5 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/app/admin/view/default/appmini/config.html b/app/admin/view/default/appmini/config.html
index 8e1113a42..ae8167e75 100755
--- a/app/admin/view/default/appmini/config.html
+++ b/app/admin/view/default/appmini/config.html
@@ -50,25 +50,6 @@
 							<h3 class="am-panel-title">扩展插件配置</h3>
 						</div>
 						<div class="am-panel-bd">
-							<div class="am-form-group">
-				                <label>{{$data.common_app_is_good_thing.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_good_thing.describe}}</span></label>
-				                <select name="{{$data.common_app_is_good_thing.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_good_thing.error_tips}}" required>
-				                    {{foreach $common_is_text_list as $v}}
-				                        <option value="{{$v.id}}" {{if isset($data['common_app_is_good_thing']['value']) and $data['common_app_is_good_thing']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-				                    {{/foreach}}
-				                </select>
-				            </div>
-				            <div class="am-form-group">
-				                <label>{{$data.common_app_is_good_thing_ver.name}}</label>
-				                <div class="am-alert am-alert-warning">
-				                    <p>1. 获取最新组件版本号，默认[ 4.0.1 ]</p>
-				                    <p>2. 好物推荐组件权限操作[ 添加插件 ]按钮后等待审核通过方可使用</p>
-				                    <p>3. 点击左侧导航[ 使用插件 ]，找到 json 代码串[ plugins->goodsSharePlugin ]参数下的[ version ]的值填入</p>
-				                    <a href="https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx56c8f077de74b07c&token=1011820682&lang=zh_CN" target="_blank">去申请权限并获取组件版本号 <i class="am-icon-external-link"></i></a>
-				                </div>
-				                <input type="text" name="{{$data.common_app_is_good_thing_ver.only_tag}}" placeholder="{{$data.common_app_is_good_thing_ver.name}}" data-validation-message="{{$data.common_app_is_good_thing_ver.error_tips}}" class="am-radius am-margin-top-xs" {{if !empty($data)}}value="{{$data.common_app_is_good_thing_ver.value}}"{{/if}} />
-				            </div>
-
 				            <div class="am-form-group">
 				                <label>{{$data.common_app_weixin_liveplayer.name}}<span class="am-form-group-label-tips">{{$data.common_app_weixin_liveplayer.describe}}</span></label>
 				                <select name="{{$data.common_app_weixin_liveplayer.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_weixin_liveplayer.error_tips}}" required>
diff --git a/app/service/AppMiniService.php b/app/service/AppMiniService.php
index 28e5c530c..aaa6a7b29 100755
--- a/app/service/AppMiniService.php
+++ b/app/service/AppMiniService.php
@@ -696,37 +696,6 @@ class AppMiniService
      */
     private static function ExtendHandleWeixin($new_dir)
     {
-        // 启用好物推荐
-        if(MyC('common_app_is_good_thing', 0) == 1)
-        {
-            // app.json
-            $file = $new_dir.DS.'app.json';
-            $config = json_decode(file_get_contents($file), true);
-            if(is_array($config) && isset($config['plugins']))
-            {
-                $config['plugins']['goodsSharePlugin'] = [
-                    'version'   => MyC('common_app_is_good_thing_ver', '4.0.1', true),
-                    'provider'  => 'wx56c8f077de74b07c',
-                ];
-                if(file_put_contents($file, JsonFormat($config)) === false)
-                {
-                    return DataReturn('好物推荐主配置失败', -50);
-                }
-            }
-
-            // goods-detail.json
-            $file = $new_dir.DS.'pages'.DS.'goods-detail'.DS.'goods-detail.json';
-            $config = json_decode(file_get_contents($file), true);
-            if(is_array($config) && isset($config['usingComponents']))
-            {
-                $config['usingComponents']['share-button'] = 'plugin://goodsSharePlugin/share-button';
-                if(file_put_contents($file, JsonFormat($config)) === false)
-                {
-                    return DataReturn('好物推荐商品配置失败', -51);
-                }
-            }
-        }
-
         // 启用直播
         if(MyC('common_app_weixin_liveplayer', 0) == 1)
         {
diff --git a/app/service/SystemBaseService.php b/app/service/SystemBaseService.php
index 156062aa5..04024a44f 100644
--- a/app/service/SystemBaseService.php
+++ b/app/service/SystemBaseService.php
@@ -154,7 +154,6 @@ class SystemBaseService
 
             // 商品相关
             'common_app_is_use_mobile_detail'   => (int) MyC('common_app_is_use_mobile_detail'),
-            'common_app_is_good_thing'          => (int) MyC('common_app_is_good_thing'),
             'common_is_show_goods_comments'     => (int) MyC('common_is_show_goods_comments', 1),
             'common_is_goods_detail_show_photo' => (int) MyC('common_is_goods_detail_show_photo', 0, true),
             'common_is_exhibition_mode_btn_text'=> MyC('common_is_exhibition_mode_btn_text', '立即咨询', true),
diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html
index 58f416bac..8a6259b1c 100755
--- a/public/static/common/lib/ueditor/dialogs/map/map.html
+++ b/public/static/common/lib/ueditor/dialogs/map/map.html
@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
     <script type="text/javascript" src="../internal.js"></script>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
     <style type="text/css">
         .content{width:530px; height: 350px;margin: 10px auto;}
         .content table{width: 100%}
diff --git a/public/static/common/lib/ueditor/dialogs/map/show.html b/public/static/common/lib/ueditor/dialogs/map/show.html
index 1d5873e79..356804e0c 100755
--- a/public/static/common/lib/ueditor/dialogs/map/show.html
+++ b/public/static/common/lib/ueditor/dialogs/map/show.html
@@ -14,7 +14,7 @@
             overflow: hidden;
         }
     </style>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
 <meta http-equiv='Content-Security-Policy' content='upgrade-insecure-requests'/></head>
 
 <body onload="initMap();">