1.0.0.24

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.0.23",
+    Version: "1.0.0.24",
     IsProduction: false,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
@@ -58,5 +58,7 @@ App({
     TempMiaoguoCardID: 0,//临时题卡ID，用于资料选取时用
     SearchNull: 0,//资料搜索为空时标记，用于资料搜索时用
     SearchItem: {},//资料搜索项信息，用于资料搜索时用
+    TempFieldNumber:0,//资料搜索时的段落编号
+    TempSearcchBackNumber:3,//资料搜索时返回的页面数
   }
 })

app.json

@@ -1,7 +1,6 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/main/addItem",
     "pages/index/accredit",
     "pages/main/default",
     "pages/main/cardInfo",

pages/main/add.js

@@ -5,21 +5,28 @@ const app = getApp();
 var field = [[], [], [], []];
 var arrTag = [];
 
+var tempCursor = 0,
+  btnName = "";
+var arrSoundMark = [];
+var isUnload = true;
+var isEdit = true;
+
 Page({
   data: {
-    PracticeTimeStr:"智能安排"
+    PracticeTimeStr:"智能安排",
+    HiddenFieldEdit:true,
+    FieldContent: "",
+    SoundSign: "[读]",
+    LineSign: "[线]",
+    BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
   },
   onLoad: function (options) {
     wx.hideShareMenu();
     var that = this;
-    var fieldid = 0;
-    if (options.fieldid)
-      fieldid = options.fieldid;
     that.setData({
       Containnerheight: main.getWindowHeight(),
       UpdateType: options.type,
       MiaoguoCardID: options.id,
-      FieldID: fieldid,
     });
 
     var list = app.globalData.CardList;
@@ -29,6 +36,7 @@ Page({
         break;
       }
     }
+    app.globalData.TempFieldNumber=0;
     app.globalData.TempMiaoguoCardID=that.data.MiaoguoCardID;
 
   },
@@ -39,14 +47,15 @@ Page({
       that.initAddCard();
     }
     else {
-      var card = {};
+      var card = {},content="";
       var list = app.globalData.CardList;
       for (var i = 0; i < list.length; i++) {
         if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
           card = main.changeStringToView(list[i].Content);
           card.MiaoguoCardID = list[i].MiaoguoCardID;
           card.LimitTime = list[i].LimitTime;
-          
+          if (that.data.FieldNumber && that.data.FieldNumber>0)
+            content = main.encryptUrl(list[i].Content[that.data.FieldNumber].Content);
           break;
         }
       }
@@ -54,6 +63,7 @@ Page({
         MiaoguoCardID: card.MiaoguoCardID,
         Field: card.Field,
         Tags: card.Tags,
+        FieldContent:content,
       });
 
       if (that.data.UpdateType != "add2") {
@@ -61,13 +71,6 @@ Page({
           title: '编辑题卡'
         });
       }
-
-      if (that.data.UpdateType == "edit3") {
-        that.setData({
-          UpdateType: "edit2",
-        });
-        that.gotoAddItem({ currentTarget: { dataset: { fieldid: that.data.FieldID } } });
-      }
     }
   },
   onUnload: function () {
@@ -91,13 +94,28 @@ Page({
     });
   },
   gotoAddItem: function (e) {
+    var that=this;
     var fieldid = e.currentTarget.dataset.fieldid;
-    wx.navigateTo({
-      url: './addItem?id=' + this.data.MiaoguoCardID + '&fieldid=' + fieldid,
+    var content;
+    var list = app.globalData.CardList;
+    for (var i = 0; i < list.length; i++) {
+      if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        content = main.encryptUrl(list[i].Content[fieldid].Content);
+        break;
+      }
+    }
+    that.setData({
+      HiddenFieldEdit: false,
+      Focus: true,
+      FieldNumber: fieldid,
+      FieldContent:content,
+    });
+    wx.setNavigationBarTitle({
+      title: '编辑 段落' + fieldid,
     });
   },
   onSearch: function (e) {
-    wx.removeStorageSync("TempFieldNumber");
+    app.globalData.TempFieldNumber = 0;
     wx.navigateTo({
       url: './searchWeb',
     })
@@ -111,14 +129,6 @@ Page({
       });
     }
     else {
-      var list = app.globalData.CardList;
-      for (var i = 0; i < list.length; i++) {
-        if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-          list[i].Content[0].Content=that.data.Tags;
-          break;
-        }
-      }
-      app.globalData.CardList = list;
       wx.navigateTo({
         url: './preview?type=preview&id=' + this.data.MiaoguoCardID,
       });
@@ -358,11 +368,259 @@ Page({
           that.setData({
             Tags: that.data.Tags,
           });
+
+          var list = app.globalData.CardList;
+          for (var i = 0; i < list.length; i++) {
+            if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+              list[i].Content[0].Content = that.data.Tags;
+              break;
+            }
+          }
+          app.globalData.CardList = list;
         }
       }
     });
     
   },
+
+
+  //段落编辑**************************
+
+  //字段输入
+  bindinputField: function (e) {
+    console.log("bindinputField:" + e.detail.value + " isEdit:" + isEdit);
+
+    var that = this;
+    if (app.globalData.IsAndroid && !isEdit) {
+      return;
+    }
+
+    this.setData({
+      FieldContent: 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 == "[/读]") {
+      this.setData({
+        SoundSign: "[读]",
+      });
+    } else if (btnName == "[线]") {
+      this.setData({
+        LineSign: "[/线]",
+      });
+    } else if (btnName == "[/线]") {
+      this.setData({
+        LineSign: "[线]",
+      });
+    }
+
+    if (!this.data.Focus) {
+      this.data.FieldContent = this.data.FieldContent + btnName;
+      this.setData({
+        FieldContent: this.data.FieldContent,
+      });
+    }
+    //console.log("addSymbol:" + this.data.FieldContent);
+
+    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.FieldContent);
+    if (app.globalData.IsAndroid && !isEdit) {
+      setTimeout(function () {
+        isEdit = true;
+        console.log("onBindblur2:" + isEdit);
+      }, 500);
+      return;
+    }
+    isEdit = false;
+    if (app.globalData.IsAndroid && !isEdit) {
+      setTimeout(function () {
+        isEdit = true;
+        console.log("onBindblur2:" + isEdit);
+      }, 500);
+    }
+    //console.log("onBindblur:"+isEdit);
+
+    this.updateField();
+    tempCursor = e.detail.cursor;
+    //console.log("tempCursor:" + tempCursor);
+    if (tempCursor == undefined)
+      tempCursor = this.data["FieldContent"].length;
+    var str1 = "",
+      str2 = "";
+    if (this.data.FieldContent.length > 0) {
+      str1 = this.data.FieldContent.substr(0, tempCursor);
+      str2 = this.data.FieldContent.substring(tempCursor, this.data.FieldContent.length);
+    }
+    //console.log("str1:" + str1);
+    //console.log("str2:" + str2);
+    var cur = 1;
+    if (btnName == "[读]" || btnName == "[线]") {
+      cur = 3;
+    } else if (btnName == "[/读]" || btnName == "[/线]") {
+      cur = 4;
+    } else if (btnName == "(　　　)") {
+      cur = 5;
+    } else if (btnName == "_____") {
+      cur = 5;
+    }
+
+    this.data.FieldContent = str1 + btnName + str2;
+    this.setData({
+      FieldContent: this.data.FieldContent,
+      Focus: false,
+      Cursor: tempCursor + cur,
+    });
+
+    btnName = "";
+
+  },
+
+  onSearchField: function (e) {
+    app.globalData.TempFieldNumber = this.data.FieldNumber;
+    wx.navigateTo({
+      url: './searchWeb',
+    });
+    this.updateField();
+
+    setTimeout(function () {
+      isEdit = true;
+      //console.log("onSearchEnd");
+    }, 1000);
+  },
+  clear: function () {
+    var that = this;
+    //console.log("clear");
+    this.setData({
+      FieldContent: "",
+      Focus: true,
+      Cursor: 0,
+    });
+    btnName = "";
+    isEdit = false;
+    this.updateField();
+
+  },
+  closeAddItem: function (e) {
+    var that=this;
+    var isSave = e.currentTarget.dataset.idsave;
+    if (isSave == "true") {
+      isUnload = false;
+      wx.removeStorageSync("TempCardInfoAddItem");
+      this.updateField();
+      var title ="编辑题卡";
+      if (that.data.UpdateType == "add2") {
+        title = "添加题卡";
+      }
+      wx.setNavigationBarTitle({
+        title: title,
+      });
+
+    }
+    this.setData({
+      HiddenFieldEdit:true,
+    });
+  },
+
+  updateField: function (history) {
+    var str = this.data.FieldContent;
+    str = main.decryptUrl(str);
+
+    str = str.replace(/\[读\]/g, "\n[读]");
+    str = str.replace(/\[图\]/g, "\n[图]");
+    str = str.replace(/\[\/读\]/g, "[\/读]\n");
+    str = str.replace(/\[\/图\]/g, "[\/图]\n");
+    str = str.replace(/\n\n/g, "\n");
+
+    var list = app.globalData.CardList;
+    var card={};
+    for (var i = 0; i < list.length; i++) {
+      if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        if (history != undefined)
+          list[i].Content[this.data.FieldNumber].Content = history;
+        else
+          list[i].Content[this.data.FieldNumber].Content = str;
+        
+        card = main.changeStringToView(list[i].Content);
+        break;
+      }
+    }
+    app.globalData.CardList = list;
+
+    this.setData({
+        Field: card.Field,
+        Tags: card.Tags,
+    });
+  },
+
+  uploadImageField: 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.FieldContent = that.data.FieldContent + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
+
+        if (tempCursor == undefined)
+          tempCursor = that.data.FieldContent.length;
+        var str1 = "",
+          str2 = "";
+        if (that.data.FieldContent.length > 0) {
+          str1 = that.data.FieldContent.substr(0, tempCursor);
+          str2 = that.data.FieldContent.substring(tempCursor, that.data.FieldContent.length);
+        }
+
+        var str0 = "[图]" + tempFilePaths[0] + "[/图]";
+
+        that.data.FieldContent = str1 + str0 + str2;
+
+        //console.log("uploadImageEnd:" + that.data.FieldContent);
+
+        that.setData({
+          FieldContent: that.data.FieldContent,
+          Focus: false,
+        });
+        that.updateField();
+      },
+      fail: function () {
+
+      }
+    });
+
+  },
+  
+
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
@@ -371,3 +629,5 @@ Page({
     }
   },
 })
+
+

pages/main/add.wxml

@@ -1,4 +1,4 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' hidden='{{!HiddenFieldEdit}}'>
   <view class="panelTimePlan FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
     <view class="panelItem1">
       练习时间
@@ -27,29 +27,18 @@
           <block wx:if="{{itemParent==2}}">答案</block>
           <block wx:if="{{itemParent==3}}">其它</block>
         </text>
-
-
         <block wx:for="{{Field[itemParent]}}" wx:key="index">
-
           <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-
           <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
           <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         </block>
         </text>
-
         <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
-
-        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' />
-
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' binderror="onBindError" />
-
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
         <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
-
-
   </block>
   </view>
   </view>
@@ -85,4 +74,64 @@
       <image class="universalpic_preview_black_30x30" src='../images/universalpic_preview_black_30x30.png' />
     </view>
   </view>
+</view>
+
+<!-- 字段编辑 -->
+<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx;' hidden='{{HiddenFieldEdit}}'>
+  <view class="panelItemTag FlexRow">
+    <view class='left FlexRow'>
+      <view class="panelSaveTag1 FlexRow" bindtap="onSearchField">
+        <view class="add">+</view> 资料
+      </view>
+      <view class="panelSaveTag2 panelSaveTag1 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="panelSaveTag3 panelSaveTag1 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="panelSaveTag2 panelSaveTag1 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="panelSaveTag3 panelSaveTag1 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="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField">
+        <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
+      </view>
+
+    </view>
+    <view class='right FlexRow'>
+      <view class="clear" catchtap="clear">清空</view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class='panelInput'>
+    <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
+  </view>
+  <cover-view class='lineFooter'></cover-view>
+  <cover-view class='panelBtnItem FlexColumn'>
+    <cover-view class="panelBtnSmall 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="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="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 class="btn1 FlexRow" bindtap="addSymbol" data-id="³">
+        <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_cube_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>
+  </cover-view>
 </view>

pages/main/add.wxss

@@ -239,3 +239,212 @@
   height: 36rpx;
   margin: 0 40rpx;
 }
+
+/* 字段编辑 */
+.addItem {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #f0f0f0;
+  position: fixed;
+  top: 0;
+}
+
+.left {
+  margin-left: 25rpx;
+}
+
+.right {
+  margin-right: 25rpx;
+}
+
+.panelItemTag {
+  width: 100%;
+  justify-content: space-between;
+  min-height: 120rpx;
+  background-color: #fff;
+}
+
+.panelSaveTag1 {
+  width: 148rpx;
+  background-color: #fff;
+  border: 1rpx solid #9b9b9b;
+  color: #787878;
+  text-align: center;
+  height: 80rpx;
+  line-height: 80rpx;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+}
+
+.panelSaveTag2 {
+  width: 80rpx;
+  height: 80rpx;
+  background-color: #fff;
+  border: 1rpx solid #9b9b9b;
+  margin-left: 10rpx;
+}
+
+.panelSaveTag3 {
+  width: 80rpx;
+  height: 80rpx;
+  margin-left: 10rpx;
+  background-color: #0071ef;
+  border: 1rpx solid #0071ef;
+}
+
+.universalpic_read_begin_gray_20x20 {
+  width: 21rpx;
+  height: 20rpx;
+}
+
+.universalpic_read_end_white_38x22 {
+  width: 38rpx;
+  height: 22rpx;
+}
+
+.universalpic_editbar_underline_gray_14x20 {
+  width: 14rpx;
+  height: 20rpx;
+}
+
+.universalpic_underline_end_white_30x22 {
+  width: 31rpx;
+  height: 22rpx;
+}
+
+.universalpic_picture_gray_26x26 {
+  width: 26rpx;
+  height: 26rpx;
+}
+
+.add {
+  font-size: 42rpx;
+  font-weight: 600;
+  margin: 0 10rpx 10rpx 0;
+}
+
+.clear {
+  width: 108rpx;
+  height: 80rpx;
+  color: #0071ef;
+  background-color: #fff;
+  border: 1rpx solid #9b9b9b;
+  text-align: center;
+  border-radius: 10rpx;
+  line-height: 80rpx;
+  font-size: 24rpx;
+}
+
+.line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+  margin-right: 20rpx;
+}
+
+.universalpic_help_gray_26x26 {
+  width: 26rpx;
+  height: 26rpx;
+  margin: 0 0 0 40rpx;
+}
+
+.panelInput {
+  width: 100%;
+  height: 250rpx;
+  margin-top: 10rpx;
+  background-color: #fff;
+  font-size: 36rpx;
+  font-weight: 400;
+}
+
+.input {
+  margin: 30rpx 30rpx 0 30rpx;
+  width: 690rpx;
+  height: 220rpx;
+}
+
+.panelBtnItem {
+  position: fixed;
+  top: 382rpx;
+  width: 100%;
+  background-color: #fff;
+}
+
+.panelBtnSmall {
+  z-index: 10;
+  width:100%;
+  height: 120rpx;
+  background-color: #fff;
+  justify-content: flex-start;
+}
+
+.panelBtnSmall .btn0 {
+  width: 10rpx;
+}
+
+.panelBtnSmall .btn {
+  font-family: 'Roboto-Black';
+  width: 80rpx;
+  background-color: #fff;
+  border: 1rpx solid #9b9b9b;
+  color: #787878;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 80rpx;
+  height: 80rpx;
+  margin-right: 10rpx;
+  font-size: 36rpx;
+}
+
+.panelBtnSmall .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 {
+  width: 18rpx;
+  height: 28rpx;
+}
+
+.universalpic_editbar_sqr_gray {
+  width: 25rpx;
+  height: 22rpx;
+}
+
+.panelBtn {
+  width: 100%;
+  background-color: #f8f8f8;
+  z-index: 10;
+}
+
+.panelBtn .line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+}
+
+.panelBtn .text1 {
+  width: 374rpx;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #a20602;
+}
+
+.panelBtn .text2 {
+  color: #0071ef;
+}
+
+.lineFooter {
+  z-index: 10;
+}

pages/main/addItem.js

@@ -1,292 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-const app = getApp();
-
-var tempCursor = 0,
-  btnName = "";
-var arrSoundMark = [];
-var isUnload = true;
-var isEdit = true;
-
-Page({
-  data: {
-    Field: "",
-    SoundSign: "[读]",
-    LineSign: "[线]",
-    BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
-  },
-  onLoad: function (options) {
-    wx.hideShareMenu();
-    var id = options.id;
-    var fieldid = options.fieldid;
-    tempCursor = 0, btnName = "", arrSoundMark = [];
-
-    var that = this;
-    that.setData({
-      MiaoguoCardID: id,
-      Focus: true,
-      FieldNumber: fieldid,
-      Containnerheight: main.getWindowHeight(),
-    });
-    wx.setNavigationBarTitle({
-      title: '编辑 段落' + fieldid,
-    });
-
-  },
-  onShow: function () {
-    //console.log("onShow");
-    var that = this;
-
-    //console.log("onShow:" + isEdit);
-    if (app.globalData.IsAndroid && !isEdit) {
-      return;
-    }
-
-    var list = app.globalData.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;
-      }
-    }
-
-    isUnload = true;
-  },
-  onUnload: function () {
-    if (isUnload) {
-      var content = wx.getStorageSync("TempCardInfoAddItem");
-      if (content != undefined) {
-        this.updateField(content);
-        wx.removeStorageSync("TempCardInfoAddItem");
-      }
-    }
-    isEdit = true;
-  },
-  bindinputField: function (e) {
-    console.log("bindinputField:" + e.detail.value + " isEdit:" + isEdit);
-
-    var that = this;
-    if (app.globalData.IsAndroid && !isEdit) {
-      return;
-    }
-
-    this.setData({
-      Field: 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 == "[/读]") {
-      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,
-      });
-    }
-    //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 (app.globalData.IsAndroid && !isEdit) {
-      setTimeout(function () {
-        isEdit = true;
-        console.log("onBindblur2:" + isEdit);
-      }, 500);
-      return;
-    }
-    isEdit = false;
-    if (app.globalData.IsAndroid && !isEdit) {
-      setTimeout(function () {
-        isEdit = true;
-        console.log("onBindblur2:" + isEdit);
-      }, 500);
-    }
-    //console.log("onBindblur:"+isEdit);
-
-    this.updateField();
-    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;
-    } else if (btnName == "(　　　)") {
-      cur = 5;
-    } else if (btnName == "_____") {
-      cur = 5;
-    }
-
-    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();
-    
-    setTimeout(function () {
-      isEdit = true;
-      //console.log("onSearchEnd");
-    }, 1000);
-  },
-  clear: function () {
-    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("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 = "[图]" + 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 () {
-
-      }
-    });
-
-  },
-  updateField: function (history) {
-    var str = this.data.Field;
-    str = main.decryptUrl(str);
-
-    str = str.replace(/\[读\]/g, "\n[读]");
-    str = str.replace(/\[图\]/g, "\n[图]");
-    str = str.replace(/\[\/读\]/g, "[\/读]\n");
-    str = str.replace(/\[\/图\]/g, "[\/图]\n");
-    str = str.replace(/\n\n/g, "\n");
-
-    var list = app.globalData.CardList;
-    for (var i = 0; i < list.length; i++) {
-      if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-        if (history != undefined)
-          list[i].Content[this.data.FieldNumber].Content = history;
-        else
-          list[i].Content[this.data.FieldNumber].Content = str;
-        break;
-      }
-    }
-    app.globalData.CardList=list;
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
-    }
-  },
-})

pages/main/addItem.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "编辑 段落1",
-  "backgroundColor": "#F0F0F0"
-}

pages/main/addItem.wxml

@@ -1,58 +0,0 @@
-<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <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="panelSave2 panelSave1 FlexRow" catchtap="uploadImage">
-        <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
-      </view>
-
-    </view>
-    <view class='right FlexRow'>
-      <view class="clear" catchtap="clear">清空</view>
-    </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='panel2 FlexColumn'>
-    <cover-view class="panelBtnSmall 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="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="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 class="btn1 FlexRow" bindtap="addSymbol" data-id="³">
-        <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_cube_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>
-  </cover-view>
-</view>

pages/main/addItem.wxss

@@ -1,207 +0,0 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
-  background-color: #f0f0f0;
-  position: fixed;
-  top: 0;
-}
-
-.left {
-  margin-left: 25rpx;
-}
-
-.right {
-  margin-right: 25rpx;
-}
-
-.panelTag {
-  width: 100%;
-  justify-content: space-between;
-  min-height: 120rpx;
-  background-color: #fff;
-}
-
-.panelSave1 {
-  width: 148rpx;
-  background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  color: #787878;
-  text-align: center;
-  height: 80rpx;
-  line-height: 80rpx;
-  border-radius: 10rpx;
-  font-size: 28rpx;
-}
-
-.panelSave2 {
-  width: 80rpx;
-  height: 80rpx;
-  background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  margin-left: 10rpx;
-}
-
-.panelSave3 {
-  width: 80rpx;
-  height: 80rpx;
-  margin-left: 10rpx;
-  background-color: #0071ef;
-  border: 1rpx solid #0071ef;
-}
-
-.universalpic_read_begin_gray_20x20 {
-  width: 21rpx;
-  height: 20rpx;
-}
-
-.universalpic_read_end_white_38x22 {
-  width: 38rpx;
-  height: 22rpx;
-}
-
-.universalpic_editbar_underline_gray_14x20 {
-  width: 14rpx;
-  height: 20rpx;
-}
-
-.universalpic_underline_end_white_30x22 {
-  width: 31rpx;
-  height: 22rpx;
-}
-
-.universalpic_picture_gray_26x26 {
-  width: 26rpx;
-  height: 26rpx;
-}
-
-.add {
-  font-size: 42rpx;
-  font-weight: 600;
-  margin: 0 10rpx 10rpx 0;
-}
-
-.clear {
-  width: 108rpx;
-  height: 80rpx;
-  color: #0071ef;
-  background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  text-align: center;
-  border-radius: 10rpx;
-  line-height: 80rpx;
-  font-size: 24rpx;
-}
-
-.line1 {
-  width: 4rpx;
-  height: 30rpx;
-  background-color: #d2d2d2;
-  margin-right: 20rpx;
-}
-
-.universalpic_help_gray_26x26 {
-  width: 26rpx;
-  height: 26rpx;
-  margin: 0 0 0 40rpx;
-}
-
-.panelInput {
-  width: 100%;
-  height: 250rpx;
-  margin-top: 10rpx;
-  background-color: #fff;
-  font-size: 36rpx;
-  font-weight: 400;
-}
-
-.input {
-  margin: 30rpx 30rpx 0 30rpx;
-  width: 690rpx;
-  height: 220rpx;
-}
-
-.panel2 {
-  position: fixed;
-  top: 382rpx;
-  width: 100%;
-  background-color: #fff;
-}
-
-.panelBtnSmall {
-  z-index: 10;
-  width:100%;
-  height: 120rpx;
-  background-color: #fff;
-  justify-content: flex-start;
-}
-
-.panelBtnSmall .btn0 {
-  width: 10rpx;
-}
-
-.panelBtnSmall .btn {
-  font-family: 'Roboto-Black';
-  width: 80rpx;
-  background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  color: #787878;
-  border-radius: 10rpx;
-  text-align: center;
-  line-height: 80rpx;
-  height: 80rpx;
-  margin-right: 10rpx;
-  font-size: 36rpx;
-}
-
-.panelBtnSmall .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 {
-  width: 18rpx;
-  height: 28rpx;
-}
-
-.universalpic_editbar_sqr_gray {
-  width: 25rpx;
-  height: 22rpx;
-}
-
-.panelBtn {
-  width: 100%;
-  background-color: #f8f8f8;
-  z-index: 10;
-}
-
-.panelBtn .line1 {
-  width: 4rpx;
-  height: 30rpx;
-  background-color: #d2d2d2;
-}
-
-.panelBtn .text1 {
-  width: 374rpx;
-  line-height: 100rpx;
-  text-align: center;
-  font-size: 28rpx;
-  color: #a20602;
-}
-
-.panelBtn .text2 {
-  color: #0071ef;
-}
-
-.lineFooter {
-  z-index: 10;
-}

pages/main/detail.wxml

@@ -161,7 +161,7 @@
         </view>
       </view>
     </view>
-    <view class="iphoneX" wx:if="{{IsIphoneX}}"></view>
+    <view class="iphoneX" wx:if="{{IsIphoneX}}" style='background-color:{{Color.BackColor2}};'></view>
   </view>
 </view>
 

pages/main/detail.wxss

@@ -245,7 +245,7 @@
 
 .iphoneX{
   width: 100%;
-  height: 80rpx;
+  height: 60rpx;
   z-index: 10;
 }
 

pages/main/searchWeb.js

@@ -59,8 +59,9 @@ Page({
       }
     }
     main.updateSearchList(obj);
+    app.globalData.TempSearcchBackNumber=2;
     wx.navigateTo({
-      url: './searchWeb2?back=2',
+      url: './searchWeb2',
     });
   },
   onShareAppMessage: function () {

pages/main/searchWeb.wxml

@@ -20,7 +20,7 @@
         <view class="panelItemSearch11">
           {{item.Key}}
         </view>
-        <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici'}}">
+        <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
           {{item.TypeName}}
         </view>
       </view>

pages/main/searchWeb1.js

@@ -155,15 +155,21 @@ Page({
             obj.Dynasty = data.CHN.Dynasty;
           if (data.CHN && data.CHN.PeomContent) {
             obj.Type = "shici";
+            obj.TypeName = "诗词";
             obj.Content = data.CHN.PeomContent.join("").substr(0, 26);
           }
-          else {
+          else if (data.CHN){
             obj.Type = "zici";
           }
+          if (data.ENG && !data.CHN) {
+            obj.Type = "eng";
+            obj.TypeName="外语";
+          }
+          
           main.updateSearchList(obj);
 
           wx.navigateTo({
-            url: './searchWeb2?back=3',
+            url: './searchWeb2',
           });
         }
       }

pages/main/searchWeb1.wxml

@@ -60,17 +60,17 @@
           <view class="panelItemSearch11">
             {{item.Key}}
           </view>
-          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici'}}">
+          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
             {{item.TypeName}}
           </view>
         </view>
-        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici'}}">
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici'  || item.Type=='eng'}}">
           {{item.Remark}}
         </view>
         <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
           {{item.Author}} {{item.Dynasty}}
         </view>
-        <view class="panelItemSearch3 FlexRow" wx:if="{{item.Type=='shici'}}">
+        <view class="panelItemSearch3 FlexRow">
           {{item.Content}}
         </view>
       </view>
@@ -90,17 +90,17 @@
           <view class="panelItemSearch11">
             {{item.Key}}
           </view>
-          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici'}}">
+          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
             {{item.TypeName}}
           </view>
         </view>
-        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici'}}">
+        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici' || item.Type=='eng'}}">
           {{item.Remark}}
         </view>
         <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
           {{item.Author}} {{item.Dynasty}}
         </view>
-        <view class="panelItemSearch3 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='zici'}}">
+        <view class="panelItemSearch3 FlexRow">
           {{item.Content}}
         </view>
       </view>

pages/main/searchWeb2.js

@@ -2,7 +2,6 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var back = 3;
 var hasStart = {};
 
 Page({
@@ -16,10 +15,6 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
-
-    if (options.back)
-      back = Number(options.back);
-
     this.getList();
     
     hasStart = {};
@@ -58,13 +53,13 @@ Page({
           }
         }
       }
+    }
 
-      if (data.ENG && data.ENG.Paraphrase && common.checkIsArray(data.ENG.Paraphrase)) {
+    if (data.ENG && data.ENG.Paraphrase && common.checkIsArray(data.ENG.Paraphrase)) {
 
-        for (var i = 0; i < data.ENG.Paraphrase.length; i++) {
-          var item = data.ENG.Paraphrase[i];
-          item.PartOfSpeech = common.ReplaceAllString(item.PartOfSpeech, "释义", "");
-        }
+      for (var i = 0; i < data.ENG.Paraphrase.length; i++) {
+        var item = data.ENG.Paraphrase[i];
+        item.PartOfSpeech = common.ReplaceAllString(item.PartOfSpeech, "释义", "");
       }
     }
 
@@ -102,8 +97,8 @@ Page({
       }
 
       this.data.CSS[css].Number = "1";
-      if (wx.getStorageSync("TempFieldNumber") && !hasStart[css]) {
-        this.data.CSS[css].Number = Number(wx.getStorageSync("TempFieldNumber"));
+      if (app.globalData.TempFieldNumber>0 && !hasStart[css]) {
+        this.data.CSS[css].Number = app.globalData.TempFieldNumber;
         hasStart[css] = true;
       }
     }
@@ -130,10 +125,7 @@ Page({
           delete this.data.CSS[item];
         }
       }
-      if (wx.getStorageSync("TempFieldNumber")) {
-        wx.removeStorageSync("TempFieldNumber");
-      }
-
+      app.globalData.TempFieldNumber = 0;
       var id = app.globalData.TempMiaoguoCardID;
       var list = app.globalData.CardList;
       for (var i = 0; i < list.length; i++) {
@@ -193,7 +185,7 @@ Page({
       app.globalData.CardList = list;
 
       wx.navigateBack({
-        delta: back,
+        delta: app.globalData.TempSearcchBackNumber,
       });
     }
     else {