1.0.0.10

app.js

@@ -13,8 +13,8 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.0.0.9",
-    IsProduction: false,
+    Version: "1.0.0.10",
+    IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',
@@ -26,6 +26,7 @@ App({
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=5&le=auto&audio=",
     pinyinUrl: "https://pinyin.kylx365.com/sounds/[pinyin].m4a",
+    uploadImageUrl:"https://miaguo-1253256735.file.myqcloud.com/",
     BaiduToken: "",//百度开发平台token
     systemInfo: null,
     userInfo: null,

app.json

@@ -1,8 +1,7 @@
 {
   "pages": [    
-
-    "pages/main/addItem",
     "pages/index/index",
+    "pages/main/addItem",
     "pages/index/accredit",
     "pages/main/default",
     "pages/main/cardInfo",
@@ -16,7 +15,6 @@
     "pages/main/searchWeb",
     "pages/main/detail",
     "pages/main/colorplan",
-    "pages/main/uploadinmage",
     "pages/main/setting"
   ],
   "window": {

pages/main/add.js

@@ -126,88 +126,146 @@ Page({
       });
     }
     else {
-      var userid = app.globalData.userInfo.UserID;
-      var isTodayStudy = 0;
-      if (that.data.IsTodayStudy && that.data.UpdateType=="add2")
-        isTodayStudy = 1;
+      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 = {
-        Tags: tags,
-        Field1: "",
-        Field2: "",
-        Field3: "",
-        IsTodayStudy: isTodayStudy,
-        ID: that.data.MiaoguoCardID,
-      };
-      for (var i = 1; i <= 3; i++) {
-        for (var key in that.data.Field[i]) {
-          var item = that.data.Field[i][key];
-          var str = "";
-          if (item.Type == "image") {
-            if (item.Url){
-              str = "[图 url='"+item.Url+"']" + item.Content + "[/图]";
+        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 = {
+          Tags: tags,
+          Field1: "",
+          Field2: "",
+          Field3: "",
+          IsTodayStudy: isTodayStudy,
+          ID: that.data.MiaoguoCardID,
+        };
+        for (var i = 1; i <= 3; i++) {
+          for (var key in that.data.Field[i]) {
+            var item = that.data.Field[i][key];
+            var str = "";
+            if (item.Type == "image") {
+              if (item.Url) {
+                str = "[图 url='" + item.Url + "']" + item.Content + "[/图]";
+              }
+              else
+                str = "[图]" + item.Content + "[/图]";
             }
-            else
-              str = "[图]" + item.Content + "[/图]";
-          }
-          else if (item.Type == "line") {
-            for (var j = 0; j < item.Content.length; j++) {
-              if (item.Content[j].key == "normal")
-                str += item.Content[j].value;
-              if (item.Content[j].key == "line") {
-                str += "[线]" + item.Content[j].value + "[/线]";
+            else if (item.Type == "line") {
+              for (var j = 0; j < item.Content.length; j++) {
+                if (item.Content[j].key == "normal")
+                  str += item.Content[j].value;
+                if (item.Content[j].key == "line") {
+                  str += "[线]" + item.Content[j].value + "[/线]";
+                }
               }
             }
+            else if (item.Type == "sound") {
+              if (item.SoundMark)
+                str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+              else
+                str = "[读]" + item.Content + "[/读]";
+            }
+            else if (item.Type == "normal") {
+              str = item.Content;
+            }
+            else if (item.Type == "return") {
+              str = "\n";
+            }
+            param1["Field" + i] += str;
           }
-          else if (item.Type == "sound") {
-            if (item.SoundMark)
-              str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
-            else
-              str = "[读]" + item.Content + "[/读]";
-          }
-          else if (item.Type == "normal") {
-            str = item.Content;
-          }
-          else if (item.Type == "return") {
-            str = "\n";
-          }
-          param1["Field" + i] += str;
-        }
-        param1["Field" + i] = main.changeViewToString(param1["Field" + i]);
+          param1["Field" + i] = main.changeViewToString(param1["Field" + i]);
 
-      }
-      // var param2 = {
-      //   param: common.Encrypt(JSON.stringify(param1))
-      // }
-      main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
-        if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2") {
-          that.saveNewData();
-          that.onClose();
         }
-        else {
-          wx.showToast({
-            title: '已保存！',
-            image: "../images/universalpic_saved_white_120x120.png",
-          });
-
-          if (that.data.UpdateType == "add2") {
-            that.initAddCard();
+        // var param2 = {
+        //   param: common.Encrypt(JSON.stringify(param1))
+        // }
+        main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
+          if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2") {
+            that.saveNewData();
+            that.onClose();
           }
+          else {
+            wx.showToast({
+              title: '已保存！',
+              image: "../images/universalpic_saved_white_120x120.png",
+            });
+
+            if (that.data.UpdateType == "add2") {
+              that.initAddCard();
+            }
 
-          var taskToday = wx.getStorageSync("TaskToday");
-          taskToday.CardNumber++;
-          wx.setStorageSync("TaskToday", taskToday);
+            var taskToday = wx.getStorageSync("TaskToday");
+            taskToday.CardNumber++;
+            wx.setStorageSync("TaskToday", taskToday);
 
-          that.saveNewData();
-        }
+            that.saveNewData();
+          }
+        });
       });
     }
   },
+  uploadImageAll: function (arr, callback) {
+    var that=this;
+    var arrSource=[], arrResult=[];
+    for(var i=0;i<arr.length;i++){
+      for(var j=0;j<arr[i].length;j++){
+        if (arr[i][j].Type == "image" && arr[i][j].Url && !arr[i][j].Content){
+          //console.log("Source:" +arr[i][j].Url);
+          arrSource.push(arr[i][j].Url);
+          that.uploadImage(arr[i][j].Url, function (data) {
+            //console.log("Target:"+data);
+            data = app.globalData.uploadImageUrl+data;
+            arrResult.push(data);
+          });
+        }
+      }
+    }
+
+    var interval=setInterval(function(){
+      //console.log(arrResult.length);
+      if (arrResult.length >= arrSource.length){
+        clearInterval(interval);
+        var ari=0;
+        for (var i = 0; i < arr.length; i++) {
+          for (var j = 0; j < arr[i].length; j++) {
+            if (arr[i][j].Type == "image" && arr[i][j].Url && !arr[i][j].Content) {
+              arr[i][j].Content=arrResult[ari++];
+            }
+          }
+        }
+        //console.log(JSON.stringify(arr));
+        callback(arr);
+      }
+    },500);
+  },
+  uploadImage:function(file,callback){
+    var url = common.Encrypt("MiaoguoUploadFile");
+    wx.uploadFile({
+      url: app.globalData.serverUrl + url,
+      filePath: file,
+      name: 'file',
+      success(res) {
+        wx.hideLoading();
+        callback(res.data);
+      },
+      fail: function (err) {
+        wx.hideLoading();
+        wx.showModal({
+          title: '上传图片失败',
+          showCancel: false,
+          content: JSON.stringify(err),
+        });
+      }
+    });
+
+  },
   saveNewData: function () {
     var list = wx.getStorageSync("CardList");
     for (var i = 0; i < list.length; i++) {

pages/main/addItem.js

@@ -3,12 +3,11 @@ import main from '../../utils/main';
 
 const app = getApp();
 
-var tempCursor = 0, btnName = "";
+var tempCursor = 0,
+  btnName = "";
 var arrSoundMark = [];
-var isUpload = true;
-
+var isUnload = true;
 var isAndroid = false;
-
 var isEdit = true;
 
 Page({
@@ -23,7 +22,6 @@ Page({
     var id = options.id;
     var fieldid = options.fieldid;
     tempCursor = 0, btnName = "", arrSoundMark = [];
-    isEdit = true;
 
     var that = this;
     that.setData({
@@ -36,72 +34,121 @@ Page({
       title: '编辑 段落' + fieldid,
     });
 
-    var systemInfo = wx.getSystemInfoSync();
-    if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+    if (app.globalData.systemInfo.system.indexOf("Android") >= 0) {
       isAndroid = true;
     }
   },
   onShow: function () {
-    console.log("onShow:" + isEdit);
+    console.log("onShow");
     var that = this;
-    if (isEdit) {
-      var list = wx.getStorageSync("CardList");
-
-      var card = {};
-      for (var i = 0; i < list.length; i++) {
-        if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-          var content = main.encryptUrl(list[i].Content[this.data.FieldNumber].Content);
-          this.setData({
-            Field: content,
-          });
-
-          if (!wx.getStorageSync("TempCardInfoAddItem")) {
-            wx.setStorageSync("TempCardInfoAddItem", content);
-          }
-
-          break;
+
+    if (isAndroid && !isEdit) {
+      return;
+    }
+
+    var list = wx.getStorageSync("CardList");
+    var card = {};
+    for (var i = 0; i < list.length; i++) {
+      if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        var content = main.encryptUrl(list[i].Content[this.data.FieldNumber].Content);
+        this.setData({
+          Field: content,
+        });
+
+        if (!wx.getStorageSync("TempCardInfoAddItem")) {
+          wx.setStorageSync("TempCardInfoAddItem", content);
         }
+
+        break;
       }
     }
-    isUpload = true;
+
+    isUnload = true;
   },
   onUnload: function () {
-    if (isUpload) {
+    if (isUnload) {
       var content = wx.getStorageSync("TempCardInfoAddItem");
       if (content != undefined) {
         this.updateField(content);
         wx.removeStorageSync("TempCardInfoAddItem");
       }
     }
+    isEdit = true;
   },
-  bindFormSubmit: function (e) {
-    console.log(e.detail.value);
-    console.log(e.detail.target.id);
-    btnName = e.detail.target.id;
+  bindinputField: function (e) {
+    var that = this;
+    if (isAndroid && !isEdit) {
+      return;
+    }
+
+    this.setData({
+      Field: e.detail.value,
+    });
+    console.log("bindinputField:" + e.detail.value);
+    //this.updateField();
+
+  },
+  addSymbol: function (e) {
+    console.log("addSymbol");
+    isEdit = true;
+    var that = this;
+
+    btnName = e.currentTarget.dataset.id;
     if (btnName == "[读]") {
       this.setData({
         SoundSign: "[/读]",
       });
-    }
-    else if (btnName == "[/读]") {
+    } else if (btnName == "[/读]") {
       this.setData({
         SoundSign: "[读]",
       });
-    }
-    else if (btnName == "[线]") {
+    } else if (btnName == "[线]") {
       this.setData({
         LineSign: "[/线]",
       });
-    }
-    else if (btnName == "[/线]") {
+    } else if (btnName == "[/线]") {
       this.setData({
         LineSign: "[线]",
       });
     }
-    console.log("tempCursor:" + tempCursor);
+
+    if (!this.data.Focus) {
+      this.data.Field = this.data.Field + btnName;
+      this.setData({
+        Field: this.data.Field,
+      });
+    }
+    //console.log("addSymbol:" + this.data.Field);
+
+    setTimeout(function () {
+      that.setData({
+        Focus: true,
+      });
+    }, 300);
+  },
+  onBindFocus: function () {
+    this.setData({
+      Focus: true,
+    });
+  },
+  onBindblur: function (e) {
+    var that = this;
+    console.log("onBindblur:" + isEdit + " Filed:" + this.data.Field);
+    if (isAndroid && !isEdit) {
+      setTimeout(function () {
+        isEdit = true;
+      }, 500);
+      return;
+    }
+    isEdit = false;
+
+    this.updateField();
+    tempCursor = e.detail.cursor;
+    //console.log("tempCursor:" + tempCursor);
     if (tempCursor == undefined)
       tempCursor = this.data["Field"].length;
-    var str1 = "", str2 = "";
+    var str1 = "",
+      str2 = "";
     if (this.data.Field.length > 0) {
       str1 = this.data.Field.substr(0, tempCursor);
       str2 = this.data.Field.substring(tempCursor, this.data.Field.length);
@@ -111,159 +158,98 @@ Page({
     var cur = 1;
     if (btnName == "[读]" || btnName == "[线]") {
       cur = 3;
-    }
-    else if (btnName == "[/读]" || btnName == "[/线]") {
+    } else if (btnName == "[/读]" || btnName == "[/线]") {
       cur = 4;
+    } else if (btnName == "(     )") {
+      cur = 7;
+    } else if (btnName == "_____") {
+      cur = 5;
     }
 
     this.data.Field = str1 + btnName + str2;
     this.setData({
       Field: this.data.Field,
-      //Focus:false,
+      Focus: false,
       Cursor: tempCursor + cur,
     });
 
     btnName = "";
 
   },
-  bindinputField: function (e) {
-    console.log("bindinputField:" + isEdit);
-    // if (isEdit) {
-    //   this.setData({
-    //     Field: e.detail.value,
-    //   });
-    // }
-  },
-  addSymbol: function (e) {
-    console.log("addSymbol:" + isEdit);
-    // btnName = e.currentTarget.dataset.id;
-    // if (btnName == "[读]") {
-    //   this.setData({
-    //     SoundSign: "[/读]",
-    //   });
-    // }
-    // else if (btnName == "[/读]") {
-    //   this.setData({
-    //     SoundSign: "[读]",
-    //   });
-    // }
-    // else if (btnName == "[线]") {
-    //   this.setData({
-    //     LineSign: "[/线]",
-    //   });
-    // }
-    // else if (btnName == "[/线]") {
-    //   this.setData({
-    //     LineSign: "[线]",
-    //   });
-    // } 
-
-    // if (!this.data.Focus){
-    //   this.data.Field=this.data.Field+btnName;
-    //   this.setData({
-    //     Field: this.data.Field,
-    //   });
-    // }
-  },
-  onBindFocus: function () {
-    console.log("onBindFocus:" + isEdit);
-    // this.setData({
-    //   Focus: true,
-    // });
-  },
-  onBindblur: function (e) {
-    console.log("onBindblur:" + isEdit);
-    // var that=this;
-    // if (isEdit) {
-    //   that.androidFunction();
-
-    //   //console.log(e);
-    tempCursor = e.detail.cursor;
-    //   //console.log("tempCursor:" + tempCursor);
-    //   if (tempCursor == undefined)
-    //     tempCursor = this.data["Field"].length;
-    //   var str1 = "", str2 = "";
-    //   if (this.data.Field.length > 0) {
-    //     str1 = this.data.Field.substr(0, tempCursor);
-    //     str2 = this.data.Field.substring(tempCursor, this.data.Field.length);
-    //   }
-    //   //console.log("str1:" + str1);
-    //   //console.log("str2:" + str2);
-    //   var cur = 1;
-    //   if (btnName == "[读]" || btnName == "[线]") {
-    //     cur = 3;
-    //   }
-    //   else if (btnName == "[/读]" || btnName == "[/线]") {
-    //     cur = 4;
-    //   }
-
-    //   this.data.Field = str1 + btnName + str2;
-    //   this.setData({
-    //     Field: this.data.Field,
-    //     Focus:false,
-    //     Cursor: tempCursor + cur,
-    //   });
-
-    //   btnName = "";
-
-
-    // }
-  },
   onSearch: function (e) {
-    // wx.setStorageSync("TempFieldNumber", this.data.FieldNumber);
-    // wx.navigateTo({
-    //   url: './searchWeb',
-    // });
-    // this.updateField();
+    wx.setStorageSync("TempFieldNumber", this.data.FieldNumber);
+    wx.navigateTo({
+      url: './searchWeb',
+    });
+    this.updateField();
   },
   clear: function () {
-    console.log("clear:" + isEdit);
-    // this.setData({
-    //   Field: "",
-    //   Focus: false,
-    //   Cursor: 0,
-    // });
-    // this.updateField();
+    var that = this;
+    console.log("clear");
+    this.setData({
+      Field: "",
+      Focus: true,
+      Cursor: 0,
+    });
+    btnName = "";
+    isEdit = false;
+    this.updateField();
+
+  },
+  closeAddItem: function (e) {
+    var isSave = e.currentTarget.dataset.idsave;
+    if (isSave == "true") {
+      isUnload = false;
+      wx.removeStorageSync("TempCardInfoAddItem");
+      this.updateField();
+    }
+    wx.navigateBack({
+      delta: 1,
+    });
   },
 
   uploadImage: function () {
-    console.log("uploadImage:" + isEdit);
-    // var that=this;
-    // that.androidFunction();
-    // wx.chooseImage({
-    //   count: 1,
-    //   sizeType: ['compressed'],
-    //   sourceType: ['album', 'camera'],
-    //   success(res) {
-    //     // tempFilePath可以作为img标签的src属性显示图片
-    //     const tempFilePaths = res.tempFilePaths;
-    //     //console.log(tempFilePaths[0]);
-
-    //     that.data.Field = that.data.Field + "[图 url='" + tempFilePaths[0] + "'][/图]";
-
-    //     //console.log("uploadImageEnd:" + that.data.Field);
-
-    //     that.setData({
-    //       Field: that.data.Field,
-    //       Focus: false,
-    //     });
-    //     that.updateField();
-
-    //   },
-    //   fail:function(){
-    //   }
-    // });
-  },
+    console.log("uploadImageStart");
+    var that = this;
+
+    wx.chooseImage({
+      count: 1,
+      sizeType: ['compressed'],
+      sourceType: ['album', 'camera'],
+      success(res) {
+        // tempFilePath可以作为img标签的src属性显示图片
+        const tempFilePaths = res.tempFilePaths;
+        //console.log(tempFilePaths[0]);
+        //that.data.Field = that.data.Field + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
+
+
+        if (tempCursor == undefined)
+          tempCursor = that.data.Field.length;
+        var str1 = "",
+          str2 = "";
+        if (that.data.Field.length > 0) {
+          str1 = that.data.Field.substr(0, tempCursor);
+          str2 = that.data.Field.substring(tempCursor, that.data.Field.length);
+        }
+
+        var str0 = "[图 url='" + tempFilePaths[0] + "'][/图]";
+
+        that.data.Field = str1 + str0 + str2;
+
+        console.log("uploadImageEnd:" + that.data.Field);
+
+        that.setData({
+          Field: that.data.Field,
+          Focus: false,
+        });
+        that.updateField();
+      },
+      fail: function () {
+
+      }
+    });
 
-  // androidFunction:function(){
-  //   isEdit=false;
-  //   var systemInfo = wx.getSystemInfoSync();
-  //   if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-  //     setTimeout(function () {
-  //       isEdit = true;
-  //     }, 1000);
-  //   }
-  // },
+  },
   updateField: function (history) {
     var str = this.data.Field;
     str = main.decryptUrl(str);
@@ -286,18 +272,6 @@ Page({
     }
     wx.setStorageSync("CardList", list);
   },
-  closeAddItem: function (e) {
-    var isSave = e.currentTarget.dataset.idsave;
-    if (isSave == "true") {
-      isUpload = false;
-      wx.removeStorageSync("TempCardInfoAddItem");
-      this.updateField();
-    }
-    wx.navigateBack({
-      delta: 1,
-    });
-  },
-
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
@@ -305,4 +279,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/main/addItem.wxml

@@ -1,66 +1,54 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <form bindsubmit='bindFormSubmit'>
-    <view class="panelTag FlexRow">
-      <view class='left FlexRow'>
-        <button class="panelSave1 FlexRow" form-type="submit" id="onSearch">
-          <view class="add">+</view> 资料
-        </button>
-        <button class="panelSave2 panelSave1 FlexRow" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}" form-type="submit" id="[读]">
-          <image class="universalpic_read_begin_gray_20x20" src='../images/universalpic_read_begin_gray_20x20.png' />
-        </button>
-        <button class="panelSave3 panelSave1 FlexRow" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}" form-type="submit" id="[/读]">
-          <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
-        </button>
-        <button class="panelSave2 panelSave1 FlexRow" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}" form-type="submit" id="[线]">
-          <image class="universalpic_editbar_underline_gray_14x20" src='../images/universalpic_editbar_underline_gray_14x20.png' />
-        </button>
-        <button class="panelSave3 panelSave1 FlexRow" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}" form-type="submit" id="[/线]">
-          <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
-        </button>
-        <button class="panelSave2 panelSave1 FlexRow" form-type="submit" id="uploadImage">
-          <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
-        </button>
-
+  <view class="panelTag FlexRow">
+    <view class='left FlexRow'>
+      <view class="panelSave1 FlexRow" bindtap="onSearch">
+        <view class="add">+</view> 资料
+      </view>
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
+        <image class="universalpic_read_begin_gray_20x20" src='../images/universalpic_read_begin_gray_20x20.png' />
+      </view>
+      <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
+        <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
+      </view>
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
+        <image class="universalpic_editbar_underline_gray_14x20" src='../images/universalpic_editbar_underline_gray_14x20.png' />
+      </view>
+      <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}">
+        <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
       </view>
-      <view class='right FlexRow'>
-        <button class="clear" form-type="submit" id="clear">清空</button>
+      <view class="panelSave2 panelSave1 FlexRow" catchtap="uploadImage">
+        <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
       </view>
+
     </view>
-    <view class='lineFooter'></view>
-    <view class='panelInput'>
-      <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{Field}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' name="textarea" />
+    <view class='right FlexRow'>
+      <view class="clear" catchtap="clear">清空</view>
     </view>
-    <cover-view class='lineFooter'></cover-view>
-    <cover-view class="panelTag0 panelTag FlexRow">
-      <cover-view class="btn0"></cover-view>
-      <cover-view class="btnPanel">
-        <button class="btn FlexRow" form-type="submit" id="(     )">
-          <cover-image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
-        </button>
-      </cover-view>
-      <cover-view class="btnPanel">
-        <button class="btn FlexRow" form-type="submit" id="_____">
-          <cover-image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
-        </button>
-      </cover-view>
-      <cover-view class="btnPanel" wx:for="{{BtnArray}}" wx:key="index">
-        <button class="btn FlexRow" form-type="submit" id="{{item}}" >
-          {{item}}
-        </button>
-      </cover-view>
-      <cover-view class="btnPanel">
-        <button class="btn FlexRow" form-type="submit" id="²">
-          <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
-        </button>
-      </cover-view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class='panelInput'>
+    <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{Field}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
+  </view>
+  <cover-view class='lineFooter'></cover-view>
+  <cover-view class="panelTag0 panelTag FlexRow">
+    <cover-view class="btn0"></cover-view>
+    <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="(     )">
+      <cover-image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
     </cover-view>
-
-    <cover-view class='lineFooter'></cover-view>
-    <cover-view class='panelBtn FlexRow'>
-      <button class='text1' bindtap="closeAddItem" data-idsave="false">取消</button>
-      <cover-view class='line2'></cover-view>
-      <button class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</button>
+    <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="_____">
+      <cover-image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
     </cover-view>
-    <cover-view class='lineFooter'></cover-view>
-  </form>
+    <cover-view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</cover-view>
+    <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
+      <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
+    </cover-view>
+  </cover-view>
+  <cover-view class='lineFooter'></cover-view>
+  <cover-view class='panelBtn FlexRow'>
+    <cover-view class='text1' bindtap="closeAddItem" data-idsave="false">取消</cover-view>
+    <cover-view class='line1'></cover-view>
+    <cover-view class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</cover-view>
+  </cover-view>
+  <cover-view class='lineFooter'></cover-view>
+
 </view>

pages/main/addItem.wxss

@@ -23,22 +23,20 @@
 .panelSave1 {
   width: 148rpx;
   background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  color: #787878;
+  border:1rpx solid #9B9B9B;
+  color:#787878;
   text-align: center;
   height: 80rpx;
   line-height: 80rpx;
   border-radius: 10rpx;
   font-size: 28rpx;
-  padding-left: 0;
-  padding-right: 0;
 }
 
 .panelSave2 {
   width: 80rpx;
   height: 80rpx;
   background-color: #fff;
-  border: 1rpx solid #9b9b9b;
+  border:1rpx solid #9B9B9B;
   margin-left: 10rpx;
 }
 
@@ -46,8 +44,8 @@
   width: 80rpx;
   height: 80rpx;
   margin-left: 10rpx;
-  background-color: #0071ef;
-  border: 1rpx solid #0071ef;
+  background-color: #0071EF;
+  border:1rpx solid #0071EF;
 }
 
 .universalpic_read_begin_gray_20x20 {
@@ -55,22 +53,22 @@
   height: 20rpx;
 }
 
-.universalpic_read_end_white_38x22 {
+.universalpic_read_end_white_38x22{
   width: 38rpx;
   height: 22rpx;
 }
 
-.universalpic_editbar_underline_gray_14x20 {
+.universalpic_editbar_underline_gray_14x20{
   width: 14rpx;
   height: 20rpx;
 }
 
-.universalpic_underline_end_white_30x22 {
+.universalpic_underline_end_white_30x22{
   width: 31rpx;
   height: 22rpx;
 }
 
-.universalpic_picture_gray_26x26 {
+.universalpic_picture_gray_26x26{
   width: 26rpx;
   height: 26rpx;
 }
@@ -86,13 +84,11 @@
   height: 80rpx;
   color: #0071ef;
   background-color: #fff;
-  border: 1rpx solid #9b9b9b;
+  border:1rpx solid #9B9B9B;
   text-align: center;
   border-radius: 10rpx;
   line-height: 80rpx;
   font-size: 24rpx;
-  padding-left: 0;
-  padding-right: 0;
 }
 
 .line1 {
@@ -117,35 +113,35 @@
   width: 20rpx;
 }
 
-.panelTag .btnPanel{
-  width: 80rpx;
-  height: 80rpx;
-  margin-right: 10rpx;
-  border: 1rpx solid #9b9b9b;
-  border-radius: 10rpx;
-}
-
 .panelTag .btn {
   font-family: 'Roboto-Black';
   width: 80rpx;
   background-color: #fff;
-  color: #787878;
-  
+  border:1rpx solid #9B9B9B;
+  color:#787878;
+  border-radius: 10rpx;
   text-align: center;
   line-height: 80rpx;
   height: 80rpx;
+  margin-right: 10rpx;
   font-size: 36rpx;
-  
 }
-.panelTag .btn[native] {
-  border: none;
+
+.panelTag .btn1 {
+  width: 80rpx;
+  height: 80rpx;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  border-radius: 10rpx;
+  margin-right: 10rpx;
 }
+
 .universalpic_editbar_brackets_gray {
   width: 34rpx;
   height: 26rpx;
 }
 
-.universalpic_editbar_underline_gray {
+.universalpic_editbar_underline_gray{
   width: 18rpx;
   height: 28rpx;
 }
@@ -167,7 +163,7 @@
 .input {
   margin: 30rpx 30rpx 0 30rpx;
   width: 690rpx;
-  height: 220rpx;
+  height:220rpx;
 }
 
 .panelBtn {
@@ -176,26 +172,24 @@
   z-index: 10;
 }
 
-.panelBtn .line2 {
+.panelBtn .line1 {
   width: 4rpx;
   height: 30rpx;
   background-color: #d2d2d2;
 }
 
 .panelBtn .text1 {
-  width: 370rpx;
+  width: 374rpx;
   line-height: 100rpx;
   text-align: center;
   font-size: 28rpx;
   color: #a20602;
-  padding-left: 0;
-  padding-right: 0;
 }
 
 .panelBtn .text2 {
   color: #0071ef;
 }
 
-.lineFooter {
+.lineFooter{
   z-index: 10;
-}
+}

pages/main/detail.js

@@ -668,6 +668,15 @@ Page({
     this.setData({
       TaskInfo: this.data.TaskInfo,
     });
+
+    main.getData('UpdateCardImageUrl?MiaoguoCardID=' + this.data.TaskInfo[0].ID, function (data) {
+
+    });
+  },
+  onClose:function(){
+    wx.navigateBack({
+      delta: 1,
+    });
   },
   onShareAppMessage: function () {
     return {

pages/main/detail.wxml

@@ -129,6 +129,8 @@
       <view style='color:{{Color.FrontColor1}};'>单张题卡平均用时</view>
       <view class="time">{{Speed2}}</view>
     </view>
+
+    <view class='panelLastFooter' bindtap='onClose'>关闭</view>
   </view>
 
   <view class='footer' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}"></view>

pages/main/detail.wxss

@@ -381,7 +381,16 @@
   font-family: 'Roboto-Black';
 }
 
-
+.panelLastFooter{
+  width: 100%;
+  height:130rpx;
+  border-top:1rpx solid rgba(0, 0, 0, 0.2);
+  font-size:36rpx;
+  text-align: center;
+  line-height: 130rpx;
+  position: fixed;
+  bottom: 0;
+}
 .practice_introduction_marks_a{
   width: 22rpx;
   height: 16rpx;

pages/main/searchCardList.js

@@ -70,7 +70,7 @@ Page({
           result.push(str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]")));
         else {
           str = str.substr(str.indexOf("[图") + 2);
-          result.push(str.substring(str.indexOf("url='") + 7, str.indexOf("]")-1));
+          result.push(str.substring(str.indexOf(" url='") + 6, str.indexOf("]")-1));
           str = str.substring(str.indexOf("]") + 1, str.indexOf("[/图]"));
           result.push(str);
         }
@@ -131,6 +131,10 @@ Page({
     this.setData({
       List: this.data.List,
     });
+
+    main.getData('UpdateCardImageUrl?MiaoguoCardID='+id, function (data) {
+      
+    });
   },
   gotoNextPage: function (e) {
     wx.showLoading({

pages/main/uploadinmage.js

@@ -1,39 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-const app = getApp();
-
-Page({
-  data: {
-  },
-  onLoad: function () {
-    wx.hideShareMenu();
-    var that = this;
-    that.setData({
-      Containnerheight: main.getWindowHeight(),
-    });
-  },
-  upload:function(){
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'],
-      sourceType: ['album', 'camera'],
-      success(res) {
-        // tempFilePath可以作为img标签的src属性显示图片
-        const tempFilePaths = res.tempFilePaths;
-        var url = common.Encrypt("MiaoguoUploadFile");
-        wx.uploadFile({
-          url: app.globalData.serverUrlLocalhost +url, // 仅为示例，非真实的接口地址
-          filePath: tempFilePaths[0],
-          name: 'file',
-          formData: {
-            filename: 'test'
-          },
-          success(res) {
-            
-          }
-        })
-      }
-    });
-  },
-});

pages/main/uploadinmage.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/main/uploadinmage.wxml

@@ -1,2 +0,0 @@
-<!--pages/main/uploadinmage.wxml-->
-<button bindtap='upload'>上传图片</button>

pages/main/uploadinmage.wxss

@@ -1 +0,0 @@
-/* pages/main/uploadinmage.wxss */