From 1fb3c7a37fab1ba4bc4ae2fe05ee7ca40f78a063 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 18 Jul 2019 21:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/Appminibaiduconfig.php | 70 +++++++++++ .../admin/controller/Appminibaidulist.php | 113 ++++++++++++++++++ .../default/appminibaiduconfig/index.html | 40 +++++++ .../view/default/appminibaidulist/index.html | 67 +++++++++++ application/api/controller/User.php | 17 +-- .../alipay/pages/goods-detail/goods-detail.js | 2 +- .../pages/goods-search/goods-search.acss | 10 +- public/appmini/old/baidu/README.md | 1 - .../baidu/pages/goods-detail/goods-detail.css | 7 +- .../baidu/pages/goods-detail/goods-detail.js | 2 +- .../pages/goods-detail/goods-detail.swan | 5 +- .../baidu/pages/goods-search/goods-search.css | 8 +- .../appmini/old/baidu/pages/index/index.css | 2 +- public/appmini/old/baidu/pages/index/index.js | 10 ++ .../user-address-save/user-address-save.css | 3 + .../baidu/pages/user-address/user-address.css | 3 + public/appmini/old/baidu/project.swan.json | 2 +- .../weixin/pages/goods-detail/goods-detail.js | 2 +- .../pages/goods-search/goods-search.wxss | 8 +- 19 files changed, 338 insertions(+), 34 deletions(-) create mode 100755 application/admin/controller/Appminibaiduconfig.php create mode 100755 application/admin/controller/Appminibaidulist.php create mode 100755 application/admin/view/default/appminibaiduconfig/index.html create mode 100755 application/admin/view/default/appminibaidulist/index.html mode change 100755 => 100644 public/appmini/old/alipay/pages/goods-search/goods-search.acss delete mode 100755 public/appmini/old/baidu/README.md diff --git a/application/admin/controller/Appminibaiduconfig.php b/application/admin/controller/Appminibaiduconfig.php new file mode 100755 index 000000000..2cd7135b0 --- /dev/null +++ b/application/admin/controller/Appminibaiduconfig.php @@ -0,0 +1,70 @@ +IsLogin(); + + // 权限校验 + $this->IsPower(); + } + + /** + * [Index 配置列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function Index() + { + // 配置信息 + $this->assign('data', ConfigService::ConfigList()); + + return $this->fetch(); + } + + /** + * [Save 配置数据保存] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2017-01-02T23:08:19+0800 + */ + public function Save() + { + return ConfigService::ConfigSave($_POST); + } +} +?> \ No newline at end of file diff --git a/application/admin/controller/Appminibaidulist.php b/application/admin/controller/Appminibaidulist.php new file mode 100755 index 000000000..29d55ee46 --- /dev/null +++ b/application/admin/controller/Appminibaidulist.php @@ -0,0 +1,113 @@ +IsLogin(); + + // 权限校验 + $this->IsPower(); + + // 参数 + $this->params = input(); + $this->params['application_name'] = 'baidu'; + } + + /** + * [Index 列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function Index() + { + $this->assign('data_list', AppMiniService::DataList($this->params)); + return $this->fetch(); + } + + /** + * [Created 生成] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2017-02-05T20:12:30+0800 + */ + public function Created() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error('非法访问'); + } + + // 配置内容 + $app_mini_title = MyC('common_app_mini_baidu_title'); + $app_mini_describe = MyC('common_app_mini_baidu_describe'); + if(empty($app_mini_title) || empty($app_mini_describe)) + { + return DataReturn('配置信息不能为空', -1); + } + + // 开始操作 + $this->params['app_mini_title'] = $app_mini_title; + $this->params['app_mini_describe'] = $app_mini_describe; + return AppMiniService::Created($this->params); + } + + /** + * [Delete 删除包] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-09T21:13:47+0800 + */ + public function Delete() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error('非法访问'); + } + + // 开始操作 + return AppMiniService::Delete($this->params); + } +} +?> \ No newline at end of file diff --git a/application/admin/view/default/appminibaiduconfig/index.html b/application/admin/view/default/appminibaiduconfig/index.html new file mode 100755 index 000000000..818f69774 --- /dev/null +++ b/application/admin/view/default/appminibaiduconfig/index.html @@ -0,0 +1,40 @@ +{{include file="public/header" /}} + + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+
+ +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/admin/view/default/appminibaidulist/index.html b/application/admin/view/default/appminibaidulist/index.html new file mode 100755 index 000000000..eb18efa4e --- /dev/null +++ b/application/admin/view/default/appminibaidulist/index.html @@ -0,0 +1,67 @@ +{{include file="public/header" /}} + + +
+
+ +
+ +
+ + + + {{if config('shopxo.is_develop') eq true}} +
+ 当前为开发模式
+    1. 发布小程序必须采用 https 协议，上线需确认 app.js 中 request_url 参数值是否正确。
+    2. 发布小程序，建议关闭开发者模式、从正式环境重新生成小程序下载使用开发者工具上传审核。
+    3. 非 https 环境下，在开发者工具 -> 顶部导航 -> 校验域名（关闭即可）。 +
+ {{else /}} +
+ 1. 生成小程序必须在 https 协议下进行操作、请配置好服务器 ssl 并使用 https 协议登录后台管理生成小程序。
+ 2. 如需非 https 协议下生成小程序，请在 config/shopxo.php 文件中 is_develop值改为true开启开发者模式。 +
+ {{/if}} + + + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + {{/foreach}} + {{/if}} + +
包名大小创建时间操作
{{$v.name}}{{$v.size}}{{$v.time}} + {{if !empty($v.url)}} + + + + {{/if}} + +
+ {{if empty($data_list)}} +
没有相关数据
+ {{/if}} + +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 6f7450578..e969f054b 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -227,19 +227,12 @@ class User extends Common */ public function BaiduUserAuth() { - //return DataReturn('暂未开放', -1); - - //$_POST['config'] = MyC('baidu_mini_program_config'); - $_POST['config'] = [ - 'id' => '16634987', - 'key' => 'C9Gg744cBqQ3zvbC5uOPMg9yWpmuQ8O7', - 'secret' => 'KmdPEyuSAXcbiouKVq6LOSUjctZpxmNb', - - // 'id' => '14675874', - // 'key' => 'G8x7Q2oSIo2Egcps7QB8fQGCQrUDjwNN', - // 'secret' => 'T5PXvGwDxci6GVAeQErigGvTRK48MVRz', + $params['config'] = [ + 'id' => MyC('common_app_mini_baidu_appid'), + 'key' => MyC('common_app_mini_baidu_appkey'), + 'secret' => MyC('common_app_mini_baidu_appsecret'), ]; - $result = (new \base\BaiduAuth())->GetAuthUserInfo($_POST); + $result = (new \base\BaiduAuth())->GetAuthUserInfo($params); if($result['status'] == 0) { return UserService::AuthUserProgram($result['data'], 'baidu_openid'); diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js index 44c27ac75..1ec38aad3 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js @@ -723,7 +723,7 @@ Page({ if(count > 9) { count = 0; } - if(self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) { + if(self.data.plugins_limitedtimediscount_is_show_time == false) { clearInterval(timers); } }, 100); diff --git a/public/appmini/old/alipay/pages/goods-search/goods-search.acss b/public/appmini/old/alipay/pages/goods-search/goods-search.acss old mode 100755 new mode 100644 index 4c0158677..b3191864c --- a/public/appmini/old/alipay/pages/goods-search/goods-search.acss +++ b/public/appmini/old/alipay/pages/goods-search/goods-search.acss @@ -63,21 +63,21 @@ padding: 20rpx 20rpx 0 20rpx; } .popup-form input { - font-size: 24rpx; - height: 50rpx; - line-height: 50rpx; + font-size: 26rpx; + height: 60rpx; + line-height: 60rpx; background: #fbfbfb; border-radius: 6rpx; } .screening-price input { - width: 220rpx; + width: calc(50% - 45rpx); } .screening-price .separator { margin-top: 20rpx; width: 30rpx; } .popup-form .keywords input { - width: 490rpx; + width: calc(100% - 30rpx); } .popup-form .item:not(:last-child) { margin-bottom: 50rpx; diff --git a/public/appmini/old/baidu/README.md b/public/appmini/old/baidu/README.md deleted file mode 100755 index d9feb615c..000000000 --- a/public/appmini/old/baidu/README.md +++ /dev/null @@ -1 +0,0 @@ -百度小程序 \ No newline at end of file diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css index fd561f4ce..cb0d193cc 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css @@ -249,10 +249,15 @@ top: calc(65vh - 110rpx); z-index: 2; } -.goods-video-submit image { +.goods-video-submit image, .cover-goods-video-close { width: 80rpx; height: 80rpx; } +.cover-goods-video-close { + position: absolute; + left: 30rpx; + bottom: 30rpx; +} /* diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js index 03da24cd9..5fd847c7c 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js @@ -627,7 +627,7 @@ Page({ if (count > 9) { count = 0; } - if (self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) { + if(self.data.plugins_limitedtimediscount_is_show_time == false) { clearInterval(timers); } }, 100); diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan index 319cdf44b..81d73b5a9 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan @@ -11,11 +11,12 @@ - + - diff --git a/public/appmini/old/baidu/pages/goods-search/goods-search.css b/public/appmini/old/baidu/pages/goods-search/goods-search.css index 76de1c8fe..2a1487709 100755 --- a/public/appmini/old/baidu/pages/goods-search/goods-search.css +++ b/public/appmini/old/baidu/pages/goods-search/goods-search.css @@ -65,15 +65,15 @@ height: 100vh; } .popup-form input { - font-size: 24rpx; - height: 50rpx; - line-height: 50rpx; + font-size: 26rpx; + height: 60rpx; + line-height: 60rpx; background: #fbfbfb; border-radius: 6rpx; padding: 0 6rpx; } .screening-price input { - width: calc(50% - 32rpx); + width: calc(50% - 16rpx); } .screening-price .separator { margin-top: 10rpx; diff --git a/public/appmini/old/baidu/pages/index/index.css b/public/appmini/old/baidu/pages/index/index.css index a7c4a1408..1a41da378 100755 --- a/public/appmini/old/baidu/pages/index/index.css +++ b/public/appmini/old/baidu/pages/index/index.css @@ -165,7 +165,7 @@ } .limitedtimediscount .goods-list .item { width: 460rpx; - height: 605rpx; + height: 610rpx; border: 1px solid #f5f5f5; background: white; display: inline-block; diff --git a/public/appmini/old/baidu/pages/index/index.js b/public/appmini/old/baidu/pages/index/index.js index 21c4e00c2..f6a12e679 100755 --- a/public/appmini/old/baidu/pages/index/index.js +++ b/public/appmini/old/baidu/pages/index/index.js @@ -20,9 +20,19 @@ Page({ }, onShow() { + this.set_page_info(); this.init(); }, + // web页面信息设置 + set_page_info() { + swan.setPageInfo({ + title: app.data.application_title, + keywords: app.data.application_describe, + description: app.data.application_describe, + }); + }, + // 获取数据列表 init() { var self = this; diff --git a/public/appmini/old/baidu/pages/user-address-save/user-address-save.css b/public/appmini/old/baidu/pages/user-address-save/user-address-save.css index ad75aa724..47dee5470 100755 --- a/public/appmini/old/baidu/pages/user-address-save/user-address-save.css +++ b/public/appmini/old/baidu/pages/user-address-save/user-address-save.css @@ -17,6 +17,9 @@ box-sizing: border-box; width: calc(100% - 250rpx); } +.submit-bottom { + border-radius: 0 !important; +} /* 三级联动 */ .select-address{ box-sizing: border-box; diff --git a/public/appmini/old/baidu/pages/user-address/user-address.css b/public/appmini/old/baidu/pages/user-address/user-address.css index dff6f15ed..52ef9c644 100755 --- a/public/appmini/old/baidu/pages/user-address/user-address.css +++ b/public/appmini/old/baidu/pages/user-address/user-address.css @@ -24,6 +24,9 @@ .operation .delete-submit { margin-left: 20rpx; } +.submit-bottom { + border-radius: 0 !important; +} .page { padding-bottom: 85rpx; } \ No newline at end of file diff --git a/public/appmini/old/baidu/project.swan.json b/public/appmini/old/baidu/project.swan.json index a050bf44b..1befe0361 100644 --- a/public/appmini/old/baidu/project.swan.json +++ b/public/appmini/old/baidu/project.swan.json @@ -1 +1 @@ -{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","expands":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib/online-service","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge"],"paths":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.json","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.css","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user/user.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.swan"]},"host":"baiduboxapp","preview":{"packageId":221505},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}} \ No newline at end of file +{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"","expands":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib/online-service","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user-address-save","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user-address","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail"],"paths":[]},"host":"baiduboxapp","preview":{"packageId":222699},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index a83ef3025..537e2dc97 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -710,7 +710,7 @@ Page({ if(count > 9) { count = 0; } - if(self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) { + if (self.data.plugins_limitedtimediscount_is_show_time == false) { clearInterval(timers); } }, 100); diff --git a/public/appmini/old/weixin/pages/goods-search/goods-search.wxss b/public/appmini/old/weixin/pages/goods-search/goods-search.wxss index 76de1c8fe..2a1487709 100755 --- a/public/appmini/old/weixin/pages/goods-search/goods-search.wxss +++ b/public/appmini/old/weixin/pages/goods-search/goods-search.wxss @@ -65,15 +65,15 @@ height: 100vh; } .popup-form input { - font-size: 24rpx; - height: 50rpx; - line-height: 50rpx; + font-size: 26rpx; + height: 60rpx; + line-height: 60rpx; background: #fbfbfb; border-radius: 6rpx; padding: 0 6rpx; } .screening-price input { - width: calc(50% - 32rpx); + width: calc(50% - 16rpx); } .screening-price .separator { margin-top: 10rpx; -- GitLab