wesmiler 6 سال پیش
والد
کامیت
04bed20544

+ 0 - 3
public/static/weixin/js/papers.js

@@ -660,9 +660,6 @@ var app = new Vue({
                                         }
                                     }
                                     base64 = canvas.toDataURL("image/jpeg", 0.8);
-                                }else if (navigator.userAgent.match(/Android/i)) {// 修复android
-                                    var encoder = new JPEGEncoder();
-                                    base64 = encoder.encode(ctx.getImageData(0, 0, expectWidth, expectHeight), 80);
                                 }else{
                                     //alert(Orientation);
                                     if(Orientation != "" && Orientation != 1){

+ 0 - 3
public/static/weixin/js/photo.js

@@ -814,9 +814,6 @@ var app = new Vue({
                                         }
                                     }
                                     base64 = canvas.toDataURL("image/jpeg", 0.8);
-                                }else if (navigator.userAgent.match(/Android/i)) {// 修复android
-                                    var encoder = new JPEGEncoder();
-                                    base64 = encoder.encode(ctx.getImageData(0, 0, expectWidth, expectHeight), 80);
                                 }else{
                                     //alert(Orientation);
                                     if(Orientation != "" && Orientation != 1){

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

@@ -107,6 +107,7 @@ class Stroage extends Model
             $name = isset($fileInfo['name']) ? $fileInfo['name'] : '';
             $fileType = cmf_get_file_extension($name);
             $file = "files/{$scene}/" . $filename;
+            var_dump($fileInfo);
             if (Stroage::checkFileExists($file)) {
                 $page = Stroage::getFilePage($file);
                 if (in_array($fileType, ['xls', 'xlsx'])) {