2.5.1

app.json

@@ -1,14 +1,11 @@
 {
   "pages": [
     "pages/index/index",
-    
-    "pages/plan/taskBasic",
-    "pages/plan/taskHelp",
-    "pages/plan/taskFull",
-
+    "pages/main/latex",
+    "pages/main/latex_common",
+    "pages/index/test",
     "pages/main/remind",
     "pages/share/cardlist",
-    
     "pages/share/shareitem",
     "pages/share/shareindex",
     "pages/share/sharewall",
@@ -17,7 +14,6 @@
     "pages/main/folderEdit",
     "pages/main/folderIcon",
     "pages/main/orderform",
-
     "pages/main/cardmain",
     "pages/main/mainlist",
     "pages/main/addInfomation",
@@ -26,7 +22,6 @@
     "pages/main/searchCard",
     
     "pages/main/preview",
-    "pages/plan/pattern",
     "pages/index/accredit",
     "pages/other/openSetting",
 
@@ -38,8 +33,7 @@
     "pages/main/systemsetting",
     "pages/main/symbolsetting",
 
-    "pages/plan/clicktype",
-    "pages/plan/colorplan",
+    
     "pages/other/family",
     "pages/other/recover",
     "pages/other/grade",
@@ -97,11 +91,6 @@
     {
       "root": "pages_test",
       "pages": [
-        "test/index",
-        "test/list",
-        "test/item",
-        "test/wordlist",
-        "test/report",
         "knowledge/library",
         "knowledge/package",
         "knowledge/unit",
@@ -110,6 +99,17 @@
         "knowledge/examine",
         "knowledge/index"
       ]
+    },
+    {
+      "root": "pages_plan",
+      "pages": [
+        "plan/taskFull",
+        "plan/pattern",
+        "plan/clicktype",
+        "plan/colorplan",
+        "plan/taskBasic",
+        "plan/taskHelp"
+      ]
     }
   ],
   "preloadRule": {
@@ -124,11 +124,20 @@
       "packages": [
         "pages_test"
       ]
+    },
+    "pages_plan/plan/taskFull": {
+      "network": "all",
+      "packages": [
+        "pages_plan"
+      ]
     }
   },
   "requiredBackgroundModes": [
     "audio"
   ],
+  "miniApp": {
+    "useAuthorizePage": true
+  },
   "lazyCodeLoading": "requiredComponents",
   "sitemapLocation": "sitemap.json"
 }

app.miniapp.json

@@ -0,0 +1,10 @@
+{
+	"adapteByMiniprogram": {
+		"userName": "gh_7bf6b7fb6cc1"
+  },
+  "identityServiceConfig": {
+    "authorizeMiniprogramType": 1,
+    "miniprogramLoginPath": "pages/index/index",
+    "adaptWxLogin": true
+  }
+}

components/navigation-bar/navigation-bar.wxss

@@ -27,7 +27,7 @@ page{--height:44px;--right:190rpx;}
   font-size:17px;text-align:center;position:relative;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;
   align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;overflow: hidden;
 }
-.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px; font-weight: 700;}
+.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px; font-weight: 400;}
 
 
 .weui-navigation-bar__inner .weui-navigation-bar__loading {

i18n/base.json

@@ -0,0 +1,11 @@
+{
+	"ios": {
+		"name": "秒过 - 错题记忆卡"
+	},
+	"android": {
+		"name": "秒过 - 错题记忆卡"
+	},
+	"common": {
+		"name": "秒过 - 错题记忆卡"
+	}
+}

miniapp/android/i18nInfo.json

@@ -0,0 +1 @@
+{"base":{"ios":{"name":"秒过 - 错题记忆卡"},"android":{"name":"秒过 - 错题记忆卡"}}}

miniapp/ios/i18nInfo.json

@@ -0,0 +1 @@
+{"base":{"ios":{"name":"秒过 - 错题记忆卡"},"android":{"name":"秒过 - 错题记忆卡"}}}

pages/index/test.js

@@ -1,4 +1,4 @@
-var wxCharts = require('../template/wxcharts-min.js');
+var wxCharts = require('../../pages/template/wxcharts-min.js');
 
 var ringChart = null;
 
@@ -6,7 +6,6 @@ Page({
   data: {
     navbarInitTop: 0, //导航栏初始化距顶部的距离
     isFixedTop: false, //是否固定顶部
-    LaTeX: '$$x=\\frac{-b±\\sqrt{b^{2}-4ac}}{2a}$$'
   },
 
   /**

pages/index/test.json

@@ -1,5 +1,3 @@
 {
-  "usingComponents": {
-    "mp-html": "../../components/mp-weixin"
-  }
+  "usingComponents": {}
 }

pages/main/add.js

@@ -126,7 +126,7 @@ Page({
 
     if (app.globalData.IsIPhoneX) {
       that.setData({
-        InputHeight: 480,
+        InputHeight: 450,
       });
     }
 
@@ -140,7 +140,13 @@ Page({
   },
   onShow: function () {
     var that = this;
-    if (that.data.UpdateType == "add" || that.data.UpdateType == "add3") {
+    if (app.globalData.Latex){
+      that.setData({
+        FieldContent: that.data.FieldContent+app.globalData.Latex,
+      });
+      app.globalData.Latex="";
+    }
+    else if (that.data.UpdateType == "add" || that.data.UpdateType == "add3") {
       that.initAddCard();
     } else {
       var card = {},
@@ -424,7 +430,6 @@ Page({
               var param1 = {};
               param1 = that.formatField(that.data.Field);
               param1.Tags = tags;
-
               param1.IsCollect = that.data.IsCollect;
 
               param1.LimitTime = that.data.LimitTime;
@@ -453,7 +458,6 @@ Page({
               timeoutUploadImage = setTimeout(function () {
                 wx.hideLoading();
               }, 15000);
-
               main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
                 wx.removeStorageSync("TempCardNoSaved");
 
@@ -590,7 +594,16 @@ Page({
             else
               str = "[读]" + item.Content + "[/读]";
           } else if (item.Type == "bigword") {
-              str = "[特]"+item.Content+"[/特]";
+            str = "[特 FS=\""+item.FontSize+"\"]"+item.Content+"[/特]";
+          } else if (item.Type == "latex") {
+            str = "[公式";
+            if (item.LatexName)
+              str+=" N=\""+item.LatexName+"\" ";
+            if (item.FontSize)
+              str+=" FS=\""+item.FontSize+"\" ";
+            str += "]"+item.Content+"[/公式]";
+            str = str.replace("$$", "");
+            str = str.replace("$$", "");
           } else if (item.Type == "recorder") {
                 if (item.SoundMark)
                   str = "[音 url='" + item.SoundMark + "'][/音]";
@@ -1090,27 +1103,19 @@ Page({
       });
       next(that);
     }
-
-
-
     function next(obj) {
       isViolate = false;
-
       obj.updateField();
-
       obj.setData({
         HiddenFieldEdit: true,
       });
-
       var title = "编辑题卡";
       if (obj.data.UpdateType == "add2") {
         title = "新建题卡";
       }
-
       that.setData({
         PageTitle: title,
       });
-
       that.setBtnSaveCss();
     }
   },
@@ -1136,6 +1141,7 @@ Page({
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         list[i].Content[this.data.FieldNumber].Content = str;
         card = main.changeStringToView(list[i].Content);
+        //debugger;
         break;
       }
     }

pages/main/add.json

@@ -1,7 +1,8 @@
 {
   "navigationBarTitleText": "新建题卡",
   "usingComponents": {
-    "navigation-bar": "/components/navigation-bar/navigation-bar"
+    "navigation-bar": "/components/navigation-bar/navigation-bar",
+    "mp-html": "/components/mp-weixin"
   },
   "navigationStyle": "custom"
 }

pages/main/add.wxml

@@ -1,6 +1,6 @@
 <navigation-bar title="{{PageTitle}}" bindgetBarInfo="getBarInfo" show="true" left="true">
 </navigation-bar>
-
+<view class="containerWhite"></view>
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' hidden='{{!HiddenFieldEdit}}'>
 	<view class="panelTop FlexRow" style="top:{{topBarHeight+topBarHeightIPad}}rpx;">
 		<view class="panelLeft FlexRow">
@@ -42,7 +42,9 @@
 						<block wx:if="{{itemParent==2}}">写答案</block>
 						<block wx:if="{{itemParent==3}}">其它</block>
 					</text>
-					<block wx:for="{{Field[itemParent]}}" wx:key="index">
+          <block wx:for="{{Field[itemParent]}}" wx:key="index">
+            <view class="textLatexName" wx:if="{{item.Type=='latex' && item.LatexName}}">{{item.LatexName}}</view>
+            <mp-html class="textLaTeX" content="{{item.Content}}" wx:if="{{item.Type=='latex'}}" style="font-size:{{item.FontSize}}rpx;"/>
 						<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">
@@ -51,8 +53,7 @@
 								<text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}">{{contentItem.value}}</text>
 							</block>
 						</text>
-
-						<view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
+            <view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
 							<image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
 						</view>
 						<text class="textBigWord" wx:if="{{item.Type=='bigword'}}">{{item.Content}}</text>
@@ -64,7 +65,6 @@
 						<view class="textBr" wx:if="{{item.Type=='br'}}"></view>
 						<text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
 					</block>
-
 				</view>
 			</view>
 		</block>
@@ -216,8 +216,12 @@
 			<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[光]'}}">
 				<image class="universalpic_backcolor_activate_60x40" src='../images/universalpic_backcolor_activate_60x40.png' />
 			</view>
-
-			<view class="panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
+      
+      <view class="panelSaveTag11 panelSaveTag1 FlexRow" catchtap="goto" data-url="latex" wx:if="{{IsShow==1}}">
+        <image class="universalpic_formula_default_16x20" src='../images/universalpic_formula_default_16x20.png' />
+		  </view>
+			
+      <view class="panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
 				<image class="universalpic_picture_black_30x30" src='../images/universalpic_picture_black_30x30.png' />
 			</view>
 
@@ -231,17 +235,24 @@
 			<view class="panelSaveTag11 panelSaveTag1 FlexRow" catchtap="recorderAccredit" wx:if="{{IsShow==1}}">
 				<image class="universalpic_microphone_black_20x30" src='../images/universalpic_microphone_black_20x30.png' />
 			</view>
+      
 		</view>
-
 		<view class="panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="true">
 			<view class="panelSaveTag311">确定</view>
 		</view>
 	</view>
 	<view class='lineFooter'></view>
 	<view class='panelInput'>
-		<textarea class="input" style="height:{{InputHeight+topBarHeightIPad2}}rpx;" maxlength='-1' show-confirm-bar="true" value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
+		<textarea class="input" style="height:{{InputHeight+topBarHeightIPad2}}rpx;" 
+    maxlength='-1' show-confirm-bar="true" 
+    value="{{FieldContent}}" 
+    focus="{{Focus}}" 
+    cursor="{{Cursor}}" 
+    bindinput="bindinputField" 
+    bindblur="onBindblur" 
+    bindfocus="onBindFocus" 
+    data-id='{{FieldNumber}}' />
 	</view>
-	<view class='lineFooter'></view>
 	<view class='panelBtnItem FlexColumn'>
 		<scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
 			<view class="btn0"></view>

pages/main/add.wxss

@@ -1,6 +1,14 @@
 page{
   background-color: #f2f2f2;
 }
+.containerWhite{
+  z-index: 0;
+  position: fixed;
+  top:0;
+  width: 100%;
+  height:200rpx;
+  background-color: #fff;
+}
 
 /* ******************* */
 .panelTop {
@@ -289,7 +297,7 @@ page{
   flex-wrap: wrap;
   align-items: flex-start;
   justify-content: flex-start;
-  width: 610rpx;
+  width: 600rpx;
   font-size: 36rpx;
   color:#1e1e1e;
   margin: 40rpx 0 40rpx 40rpx;
@@ -476,6 +484,12 @@ page{
   width:60rpx;
   height:40rpx;
 }
+
+.universalpic_formula_default_16x20{
+  width:16rpx;
+  height:20rpx;
+}
+
 .universalpic_picture_black_30x30{
   width:30rpx;
   height:30rpx;
@@ -1288,3 +1302,14 @@ page{
   color:#fff;
   font-size:36rpx;
 }
+.textLaTeX{
+  overflow-x: hidden;
+  width:600rpx;
+  margin-top: 20rpx;
+}
+.textLatexName{
+  font-size:28rpx;
+  font-weight: 400;
+  margin: 10rpx 0;
+  width: 100%;
+}

pages/main/addInfomation.js

@@ -33,6 +33,8 @@ Page({
           item.Remark = item.Author + " " + item.Dynasty;
         } else if (item.Type == "eng") {
           item.TypeName = "D";
+        } else if (item.Type == "latex") {
+          item.TypeName = "G";
         } else {
           if (item.Key.length == 1)
             item.TypeName = "Z";
@@ -42,8 +44,6 @@ Page({
 
         if (item.Content && item.Content.length > WORD_LENGTH)
               item.Content = item.Content.substr(0, WORD_LENGTH) + "...";
-
-
       }
       that.setData({
         SearchWord3: list,
@@ -95,7 +95,7 @@ Page({
   searchResult: function (e) {
     var that = this;
     var search = that.data.SearchInfo;
-    
+    app.globalData.TempStr=search;
     if (wx.getStorageSync("IsHelpAddInfomation")==1){
       if (search!="厉害"){
         wx.showToast({
@@ -114,7 +114,6 @@ Page({
     var searchtype=e.currentTarget.dataset.searchtype;
     var author=e.currentTarget.dataset.author;
     var shiciurl=e.currentTarget.dataset.shiciurl;
-
     main.searchInfomation(search,searchtype,author,shiciurl,function(list,obj){
       
       if (obj){
@@ -123,20 +122,18 @@ Page({
           wx.navigateTo({
             url: './addInfomationDetail',
           });
-          
         });
       }
       else{
         wx.setNavigationBarTitle({
           title: "搜索结果"
         });
-
+        //debugger;
         that.setData({
           SearchList: list,
           IsStart: true,
           IsMore:true,
         });
-
         that.getCardList();
 
         updateData(that,search);

pages/main/addInfomation.wxml

@@ -3,7 +3,7 @@
     <view class="panelLeft FlexRow">
       <view id="input" class="panelTopSearch FlexRow">
         <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
-        <input class='input' always-embed="true" maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}" placeholder="字词、成语、诗词、单词" confirm-type="search" bindconfirm="searchResult" />
+        <input class='input' always-embed="true" maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}" placeholder="字词、成语、诗词、单词、公式名称" confirm-type="search" bindconfirm="searchResult" />
         <view class="clearData FlexRow" catchtap="clearInput" wx:if="{{SearchInfo}}">
           <view class="clearData0 FlexRow">
             <image class="universalpic_close_black_16x16" src='../images/universalpic_close_black_16x16.png' />
@@ -63,6 +63,7 @@
           <image wx:if="{{item.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23" src='../images/universalpic_dictionary_ciyu_black_55x23.png' />
           <image wx:if="{{item.TypeName=='S'}}" class="universalpic_dictionary_shici_black_53x27" src='../images/universalpic_dictionary_shici_black_53x27.png' />
           <image wx:if="{{item.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28" src='../images/universalpic_dictionary_danci_black_53x28.png' />
+          <image wx:if="{{item.TypeName=='G'}}" class="universalpic_dictionary_hanzi_black_54x26" src='../images/universalpic_dictionary_formula_black_54x26.png' />
         </view>
         <view class="panelSearchData1 FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="SearchWord3">
           <view class="panelSearchDataText1">{{item.Key}}</view>
@@ -85,11 +86,12 @@
     <view class="panelSearchData0 FlexColumn" wx:if="{{SearchList.length>0}}">
       <view class="panelSearchDataOther FlexColumn">
         <view class="panelSearchDataOther2 FlexRow" wx:for="{{SearchList}}" wx:key="index" bindtap='searchResult' data-search="{{item.Key}}" data-type="SearchList" data-author="{{item.Author}}" data-searchtype="{{item.Type}}" data-shiciurl="{{item.Url}}" wx:if="{{(IsMore && index<4) || (!IsMore)}}">
-          <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage FlexColumn">
+          <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage2 FlexColumn">
             <image wx:if="{{item.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26" src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
             <image wx:if="{{item.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23" src='../images/universalpic_dictionary_ciyu_black_55x23.png' />
             <image wx:if="{{item.TypeName=='S'}}" class="universalpic_dictionary_shici_black_53x27" src='../images/universalpic_dictionary_shici_black_53x27.png' />
             <image wx:if="{{item.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28" src='../images/universalpic_dictionary_danci_black_53x28.png' />
+            <image wx:if="{{item.TypeName=='G'}}" class="universalpic_dictionary_hanzi_black_54x26" src='../images/universalpic_dictionary_formula_black_54x26.png' />
           </view>
           <view class="panelSearchDataOther21 FlexColumn">
             <view class="panelSearchDataText1">{{item.Key}}</view>

pages/main/addInfomation.wxss

@@ -204,13 +204,12 @@
   position: relative;
   background-color: #fff;
   border-radius: 10rpx;
-  padding-top:30rpx;
 }
 
 
 .panelSearchDataOther21{
   align-items: flex-start;
-  margin-left: 30rpx;
+  margin: 30rpx 0 0 30rpx;
   overflow-x: hidden;
   width:540rpx;
 }
@@ -219,7 +218,14 @@
   width:100rpx;
   height:116rpx;
   border-radius: 6rpx;
-  margin-left: 30rpx;
+  margin: 0 0 30rpx 30rpx;
+}
+
+.panelSearchDataImage2{
+  width:100rpx;
+  height:116rpx;
+  border-radius: 6rpx;
+  margin: 30rpx 0 30rpx 30rpx;
 }
 
 .panelSearchDataImageZ{
@@ -236,6 +242,9 @@
 .panelSearchDataImageD{
   background-color: #C9EFF9;
 }
+.panelSearchDataImageG{
+  background-color: #CEF5D0;
+}
 
 
 .universalpic_dictionary_ciyu_black_55x23{

pages/main/addInfomationDetail.js

@@ -55,6 +55,13 @@ Page({
         data.TypeName = "C";
     } else if (data.ENG) {
       data.TypeName = "D";
+    } else if (data.LATEX){
+      data.TypeName = "G";
+      var str=data.LATEX.LatexContent;
+      str = str.replace(/##xg##/g, "\\");
+      var str2 = "$$"+str+"$$";
+      data.LATEX.LatexContent1=str;
+      data.LATEX.LatexContent2=str2;
     }
 
     if (data.CHN && data.CHN.KaitiArr) {
@@ -98,8 +105,6 @@ Page({
         var obj2 = main.changeStringToView(obj);
         var str = obj2.Field[1][0].Content;
         item.push(str);
-
-
         item[1] = common.ReplaceAllString(item[1], "<b>", "");
         item[1] = common.ReplaceAllString(item[1], "</b>", "");
       }
@@ -128,6 +133,12 @@ Page({
       this.data.CSS[css].Content = content;
       this.data.CSS[css].Type = type;
       this.data.CSS[css].Tag = tag;
+
+      if (e.currentTarget.dataset.latexname)
+        this.data.CSS[css].LatexName=e.currentTarget.dataset.latexname;
+      if (e.currentTarget.dataset.fontsize)
+        this.data.CSS[css].FontSize=e.currentTarget.dataset.fontsize;
+
       if (tag == "发音")
         this.data.CSS[css].SoundMark = soundmark;
 
@@ -193,9 +204,9 @@ Page({
 
               var tags = item.Tag.split(",");
               for (var j = 0; j < tags.length; j++) {
-                if (tags[i]) {
-                  if (strArrTag.indexOf(tags[i] + ",") < 0)
-                    list[i].Content[0].Content.push(tags[i]);
+                if (tags[j]) {
+                  if (strArrTag.indexOf(tags[j] + ",") < 0)
+                    list[i].Content[0].Content.push(tags[j]);
                 }
               }
             }
@@ -205,6 +216,14 @@ Page({
               item.Content = main.encryptUrl(item.Content);
 
               str = "[图]" + item.Content + "[/图]";
+            } else if (key=="LATEX_LatexName") {
+              str = "[特 FS=\"64\"]" + item.Content + "[/特]";
+            } else if (key=="LATEX_LatexContent") {
+              str = item.Content;
+              str = str.replace(/##xg##/g, "\\");
+              str = str.replace(/\r/g, "");
+              str = "[公式 N=\""+item.LatexName+"\" FS=\""+item.FontSize+"\"]"+ str + "[/公式]";
+              //debugger;
             } else if (item.Type == "sound") {
               str = "[读]" + item.Content + "[/读]";
               if (item.Tag == "发音") {
@@ -292,7 +311,6 @@ Page({
                 list[i].Content[item.Number].Content = "\n\n" + list[i].Content[item.Number].Content;
               }
             }
-
           }
           break;
         }

pages/main/addInfomationDetail.json

@@ -1,3 +1,6 @@
 {
-  "navigationBarTitleText": "资料"
+  "navigationBarTitleText": "资料",
+  "usingComponents": {
+    "mp-html": "/components/mp-weixin"
+  }
 }

pages/main/addInfomationDetail.wxml

@@ -9,6 +9,8 @@
       src='../images/universalpic_dictionary_shici_black_53x27.png' />
     <image wx:if="{{Result.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28"
       src='../images/universalpic_dictionary_danci_black_53x28.png' />
+    <image wx:if="{{Result.TypeName=='G'}}" class="universalpic_dictionary_hanzi_black_54x26"
+      src='../images/universalpic_dictionary_formula_black_54x26.png' />
       
     </view>
     <view class="panelRight FlexRow">
@@ -626,6 +628,80 @@
       </block>
     </view>
   </block>
+
+  <!-- 搜索公式内容-->
+  <block wx:if="{{Result.LATEX.SearchText}}">
+    <view class="panelTitle0 panelTitle FlexColumn">
+      <view class="panelTitle1 FlexRow">
+        <view class="panelTitle11">搜索内容</view>
+      </view>
+    </view>
+    <view class="{{CSS.LATEX_SearchText.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"
+      data-content="{{Result.LATEX.SearchText}}" data-css="LATEX_SearchText">
+      <view class="FlexRow">
+        <view class="{{CSS.LATEX_SearchText.Css2}} panelSelect0">{{CSS.LATEX_SearchText.Number}}</view>
+        <view class="panelItemText">{{Result.LATEX.SearchText}}</view>
+      </view>
+      <view></view>
+    </view>
+  </block> 
+
+  <!-- 公式名称 -->
+  <block wx:if="{{Result.LATEX.LatexName}}">
+    <view class="panelTitle0 panelTitle FlexColumn">
+      <view class="panelTitle1 FlexRow">
+        <view class="panelTitle11">公式名称</view>
+      </view>
+    </view>
+    <view class="{{CSS.LATEX_LatexName.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"
+      data-content="{{Result.LATEX.LatexName}}" data-css="LATEX_LatexName" data-tag="{{Result.LATEX.Grade}},{{Result.LATEX.Subject}},公式">
+      <view class="FlexRow">
+        <view class="{{CSS.LATEX_LatexName.Css2}} panelSelect0">{{CSS.LATEX_LatexName.Number}}</view>
+        <view class="panelItemText">{{Result.LATEX.LatexName}}</view>
+      </view>
+      <view></view>
+    </view>
+  </block>
+
+  <!-- 公式类别 -->
+  <block wx:if="{{Result.LATEX.Category}}">
+    <view class="panelTitle0 panelTitle FlexColumn">
+      <view class="panelTitle1 FlexRow">
+        <view class="panelTitle11">类别</view>
+      </view>
+    </view>
+    <view class="{{CSS.LATEX_Category.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"
+      data-content="{{Result.LATEX.Category}}" data-css="LATEX_Category">
+      <view class="FlexRow">
+        <view class="{{CSS.LATEX_Category.Css2}} panelSelect0">{{CSS.LATEX_Category.Number}}</view>
+        <view class="panelItemText">{{Result.LATEX.Category}}</view>
+      </view>
+      <view></view>
+    </view>
+    <text class="panelRemark">该内容属于《{{Result.LATEX.Subject}}·{{Result.LATEX.Grade}}·{{Result.LATEX.Category}}》</text>
+  
+  </block>
+
+  <!-- 公式 -->
+  <block wx:if="{{Result.LATEX.LatexContent}}">
+    <view class="panelTitle0 panelTitle FlexColumn">
+      <view class="panelTitle1 FlexRow">
+        <view class="panelTitle11">公式</view>
+      </view>
+    </view>
+    <view class="{{CSS.LATEX_LatexContent.Css1}} panelItem panelItem0 FlexRow" bindtap='getInputData' data-type="normal"
+      data-content="{{Result.LATEX.LatexContent}}" data-css="LATEX_LatexContent" data-latexname="{{Result.LATEX.LatexName}}" data-fontsize="{{Result.LATEX.FontSize}}" data-tag="{{Result.LATEX.Grade}},{{Result.LATEX.Subject}},公式">
+      <view class="FlexRow">
+        <view class="{{CSS.LATEX_LatexContent.Css2}} panelSelect0">{{CSS.LATEX_LatexContent.Number}}</view>
+        <mp-html class="panelItemText panelItemText0" content="{{Result.LATEX.LatexContent2}}" style="font-size:{{Result.LATEX.FontSize-8}}rpx;" />
+      </view>
+      <view></view>
+    </view>
+    <text class="panelRemark2 panelRemark3">由于公式的格式特殊，普通输入框无法直接显示。因此，系统会采用以下方式呈现：</text>
+    <text class="panelRemark2"><text class="panelRemark21">[公式]</text><text>{{Result.LATEX.LatexContent1}}</text><text class="panelRemark21">[/公式]</text></text>
+    <text class="panelRemark2 panelRemark4">以 [公式] 开始，以 [/公式] 结尾，中间内容使用 LaTeX 格式书写。LaTeX 是国际通用的数学公式书写标准，这种格式并非乱码，而是专业表达方式。</text>
+  </block>
+
   <view class="panelHeight40"></view>
 </view>
 

pages/main/addInfomationDetail.wxss

@@ -129,6 +129,11 @@
   justify-content: space-between;
 }
 
+.panelItem0{
+  height:auto;
+  padding: 10rpx 0;
+}
+
 .panelItem1{
   height:140rpx;
 }
@@ -176,6 +181,14 @@
   max-width:490rpx;
 }
 
+.panelItemTextLatex{
+  max-width:580rpx;
+  background-color: #fff;
+  color: #000000;
+  font-size: 48rpx;
+  margin: 20rpx 0;
+}
+
 .panelWordImage{
   width:80rpx;
   height:80rpx;
@@ -189,6 +202,28 @@
   border-bottom:1rpx solid #d2d2d2;
 }
 
+.panelRemark2{
+  width: 670rpx;
+  font-size:24rpx;
+  color:#4D4D4D;
+  font-weight: 400;
+  margin-bottom: 20rpx;
+}
+.panelRemark21{
+  font-weight: 700;
+  font-size: 24rpx;
+  color: #5282FA;
+}
+
+.panelRemark3{
+  margin-top: 10rpx;
+  font-weight: 700;
+}
+.panelRemark4{
+  margin-bottom: 60rpx;
+  font-weight: 700;
+}
+
 .Select1 {
   border:1rpx solid #5282FA;
   background-color: #5282FA;

pages/main/cardmain.wxml

@@ -141,7 +141,7 @@
   <view class='panelBottom FlexColumn' catchtap="">
     <view class='panelBottom1 FlexRow'>
       <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../../pages_test/knowledge/index">
-        <view>检验</view>
+        <view>知识</view>
       </view>
       <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages/main/default">
         <view>练习</view>

pages/main/default.js

@@ -565,9 +565,9 @@ Page({
   gotoTaskSetting:function(e){
     var taskSetting=wx.getStorageSync("TaskSetting");
     if (taskSetting)
-      this.goto({currentTarget:{dataset:{url:"../plan/taskFull"}}});
+      this.goto({currentTarget:{dataset:{url:"../../pages_plan/plan/taskFull"}}});
     else
-      this.goto({currentTarget:{dataset:{url:"../plan/taskBasic"}}});
+      this.goto({currentTarget:{dataset:{url:"../../pages_plan/plan/taskBasic"}}});
   },
   onShareAppMessage: function () {
     if (wx.getStorageSync("IsHelpAddInfomation") == 1) {

pages/main/default.wxml

@@ -16,9 +16,9 @@
     <image class="icon_nextpage_2" src="../images/icon_nextpage_2.png" ></image>
   </view>
 
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_start.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_goon.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
-  <image wx:if="{{TodayTaskNumber==0}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_report.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='{{ImagePath}}web/practise_index_start.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='{{ImagePath}}web/practise_index_goon.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
+  <image wx:if="{{TodayTaskNumber==0}}" class="study_index_start{{IsIPad}}" src='{{ImagePath}}web/practise_index_report.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
 
   <view class="setting{{IsIPad}}" catchtap="gotoTaskSetting"></view>
   
@@ -31,12 +31,12 @@
         <image class="universalpic_close_black" src='{{ImagePath}}web/universalpic_close_black.png' />
       </view>
     </view>
-    <image class="study_index_footer" src='../images/practise_index_footer.png' />
+    <image class="study_index_footer" src='{{ImagePath}}web/practise_index_footer.png' />
 
     <view class='panelBottom1 FlexRow'>
       <!-- <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages_test/test/index"> -->
       <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../../pages_test/knowledge/index">
-        <view>检验</view>
+        <view>知识</view>
       </view>
       <view class='panelBottom11 FlexColumn'>
         <view class='text5'>练习</view>
@@ -120,9 +120,9 @@
     <text class="IsRemindText3" wx:if="{{AwardDayNumber>0}}">现在您的奖励还有\n{{AwardDayNumber}}天</text>
     <view class="IsRemindBtn" catchtap="goto" data-url="../../pages_agent/marketing/index" >详情</view>
 
-    <image class="practise_index_board_blackboard" src='../images/practise_index_board_blackboard.png' />
-    <image class="practise_index_board_avater01" src='../images/practise_index_board_avater01.png' />
-    <image class="practise_index_board_close" catchtap="closeRemind" src='../images/practise_index_board_close.png' />
+    <image class="practise_index_board_blackboard" src='{{ImagePath}}web/practise_index_board_blackboard.png' />
+    <image class="practise_index_board_avater01" src='{{ImagePath}}web/practise_index_board_avater01.png' />
+    <image class="practise_index_board_close" catchtap="closeRemind" src='{{ImagePath}}web/practise_index_board_close.png' />
   </view>
 </view>
 
@@ -153,7 +153,7 @@
       </view>
     </view>
     <view class="text9" catchtap="goto" data-url="../other/family">设置</view>
-    <image class="practise_index_board_close" src="../images/practise_index_board_close.png" catchtap="closeUserFamily"></image>
+    <image class="practise_index_board_close" src="{{ImagePath}}web/practise_index_board_close.png" catchtap="closeUserFamily"></image>
   </view>
 </view>
 

pages/main/detail.json

@@ -3,7 +3,8 @@
   "navigationBarTextStyle": "white",
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "navigation-bar": "/components/navigation-bar/navigation-bar"
+    "navigation-bar": "/components/navigation-bar/navigation-bar",
+    "mp-html": "/components/mp-weixin"
   },
   "navigationStyle": "custom"
 }

pages/main/detail.wxml

@@ -1,4 +1,4 @@
-<import src="../template/cardShow.wxml" />
+<import src="../../pages/template/cardShow.wxml" />
 <navigation-bar show="true" center="true" bindgetBarInfo="getBarInfo" left="true" background="{{Color.BackColor}}"
   color="#fff">
   <view slot="left" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
@@ -102,9 +102,9 @@
     <view class='footer0'></view>
 
     <!-- 下方按钮 -->
-    <image wx:if="{{!IsIPad}}" class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
+    <image wx:if="{{!IsIPad}}" class="footerShade" src="{{ImagePath}}web/study_learning_bgimage_tc0{{Color.ID}}.png" />
     <view class='footer'>
-      <image wx:if="{{!IsIPad}}" class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
+      <image wx:if="{{!IsIPad}}" class="footerImage" src="{{ImagePath}}web/study_learning_maskimage_tc0{{Color.ID}}.png" />
       <view wx:if="{{IsIPad}}" class="footerImage" style="background-color:{{Color.BackColor}}"></view>
       <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}"
         catchtap="onShowAnswer">

pages/main/detail.wxss

@@ -286,6 +286,7 @@ page{
 .panelItem .textBigword{
   font-size:108rpx;
   line-height: 108rpx;
+  font-weight: bold;
 }
 
 .panelItem .textNormal2 {
@@ -354,6 +355,30 @@ page{
   height: 24rpx;
 }
 
+.panelItem .textLaTeXContainer{
+  width: 100%;
+  background-color: #fff;
+  align-items: flex-start;
+  border-radius: 10rpx;
+}
+.panelItem .textLaTeXName{
+  width: 590rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin: 40rpx 0 0 30rpx;
+  color:#2e2e2e;
+}
+
+.panelItem .textLaTeX {
+  width: 590rpx;
+  background-color: #fff;
+  color: #000000;
+  border-radius: 10rpx;
+  font-size: 48rpx;
+  margin: 20rpx 0 20rpx 30rpx;
+  overflow-x:hidden;
+}
+
 .panelItem .textReturn {
   width: 100%;
 }

pages/main/health.wxml

@@ -46,7 +46,7 @@
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth680"></view>
     </view>
-    <view class="help1 FlexRow" bindtap="goto" data-url="../plan/pattern">
+    <view class="help1 FlexRow" bindtap="goto" data-url="../../pages_plan/plan/pattern">
       <view class="help10 FlexRow">
         <view class="help11 FlexColumn">
           <view class="help111">调整「记忆评价」模式</view>
@@ -141,7 +141,7 @@
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth680"></view>
     </view>
-    <view class="help1 FlexRow" bindtap="goto" data-url="../plan/studyplandetail?CardType=0">
+    <view class="help1 FlexRow" bindtap="goto" data-url="../../pages_plan/plan/studyplandetail?CardType=0">
       <view class="help10 FlexRow">
         <view class="help11 FlexColumn">
           <view class="help111">调整「日常练习」任务限量</view>
@@ -152,7 +152,7 @@
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth680"></view>
     </view>
-    <view class="help1 FlexRow" bindtap="goto" data-url="../plan/studyplandetail?CardType=-1">
+    <view class="help1 FlexRow" bindtap="goto" data-url="../../pages_plan/plan/studyplandetail?CardType=-1">
       <view class="help10 FlexRow">
         <view class="help11 FlexColumn">
           <view class="help111">调整「紧急练习」任务限量</view>

pages/main/latex.js

@@ -0,0 +1,218 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var keyHeight=0;
+var isCloseKeyboard=1;
+var tempCursor = undefined;
+var btnName="";
+var isEdit = true;
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    InputHeight1: 157,
+    InputHeight2: 157,
+    BtnArray:[
+      {Name:"换行",Content:"\\\\",FontSize:"24"},
+      {Name:"空格",Content:"\\, ",FontSize:"24"},
+      {Name:"等距空格",Content:"\\quad ",FontSize:"24"},
+      {Name:"分数",Content:"\\frac{a}{b} ",FontSize:"24"},
+      {Name:"平方根",Content:"\\sqrt{a} ",FontSize:"24"},
+      {Name:"∵",Content:"∵",FontSize:"36"},
+      {Name:"∴",Content:"∴",FontSize:"36"},
+      {Name:"∠",Content:"∠",FontSize:"36"},
+      {Name:"∥",Content:"∥",FontSize:"36"},
+      {Name:"⟂",Content:"⟂",FontSize:"36"},
+      {Name:"▵",Content:"▵",FontSize:"36"},
+      {Name:"∼",Content:"∼",FontSize:"36"},
+      {Name:"≅",Content:"≅",FontSize:"36"},
+      {Name:"×",Content:"×",FontSize:"36"},
+      {Name:"÷",Content:"÷",FontSize:"36"},
+      {Name:"·",Content:"\\cdot",FontSize:"36"},
+      {Name:"±",Content:"±",FontSize:"36"},
+      {Name:"≠",Content:"≠",FontSize:"36"},
+      {Name:"≥",Content:"≥",FontSize:"36"},
+      {Name:"≤",Content:"≤",FontSize:"36"},
+      {Name:"π",Content:"π",FontSize:"36"},
+      {Name:"°",Content:"°",FontSize:"36"},
+      {Name:"⇒",Content:"⇒",FontSize:"36"},
+      {Name:"⇔",Content:"⇔",FontSize:"36"},
+      {Name:"∞",Content:"∞",FontSize:"36"},
+      {Name:"²",Content:"²",FontSize:"36"},
+      {Name:"³",Content:"³",FontSize:"36"},
+      {Name:"N次方",Content:"x^{n} ",FontSize:"24"},
+      {Name:"N次方根",Content:"\\sqrt[n]{a} ",FontSize:"24"},
+      {Name:"x₁",Content:"x₁",FontSize:"36"},
+      {Name:"x₂",Content:"x₂",FontSize:"36"},
+      {Name:"下标n",Content:"x_{n} ",FontSize:"24"},
+    ],
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      Focus: true,
+    });
+    that.clear();
+  },
+  onShow:function(e){
+    var that = this;
+    var obj=app.globalData.Latex;
+    if (obj){
+      that.setData({
+        KeyContent: obj.Content,
+        LatexContent:"$$"+obj.Content+"$$",
+        LatexName:obj.Name,
+        FontSize:obj.FontSize,
+      });
+      obj=null;
+    }
+
+    if (app.globalData.IsIPhoneX) {
+      that.setData({
+        InputHeight1: 240,
+        InputHeight2: 240,
+      });
+    }
+  },
+  //字段输入
+  bindinputField: function (e) {
+    var that = this;
+    if (app.globalData.IsAndroid && !isEdit) {
+      return;
+    }
+    var value=e.detail.value;
+    value=value.replace("｝","}");
+    value=value.replace("｛","{");
+    that.setData({
+      KeyContent: value,
+      LatexContent:"$$"+value+"$$",
+    });
+  },
+  setLatex:function(e){
+    console.log("setLatex");
+    var that=this;
+    isEdit = true;
+    var value=e.currentTarget.dataset.value;
+    btnName=value;
+    
+    if (!that.data.Focus) {
+      var obj = {
+        detail: {
+          cursor: tempCursor
+        }
+      };
+      that.onBindblur(obj);
+    }
+    
+    setTimeout(function () {
+      that.setData({
+        Focus: true,
+      });
+    }, 300);
+  },
+  
+  //焦点聚焦
+  onBindFocus: function () {
+    //console.log("onBindFocus");
+    btnName = "";
+    this.setData({
+      Focus: true,
+    });
+  },
+  //失焦
+  onBindblur: function (e) {
+    //console.log("onBindblur:" + isEdit + " Filed:" + this.data.KeyContent);
+    
+    var that = this;
+    //debugger;
+    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);
+
+    tempCursor = e.detail.cursor;
+    if (tempCursor == undefined)
+      tempCursor = this.data["KeyContent"].length;
+    var str1 = "",
+      str2 = "";
+    if (this.data.KeyContent.length > 0) {
+      str1 = this.data.KeyContent.substr(0, tempCursor);
+      str2 = this.data.KeyContent.substring(tempCursor, this.data.KeyContent.length);
+    }
+    var cur = 0;
+    if (btnName) {
+      cur = btnName.length;
+    }
+    
+    that.data.KeyContent = str1 + btnName + str2;
+    that.setData({
+      KeyContent: that.data.KeyContent,
+      LatexContent:"$$"+that.data.KeyContent+"$$",
+      Focus: false,
+      Cursor: tempCursor + cur,
+    });
+    btnName="";
+  },
+  bindscrollHandler: function () {
+    //console.log("bindscrollHandler");
+    btnName = "";
+  },
+  onLatexError(e){
+    var that = this;
+    //console.log(e);
+  },
+  clear:function(){
+    var that = this;
+    that.setData({
+      KeyContent:"",
+      LatexContent:"",
+      Focus: true,
+      Cursor: 0,
+    });
+    btnName="";
+  },
+  close: function (e) {
+    var that=this;
+    var value=e.currentTarget.dataset.value;
+    if (value==1){
+      app.globalData.Latex="\n[公式";
+      if (that.data.LatexName)
+        app.globalData.Latex+=" N=\""+that.data.LatexName+"\"";
+      if (that.data.FontSize)
+        app.globalData.Latex+=" FS=\""+that.data.FontSize+"\"";
+      app.globalData.Latex+="]"+that.data.KeyContent+"[/公式]\n";
+    }
+    else
+      app.globalData.Latex="";
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/latex.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "公式编辑",
+  "enablePullDownRefresh": false,
+  "backgroundColor": "#f0f0f0",
+  "usingComponents": {
+    "mp-html": "/components/mp-weixin"
+  }
+}

pages/main/latex.wxml

@@ -0,0 +1,33 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTap FlexColumn">
+    <view class="panelTap1 FlexRow">
+      <view class="btn2 FlexColumn" bind:tap="close">取消</view>
+      <view class="btn2 btn21 FlexRow" bind:tap="goto" data-url="./latex_common"><text>选公式</text></view>
+      <view class="btn2 FlexColumn" bind:tap="close" data-value="1">确定</view>
+    </view>
+  </view>
+  <scroll-view scroll-y="true" class="panelScorll" style="height:{{InputHeight1}}rpx;">
+    <mp-html class="panel1" content="{{LatexContent}}" style="font-size: {{FontSize}}rpx;height:{{InputHeight1}}rpx;" binderror="onLatexError"></mp-html>
+  </scroll-view>
+  
+  <view class="panel2 FlexColumn" style="top:{{InputHeight2+80}}rpx;">
+    <view class="panel21 FlexColumn">
+      <textarea class="input" maxlength='-1'
+      style="height:{{InputHeight2}}rpx;" 
+      value="{{KeyContent}}" 
+      focus="{{Focus}}" 
+      cursor="{{Cursor}}" 
+      bindinput="bindinputField" 
+      bindblur="onBindblur" 
+      bindfocus="onBindFocus" 
+      />
+    </view>
+    <scroll-view scroll-x="true" class="panel3" bindscroll="bindscrollHandler">
+      <view class="panel31 panel310"></view>
+      <view class="panel31 FlexRow" wx:for="{{BtnArray}}" wx:key="index"  catchtap="setLatex" data-value="{{item.Content}}">
+        <view class="panel311 FlexRow" style="font-size: {{item.FontSize}}rpx;">{{item.Name}}</view>
+      </view>
+      <view class="panel31 panel310"></view>
+    </scroll-view>
+  </view>
+</view>

pages/main/latex.wxss

@@ -0,0 +1,150 @@
+.container {
+  width:100%;
+  background-color: #f0f0f0;
+} 
+.panelTap{
+  width: 100%;
+  position: fixed;
+  z-index: 10;
+}
+
+.panelTap1{
+  width: 100%;
+  justify-content: space-between;
+  background-color: #fff;
+}
+.btn2{
+  margin: 0 10rpx;
+  min-width:100rpx;
+  height:100rpx;
+  font-size: 28rpx;
+}
+.btn21{
+  width:300rpx;
+  margin-left: 380rpx;
+}
+
+.text1{
+  margin: 50rpx 0 30rpx 0;
+  justify-content:space-between;
+  width: 690rpx;
+}
+
+.panelScorll{
+  width:100%;
+  overflow-y: hidden;
+  background-color: #fff;
+  position: fixed;
+  top:100rpx;
+}
+
+.panel1{
+  width:690rpx;
+  min-height:157rpx;
+  background-color: #fff;
+  color: #000000;
+  padding: 30rpx 0;
+  font-size: 48rpx;
+  text-align: center;
+  z-index: 0;
+}
+.panel2{
+  width:100%;
+  background-color: #f2f2f2;
+  position: fixed;
+  top:280rpx;
+  z-index: 100;
+  border-top: 1rpx solid #D2D2D2;
+}
+
+.btn{
+  margin: 5rpx 5rpx;
+  font-size: 24rpx;
+}
+
+.panel4{
+  width:690rpx;
+  margin: 20rpx 0 0 0;
+  align-items: flex-start;
+}
+.panel41{
+  width:590rpx;
+  height: 160rpx;
+}
+.panel411{
+  width:580rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.panel4Line{
+  width:5rpx;
+  height:160rpx;
+  background-color: #d2d2d2;
+  margin: 0 20rpx 0 0;
+}
+.panel42{
+  width:70rpx;
+  justify-content: space-between;
+}
+.btn3{
+  height:70rpx;
+  width:80rpx;
+  border:1rpx solid #d2d2d2;
+  border-radius: 10rpx;
+}
+
+.panel21{
+  width:100%;
+  background-color: #fff;
+  margin-top: 10rpx;
+  font-size: 36rpx;
+}
+.input{
+  width:690rpx;
+  font-size: 36rpx;
+  height: 157rpx;
+  margin-top: 30rpx;
+  font-weight: 400;
+}
+.container2{
+  position: fixed;
+  background-color: #fff;
+  z-index: 200;
+}
+
+.btn4{
+  margin: 10rpx 8rpx;
+  font-size: 24rpx;
+}
+.panelFooter{
+  width: 650rpx;
+  position: fixed;
+  bottom: 80rpx;
+}
+
+.panel3{
+  z-index: 10;
+  width:100%;
+  height: 100rpx;
+  background-color: #fff;
+  display: flex;
+  white-space: nowrap;
+  border-bottom: 1rpx solid #d2d2d2;
+}
+.panel31{
+  min-width: 80rpx;
+  margin: 10rpx 5rpx 0 5rpx;
+  display: inline-block;
+}
+.panel310{
+  min-width: 10rpx;
+}
+.panel311{
+  width: 100%;
+  height:80rpx;
+  padding: 0 16rpx;
+  font-size:24rpx;
+  font-weight: 700;
+  color:#4D4D4D;
+}

pages/main/latex_common.js

@@ -0,0 +1,105 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var latexDataSource;
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    Menu1:[{Name:"数学",Selected:1},{Name:"物理",Selected:0},{Name:"化学",Selected:0},],
+    Menu2:[{Name:"小学",Pos:"L",Selected:1},{Name:"初中",Pos:"",Selected:0},{Name:"高中",Pos:"R",Selected:0}]
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    that.init();
+  },
+  init:function(){
+    var that = this;
+    wx.showLoading({
+      title: '请稍等',
+    })
+    var url = 'GetLatexList';
+    main.getData(url, function (data) {
+      wx.hideLoading();
+      if (data) {
+
+        latexDataSource=JSON.stringify(data);
+        that.setData({
+          LatexData:data,
+        });
+      }
+    });
+  },
+  setMenu:function(e){
+    var that=this;
+    var level=e.currentTarget.dataset.level;
+    var subject=e.currentTarget.dataset.subject;
+    var grade=e.currentTarget.dataset.grade;
+    var category=e.currentTarget.dataset.category;
+    //debugger;
+    that.data.LatexData=JSON.parse(latexDataSource);
+        
+    for(var i=0;i<that.data.LatexData.length;i++){
+      if (subject==i)
+        that.data.LatexData[i].Selected=1;
+      else
+        that.data.LatexData[i].Selected=0;
+      
+      if (level>0){
+        
+        for(var j=0;j<that.data.LatexData[i].List.length;j++){
+          if (grade==j){
+            that.data.LatexData[i].List[j].Selected=1;
+          }
+          else
+            that.data.LatexData[i].List[j].Selected=0;
+          
+          if (level==2){
+            that.data.LatexData[i].List[j].List[0].Selected=1;
+              
+            for(var k=0;k<that.data.LatexData[i].List[j].List.length;k++){
+              if (category==k){
+                that.data.LatexData[i].List[j].List[0].Selected=0;
+                that.data.LatexData[i].List[j].List[k].Selected=1;
+              }
+              else
+                that.data.LatexData[i].List[j].List[k].Selected=0;
+            }
+          }
+          
+        }
+        
+      }
+    }
+    that.setData({
+      LatexData:that.data.LatexData,
+    });
+    if (level==0 || level==1){
+      that.setData({
+        ScrollLeft:0,
+      });
+    }
+  },
+  selectItem:function(e){
+    var obj={};
+    obj.Name=e.currentTarget.dataset.name;
+    obj.Content=e.currentTarget.dataset.content;
+    obj.FontSize=e.currentTarget.dataset.fontsize;
+    obj.Content=obj.Content.substr(2,obj.Content.length-4);
+    app.globalData.Latex=obj;
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/latex_common.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "常用公式",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "mp-html": "/components/mp-weixin"
+  }
+}

pages/main/latex_common.wxml

@@ -0,0 +1,44 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTap FlexRow">
+    <view class="panelTop1 FlexColumn" wx:for="{{LatexData}}" wx:key="index" bind:tap="setMenu" data-level="0" data-subject="{{index}}" >
+      <view>{{item.Name}}</view>
+      <view class="panelTopLine{{item.Selected}}"></view>
+    </view>
+  </view>
+
+  <view class="panelMenu1 FlexRow">
+    <block wx:for="{{LatexData}}" wx:key="index">
+      <block wx:for="{{item.List}}" wx:key="indexGrade" wx:if="{{item.Selected==1}}" wx:for-item="itemGrade" wx:for-index="indexGrade">
+        <view class="panelMenu11 panelMenu11_{{index}} panelMenu11{{itemGrade.Pos}} panelMenu11{{itemGrade.Selected}} FlexRow" bind:tap="setMenu"  data-level="1"   data-subject="{{index}}" data-grade="{{indexGrade}}">{{itemGrade.Name}}</view>
+      </block>
+    </block>
+   </view>
+
+  <scroll-view scroll-x="true" scroll-left="{{ScrollLeft}}" class="panelMenu2">
+    <view style="width: 30rpx;display: inline-block;"></view>
+    <block wx:for="{{LatexData}}" wx:key="index">
+      <block wx:for="{{item.List}}" wx:key="indexGrade" wx:if="{{item.Selected==1}}" wx:for-item="itemGrade" wx:for-index="indexGrade">
+        <block wx:for="{{itemGrade.List}}" wx:key="indexCategory" wx:if="{{itemGrade.Selected==1}}" wx:for-item="itemCategory" wx:for-index="indexCategory">
+          <view class="panelMenu21 panelMenu21{{itemCategory.Selected}} FlexRow" bind:tap="setMenu" data-level="2" data-subject="{{index}}" data-grade="{{indexGrade}}" data-category="{{indexCategory}}">
+            <view>{{itemCategory.Name}}</view>
+          </view>
+        </block>
+      </block>
+    </block>
+    <view style="width: 30rpx;display: inline-block;"></view>
+  </scroll-view>
+  
+  <block wx:for="{{LatexData}}" wx:key="index">
+    <block wx:for="{{item.List}}" wx:key="indexGrade" wx:if="{{item.Selected==1}}" wx:for-item="itemGrade" wx:for-index="indexGrade">
+      <block wx:for="{{itemGrade.List}}" wx:key="indexCategory" wx:if="{{itemGrade.Selected==1}}" wx:for-item="itemCategory" wx:for-index="indexCategory">
+        <block wx:for="{{itemCategory.List}}" wx:key="indexLatex" wx:if="{{itemCategory.Selected==1}}" wx:for-item="itemLatex" wx:for-index="indexLatex">
+          <view class="panelCard FlexColumn" bind:tap="selectItem" data-name="{{itemLatex.Name}}" data-content="{{itemLatex.LaTeX}}" data-fontsize="{{itemLatex.FontSize}}">
+            <view class="panelCard1">{{itemLatex.Name}}</view>
+            <mp-html class="panelCardLatex" content="{{itemLatex.LaTeX}}" style="font-size:{{itemLatex.FontSize}}rpx;" />
+          </view>
+        </block>
+      </block>
+    </block>
+  </block>
+  <view style="height: 60rpx;"></view>
+</view>

pages/main/latex_common.wxss

@@ -0,0 +1,112 @@
+.container {
+  width:100%;
+  background-color: #e3e3e3;
+} 
+.panelTap{
+  width: 100%;
+  position: fixed;
+  background-color: #fff;
+  z-index: 10;
+  height:120rpx;
+  top:0;
+  align-items: flex-end;
+}
+
+.panelTap1{
+  height:120rpx;
+  justify-content: flex-end;
+}
+
+.panelTopLine0{
+  width:72rpx;
+  height:20rpx;
+  background-color: #fff;
+  margin: 20rpx 50rpx 0 50rpx;
+}
+.panelTopLine1{
+  width:72rpx;
+  height:20rpx;
+  background-color: #FF8451;
+  margin: 20rpx 50rpx 0 50rpx;
+}
+
+.panelMenu1{
+  width:690rpx;
+  height:80rpx;
+  background: #4D4D4D;
+  border-radius: 20rpx;
+  margin-top: 160rpx;
+}
+.panelMenu11{
+  height:70rpx;
+  font-size:28rpx;
+  box-shadow: 0 4rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 5rpx 5rpx 5rpx 5rpx;
+  color:#e3e3e3;
+}
+.panelMenu11L{
+  box-shadow: 0 4rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 15rpx 5rpx 5rpx 15rpx;
+}
+.panelMenu11R{
+  box-shadow: 0 4rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 5rpx 15rpx 15rpx 5rpx;
+}
+.panelMenu111{
+  background-color: #fff;
+  color:#4d4d4d;
+}
+.panelMenu11_0{
+  width:228rpx;
+}
+.panelMenu11_1{
+  width:340rpx;
+}
+.panelMenu11_2{
+  width:340rpx;
+}
+
+.panelMenu2{
+  width:100%;
+  display: flex;
+  white-space: nowrap;
+  overflow-x: hidden;
+  margin: 40rpx 0 30rpx 0;
+}
+.panelMenu21{
+  display: inline-block;
+  padding: 10rpx 20rpx;
+  font-size: 28rpx;
+  margin-right: 20rpx;
+}
+.panelMenu211{
+  background: #FFFFFF;
+  border-radius: 10rpx;
+}
+
+.panelCard{
+  width:690rpx;
+  background: #FFFFFF;
+  box-shadow: 0 6rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 20rpx;
+  font-size: 28rpx;
+  color: #2E2E2E;
+  margin-top: 30rpx;
+  justify-content: flex-start;
+}
+.panelCard1{
+  width:630rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin-top: 40rpx;
+}
+.panelCardLatex{
+  width:630rpx;
+  min-height:80rpx;
+  margin: 30rpx 0 50rpx 0;
+  text-align: center;
+  background-color: #fff;
+  color: #000000;
+  font-size: 48rpx;
+  line-height: 120rpx;
+}

pages/main/mainlist.js

@@ -275,20 +275,11 @@ Page({
       if (item.Content[1].ContentStr.length > len)
         item.Content[1].ContentStr = main.replaceCardInfoString(item.Content[1].ContentStr.substr(0, len)) + "...";
 
-      if (item.Content[1].ContentStr){
-        item.Content[1].ContentStr=item.Content[1].ContentStr.replace("[特]","");
-        item.Content[1].ContentStr=item.Content[1].ContentStr.replace("[/特]","");
-      }
 
       item.Content[2].ContentStr = main.replaceCardInfoString(item.Content[2].Content);
       if (item.Content[2].ContentStr.length > len)
         item.Content[2].ContentStr = main.replaceCardInfoString(item.Content[2].ContentStr.substr(0, len)) + "...";
 
-      if (item.Content[2].ContentStr){
-        item.Content[2].ContentStr=item.Content[2].ContentStr.replace("[特]","");
-        item.Content[2].ContentStr=item.Content[2].ContentStr.replace("[/特]","");
-      }
-
       var imageUrl = getImage(item.Content[1].Content);
       if (imageUrl.length == 0 && item.Content[2].Content)
         imageUrl = getImage(item.Content[2].Content);
@@ -301,6 +292,16 @@ Page({
         item.ImageUrlServer = imageUrl;
         item.Width="540";
       }
+      else{
+        if (item.Content[1].Content.indexOf("[/公式]")>0
+        || item.Content[2].Content.indexOf("[/公式]")>0
+        || item.Content[3].Content.indexOf("[/公式]")>0){
+          item.ImageUrlTemp = "../images/universalpic_dictionary_formula_black_80x80.jpg";
+          item.ImageUrlServer = item.ImageUrlTemp;
+          item.Width="540";
+        }
+      }
+      //debugger;
 
       if (item.FirstTime < "1900-01-02")
         item.CardCategory = "新题卡";
@@ -700,8 +701,6 @@ Page({
           arr[0][2]="";
         }
         //console.log("CardType:"+that.data.CardType);
-        
-
         that.setData({
           FilterArr:arr,
         });

pages/main/preview.js

@@ -206,7 +206,6 @@ Page({
           nextId = list[i + 1].MiaoguoCardID;
         else
           nextId = 0;
-
         card = main.changeStringToView(list[i].Content);
         card.MiaoguoCardID = list[i].MiaoguoCardID;
         card.LimitTime = list[i].LimitTime;

pages/main/preview.json

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "格式预览",
+  "usingComponents": {
+    "mp-html": "/components/mp-weixin"
+  },
   "enablePullDownRefresh": true
 }

pages/main/preview.wxml

@@ -1,4 +1,4 @@
-<import src="../template/cardShow.wxml" />
+<import src="../../pages/template/cardShow.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}'>
   <!-- 顶端工具栏 -->

pages/main/preview.wxss

@@ -306,6 +306,7 @@
 .panelItem .textBigword{
   font-size:108rpx;
   line-height: 108rpx;
+  font-weight: bold;
 }
 
 .panelItem .textNormal2 {
@@ -363,6 +364,29 @@
   height: 24rpx;
 }
 
+.panelItem .textLaTeXContainer{
+  width: 100%;
+  background-color: #fff;
+  align-items: flex-start;
+  border-radius: 10rpx;
+}
+.panelItem .textLaTeXName{
+  width: 590rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin: 10rpx 0 0 30rpx;
+  color:#2e2e2e;
+}
+.panelItem .textLaTeX {
+  width: 590rpx;
+  background-color: #fff;
+  color: #000000;
+  border-radius: 10rpx;
+  font-size: 48rpx;
+  margin: 20rpx 0 20rpx 30rpx;
+  overflow-x:hidden;
+}
+
 .panelItem .textReturn {
   width: 100%;
 }

pages/main/systemsetting.wxml

@@ -3,19 +3,19 @@
     <view class="panelTitle1">通用</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap='goto' data-url="../plan/pattern">
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../../pages_plan/plan/pattern">
     <view class="panelItem1">记忆评价</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="panelItem FlexRow" bindtap='goto' data-url="../plan/clicktype">
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../../pages_plan/plan/clicktype">
     <view class="panelItem1">显示答案的操作方式</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="panelItem FlexRow" bindtap='goto' data-url="../plan/colorplan">
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../../pages_plan/plan/colorplan">
     <view class="panelItem1">题卡主题色</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />

pages/other/annualreport.wxml

@@ -97,7 +97,7 @@
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow" bindtap='goto' data-url="../plan/pattern">
+		<view class="panelItem FlexRow" bindtap='goto' data-url="../../pages_plan/plan/pattern">
 			<view class="text3">使用记忆评价完整模式让复习更精确</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />

pages/other/lessonlist.js

@@ -38,7 +38,7 @@ Page({
           arr[1].List.splice(6, 1);
 
 
-          arr[1].List[4].Title = "通过【检验】生成字词、古诗词、英语题卡";
+          arr[1].List[4].Title = "通过【知识】生成字词、古诗词、英语题卡";
           arr[1].List[3].Title = "通过【加资料】制作字词、古诗词、英语题卡";
           arr[1].List[2].Title = "制作任何知识点的普通题卡";
 

pages/share/milestone.js

@@ -1,6 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
-import fanObj from '../template/FanObject';
+import fanObj from '../../pages/template/FanObject';
 const app = getApp();
 
 Page({

pages/share/milestone.wxml

@@ -1,4 +1,4 @@
-<import src="../template/Fan.wxml" />
+<import src="../../pages/template/Fan.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexColumn">

pages/share/milestone.wxss

@@ -1,4 +1,4 @@
-@import "../template/Fan.wxss";
+@import "../../pages/template/Fan.wxss";
 
 .container{
   background-color: #fff;

pages/template/cardShow.wxml

@@ -6,8 +6,13 @@
       <text class="textProblem" style='background-color:{{Color.LineColor}};'>题目</text>
       <view class="textReturn"></view>
       <block wx:for="{{Field[1]}}" wx:key="index">
-
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
+        <view class="textLaTeXContainer FlexColumn">
+          <view class="textLaTeXName" wx:if="{{item.LatexName}}">{{item.LatexName}}</view>
+          <mp-html class="textLaTeX" content="{{item.Content}}" wx:if="{{item.Type=='latex'}}" style="font-size:{{item.FontSize}}rpx;"/>
+          <view style="height:20rpx;" wx:if="{{item.LatexName}}"></view>
+        </view>
+        
         <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}" style="height:{{FontSize/2}}rpx;"></view>
         <text class="textNormal" selectable="true" space='{{TextSpace}}' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
         <text class="textNormal" selectable="true" space='{{TextSpace}}' wx:if="{{item.Type=='line'}}">
@@ -18,7 +23,7 @@
       </block>
       </text>
 
-      <view class="textBigword" wx:if="{{item.Type=='bigword'}}">{{item.Content}}</view>
+      <view class="textBigword" wx:if="{{item.Type=='bigword'}}" style="font-size:{{item.FontSize}}rpx;line-height:{{item.FontSize}}rpx;">{{item.Content}}</view>
       
       <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
         <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />
@@ -57,6 +62,11 @@
       <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
         <text class='textDot' wx:if="{{Field[itemParent][0].Type!='normal' && Field[itemParent][0].Type!='line'}}" style='color:{{Color.LineColor}};'>●</text>
         <block wx:for="{{Field[itemParent]}}" wx:key="index">
+          <view class="textLaTeXContainer FlexColumn">
+            <view class="textLaTeXName" wx:if="{{item.LatexName}}">{{item.LatexName}}</view>
+            <mp-html class="textLaTeX" content="{{item.Content}}" wx:if="{{item.Type=='latex'}}" style="font-size:{{item.FontSize}}rpx;"/>
+            <view style="height:20rpx;" wx:if="{{item.LatexName}}"></view>
+          </view>
           <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
           <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
 
@@ -81,8 +91,7 @@
           </view>
 
           <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
-          <view class="textBigword" wx:if="{{item.Type=='bigword'}}">{{item.Content}}</view>
-      
+          <view class="textBigword" wx:if="{{item.Type=='bigword'}}" style="font-size:{{item.FontSize}}rpx;line-height:{{item.FontSize}}rpx;">{{item.Content}}</view>
           <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
             <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
               <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />

pages/plan/clicktype.wxml

@@ -19,7 +19,7 @@
     <block wx:for="{{List}}" wx:key="index">
       <view class="{{item.SelectedCSS}} panelSelected FlexRow" bindtap="selectType" data-index="{{index}}">
         <view class='panelSelected0 FlexRow' hidden="{{!item.SelectedCSS}}">
-          <image src='../images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
+          <image src='../../pages/images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
         </view>
         <view class='panelSelected00 panelSelected0' hidden="{{item.SelectedCSS}}">
         </view>

pages/plan/pattern.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="line"></view>
   <view class="panelTitle FlexRow">
-    <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
+    <image class="universalpic_plan_2line_black_30x32" src="../../pages/images/universalpic_plan_data_black_30x32.png" />
     <view class="panelTitle1">样式预览</view>
   </view>
   <view class="lineWidthAll0 lineWidthAll FlexRow">
@@ -25,7 +25,7 @@
       <view class="panelItem1 FlexRow" bindtap="selectPattern" data-index="{{index}}">
         <view class="imgTrue FlexRow">
           <block wx:if="{{index==MemoryLevel}}">
-            <image class="universalpic_checked_blue_40x40" src='../images/universalpic_checked_blue_40x40.png' />
+            <image class="universalpic_checked_blue_40x40" src='../../pages/images/universalpic_checked_blue_40x40.png' />
           </block>
         </view>
         <view class="panelItem11 FlexColumn">
@@ -62,7 +62,7 @@
               <view class="picker">
                 {{item.Value}}秒内
               </view>
-              <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+              <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
             </view>
           </view>
         </picker>
@@ -74,7 +74,7 @@
   <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=1&idchild=2">
     <view class="panelItem31">帮助：记忆评价的作用</view>
     <view class="panelItem32 FlexRow">
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
@@ -83,7 +83,7 @@
   <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=1&idchild=3">
     <view class="panelItem31">帮助：时间指标的作用</view>
     <view class="panelItem32 FlexRow">
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class='lineFooter'></view>

pages/plan/setting.wxml

@@ -6,7 +6,7 @@
       <view class="picker" wx:if="{{CardType==0}}">
         当前
       </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
@@ -18,7 +18,7 @@
       <view class="picker" wx:if="{{CardType==1}}">
         当前
       </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class='lineFooter'></view>
@@ -26,7 +26,7 @@
   <view class="panelItem FlexRow" bindtap='setPattern'>
     <view class="panelItem1">记忆评价</view>
     <view class="panelItem2 FlexRow">
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class='lineFooter'></view>
@@ -45,7 +45,7 @@
       <view class="picker">
         {{ClickTypeName}}
       </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
@@ -57,7 +57,7 @@
       <view class="picker">
         {{ColorName}}
       </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class='lineFooter'></view>

pages/plan/sortRule.wxml

@@ -18,13 +18,13 @@
     <block wx:for="{{List}}" wx:key="index">
       <view class="{{item.SelectedCSS}} panelSelected FlexRow" bindtap="selectType" data-index="{{index}}">
         <view class='panelSelected0 FlexRow' hidden="{{!item.SelectedCSS}}">
-          <image src='../images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
+          <image src='../../pages/images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
         </view>
         <view class='panelSelected00 panelSelected0' hidden="{{item.SelectedCSS}}">
         </view>
         <view class='panelSelected1 FlexColumn'>
           <view class='text1'>{{item.Name}}</view>
-          <image wx:if="{{item.Image}}" src='../images/{{item.Image}}.png' class="{{item.Image}}" />
+          <image wx:if="{{item.Image}}" src='../../pages/images/{{item.Image}}.png' class="{{item.Image}}" />
           <view style="height:10rpx;" wx:if="{{!item.Image}}"></view>
         </view>
       </view>

pages/plan/studyplan.js

@@ -1,6 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
-import fanObj from '../template/FanObject';
+import fanObj from '../../template/FanObject';
 
 const app = getApp();
 var cardNumberCommon = 0;

pages/plan/studyplan.wxml

@@ -1,23 +1,23 @@
-<import src="../template/Fan.wxml" />
+<import src="../../pages/template/Fan.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-	<image class="practise_dashboard_header" src="../images/practise_dashboard_header.png"></image>
+	<image class="practise_dashboard_header" src="../../pages/images/practise_dashboard_header.png"></image>
 	<view class="panel1 FlexColumn">
 		<view class="panel11 FlexRow">
 			<view class="panel111">练习模式</view>
 			<view class="panel112 FlexRow" bindtap="showHelp" data-id="1">
-				<image class="universalpic_light_black_22x30" src="../images/universalpic_light_black_22x30.png" />
+				<image class="universalpic_light_black_22x30" src="../../pages/images/universalpic_light_black_22x30.png" />
 			</view>
 		</view>
 
 		<view class="panel12 FlexRow" bindtap="showHelp" data-id="3">
 			<view class="FlexRow">
-				<image class="universalpic_diagram_black_30x28" src="../images/universalpic_diagram_black_30x28.png" />
+				<image class="universalpic_diagram_black_30x28" src="../../pages/images/universalpic_diagram_black_30x28.png" />
 				<view class="panel121">正在使用的练习模式</view>
 			</view>
 			<view class="FlexRow">
 				<view class="panel122">{{CurrentPlan}}</view>
-				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				<image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
 			</view>
 		</view>
 

pages/plan/studyplan.wxss

@@ -1,4 +1,4 @@
-@import "../template/Fan.wxss";
+@import "../../pages/template/Fan.wxss";
 
 .container{
   font-size:28rpx;

pages/plan/studyplandetail.js

@@ -1,6 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
-import fanObj from '../template/FanObject';
+import fanObj from '../../pages/template/FanObject';
 import constant from '../../utils/constant';
 
 const app = getApp();

pages/plan/studyplandetail.wxml

@@ -1,9 +1,9 @@
-<import src="../template/Fan.wxml" />
+<import src="../../pages/template/Fan.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 	<view class="line"></view>
 	<view class="panelTitle FlexRow">
-		<image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
+		<image class="universalpic_plan_2line_black_30x32" src="../../pages/images/universalpic_plan_data_black_30x32.png" />
 		<view class="panelTitle1">参考数据</view>
 	</view>
 	<view class="lineWidthAll1 FlexRow">
@@ -139,7 +139,7 @@
 					<view class="picker" wx:if="{{CardType=='1'}}">
 						{{CardMaxNumberNewUrgent}}张
 					</view>
-					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+					<image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
 				</view>
 			</view>
 		</picker>
@@ -156,7 +156,7 @@
 					<view class="picker" wx:if="{{CardType=='1'}}">
 						{{CardMaxNumberHistoryUrgent}}张
 					</view>
-					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+					<image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
 				</view>
 			</view>
 		</picker>
@@ -173,7 +173,7 @@
 				<view class="picker">
 					{{SortType}}
 				</view>
-				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				<image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
 			</view>
 		</view>
 	</block>

pages/plan/studyplandetail.wxss

@@ -1,4 +1,4 @@
-@import "../template/Fan.wxss";
+@import "../../pages/template/Fan.wxss";
 
 .container{
   font-size:28rpx;

pages/plan/taskBasic.js

@@ -1,6 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
-import fanObj from '../template/FanObject';
+import fanObj from '../../pages/template/FanObject';
 
 const app = getApp();
 
@@ -73,8 +73,6 @@ Page({
         });
       });
     });
-    
-
   },
   clickBtnNumber:function(e){
     var that = this;

pages/plan/taskBasic.wxml

@@ -1,4 +1,4 @@
-<import src="../template/Fan.wxml" />
+<import src="../../pages/template/Fan.wxml" />
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image class="mg4_practicePic_1" src="{{ImagePath}}web/mg4_practicePic_1.png" />
   <image class="mg4_textH1_1" src="{{ImagePath}}web/mg4_textH1_1.png" />
@@ -158,17 +158,17 @@
   <view class="panel3 panel1 FlexColumn" bindtap="goto" data-url="../../pages_test/knowledge/index">
     <view class="panel21 FlexColumn">
       <view class="panel31 FlexRow">
-        <text class="text1">去「检验」逛逛</text>
+        <text class="text1">去「知识」逛逛</text>
         <view class="panel311 FlexColumn">
           <image class="mg4_iconNext_1" src="{{ImagePath}}web/mg4_iconNext_1.png" />
         </view>
       </view>
-      <text class="text6">题卡太少不够练？\n创建新题卡或去「检验」栏目生成课本知识点</text>
+      <text class="text6">题卡太少不够练？\n创建新题卡或去「知识」栏目生成课本知识点</text>
     </view>
 
   </view>
   <image class="mg4_practicePic_2" src="{{ImagePath}}web/mg4_practicePic_2.png" />
-  <view class="panel4 panel1 FlexColumn" bindtap="goto" data-url="../../pages/plan/taskHelp?type=1">
+  <view class="panel4 panel1 FlexColumn" bindtap="goto" data-url="../../pages_plan/plan/taskHelp?type=1">
     <view class="panel21 FlexColumn">
       <view class="panel31 FlexRow">
         <text class="text1">完整版设置</text>

pages/plan/taskBasic.wxss

@@ -1,4 +1,4 @@
-@import "../template/Fan.wxss";
+@import "../../pages/template/Fan.wxss";
 
 page {
   background-color: #3157ba;

pages/plan/taskFull.js

@@ -1,6 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
-import fanObj from '../template/FanObject';
+import fanObj from '../../pages/template/FanObject';
 import constant from '../../utils/constant';
 
 const app = getApp();