1.0.0.9

pages/main/addItem.js

@@ -3,10 +3,9 @@ import main from '../../utils/main';
 
 const app = getApp();
 
-var field = "";
 var tempCursor = 0, btnName = "";
 var arrSoundMark = [];
-var isUnload = true;
+var isUpload = true;
 
 var isEdit = true;
 
@@ -21,7 +20,8 @@ Page({
     wx.hideShareMenu();
     var id = options.id;
     var fieldid = options.fieldid;
-    field = "", tempCursor = 0, btnName = "", arrSoundMark = [];
+    tempCursor = 0, btnName = "", arrSoundMark = [];
+    isEdit=true;
 
     var that = this;
     that.setData({
@@ -34,10 +34,10 @@ Page({
       title: '编辑 段落' + fieldid,
     });
   },
-  onShow: function (e) {
-    console.log("onShow:" + JSON.stringify(e));
+  onShow: function () {
+    console.log("onShow:"+isEdit);
     var that = this;
-    if (isEdit) {
+    if (isEdit){
       var list = wx.getStorageSync("CardList");
 
       var card = {};
@@ -56,16 +56,10 @@ Page({
         }
       }
     }
-    isUnload = true;
-
-    if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-      setTimeout(function () {
-        isEdit = true;
-      }, 600);
-    }
+    isUpload = true;
   },
   onUnload: function () {
-    if (isUnload) {
+    if (isUpload) {
       var content = wx.getStorageSync("TempCardInfoAddItem");
       if (content != undefined) {
         this.updateField(content);
@@ -74,18 +68,15 @@ Page({
     }
   },
   bindinputField: function (e) {
+    console.log("bindinputField:" + isEdit);
     if (isEdit) {
-      field = e.detail.value;
       this.setData({
         Field: e.detail.value,
       });
-      console.log("bindinputField:" + field);
     }
   },
   addSymbol: function (e) {
-    console.log("addSymbol");
-    isEdit = true;
-    var that = this;
+    console.log("addSymbol:" + isEdit);
     btnName = e.currentTarget.dataset.id;
     if (btnName == "[读]") {
       this.setData({
@@ -106,35 +97,26 @@ Page({
       this.setData({
         LineSign: "[线]",
       });
-    }
+    } 
 
-    if (!this.data.Focus) {
-      field = field + btnName;
+    if (!this.data.Focus){
+      this.data.Field=this.data.Field+btnName;
       this.setData({
-        Field: field,
+        Field: this.data.Field,
       });
     }
-    //console.log("addSymbol:" + field); 
-
-    setTimeout(function () {
-      that.setData({
-        Focus: true,
-      });
-    }, 600);
+    //console.log("addSymbol:" + this.data.Field);
   },
-  onBindFocus: function () {
+  onBindFocus:function(){
     this.setData({
       Focus: true,
     });
   },
   onBindblur: function (e) {
-    var that = this;
-    console.log("onBindblur:" + field + " btnName:" + btnName + " isEdit:" + isEdit);
+    console.log("onBindblur:" + isEdit);
+    var that=this;
     if (isEdit) {
-      var systemInfo = wx.getSystemInfoSync();
-      if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-        isEdit = false;
-      }
+      that.androidFunction();
 
       //console.log(e);
       tempCursor = e.detail.cursor;
@@ -156,20 +138,16 @@ Page({
         cur = 4;
       }
 
-      field = str1 + btnName + str2;
+      this.data.Field = str1 + btnName + str2;
       this.setData({
-        Field: field,
-        Focus: false,
+        Field: this.data.Field,
+        Focus:false,
         Cursor: tempCursor + cur,
       });
 
       btnName = "";
 
-      if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-        setTimeout(function () {
-          isEdit = true;
-        }, 600);
-      }
+      
     }
   },
   onSearch: function (e) {
@@ -180,21 +158,18 @@ Page({
     this.updateField();
   },
   clear: function () {
-    console.log("clear");
+    console.log("clear:" + isEdit);
     this.setData({
       Field: "",
       Focus: false,
       Cursor: 0,
     });
-    btnName = "";
-    field = "";
-    isEdit = false;
     this.updateField();
   },
   closeAddItem: function (e) {
     var isSave = e.currentTarget.dataset.idsave;
     if (isSave == "true") {
-      isUnload = false;
+      isUpload = false;
       wx.removeStorageSync("TempCardInfoAddItem");
       this.updateField();
     }
@@ -225,9 +200,9 @@ Page({
     wx.setStorageSync("CardList", list);
   },
   uploadImage: function () {
-    console.log("uploadImageStart");
-    isEdit = false;
-    var that = this;
+    console.log("uploadImage:" + isEdit);
+    var that=this;
+    that.androidFunction();
     wx.chooseImage({
       count: 1,
       sizeType: ['compressed'],
@@ -236,21 +211,31 @@ Page({
         // tempFilePath可以作为img标签的src属性显示图片
         const tempFilePaths = res.tempFilePaths;
         //console.log(tempFilePaths[0]);
-        field = field + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
 
-        console.log("uploadImageEnd:" + field);
+        that.data.Field = that.data.Field + "[图 url='" + tempFilePaths[0] + "'][/图]";
+
+        //console.log("uploadImageEnd:" + that.data.Field);
 
         that.setData({
-          Field: field,
+          Field: that.data.Field,
           Focus: false,
         });
+        that.updateField();
 
       },
-      fail: function () {
-
+      fail:function(){
       }
     });
   },
+  androidFunction:function(){
+    isEdit=false;
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+      setTimeout(function () {
+        isEdit = true;
+      }, 1000);
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,