wesmiler

public/static/weixin/js/index.js

@@ -72,8 +72,8 @@ var app = new Vue({
             var geolocation = new BMap.Geolocation();
             //$.showLoading('获取定位中...')
             geolocation.getCurrentPosition(function (r) {
-                $.hideLoading();
                 if (this.getStatus() == BMAP_STATUS_SUCCESS) {
+                    console.log(r)
                     _this.location.lat = r.point.lat;
                     _this.location.lat = r.point.lat;
                     _this.location.info = r.address;
@@ -84,7 +84,7 @@ var app = new Vue({
                     sessionStorage.setItem('city', r.address.city)
                     sessionStorage.setItem('address', _this.location.address)
                     setTimeout(function(){
-                        $.toast.prototype.defaults.duration = 2000;
+                        $.toast.prototype.defaults.duration = 1000;
                         $.toast('您的城市：'+_this.location.city,'text');
                     }, 500)
                 }

vendor/thinkcmf/cmf-app/src/weixin/model/Stroage.php

@@ -298,12 +298,10 @@ class Stroage extends Model
                 break;
             case 'docx':
                 $command = "libreoffice6.3 --invisible --convert-to docx --outdir \"{$path}\" \"{$pathFile}\"";
-//                $command = "libreoffice6.3 --invisible --convert-to pdf:writer_pdf_Export --outdir \"{$path}\" \"{$pathFile}\"";
                 exec($command);
                 break;
         }
 
-        //echo $command;
         return $filename;
     }
 
@@ -387,7 +385,6 @@ class Stroage extends Model
 
         while (!feof($fp)) {
             $line = fgets($fp, 255);
-//            echo "++".$line."++\n\n";
             if (preg_match('/\/Count [0-9]+/', $line, $matches)) {
                 preg_match('/[0-9]+/', $matches[0], $matches2);
                 if ($max < $matches2[0]) $max = $matches2[0];