1.0.0

app.json

@@ -1,5 +1,7 @@
 {
   "pages": [    
+
+    "pages/main/addItem",
     "pages/index/index",
     "pages/index/accredit",
     "pages/main/default",
@@ -9,7 +11,6 @@
     "pages/main/searchCard1",
     "pages/main/searchCard",
     "pages/main/add",
-    "pages/main/addItem",
     "pages/main/searchWeb2",
     "pages/main/searchWeb1",
     "pages/main/searchWeb",

pages/main/addItem.js

@@ -7,6 +7,8 @@ var tempCursor = 0, btnName = "";
 var arrSoundMark = [];
 var isUpload = true;
 
+var isAndroid = false;
+
 var isEdit = true;
 
 Page({
@@ -21,7 +23,7 @@ Page({
     var id = options.id;
     var fieldid = options.fieldid;
     tempCursor = 0, btnName = "", arrSoundMark = [];
-    isEdit=true;
+    isEdit = true;
 
     var that = this;
     that.setData({
@@ -33,11 +35,16 @@ Page({
     wx.setNavigationBarTitle({
       title: '编辑 段落' + fieldid,
     });
+
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+      isAndroid = true;
+    }
   },
   onShow: function () {
-    console.log("onShow:"+isEdit);
+    console.log("onShow:" + isEdit);
     var that = this;
-    if (isEdit){
+    if (isEdit) {
       var list = wx.getStorageSync("CardList");
 
       var card = {};
@@ -67,17 +74,10 @@ Page({
       }
     }
   },
-  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;
+  bindFormSubmit: function (e) {
+    console.log(e.detail.value);
+    console.log(e.detail.target.id);
+    btnName = e.detail.target.id;
     if (btnName == "[读]") {
       this.setData({
         SoundSign: "[/读]",
@@ -97,86 +97,173 @@ Page({
       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);
-  },
-  onBindFocus:function(){
+    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({
-      Focus: true,
+      Field: this.data.Field,
+      //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;
-      }
+    // var that=this;
+    // if (isEdit) {
+    //   that.androidFunction();
 
-      this.data.Field = str1 + btnName + str2;
-      this.setData({
-        Field: this.data.Field,
-        Focus:false,
-        Cursor: tempCursor + cur,
-      });
+    //   //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;
+    //   }
 
-      btnName = "";
+    //   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();
+    // this.setData({
+    //   Field: "",
+    //   Focus: false,
+    //   Cursor: 0,
+    // });
+    // this.updateField();
   },
-  closeAddItem: function (e) {
-    var isSave = e.currentTarget.dataset.idsave;
-    if (isSave == "true") {
-      isUpload = 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(){
+    //   }
+    // });
   },
+
+  // 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);
@@ -199,43 +286,18 @@ Page({
     }
     wx.setStorageSync("CardList", list);
   },
-  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(){
-      }
-    });
-  },
-  androidFunction:function(){
-    isEdit=false;
-    var systemInfo = wx.getSystemInfoSync();
-    if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-      setTimeout(function () {
-        isEdit = true;
-      }, 1000);
+  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,

pages/main/addItem.wxml

@@ -1,54 +1,66 @@
 <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' />
+  <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>
-      <view class="panelSave2 panelSave1 FlexRow" catchtap="uploadImage">
-        <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
+      <view class='right FlexRow'>
+        <button class="clear" form-type="submit" id="clear">清空</button>
       </view>
-
     </view>
-    <view class='right FlexRow'>
-      <view class="clear" catchtap="clear">清空</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>
-  </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="btn1 FlexRow" bindtap="addSymbol" data-id="_____">
-      <cover-image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
+    <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>
     </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>
-  <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 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>
+    <cover-view class='lineFooter'></cover-view>
+  </form>
 </view>

pages/main/addItem.wxss

@@ -23,20 +23,22 @@
 .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;
 }
 
@@ -44,8 +46,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 {
@@ -53,22 +55,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;
 }
@@ -84,11 +86,13 @@
   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 {
@@ -113,35 +117,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;
-  border:1rpx solid #9B9B9B;
-  color:#787878;
-  border-radius: 10rpx;
+  color: #787878;
+  
   text-align: center;
   line-height: 80rpx;
   height: 80rpx;
-  margin-right: 10rpx;
   font-size: 36rpx;
+  
 }
-
-.panelTag .btn1 {
-  width: 80rpx;
-  height: 80rpx;
-  background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  border-radius: 10rpx;
-  margin-right: 10rpx;
+.panelTag .btn[native] {
+  border: none;
 }
-
 .universalpic_editbar_brackets_gray {
   width: 34rpx;
   height: 26rpx;
 }
 
-.universalpic_editbar_underline_gray{
+.universalpic_editbar_underline_gray {
   width: 18rpx;
   height: 28rpx;
 }
@@ -163,7 +167,7 @@
 .input {
   margin: 30rpx 30rpx 0 30rpx;
   width: 690rpx;
-  height:220rpx;
+  height: 220rpx;
 }
 
 .panelBtn {
@@ -172,24 +176,26 @@
   z-index: 10;
 }
 
-.panelBtn .line1 {
+.panelBtn .line2 {
   width: 4rpx;
   height: 30rpx;
   background-color: #d2d2d2;
 }
 
 .panelBtn .text1 {
-  width: 374rpx;
+  width: 370rpx;
   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;
-}
+}