1.1.11

app.js

@@ -25,8 +25,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.9",
-    IsProduction: false,
+    Version: "1.1.11",
+    IsProduction: true,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",
     ShareImage: '',

pages/main/add.js

@@ -210,61 +210,70 @@ Page({
           isSave = true;
         }, 5000);
 
-        that.uploadImageAll(that.data.Field, function (field) {
-          that.data.Field = field;
-          var userid = app.globalData.userInfo.UserID;
-          var isTodayStudy = 0;
-          if (that.data.IsTodayStudy && that.data.UpdateType == "add2")
-            isTodayStudy = 1;
-
-          var tags = [];
-          for (var i = 0; i < that.data.Tags.length; i++) {
-            if (that.data.Tags[i])
-              tags.push(that.data.Tags[i]);
-          }
-          var param1 = {};
-          param1 = that.formatField(that.data.Field);
-          param1.Tags = tags;
-          param1.IsTodayStudy = isTodayStudy;
-          param1.ID = that.data.MiaoguoCardID;
-          that.saveLocalCardList(param1);
-
-          // var param2 = {
-          //   param: common.Encrypt(JSON.stringify(param1))
-          // }
-          wx.hideLoading();
-          wx.showLoading({
-            title: '保存数据请稍候',
-            mask: true,
-          });
-          timeoutUploadImage = setTimeout(function () {
+        that.uploadImageAll(that.data.Field, function (success,field) {
+          if (success){
+            that.data.Field = field;
+            var userid = app.globalData.userInfo.UserID;
+            var isTodayStudy = 0;
+            if (that.data.IsTodayStudy && that.data.UpdateType == "add2")
+              isTodayStudy = 1;
+
+            var tags = [];
+            for (var i = 0; i < that.data.Tags.length; i++) {
+              if (that.data.Tags[i])
+                tags.push(that.data.Tags[i]);
+            }
+            var param1 = {};
+            param1 = that.formatField(that.data.Field);
+            param1.Tags = tags;
+            param1.IsTodayStudy = isTodayStudy;
+            param1.ID = that.data.MiaoguoCardID;
+            that.saveLocalCardList(param1);
+
+
             wx.hideLoading();
-          }, 15000);
 
-          main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
-            wx.removeStorageSync("TempCardNoSaved");
 
-            if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
-              that.onClose();
-            }
-            else {
+
+            wx.showLoading({
+              title: '保存数据请稍候',
+              mask: true,
+            });
+            timeoutUploadImage = setTimeout(function () {
               wx.hideLoading();
-              wx.showToast({
-                title: '已保存！',
-                image: "../images/universalpic_saved_white_120x120.png",
-              });
+            }, 15000);
 
-              if (that.data.UpdateType == "add2") {
-                that.initAddCard();
+            main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
+              wx.removeStorageSync("TempCardNoSaved");
+
+              if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
+                that.onClose();
               }
+              else {
+                wx.hideLoading();
+                wx.showToast({
+                  title: '已保存！',
+                  image: "../images/universalpic_saved_white_120x120.png",
+                });
+
+                if (that.data.UpdateType == "add2") {
+                  that.initAddCard();
+                }
 
-              var taskToday = app.globalData.TaskToday;
-              taskToday.CardNumber++;
-              app.globalData.TaskToday = taskToday;
+                var taskToday = app.globalData.TaskToday;
+                taskToday.CardNumber++;
+                app.globalData.TaskToday = taskToday;
 
-            }
-            wx.removeStorageSync("TempCardInfo");
-          });
+              }
+              wx.removeStorageSync("TempCardInfo");
+            });
+          }
+          else{
+            wx.showToast({
+              title: '图片上传失败',
+              mask: true,
+            });
+          }
         });
       }
       else {
@@ -363,6 +372,8 @@ Page({
         console.log("arrResult:" + JSON.stringify(arrResult));
 
         clearInterval(interval);
+        var success=true;
+
         var ari = 0;
         for (var i = 0; i < arr.length; i++) {
           for (var j = 0; j < arr[i].length; j++) {
@@ -375,24 +386,26 @@ Page({
                   break;
                 }
               }
-              console.log("serverUrl:" + serverUrl);
-              console.log("tempUrl:" + tempUrl);
+              //console.log("serverUrl:" + serverUrl);
+              //console.log("tempUrl:" + tempUrl);
 
               main.saveTempImage(serverUrl, tempUrl);
               arr[i][j].Content = serverUrl;
               arr[i][j].ContentServer = serverUrl;
 
+              if (serverUrl==""){
+                success=false;
+                break;
+              }
             }
           }
         }
         //console.log(JSON.stringify(arr));
-        callback(arr);
+        callback(success,arr);
       }
     }, 500);
   },
   uploadImage: function (file, callback) {
-
-
     var url = common.Encrypt("MiaoguoUploadFile2");
     wx.uploadFile({
       url: app.globalData.serverUrl + url,
@@ -783,7 +796,13 @@ Page({
                 str2 = that.data.FieldContent.substring(tempCursor, that.data.FieldContent.length);
               }
 
-              var str0 = "[图 w='" + res.width + "' h='" + res.height + "']" + tempFilePaths[0] + "[/图]";
+              var width = res.width;
+              if (isNaN(width))
+                width = 650;
+              var height = res.height;
+              if (isNaN(height))
+                height = 650;
+              var str0 = "[图 w='" + width + "' h='" + height + "']" + tempFilePaths[0] + "[/图]";
 
               that.data.FieldContent = str1 + str0 + str2;