wesmiler 6 tahun lalu
induk
melakukan
f08b918e9f
5 mengubah file dengan 113 tambahan dan 40 penghapusan
  1. 8 1
      composer.json
  2. 96 37
      composer.lock
  3. 1 1
      data/config/weixin.php
  4. 1 1
      public/index.php
  5. 7 0
      public/static/weixin/css/home.css

+ 8 - 1
composer.json

@@ -26,7 +26,8 @@
         "topthink/think-image": "^1.0",
         "thinkcmf/cmf-app": "~5.1.0",
         "thinkcmf/cmf-install": "~5.1.0",
-        "thinkcmf/cmf-api": "~5.1.0"
+        "thinkcmf/cmf-api": "~5.1.0",
+        "phpoffice/phpexcel": "^1.8"
     },
     "extra": {
         "think-path": "vendor/thinkphp",
@@ -34,5 +35,11 @@
     },
     "config": {
         "vendor-dir": "vendor"
+    },
+    "repositories": {
+        "packagist": {
+            "type": "composer",
+            "url": "https://packagist.phpcomposer.com"
+        }
     }
 }

+ 96 - 37
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "826af45fcb3fd98012b83fa69ab58431",
+    "content-hash": "440b015a6949fabd8644faa5c97f7781",
     "packages": [
         {
             "name": "electrolinux/phpquery",
@@ -48,16 +48,16 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.11.0",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7"
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7",
-                "reference": "83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
                 "shasum": ""
             },
             "require": {
@@ -91,7 +91,7 @@
             "keywords": [
                 "html"
             ],
-            "time": "2019-07-14T18:58:38+00:00"
+            "time": "2019-10-28T03:44:26+00:00"
         },
         {
             "name": "mindplay/annotations",
@@ -145,16 +145,16 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.0.7",
+            "version": "v6.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59"
+                "reference": "a8bf068f64a580302026e484ee29511f661b2ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/0c41a36d4508d470e376498c1c0c527aa36a2d59",
-                "reference": "0c41a36d4508d470e376498c1c0c527aa36a2d59",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a8bf068f64a580302026e484ee29511f661b2ad3",
+                "reference": "a8bf068f64a580302026e484ee29511f661b2ad3",
                 "shasum": ""
             },
             "require": {
@@ -163,13 +163,9 @@
                 "php": ">=5.5.0"
             },
             "require-dev": {
-                "doctrine/annotations": "1.2.*",
+                "doctrine/annotations": "^1.2",
                 "friendsofphp/php-cs-fixer": "^2.2",
-                "phpdocumentor/phpdocumentor": "2.*",
-                "phpunit/phpunit": "^4.8 || ^5.7",
-                "zendframework/zend-eventmanager": "3.0.*",
-                "zendframework/zend-i18n": "2.7.3",
-                "zendframework/zend-serializer": "2.7.*"
+                "phpunit/phpunit": "^4.8 || ^5.7"
             },
             "suggest": {
                 "ext-mbstring": "Needed to send email in multibyte encoding charset",
@@ -187,18 +183,18 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-2.1"
+                "LGPL-2.1-only"
             ],
             "authors": [
                 {
-                    "name": "Jim Jagielski",
-                    "email": "jimjag@gmail.com"
-                },
-                {
                     "name": "Marcus Bointon",
                     "email": "phpmailer@synchromedia.co.uk"
                 },
                 {
+                    "name": "Jim Jagielski",
+                    "email": "jimjag@gmail.com"
+                },
+                {
                     "name": "Andy Prevost",
                     "email": "codeworxtech@users.sourceforge.net"
                 },
@@ -207,20 +203,83 @@
                 }
             ],
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "time": "2019-02-01T15:04:28+00:00"
+            "time": "2020-03-14T14:23:48+00:00"
+        },
+        {
+            "name": "phpoffice/phpexcel",
+            "version": "1.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PHPExcel.git",
+                "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870",
+                "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.2|^7.0"
+            },
+            "require-dev": {
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPExcel": "Classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Maarten Balliauw",
+                    "homepage": "http://blog.maartenballiauw.be"
+                },
+                {
+                    "name": "Erik Tilt"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "http://rootslabs.net"
+                },
+                {
+                    "name": "Mark Baker",
+                    "homepage": "http://markbakeruk.net"
+                }
+            ],
+            "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+            "homepage": "https://github.com/PHPOffice/PHPExcel",
+            "keywords": [
+                "OpenXML",
+                "excel",
+                "php",
+                "spreadsheet",
+                "xls",
+                "xlsx"
+            ],
+            "abandoned": "phpoffice/phpspreadsheet",
+            "time": "2018-11-22T23:07:24+00:00"
         },
         {
             "name": "thinkcmf/cmf",
-            "version": "v5.1.8",
+            "version": "v5.1.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thinkcmf/cmf-core.git",
-                "reference": "38c731d817c57652f23150b6bd790702bbcceea6"
+                "reference": "f9e726abc3b6412bdce8b5d1e426e40bb2932380"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thinkcmf/cmf-core/zipball/38c731d817c57652f23150b6bd790702bbcceea6",
-                "reference": "38c731d817c57652f23150b6bd790702bbcceea6",
+                "url": "https://api.github.com/repos/thinkcmf/cmf-core/zipball/f9e726abc3b6412bdce8b5d1e426e40bb2932380",
+                "reference": "f9e726abc3b6412bdce8b5d1e426e40bb2932380",
                 "shasum": ""
             },
             "require": {
@@ -257,7 +316,7 @@
                 }
             ],
             "description": "The ThinkCMF Core Package",
-            "time": "2019-07-31T03:56:18+00:00"
+            "time": "2019-12-16T09:51:55+00:00"
         },
         {
             "name": "thinkcmf/cmf-api",
@@ -298,16 +357,16 @@
         },
         {
             "name": "thinkcmf/cmf-app",
-            "version": "v5.1.5",
+            "version": "v5.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thinkcmf/cmf-app.git",
-                "reference": "701477e9c6cfed749bc2ec03b47f891748a9aa58"
+                "reference": "dd02fc871dcfccc59ac21750ce6ddec359e79e7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thinkcmf/cmf-app/zipball/701477e9c6cfed749bc2ec03b47f891748a9aa58",
-                "reference": "701477e9c6cfed749bc2ec03b47f891748a9aa58",
+                "url": "https://api.github.com/repos/thinkcmf/cmf-app/zipball/dd02fc871dcfccc59ac21750ce6ddec359e79e7d",
+                "reference": "dd02fc871dcfccc59ac21750ce6ddec359e79e7d",
                 "shasum": ""
             },
             "require": {
@@ -331,7 +390,7 @@
                 }
             ],
             "description": "The ThinkCMF App Package",
-            "time": "2019-07-23T23:27:32+00:00"
+            "time": "2019-09-06T03:58:33+00:00"
         },
         {
             "name": "thinkcmf/cmf-extend",
@@ -405,16 +464,16 @@
         },
         {
             "name": "topthink/framework",
-            "version": "v5.1.37.1",
+            "version": "v5.1.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/framework.git",
-                "reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b"
+                "reference": "5762858f3d58faafb3a39427f8788884b2927007"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/framework/zipball/05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
-                "reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
+                "url": "https://api.github.com/repos/top-think/framework/zipball/5762858f3d58faafb3a39427f8788884b2927007",
+                "reference": "5762858f3d58faafb3a39427f8788884b2927007",
                 "shasum": ""
             },
             "require": {
@@ -452,7 +511,7 @@
                 "orm",
                 "thinkphp"
             ],
-            "time": "2019-05-28T06:57:29+00:00"
+            "time": "2019-11-17T23:22:02+00:00"
         },
         {
             "name": "topthink/think-captcha",

+ 1 - 1
data/config/weixin.php

@@ -3,7 +3,7 @@
  * 微信配置
  */
 return [
-    'debug'=> true, // 是否测试模式
+    'debug'=> false, // 是否测试模式
     'payDebug'=> false, // 微信支付测试,开启后支付金额为0.01元
     'payResult'=> false, // 是否记录支付结果
 //    'openid'=> '', // 测试模式测试用户OPENID

+ 1 - 1
public/index.php

@@ -12,7 +12,7 @@ namespace think;
 // [ 入口文件 ]
 
 // 调试模式开关
-define('APP_DEBUG', true);
+define('APP_DEBUG', false);
 
 define('TRACE_DEBUG', FALSE);
 

+ 7 - 0
public/static/weixin/css/home.css

@@ -75,4 +75,11 @@
 
 .text-red {
 	color: #FF5722;
+}
+#app {
+	height: auto;
+	overflow-y: scroll;
+}
+.zyw-container {
+	margin-bottom: 60px;
 }