1.3.7

app.js

@@ -26,7 +26,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.3.6",
+    Version: "1.3.7",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

pages/main/add.js

@@ -31,7 +31,8 @@ Page({
     SoundSign: "[读]",
     LineSign: "[线]",
     HighlighterSign: "[光]",
-    BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
+    MathSymbolCommon: [],
+    BtnArray: ["+", "-", "×", "÷", "=", "<", ">", "≤", "≥", "º", "¹", "²", "³", "⁴", "ⁿ", "₁", "₂", "₃", "₄", "·", "≈", "≠", "±", "(", ")", "[", "]", "{", "}", "《", "》", "％", "°", "℃", "∵", "∴", "π", "|", "‖", "∠", "⊥", "△", "☐", "◇", "▽", "♡", "☆", "⊙", "∈", "∪", "∩", "⊆", "⊂", "⊇", "⊃", "∞", "①", "②", "③", "④", "⑤", "⑥", "⑦", "⑧", "⑨", "⑩"],
     IsPracticeTime: false,
     IsRecorder: false,
     PracticeTimeArr: PracticeTimeArr
@@ -80,6 +81,7 @@ Page({
     app.globalData.TempFieldNumber = 0;
     app.globalData.TempMiaoguoCardID = that.data.MiaoguoCardID;
 
+    common.getStorageValue(that, "MathSymbolCommon", [], function () {});
   },
   onShow: function () {
     var that = this;
@@ -653,6 +655,32 @@ Page({
         HighlighterSign: "[光]",
       });
     }
+    else{
+      if (btnName !== "(     )" && btnName !=="_____"){
+        var b=false;
+        for (var i = 0; i < this.data.MathSymbolCommon.length; i++) {
+          if (this.data.MathSymbolCommon[i] == btnName) {
+            if (e.currentTarget.dataset.type=="common")
+              b=true;
+            else
+              this.data.MathSymbolCommon.splice(i,1);
+            break;
+          }
+        }
+        if (!b)
+          this.data.MathSymbolCommon.unshift(btnName);
+
+        if (this.data.MathSymbolCommon.length > 6)
+          this.data.MathSymbolCommon.pop();
+
+        this.setData({
+          MathSymbolCommon: this.data.MathSymbolCommon,
+        });
+        wx.setStorageSync("MathSymbolCommon", this.data.MathSymbolCommon)
+      }
+    }
+
+    //console.log("btnName:" + btnName);
 
     if (!this.data.Focus) {
       this.data.FieldContent = this.data.FieldContent + btnName;
@@ -670,6 +698,8 @@ Page({
   },
   //焦点聚焦
   onBindFocus: function () {
+    //console.log("onBindFocus");
+    btnName = "";
     this.setData({
       Focus: true,
     });
@@ -706,15 +736,16 @@ Page({
       str2 = this.data.FieldContent.substring(tempCursor, this.data.FieldContent.length);
     }
     //console.log("str1:" + str1);
+    //console.log("btnName:" + btnName);
     //console.log("str2:" + str2);
     var cur = 1;
     if (btnName == "[读]" || btnName == "[线]" || btnName == "[光]") {
       cur = 3;
     } else if (btnName == "[/读]" || btnName == "[/线]" || btnName == "[/光]") {
       cur = 4;
-    } else if (btnName == "(　　　)") {
-      cur = 5;
-    } else if (btnName == "_____") {
+    } else if (btnName === "(     )") {
+      cur = 7;
+    } else if (btnName === "_____") {
       cur = 5;
     }
 
@@ -728,7 +759,10 @@ Page({
     btnName = "";
 
   },
-
+  bindscrollHandler:function(){
+    //console.log("bindscrollHandler");
+    btnName = "";
+  },
   onSearchField: function (e) {
     app.globalData.TempFieldNumber = this.data.FieldNumber;
     wx.navigateTo({

pages/main/add.wxml

@@ -163,22 +163,18 @@
 
   <view class='lineFooter'></view>
   <view class='panelBtnItem FlexColumn'>
-    <view class="panelBtnSmall FlexRow">
+    <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
       <view class="btn0"></view>
-      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="(     )">
+      <view class="btn1 btn" bindtap="addSymbol" wx:for="{{MathSymbolCommon}}" wx:key="index" data-id="{{item}}" data-type="common">{{item}}</view>
+      <view class="btn" bindtap="addSymbol" data-id="(     )">
         <image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
       </view>
-      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="_____">
+      <view class="btn" bindtap="addSymbol" data-id="_____">
         <image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
       </view>
       <view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</view>
-      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
-        <image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
-      </view>
-      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="³">
-        <image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_cube_gray.png' />
-      </view>
-    </view>
+      
+    </scroll-view>
     <view class='lineFooter'></view>
     <view class='panelBtn FlexRow'>
       <view class='text1' bindtap="closeAddItem" data-idsave="false">取消</view>

pages/main/add.wxss

@@ -461,15 +461,17 @@
   width:100%;
   height: 120rpx;
   background-color: #fff;
-  justify-content: flex-start;
+  display: flex;
+  white-space: nowrap;
 }
 
 .panelBtnSmall .btn0 {
   width: 10rpx;
+  display: inline-block;
 }
 
 .panelBtnSmall .btn {
-  font-family: 'Roboto-Black';
+  /* font-family: 'Roboto-Black'; */
   width: 80rpx;
   background-color: #fff;
   border: 1rpx solid #9b9b9b;
@@ -478,17 +480,14 @@
   text-align: center;
   line-height: 80rpx;
   height: 80rpx;
+  margin-top: 20rpx;
   margin-right: 10rpx;
   font-size: 36rpx;
+  display: inline-block;
 }
 
 .panelBtnSmall .btn1 {
-  width: 80rpx;
-  height: 80rpx;
-  background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  border-radius: 10rpx;
-  margin-right: 10rpx;
+  background-color: #f0f0f0;
 }
 
 .universalpic_editbar_brackets_gray {