1.1.22

app.js

@@ -1,14 +1,15 @@
 //app.js
 App({
   globalData: {
-    version: "1.1.19",
+    Version: "1.1.22",
     IsProduction: true,
+    //IsProduction: false,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",
     ProgramName: "数学计算题",
     ShareTitle: "认真练习，告别粗心",
     SharePath: "pages/index/index",
-    ShareImage: '../../pages/images/programsystem_screenshot_pic01.png',
+    ShareImage: '../../pages/images/program_share-a01.png',
 
     fileUrl: "https://math-1253256735.file.myqcloud.com/",
     serverUrl: "https://www.kylx365.com/apiData/",

package4/main/buyad.wxml

@@ -7,15 +7,15 @@
       <view class='panel111' bindtap='gotoOrder'>
         直接购买
       </view>
-      <view class='line1'></view>
+      <!-- <view class='line1'></view>
       <view class='panel112 panel111' bindtap='gotoPackList'>
         优惠套装
-      </view>
+      </view> -->
     </view>
     <view class='number'>{{Price}}元</view>
   </view>
 
-  <image src='../images/pay_shoppingguide_illus_02.png' class="pay_shoppingguide_illus_02" bindtap='gotoGiftList' />
+  <!-- <image src='../images/pay_shoppingguide_illus_02.png' class="pay_shoppingguide_illus_02" bindtap='gotoGiftList' /> -->
   
   <button class='text1' open-type="share">推荐给家长</button>
   <image src='../images/pay_shoppingguide_footer.png' class="pay_shoppingguide_footer" />

package4/main/buyad.wxss

@@ -12,6 +12,7 @@
 .panel1 {
   width: 610rpx;
   margin-top: 30rpx;
+  margin-bottom: 60rpx;
   justify-content: flex-start;
   border-radius: 10rpx;
   box-shadow: 0 20rpx 1rpx #AE5138,
@@ -33,7 +34,7 @@
 }
 
 .panel111{
-  width: 304rpx;
+  width:100%;
   height:120rpx;
   line-height: 120rpx;
   text-align: center;

pages/index/index.js

@@ -6,7 +6,7 @@ var timeout2, timeout3;
 
 Page({
   data: {
-    version: app.globalData.version,
+    version: app.globalData.Version,
   },
   onLoad: function (options) {
     if (options) {
@@ -92,7 +92,7 @@ Page({
         System: app.globalData.systemInfo.system,
         Platform: app.globalData.systemInfo.platform,
         SDKVersion: app.globalData.systemInfo.SDKVersion,
-        ProgramVersion: app.globalData.version,
+        ProgramVersion: app.globalData.Version,
       }, function (data) {
         //console.log("UserInfo:" + data);
         if (!data) {

pages/main/answer.js

@@ -4,7 +4,7 @@ import server from '../../utils/main';
 const app = getApp()
 Page({
   data: {
-    version: app.globalData.version,
+    version: app.globalData.Version,
     IsEdit: false,
     ListHeight2: 600,
     SelectedCount: 0,

pages/main/default.js

@@ -10,7 +10,8 @@ var isMiaoguoADShow = false;
 
 Page({
   data: {
-    version: app.globalData.version,
+    version: app.globalData.Version,
+    ProgramName:app.globalData.ProgramName,
     FileUrl: app.globalData.fileUrl,
     NickName: "陌生用户",
     IsMember: 1,
@@ -78,29 +79,6 @@ Page({
         that.showHelp();
       });
     }
-
-    common.getStorageValue(this, "IsMiaoguoAD", true, function () { });
-
-    var miaoguoADTime = wx.getStorageSync("miaoguoADTime");
-    if (miaoguoADTime) {
-      if (this.data.IsShow == 1 && this.data.IsMember == 1 && isMiaoguoADShow && common.formatTime(new Date()) >= miaoguoADTime) {
-        this.setData({
-          IsMiaoguoAD2: 1,
-        });
-      }
-    }
-    else {
-      wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 1, new Date())));
-    }
-
-    isMiaoguoADShow = true;
-
-    if (app.globalData.IsShowMiaoguo){
-      this.setData({
-        IsShowMiaoguo:1,
-      });
-      app.globalData.IsShowMiaoguo=false;
-    }
   },
   downloadUserAvatar: function () {
     var avatar = wx.getStorageSync("Avatar");

pages/main/default.wxml

@@ -21,8 +21,7 @@
         </view>
         <view class="panel001 FlexRow">
           <view class="panel0010 FlexRow">
-            <image wx:for="{{[1,2,3,4]}}" wx:key="index" bindtap='gotoList' data-id="{{item}}"
-              class="homepage_question_illus_grade01" src="../images/homepage_question_illus_grade0{{item}}.png" />
+            <image wx:for="{{[1,2,3,4]}}" wx:key="index" bindtap='gotoList' data-id="{{item}}" class="homepage_question_illus_grade01" src="../images/homepage_question_illus_grade0{{item}}.png" />
           </view>
         </view>
         <view class="panel0011">
@@ -35,11 +34,12 @@
           <view class="panel0020 FlexRow">
             <view class="panel00200 FlexColumn">
               <view class="textTitle3">
-              <view class="textTitle4">练习记录</view>
+                <view class="textTitle4">练习记录</view>
                 <view class="textTitle5">练习记录</view>
               </view>
               <view class="line3"></view>
-              <view class="panel002000 FlexRow"><view class="text1">试卷张数</view>
+              <view class="panel002000 FlexRow">
+                <view class="text1">试卷张数</view>
                 <view class="text2">{{AnswerLength}}</view>
               </view>
               <view class="line4 line3"></view>
@@ -63,190 +63,84 @@
               </view>
             </view>
             <view class="panel00201 FlexRow" bindtap="gotoMemberCenter">
-              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01"
-                src="../images/universalpic_face_default_black_size01.png" bindtap='gotoBindGetUserInfo' />
+              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01" src="../images/universalpic_face_default_black_size01.png" bindtap='gotoBindGetUserInfo' />
               <image wx:if="{{IsAccredit}}" class="universalpic_face_default_black_size01" src="{{AvatarUrl}}" />
               <image wx:if="{{IsRemind}}" src='../images/message_home_01.png' class="message_home_01" />
-  
+
             </view>
           </view>
           <image class="homepage_clipboard_illus_clip" src="../images/homepage_clipboard_illus_clip.png" />
           <image class="homepage_clipboard_illus_ruler" src="../images/homepage_clipboard_illus_ruler.png" />
-
         </view>
-
-        <!-- <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
-        <image class="universalpic_line_zigzag_brown_up" src="../images/universalpic_line_zigzag_brown_up.png" />
-        <view class="panel003 circularBottom FlexColumn">
-          <view class="panel0030 FlexRow">
-            <view class="panel00300 FlexColumn">
-              <text class="text">©2018 唱意教育 - 数学计算题\n微信小程序 版本 {{version}}</text>
-              <view class="panel003000 FlexRow">
-                <view bindtap='gotoHelp'>帮助</view>
-                <view class="line"></view>
-                <view bindtap='gotoFeedback'>反馈</view>
-                <view class="line"></view>
-                <view bindtap='gotoFeedback'>合作</view>
-              </view>
-            </view>
-            <button class="btn4 btn0" open-type="share">
-              <view class="btn5 btn10 FlexColumn">
-                <image class="universalpic_share_size01" src="../images/universalpic_share_size01.png" />
-                <view>分享</view>
-              </view>
-            </button>
-
-          </view>
-
-          <view class="panel0031 FlexColumn">
-            <view class="panel00310 FlexColumn">
-              唱意教育其它练习产品
-            </view>
-            <view class="line"></view>
-            <block wx:for="{{ProgramList}}" wx:key="index">
-              <view class="panel00311 FlexRow" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>
-                <view class="panel003110 FlexRow">
-                  <image class="universalpic_product_kousuan_icon_size01" src="../images/{{item.imageName}}.png" />
-                  <view class="text">{{item.Name}}</view>
-                </view>
-                <image class="universalpic_indicator_maroon" src="../images/universalpic_indicator_pink.png" />
-              </view>
-              <view class="line"></view>
-
-            </block>
-            <view class="index5 FlexColumn" wx:if="{{IsShow==1}}">
-              <image src='../images/home_banner_footer600.png' class="home_banner" bindtap='goto' data-url='../../package4/main/newuser' />
-            </view>
-          </view>
-        </view> 
-        <view style="height:100rpx;width:100%"></view>
-        -->
       </view>
     </view>
     <view class="panel1 FlesColumn" wx:if="{{IsShow==1}}">
       <view class="panelOther FlexRow">
         <view class="panelOther1">其它产品</view>
-        <image src='../images/home_triangle_up.png' class="home_triangle_up" />
+        <image src='../images/cpxl_pic_01.png' class="home_triangle_up" />
       </view>
       <view class="panelProduct FlexColumn">
-        <view class="panelProduct10 panelProduct0 FlexColumn">
-          <view class="panelProduct1">全科练习</view>
-          <view class="panelProduct3 FlexRow" bindtap="showMiaoguo">
-            <image src='../images/sofewareicon_mg.png' class="sofewareicon_mg" />
-            <view class="panelProduct31 FlexColumn">
-              <view class="panelProduct311">秒过</view>
-              <view class="panelProduct312">基础知识记忆工具</view>
-            </view>
+        <image src="../images/cpxl_t01.png" class="cpxl_t01"></image>
+        <view class="panelProduct1 FlexRow">
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wxa5e33c61fe37dd01">
+            <image src="../images/cpxl_logo_01.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">注意力</view>
+            <view class="panelProduct112">好玩的注意力训练工具</view>
+            <view class="panelProduct113">免费</view>
+          </view>
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wxb54a6d5aff836ee3">
+            <image src="../images/cpxl_logo_02.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">英语自然拼读</view>
+            <view class="panelProduct112">词汇大全+点读练习</view>
+            <view class="panelProduct113">免费</view>
           </view>
         </view>
-
-        <view class="panelProduct1">单科练习</view>
-        <view class="panelProduct10 FlexRow" style="width:100%;">
-          <view class="panelProduct0 FlexColumn">
-            <view class="panelProduct2">数学</view>
-            <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wxa5441bbf344692ba'>
-              <image src='../images/sofewareicon_ks.png' class="sofewareicon_mg" />
-              <view class="panelProduct31 FlexColumn">
-                <view class="panelProduct311">口算星球</view>
-                <view class="panelProduct312">好玩的口算敏捷练习</view>
-              </view>
-            </view>
-            <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx1fef080f74481cbd'>
-              <image src='../images/sofewareicon_jst.png' class="sofewareicon_mg" />
-              <view class="panelProduct31 FlexColumn">
-                <view class="panelProduct311">计算题打印</view>
-                <view class="panelProduct312">打印竖式横式计算题</view>
-              </view>
-            </view>
+        <image src="../images/cpxl_t02.png" class="cpxl_t01 cpxl_t02"></image>
+        <view class="panelProduct1 panelProduct100 FlexRow">
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wxa5441bbf344692ba">
+            <image src="../images/cpxl_logo_03.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">练口算</view>
+            <view class="panelProduct112">好玩的口算敏捷训练</view>
           </view>
-          <view class="panelProduct0 FlexColumn">
-            <view class="panelProduct2">语文</view>
-            <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx331e8dd070f01d0e'>
-              <image src='../images/sofewareicon_py.png' class="sofewareicon_mg" />
-              <view class="panelProduct31 FlexColumn">
-                <view class="panelProduct311">汉语拼音</view>
-                <view class="panelProduct312">纯正发音练习</view>
-              </view>
-            </view>
-            <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx313a8f2c0741efe1'>
-              <image src='../images/sofewareicon_sz.png' class="sofewareicon_mg" />
-              <view class="panelProduct31 FlexColumn">
-                <view class="panelProduct311">识字</view>
-                <view class="panelProduct312">小学六年课本同步</view>
-              </view>
-            </view>
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wx1fef080f74481cbd">
+            <image src="../images/cpxl_logo_04.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">练笔算</view>
+            <view class="panelProduct112">竖式计算题出题+打印</view>
           </view>
         </view>
-
-        <view style="width:100%;height:20rpx;"></view>
-        <view class="panelProduct10 panelProduct0 FlexColumn" bindtap='switchProgram' data-appid='wxb54a6d5aff836ee3'>
-          <view class="panelProduct1">英语</view>
-          <view class="panelProduct3 FlexRow">
-            <image src='../images/sofewareicon_pd.png' class="sofewareicon_mg" />
-            <view class="panelProduct31 FlexColumn">
-              <view class="panelProduct311">自然拼读</view>
-              <view class="panelProduct312">英语国家母语学习法</view>
-            </view>
+        <view class="panelProduct1 FlexRow">
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wx331e8dd070f01d0e">
+            <image src="../images/cpxl_logo_05.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">汉语拼音</view>
+            <view class="panelProduct112">易错字词发音点读</view>
+            <view class="panelProduct113">免费</view>
+          </view>
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wx313a8f2c0741efe1">
+            <image src="../images/cpxl_logo_06.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">识字表点读</view>
+            <view class="panelProduct112">一到六年级语文书同步</view>
+            <view class="panelProduct113">免费</view>
           </view>
         </view>
-        <view style="width:100%;height:60rpx;"></view>
-      </view>
-
-      <image bindtap="showMiaoguo" src='../images/home_banner.png' class="home_banner" />
-
-    </view>
-  </view>
-</view>
-<image hidden="{{HelpHidden1}}" bindtap='closeHelp' class="Help_aside_homepage"
-  src="../images/Help_aside_homepage.png" />
-
-<view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
-  <view class="btn">
-    <view class="btn1 FlexColumn" catchtap="showMiaoguo">
-      <image src='../images/home_banner_window.png' class="home_banner_window" />
-      <view class="btn2">去领取</view>
-    </view>
-  </view>
-  <view class="close2 FlexColumn" bindtap='close' data-num="1">
-    以后再看
-  </view>
-  <view class="close FlexColumn" bindtap='close' data-num="0">
-    <image src='../images/02024.png' class="closeImage" />
-  </view>
-</view>
-
-<view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowGift==1}}">
-  <view class="btn">
-    <view class="btn1 FlexColumn" catchtap="showMiaoguo">
-      <view class="HelpInfo21 FlexColumn">
-        <image src='../images/02014.png' class="png02014" />
-        <view class="HelpInfo211">有效期已延长</view>
-        <view class="HelpInfo212">计算题20天礼品卡已兑换成功</view>
+        <image src="../images/cpxl_t03.png" class="cpxl_t01 cpxl_t03"></image>
+        <view class="panelProduct1 FlexRow">
+          <view class="panelProduct11 panelProduct10 FlexColumn" bind:tap="switchProgram" data-appid="wx84b3feac6069eec3">
+            <image src="../images/cpxl_logo_07.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">秒过 · 错题记忆卡</view>
+            <view class="panelProduct114">可以记牢一切基础知识的练习方法和工具。彻底解决语文字词、成语、诗词；英语单词、语法；数物化公式、定理；史地政必考要点等。</view>
+            <image src="../images/cpxl_ad_01.gif" class="cpxl_ad_01"></image>
+          </view>
+        </view>
+        <view class="panelProduct1 FlexColumn">
+          <view class="panelFooter1">2017-2025 {{ProgramName}}</view>
+          <view class="panelFooter2">唱意教育微信小程序 版本 {{version}}</view>
+        </view>
+        
       </view>
-      <view class="btn2" catchtap='goto' data-url='../../package4/main/getgiftlist'>查看记录</view>
     </view>
   </view>
-  <view class="close FlexColumn" bindtap='close' data-num="0">
-    <image src='../images/02024.png' class="closeImage" />
-  </view>
-</view>
-
-<view class="PanelMiaoguo FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowMiaoguo==1}}" catchtap="closeMiaoguo">
-  <view class="PanelMiaoguo1 FlexColumn">
-    <image src='../images/bm_sy_illus.png' class="bm_sy_illus"/>
-    <view class="Text1">该记的记不住</view>
-    <view class="Text2">用「秒过」</view>
-    <text class="Text3">帮助孩子记牢语数外基础知识的\n工具和练习方法</text>
-    <view class="Text4">了解详情，欢迎参加</view>
-    <view class="Text5">新手培训</view>
-    <view class="btn3 FlexColumn" bindtap='switchProgram' data-appid='wx84b3feac6069eec3'>
-      <image src='../images/bm_sy_banner-open.png' class="bm_sy_banner-open" />
-    </view>
-
-    <view class="btnReadme" catchtap='goto' data-url='../../package4/main/miaoguoreadme'></view>
-    <view class="btnRecord" catchtap='goto' data-url='../../package4/main/getgiftlist'></view>
-  </view>
 </view>
+<image hidden="{{HelpHidden1}}" bindtap='closeHelp' class="Help_aside_homepage" src="../images/Help_aside_homepage.png" />
 
 <audio hidden='true' id="myAudio"></audio>
 <canvas class='Canvas' canvas-id="MyCanvas"></canvas>

pages/main/default.wxss

@@ -586,59 +586,105 @@ page{
   left:105rpx;
   z-index: 10;
 }
-
 .panelProduct{
   width:100%;
-  background-color: #fff;
+  background-color: #D5CAC6;
   align-items: flex-start;
 }
-.panelProduct0{
-  width:50%;
-  font-size:32rpx;
-  color:#4D4D4D;
-  justify-content: flex-start;
-  align-items: flex-start;
+
+.cpxl_t01{
+  width: 156rpx;
+  height:52rpx;
+  margin: 60rpx 0 0 50rpx;
 }
-.panelProduct1{
-  background-color: #fff;
-  margin: 50rpx 0 0 50rpx;
-  font-size:32rpx;
-  color:#4D4D4D;
+.cpxl_t02{
+  width: 190rpx;
+}
+.cpxl_t03{
+  width: 300rpx;
 }
 
-.panelProduct10{
+.panelProduct1{
   width:100%;
+  margin: 40rpx 0 20rpx 0;
 }
 
-.panelProduct2{
-  background-color: #fff;
-  margin: 0 0 0 50rpx;
-  font-size:32rpx;
-  color:#4D4D4D;
+.panelProduct100{
+  margin: 40rpx 0 0 0;
 }
 
-.panelProduct3{
-  width:300rpx;
-  margin:30rpx 0 0 50rpx;
-  justify-content: flex-start;
+.panelProduct11{
+  width:330rpx;
+  height:285rpx;
+  background: #F8F8F8;
+  border: 4rpx solid #B67249;
+  box-shadow: 0 16rpx 0 0 rgba(0,0,0,0.30), inset 0 -20rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 30rpx;
+  margin: 0 15rpx;
+  align-items: flex-start;
+  position: relative;
+}
+
+.panelProduct10{
+  width:690rpx;
+  height:811rpx;
 }
 
-.sofewareicon_mg{
-  width:66rpx;
-  height:66rpx;
+.cpxl_logo_01{
+  width:90rpx;
+  height:90rpx;
+  margin-left: 40rpx;
 }
 
 
-.panelProduct31{
-  margin:0 0 0 30rpx;
-  align-items: flex-start;
+.panelProduct111{
+  font-size: 34rpx;
+  font-weight: 600;
+  color:#1E1E1E;
+  margin: 20rpx 0 0 40rpx;
 }
-.panelProduct311{
-  font-size:28rpx;
+
+.panelProduct112{
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin: 0 0 10rpx 40rpx;
+}
+.panelProduct113{
+  background: #B67249;
+  border-radius: 6rpx;
+  font-size: 20rpx;
+  color: #FFFFFF;
+  text-align: center;
+  width: 60rpx;
+  height:34rpx;
+  line-height: 34rpx;
+  position: absolute;
+  top:50rpx;
+  right:40rpx;
+}
+.panelProduct114{
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin: 0 0 0 40rpx;
+  width: 610rpx;
+}
+.cpxl_ad_01{
+  width:610rpx;
+  height:410rpx;
+  margin: 40rpx 0 0 40rpx;
 }
-.panelProduct312{
-  font-size:20rpx;
-  color:#4D4D4D;
+
+.panelFooter1{
+  font-size:24rpx;
+  color:#695852;
+  margin-top: 20rpx;
+}
+.panelFooter2{
+  font-size:24rpx;
+  color:#695852;
+  margin-bottom: 100rpx;
 }
 
 .home_banner{

pages/main/detail.js

@@ -12,7 +12,7 @@ const waitTime = ["", "10秒钟", "15秒钟", "20秒钟", "25秒钟"];
 
 Page({
   data: {
-    version: app.globalData.version,
+    version: app.globalData.Version,
     IsShowMenu: false,
     filter: 'horizontal',
     //filter: 'vertical',
@@ -348,6 +348,8 @@ Page({
             height = 210;
           else if (item.PageCount == 15)
             height = 250;
+          else if (item.PageCount == 9)
+            height = 400;
         }
         //括号
         var index = 0;

pages/main/item.js

@@ -9,7 +9,7 @@ var AnswerID = 0;
 
 Page({
   data: {
-    version: app.globalData.version,
+    version: app.globalData.Version,
     IsPlaying: 0,
     PlayStr: "本",
     selectTab0: "btn1",

pages/main/list.js

@@ -10,7 +10,7 @@ var arrDifficult = ["", "", "简单", "普通", "困难"];
 
 Page({
   data: {
-    version: app.globalData.version,
+    version: app.globalData.Version,
     filter: 'all',
     CategoryID: 1,
     CategoryNum: 1,
@@ -125,6 +125,25 @@ Page({
         }
       }
     }
+
+    for (var j = 0; j < list.length; j++) {
+        var item = list[j];
+        switch (item.ID){
+            case 167:
+            case 174:
+            case 166:
+            case 190:
+            case 191:
+            case 192:
+            case 193:
+            case 164:
+            case 165:
+            case 195:
+                item.CategoryLevel="乘除运算3级"
+                break;
+        }
+    }
+
     this.setData({
       QuestionTypeList: list,
     });

pages/main/userinfo.js

@@ -6,7 +6,7 @@ const app = getApp();
 Page({
   data: {
     FileUrl: app.globalData.imageUrl,
-    Version: app.globalData.version,
+    Version: app.globalData.Version,
     ProgramName: app.globalData.ProgramName,
   },
   onLoad: function (options) {

pages/main/userinfo.wxml

@@ -37,7 +37,7 @@
         <image src='../images/Arrow.png' class="Arrow" />
       </view>
     </view>
-    <view class="lineWidthAll FlexRow">
+    <!-- <view class="lineWidthAll FlexRow">
       <view class="lineWidth720"></view>
     </view>
     <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/giftlist'>
@@ -54,7 +54,7 @@
       <view class="panelItem2 FlexRow">
         <image src='../images/Arrow.png' class="Arrow" />
       </view>
-    </view>
+    </view> -->
     <view class='lineFooter'></view>
 
     <view class="panelTitle FlexRow">
@@ -69,7 +69,7 @@
         <image src='../images/Arrow.png' class="Arrow" />
       </view>
     </view>
-    <view class="lineWidthAll FlexRow">
+    <!-- <view class="lineWidthAll FlexRow">
       <view class="lineWidth720"></view>
     </view>
     <view class="panelItem0 panelItem FlexRow" bindtap='goto' data-url='../../package4/main/list?IsGift=0'>
@@ -92,7 +92,7 @@
       <view class="panelItem2 FlexRow">
         <image src='../images/Arrow.png' class="Arrow" />
       </view>
-    </view>
+    </view> -->
     <view class='lineFooter'></view>
   </block>
   <view class="panelTitle FlexRow">

project.config.json

@@ -27,7 +27,8 @@
     "showES6CompileOption": false,
     "useCompilerPlugins": false,
     "minifyWXML": true,
-    "useStaticServer": true
+    "useStaticServer": true,
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.15.0",

project.private.config.json

@@ -57,5 +57,10 @@
         }
       ]
     }
-  }
+  },
+  "setting": {
+    "compileHotReLoad": true
+  },
+  "libVersion": "3.1.5",
+  "projectname": "%E6%95%B0%E5%AD%A6%E8%AE%A1%E7%AE%97%E9%A2%98"
 }

utils/lib/AES.js

@@ -1,402 +1,402 @@
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Shortcuts
-var util = C.util,
-    charenc = C.charenc,
-    UTF8 = charenc.UTF8;
-
-// Precomputed SBOX
-var SBOX = [ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
-             0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
-             0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
-             0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
-             0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
-             0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-             0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
-             0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
-             0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
-             0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
-             0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
-             0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-             0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
-             0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
-             0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
-             0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
-             0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
-             0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-             0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
-             0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
-             0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
-             0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
-             0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
-             0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-             0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
-             0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
-             0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
-             0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
-             0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
-             0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-             0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
-             0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 ];
-
-// Compute inverse SBOX lookup table
-for (var INVSBOX = [], i = 0; i < 256; i++) INVSBOX[SBOX[i]] = i;
-
-// Compute mulitplication in GF(2^8) lookup tables
-var MULT2 = [],
-    MULT3 = [],
-    MULT9 = [],
-    MULTB = [],
-    MULTD = [],
-    MULTE = [];
-
-function xtime(a, b) {
-	for (var result = 0, i = 0; i < 8; i++) {
-		if (b & 1) result ^= a;
-		var hiBitSet = a & 0x80;
-		a = (a << 1) & 0xFF;
-		if (hiBitSet) a ^= 0x1b;
-		b >>>= 1;
-	}
-	return result;
-}
-
-for (var i = 0; i < 256; i++) {
-	MULT2[i] = xtime(i,2);
-	MULT3[i] = xtime(i,3);
-	MULT9[i] = xtime(i,9);
-	MULTB[i] = xtime(i,0xB);
-	MULTD[i] = xtime(i,0xD);
-	MULTE[i] = xtime(i,0xE);
-}
-
-// Precomputed RCon lookup
-var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
-
-// Inner state
-var state = [[], [], [], []],
-    keylength,
-    nrounds,
-    keyschedule;
-
-var AES = C.AES = {
-
-	/**
-	 * Public API
-	 */
-
-	encrypt: function (message, password, options) {
-
-		options = options || {};
-
-		// Determine mode
-		var mode = options.mode || new C.mode.OFB;
-
-		// Allow mode to override options
-		if (mode.fixOptions) mode.fixOptions(options);
-
-		var
-
-			// Convert to bytes if message is a string
-			m = (
-				message.constructor == String ?
-				UTF8.stringToBytes(message) :
-				message
-			),
-
-			// Generate random IV
-			iv = options.iv || util.randomBytes(AES._blocksize * 4),
-
-			// Generate key
-			k = (
-				password.constructor == String ?
-				// Derive key from passphrase
-				C.PBKDF2(password, iv, 32, { asBytes: true }) :
-				// else, assume byte array representing cryptographic key
-				password
-			);
-
-		// Encrypt
-		AES._init(k);
-		mode.encrypt(AES, m, iv);
-
-		// Return ciphertext
-		m = options.iv ? m : iv.concat(m);
-		return (options && options.asBytes) ? m : util.bytesToBase64(m);
-
-	},
-
-	decrypt: function (ciphertext, password, options) {
-
-		options = options || {};
-
-		// Determine mode
-		var mode = options.mode || new C.mode.OFB;
-
-		// Allow mode to override options
-		if (mode.fixOptions) mode.fixOptions(options);
-
-		var
-
-			// Convert to bytes if ciphertext is a string
-			c = (
-				ciphertext.constructor == String ?
-				util.base64ToBytes(ciphertext):
-			    ciphertext
-			),
-
-			// Separate IV and message
-			iv = options.iv || c.splice(0, AES._blocksize * 4),
-
-			// Generate key
-			k = (
-				password.constructor == String ?
-				// Derive key from passphrase
-				C.PBKDF2(password, iv, 32, { asBytes: true }) :
-				// else, assume byte array representing cryptographic key
-				password
-			);
-
-		// Decrypt
-		AES._init(k);
-		mode.decrypt(AES, c, iv);
-
-		// Return plaintext
-		return (options && options.asBytes) ? c : UTF8.bytesToString(c);
-
-	},
-
-
-	/**
-	 * Package private methods and properties
-	 */
-
-	_blocksize: 4,
-
-	_encryptblock: function (m, offset) {
-
-		// Set input
-		for (var row = 0; row < AES._blocksize; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] = m[offset + col * 4 + row];
-		}
-
-		// Add round key
-		for (var row = 0; row < 4; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] ^= keyschedule[col][row];
-		}
-
-		for (var round = 1; round < nrounds; round++) {
-
-			// Sub bytes
-			for (var row = 0; row < 4; row++) {
-				for (var col = 0; col < 4; col++)
-					state[row][col] = SBOX[state[row][col]];
-			}
-
-			// Shift rows
-			state[1].push(state[1].shift());
-			state[2].push(state[2].shift());
-			state[2].push(state[2].shift());
-			state[3].unshift(state[3].pop());
-
-			// Mix columns
-			for (var col = 0; col < 4; col++) {
-
-				var s0 = state[0][col],
-				    s1 = state[1][col],
-				    s2 = state[2][col],
-				    s3 = state[3][col];
-
-				state[0][col] = MULT2[s0] ^ MULT3[s1] ^ s2 ^ s3;
-				state[1][col] = s0 ^ MULT2[s1] ^ MULT3[s2] ^ s3;
-				state[2][col] = s0 ^ s1 ^ MULT2[s2] ^ MULT3[s3];
-				state[3][col] = MULT3[s0] ^ s1 ^ s2 ^ MULT2[s3];
-
-			}
-
-			// Add round key
-			for (var row = 0; row < 4; row++) {
-				for (var col = 0; col < 4; col++)
-					state[row][col] ^= keyschedule[round * 4 + col][row];
-			}
-
-		}
-
-		// Sub bytes
-		for (var row = 0; row < 4; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] = SBOX[state[row][col]];
-		}
-
-		// Shift rows
-		state[1].push(state[1].shift());
-		state[2].push(state[2].shift());
-		state[2].push(state[2].shift());
-		state[3].unshift(state[3].pop());
-
-		// Add round key
-		for (var row = 0; row < 4; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] ^= keyschedule[nrounds * 4 + col][row];
-		}
-
-		// Set output
-		for (var row = 0; row < AES._blocksize; row++) {
-			for (var col = 0; col < 4; col++)
-				m[offset + col * 4 + row] = state[row][col];
-		}
-
-	},
-
-	_decryptblock: function (c, offset) {
-
-		// Set input
-		for (var row = 0; row < AES._blocksize; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] = c[offset + col * 4 + row];
-		}
-
-		// Add round key
-		for (var row = 0; row < 4; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] ^= keyschedule[nrounds * 4 + col][row];
-		}
-
-		for (var round = 1; round < nrounds; round++) {
-
-			// Inv shift rows
-			state[1].unshift(state[1].pop());
-			state[2].push(state[2].shift());
-			state[2].push(state[2].shift());
-			state[3].push(state[3].shift());
-
-			// Inv sub bytes
-			for (var row = 0; row < 4; row++) {
-				for (var col = 0; col < 4; col++)
-					state[row][col] = INVSBOX[state[row][col]];
-			}
-
-			// Add round key
-			for (var row = 0; row < 4; row++) {
-				for (var col = 0; col < 4; col++)
-					state[row][col] ^= keyschedule[(nrounds - round) * 4 + col][row];
-			}
-
-			// Inv mix columns
-			for (var col = 0; col < 4; col++) {
-
-				var s0 = state[0][col],
-				    s1 = state[1][col],
-				    s2 = state[2][col],
-				    s3 = state[3][col];
-
-				state[0][col] = MULTE[s0] ^ MULTB[s1] ^ MULTD[s2] ^ MULT9[s3];
-				state[1][col] = MULT9[s0] ^ MULTE[s1] ^ MULTB[s2] ^ MULTD[s3];
-				state[2][col] = MULTD[s0] ^ MULT9[s1] ^ MULTE[s2] ^ MULTB[s3];
-				state[3][col] = MULTB[s0] ^ MULTD[s1] ^ MULT9[s2] ^ MULTE[s3];
-
-			}
-
-		}
-
-		// Inv shift rows
-		state[1].unshift(state[1].pop());
-		state[2].push(state[2].shift());
-		state[2].push(state[2].shift());
-		state[3].push(state[3].shift());
-
-		// Inv sub bytes
-		for (var row = 0; row < 4; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] = INVSBOX[state[row][col]];
-		}
-
-		// Add round key
-		for (var row = 0; row < 4; row++) {
-			for (var col = 0; col < 4; col++)
-				state[row][col] ^= keyschedule[col][row];
-		}
-
-		// Set output
-		for (var row = 0; row < AES._blocksize; row++) {
-			for (var col = 0; col < 4; col++)
-				c[offset + col * 4 + row] = state[row][col];
-		}
-
-	},
-
-
-	/**
-	 * Private methods
-	 */
-
-	_init: function (k) {
-		keylength = k.length / 4;
-		nrounds = keylength + 6;
-		AES._keyexpansion(k);
-	},
-
-	// Generate a key schedule
-	_keyexpansion: function (k) {
-
-		keyschedule = [];
-
-		for (var row = 0; row < keylength; row++) {
-			keyschedule[row] = [
-				k[row * 4],
-				k[row * 4 + 1],
-				k[row * 4 + 2],
-				k[row * 4 + 3]
-			];
-		}
-
-		for (var row = keylength; row < AES._blocksize * (nrounds + 1); row++) {
-
-			var temp = [
-				keyschedule[row - 1][0],
-				keyschedule[row - 1][1],
-				keyschedule[row - 1][2],
-				keyschedule[row - 1][3]
-			];
-
-			if (row % keylength == 0) {
-
-				// Rot word
-				temp.push(temp.shift());
-
-				// Sub word
-				temp[0] = SBOX[temp[0]];
-				temp[1] = SBOX[temp[1]];
-				temp[2] = SBOX[temp[2]];
-				temp[3] = SBOX[temp[3]];
-
-				temp[0] ^= RCON[row / keylength];
-
-			} else if (keylength > 6 && row % keylength == 4) {
-
-				// Sub word
-				temp[0] = SBOX[temp[0]];
-				temp[1] = SBOX[temp[1]];
-				temp[2] = SBOX[temp[2]];
-				temp[3] = SBOX[temp[3]];
-
-			}
-
-			keyschedule[row] = [
-				keyschedule[row - keylength][0] ^ temp[0],
-				keyschedule[row - keylength][1] ^ temp[1],
-				keyschedule[row - keylength][2] ^ temp[2],
-				keyschedule[row - keylength][3] ^ temp[3]
-			];
-
-		}
-
-	}
-
-};
-
-})();
+(function(){
+
+var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
+
+// Shortcuts
+var util = C.util,
+    charenc = C.charenc,
+    UTF8 = charenc.UTF8;
+
+// Precomputed SBOX
+var SBOX = [ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
+             0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+             0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+             0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+             0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
+             0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+             0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
+             0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+             0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+             0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+             0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
+             0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+             0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
+             0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+             0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+             0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+             0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
+             0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+             0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
+             0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+             0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+             0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+             0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
+             0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+             0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
+             0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+             0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+             0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+             0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
+             0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+             0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
+             0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 ];
+
+// Compute inverse SBOX lookup table
+for (var INVSBOX = [], i = 0; i < 256; i++) INVSBOX[SBOX[i]] = i;
+
+// Compute mulitplication in GF(2^8) lookup tables
+var MULT2 = [],
+    MULT3 = [],
+    MULT9 = [],
+    MULTB = [],
+    MULTD = [],
+    MULTE = [];
+
+function xtime(a, b) {
+	for (var result = 0, i = 0; i < 8; i++) {
+		if (b & 1) result ^= a;
+		var hiBitSet = a & 0x80;
+		a = (a << 1) & 0xFF;
+		if (hiBitSet) a ^= 0x1b;
+		b >>>= 1;
+	}
+	return result;
+}
+
+for (var i = 0; i < 256; i++) {
+	MULT2[i] = xtime(i,2);
+	MULT3[i] = xtime(i,3);
+	MULT9[i] = xtime(i,9);
+	MULTB[i] = xtime(i,0xB);
+	MULTD[i] = xtime(i,0xD);
+	MULTE[i] = xtime(i,0xE);
+}
+
+// Precomputed RCon lookup
+var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+// Inner state
+var state = [[], [], [], []],
+    keylength,
+    nrounds,
+    keyschedule;
+
+var AES = C.AES = {
+
+	/**
+	 * Public API
+	 */
+
+	encrypt: function (message, password, options) {
+
+		options = options || {};
+
+		// Determine mode
+		var mode = options.mode || new C.mode.OFB;
+
+		// Allow mode to override options
+		if (mode.fixOptions) mode.fixOptions(options);
+
+		var
+
+			// Convert to bytes if message is a string
+			m = (
+				message.constructor == String ?
+				UTF8.stringToBytes(message) :
+				message
+			),
+
+			// Generate random IV
+			iv = options.iv || util.randomBytes(AES._blocksize * 4),
+
+			// Generate key
+			k = (
+				password.constructor == String ?
+				// Derive key from passphrase
+				C.PBKDF2(password, iv, 32, { asBytes: true }) :
+				// else, assume byte array representing cryptographic key
+				password
+			);
+
+		// Encrypt
+		AES._init(k);
+		mode.encrypt(AES, m, iv);
+
+		// Return ciphertext
+		m = options.iv ? m : iv.concat(m);
+		return (options && options.asBytes) ? m : util.bytesToBase64(m);
+
+	},
+
+	decrypt: function (ciphertext, password, options) {
+
+		options = options || {};
+
+		// Determine mode
+		var mode = options.mode || new C.mode.OFB;
+
+		// Allow mode to override options
+		if (mode.fixOptions) mode.fixOptions(options);
+
+		var
+
+			// Convert to bytes if ciphertext is a string
+			c = (
+				ciphertext.constructor == String ?
+				util.base64ToBytes(ciphertext):
+			    ciphertext
+			),
+
+			// Separate IV and message
+			iv = options.iv || c.splice(0, AES._blocksize * 4),
+
+			// Generate key
+			k = (
+				password.constructor == String ?
+				// Derive key from passphrase
+				C.PBKDF2(password, iv, 32, { asBytes: true }) :
+				// else, assume byte array representing cryptographic key
+				password
+			);
+
+		// Decrypt
+		AES._init(k);
+		mode.decrypt(AES, c, iv);
+
+		// Return plaintext
+		return (options && options.asBytes) ? c : UTF8.bytesToString(c);
+
+	},
+
+
+	/**
+	 * Package private methods and properties
+	 */
+
+	_blocksize: 4,
+
+	_encryptblock: function (m, offset) {
+
+		// Set input
+		for (var row = 0; row < AES._blocksize; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] = m[offset + col * 4 + row];
+		}
+
+		// Add round key
+		for (var row = 0; row < 4; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] ^= keyschedule[col][row];
+		}
+
+		for (var round = 1; round < nrounds; round++) {
+
+			// Sub bytes
+			for (var row = 0; row < 4; row++) {
+				for (var col = 0; col < 4; col++)
+					state[row][col] = SBOX[state[row][col]];
+			}
+
+			// Shift rows
+			state[1].push(state[1].shift());
+			state[2].push(state[2].shift());
+			state[2].push(state[2].shift());
+			state[3].unshift(state[3].pop());
+
+			// Mix columns
+			for (var col = 0; col < 4; col++) {
+
+				var s0 = state[0][col],
+				    s1 = state[1][col],
+				    s2 = state[2][col],
+				    s3 = state[3][col];
+
+				state[0][col] = MULT2[s0] ^ MULT3[s1] ^ s2 ^ s3;
+				state[1][col] = s0 ^ MULT2[s1] ^ MULT3[s2] ^ s3;
+				state[2][col] = s0 ^ s1 ^ MULT2[s2] ^ MULT3[s3];
+				state[3][col] = MULT3[s0] ^ s1 ^ s2 ^ MULT2[s3];
+
+			}
+
+			// Add round key
+			for (var row = 0; row < 4; row++) {
+				for (var col = 0; col < 4; col++)
+					state[row][col] ^= keyschedule[round * 4 + col][row];
+			}
+
+		}
+
+		// Sub bytes
+		for (var row = 0; row < 4; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] = SBOX[state[row][col]];
+		}
+
+		// Shift rows
+		state[1].push(state[1].shift());
+		state[2].push(state[2].shift());
+		state[2].push(state[2].shift());
+		state[3].unshift(state[3].pop());
+
+		// Add round key
+		for (var row = 0; row < 4; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] ^= keyschedule[nrounds * 4 + col][row];
+		}
+
+		// Set output
+		for (var row = 0; row < AES._blocksize; row++) {
+			for (var col = 0; col < 4; col++)
+				m[offset + col * 4 + row] = state[row][col];
+		}
+
+	},
+
+	_decryptblock: function (c, offset) {
+
+		// Set input
+		for (var row = 0; row < AES._blocksize; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] = c[offset + col * 4 + row];
+		}
+
+		// Add round key
+		for (var row = 0; row < 4; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] ^= keyschedule[nrounds * 4 + col][row];
+		}
+
+		for (var round = 1; round < nrounds; round++) {
+
+			// Inv shift rows
+			state[1].unshift(state[1].pop());
+			state[2].push(state[2].shift());
+			state[2].push(state[2].shift());
+			state[3].push(state[3].shift());
+
+			// Inv sub bytes
+			for (var row = 0; row < 4; row++) {
+				for (var col = 0; col < 4; col++)
+					state[row][col] = INVSBOX[state[row][col]];
+			}
+
+			// Add round key
+			for (var row = 0; row < 4; row++) {
+				for (var col = 0; col < 4; col++)
+					state[row][col] ^= keyschedule[(nrounds - round) * 4 + col][row];
+			}
+
+			// Inv mix columns
+			for (var col = 0; col < 4; col++) {
+
+				var s0 = state[0][col],
+				    s1 = state[1][col],
+				    s2 = state[2][col],
+				    s3 = state[3][col];
+
+				state[0][col] = MULTE[s0] ^ MULTB[s1] ^ MULTD[s2] ^ MULT9[s3];
+				state[1][col] = MULT9[s0] ^ MULTE[s1] ^ MULTB[s2] ^ MULTD[s3];
+				state[2][col] = MULTD[s0] ^ MULT9[s1] ^ MULTE[s2] ^ MULTB[s3];
+				state[3][col] = MULTB[s0] ^ MULTD[s1] ^ MULT9[s2] ^ MULTE[s3];
+
+			}
+
+		}
+
+		// Inv shift rows
+		state[1].unshift(state[1].pop());
+		state[2].push(state[2].shift());
+		state[2].push(state[2].shift());
+		state[3].push(state[3].shift());
+
+		// Inv sub bytes
+		for (var row = 0; row < 4; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] = INVSBOX[state[row][col]];
+		}
+
+		// Add round key
+		for (var row = 0; row < 4; row++) {
+			for (var col = 0; col < 4; col++)
+				state[row][col] ^= keyschedule[col][row];
+		}
+
+		// Set output
+		for (var row = 0; row < AES._blocksize; row++) {
+			for (var col = 0; col < 4; col++)
+				c[offset + col * 4 + row] = state[row][col];
+		}
+
+	},
+
+
+	/**
+	 * Private methods
+	 */
+
+	_init: function (k) {
+		keylength = k.length / 4;
+		nrounds = keylength + 6;
+		AES._keyexpansion(k);
+	},
+
+	// Generate a key schedule
+	_keyexpansion: function (k) {
+
+		keyschedule = [];
+
+		for (var row = 0; row < keylength; row++) {
+			keyschedule[row] = [
+				k[row * 4],
+				k[row * 4 + 1],
+				k[row * 4 + 2],
+				k[row * 4 + 3]
+			];
+		}
+
+		for (var row = keylength; row < AES._blocksize * (nrounds + 1); row++) {
+
+			var temp = [
+				keyschedule[row - 1][0],
+				keyschedule[row - 1][1],
+				keyschedule[row - 1][2],
+				keyschedule[row - 1][3]
+			];
+
+			if (row % keylength == 0) {
+
+				// Rot word
+				temp.push(temp.shift());
+
+				// Sub word
+				temp[0] = SBOX[temp[0]];
+				temp[1] = SBOX[temp[1]];
+				temp[2] = SBOX[temp[2]];
+				temp[3] = SBOX[temp[3]];
+
+				temp[0] ^= RCON[row / keylength];
+
+			} else if (keylength > 6 && row % keylength == 4) {
+
+				// Sub word
+				temp[0] = SBOX[temp[0]];
+				temp[1] = SBOX[temp[1]];
+				temp[2] = SBOX[temp[2]];
+				temp[3] = SBOX[temp[3]];
+
+			}
+
+			keyschedule[row] = [
+				keyschedule[row - keylength][0] ^ temp[0],
+				keyschedule[row - keylength][1] ^ temp[1],
+				keyschedule[row - keylength][2] ^ temp[2],
+				keyschedule[row - keylength][3] ^ temp[3]
+			];
+
+		}
+
+	}
+
+};
+
+})();

utils/lib/BlockModes.js

@@ -1,378 +1,378 @@
-/*!
- * Crypto-JS contribution from Simon Greatrix
- */
-
-(function(){
-
-var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
-
-// Create pad namespace
-var C_pad = C.pad = {};
-
-// Calculate the number of padding bytes required.
-function _requiredPadding(cipher, message) {
-    var blockSizeInBytes = cipher._blocksize * 4;
-    var reqd = blockSizeInBytes - message.length % blockSizeInBytes;
-    return reqd;
-};
-
-// Remove padding when the final byte gives the number of padding bytes.
-var _unpadLength = function (message) {
-        var pad = message.pop();
-        for (var i = 1; i < pad; i++) {
-            message.pop();
-        }
-    };
-
-// No-operation padding, used for stream ciphers
-C_pad.NoPadding = {
-        pad : function (cipher,message) {},
-        unpad : function (message) {}
-    };
-
-// Zero Padding.
-//
-// If the message is not an exact number of blocks, the final block is
-// completed with 0x00 bytes. There is no unpadding.
-C_pad.ZeroPadding = {
-    pad : function (cipher, message) {
-        var blockSizeInBytes = cipher._blocksize * 4;
-        var reqd = message.length % blockSizeInBytes;
-        if( reqd!=0 ) {
-            for(reqd = blockSizeInBytes - reqd; reqd>0; reqd--) {
-                message.push(0x00);
-            }
-        }
-    },
-
-    unpad : function (message) {}
-};
-
-// ISO/IEC 7816-4 padding.
-//
-// Pads the plain text with an 0x80 byte followed by as many 0x00
-// bytes are required to complete the block.
-C_pad.iso7816 = {
-    pad : function (cipher, message) {
-        var reqd = _requiredPadding(cipher, message);
-        message.push(0x80);
-        for (; reqd > 1; reqd--) {
-            message.push(0x00);
-        }
-    },
-
-    unpad : function (message) {
-        while (message.pop() != 0x80) {}
-    }
-};
-
-// ANSI X.923 padding
-//
-// The final block is padded with zeros except for the last byte of the
-// last block which contains the number of padding bytes.
-C_pad.ansix923 = {
-    pad : function (cipher, message) {
-        var reqd = _requiredPadding(cipher, message);
-        for (var i = 1; i < reqd; i++) {
-            message.push(0x00);
-        }
-        message.push(reqd);
-    },
-
-    unpad : _unpadLength
-};
-
-// ISO 10126
-//
-// The final block is padded with random bytes except for the last
-// byte of the last block which contains the number of padding bytes.
-C_pad.iso10126 = {
-    pad : function (cipher, message) {
-        var reqd = _requiredPadding(cipher, message);
-        for (var i = 1; i < reqd; i++) {
-            message.push(Math.floor(Math.random() * 256));
-        }
-        message.push(reqd);
-    },
-
-    unpad : _unpadLength
-};
-
-// PKCS7 padding
-//
-// PKCS7 is described in RFC 5652. Padding is in whole bytes. The
-// value of each added byte is the number of bytes that are added,
-// i.e. N bytes, each of value N are added.
-C_pad.pkcs7 = {
-    pad : function (cipher, message) {
-        var reqd = _requiredPadding(cipher, message);
-        for (var i = 0; i < reqd; i++) {
-            message.push(reqd);
-        }
-    },
-
-    unpad : _unpadLength
-};
-
-// Create mode namespace
-var C_mode = C.mode = {};
-
-/**
- * Mode base "class".
- */
-var Mode = C_mode.Mode = function (padding) {
-    if (padding) {
-        this._padding = padding;
-    }
-};
-
-Mode.prototype = {
-    encrypt: function (cipher, m, iv) {
-        this._padding.pad(cipher, m);
-        this._doEncrypt(cipher, m, iv);
-    },
-
-    decrypt: function (cipher, m, iv) {
-        this._doDecrypt(cipher, m, iv);
-        this._padding.unpad(m);
-    },
-
-    // Default padding
-    _padding: C_pad.iso7816
-};
-
-
-/**
- * Electronic Code Book mode.
- * 
- * ECB applies the cipher directly against each block of the input.
- * 
- * ECB does not require an initialization vector.
- */
-var ECB = C_mode.ECB = function () {
-    // Call parent constructor
-    Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var ECB_prototype = ECB.prototype = new Mode;
-
-// Concrete steps for Mode template
-ECB_prototype._doEncrypt = function (cipher, m, iv) {
-    var blockSizeInBytes = cipher._blocksize * 4;
-    // Encrypt each block
-    for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
-        cipher._encryptblock(m, offset);
-    }
-};
-ECB_prototype._doDecrypt = function (cipher, c, iv) {
-    var blockSizeInBytes = cipher._blocksize * 4;
-    // Decrypt each block
-    for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
-        cipher._decryptblock(c, offset);
-    }
-};
-
-// ECB never uses an IV
-ECB_prototype.fixOptions = function (options) {
-    options.iv = [];
-};
-
-
-/**
- * Cipher block chaining
- * 
- * The first block is XORed with the IV. Subsequent blocks are XOR with the
- * previous cipher output.
- */
-var CBC = C_mode.CBC = function () {
-    // Call parent constructor
-    Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var CBC_prototype = CBC.prototype = new Mode;
-
-// Concrete steps for Mode template
-CBC_prototype._doEncrypt = function (cipher, m, iv) {
-    var blockSizeInBytes = cipher._blocksize * 4;
-
-    // Encrypt each block
-    for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
-        if (offset == 0) {
-            // XOR first block using IV
-            for (var i = 0; i < blockSizeInBytes; i++)
-            m[i] ^= iv[i];
-        } else {
-            // XOR this block using previous crypted block
-            for (var i = 0; i < blockSizeInBytes; i++)
-            m[offset + i] ^= m[offset + i - blockSizeInBytes];
-        }
-        // Encrypt block
-        cipher._encryptblock(m, offset);
-    }
-};
-CBC_prototype._doDecrypt = function (cipher, c, iv) {
-    var blockSizeInBytes = cipher._blocksize * 4;
-
-    // At the start, the previously crypted block is the IV
-    var prevCryptedBlock = iv;
-
-    // Decrypt each block
-    for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
-        // Save this crypted block
-        var thisCryptedBlock = c.slice(offset, offset + blockSizeInBytes);
-        // Decrypt block
-        cipher._decryptblock(c, offset);
-        // XOR decrypted block using previous crypted block
-        for (var i = 0; i < blockSizeInBytes; i++) {
-            c[offset + i] ^= prevCryptedBlock[i];
-        }
-        prevCryptedBlock = thisCryptedBlock;
-    }
-};
-
-
-/**
- * Cipher feed back
- * 
- * The cipher output is XORed with the plain text to produce the cipher output,
- * which is then fed back into the cipher to produce a bit pattern to XOR the
- * next block with.
- * 
- * This is a stream cipher mode and does not require padding.
- */
-var CFB = C_mode.CFB = function () {
-    // Call parent constructor
-    Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var CFB_prototype = CFB.prototype = new Mode;
-
-// Override padding
-CFB_prototype._padding = C_pad.NoPadding;
-
-// Concrete steps for Mode template
-CFB_prototype._doEncrypt = function (cipher, m, iv) {
-    var blockSizeInBytes = cipher._blocksize * 4,
-        keystream = iv.slice(0);
-
-    // Encrypt each byte
-    for (var i = 0; i < m.length; i++) {
-
-        var j = i % blockSizeInBytes;
-        if (j == 0) cipher._encryptblock(keystream, 0);
-
-        m[i] ^= keystream[j];
-        keystream[j] = m[i];
-    }
-};
-CFB_prototype._doDecrypt = function (cipher, c, iv) {
-    var blockSizeInBytes = cipher._blocksize * 4,
-        keystream = iv.slice(0);
-
-    // Encrypt each byte
-    for (var i = 0; i < c.length; i++) {
-
-        var j = i % blockSizeInBytes;
-        if (j == 0) cipher._encryptblock(keystream, 0);
-
-        var b = c[i];
-        c[i] ^= keystream[j];
-        keystream[j] = b;
-    }
-};
-
-
-/**
- * Output feed back
- * 
- * The cipher repeatedly encrypts its own output. The output is XORed with the
- * plain text to produce the cipher text.
- * 
- * This is a stream cipher mode and does not require padding.
- */
-var OFB = C_mode.OFB = function () {
-    // Call parent constructor
-    Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var OFB_prototype = OFB.prototype = new Mode;
-
-// Override padding
-OFB_prototype._padding = C_pad.NoPadding;
-
-// Concrete steps for Mode template
-OFB_prototype._doEncrypt = function (cipher, m, iv) {
-
-    var blockSizeInBytes = cipher._blocksize * 4,
-        keystream = iv.slice(0);
-
-    // Encrypt each byte
-    for (var i = 0; i < m.length; i++) {
-
-        // Generate keystream
-        if (i % blockSizeInBytes == 0)
-            cipher._encryptblock(keystream, 0);
-
-        // Encrypt byte
-        m[i] ^= keystream[i % blockSizeInBytes];
-
-    }
-};
-OFB_prototype._doDecrypt = OFB_prototype._doEncrypt;
-
-/**
- * Counter
- * @author Gergely Risko
- *
- * After every block the last 4 bytes of the IV is increased by one
- * with carry and that IV is used for the next block.
- *
- * This is a stream cipher mode and does not require padding.
- */
-var CTR = C_mode.CTR = function () {
-    // Call parent constructor
-    Mode.apply(this, arguments);
-};
-
-// Inherit from Mode
-var CTR_prototype = CTR.prototype = new Mode;
-
-// Override padding
-CTR_prototype._padding = C_pad.NoPadding;
-
-CTR_prototype._doEncrypt = function (cipher, m, iv) {
-    var blockSizeInBytes = cipher._blocksize * 4;
-    var counter = iv.slice(0);
-
-    for (var i = 0; i < m.length;) {
-        // do not lose iv
-        var keystream = counter.slice(0);
-
-        // Generate keystream for next block
-        cipher._encryptblock(keystream, 0);
-
-        // XOR keystream with block
-        for (var j = 0; i < m.length && j < blockSizeInBytes; j++, i++) {
-            m[i] ^= keystream[j];
-        }
-
-        // Increase counter
-        if(++(counter[blockSizeInBytes-1]) == 256) {
-            counter[blockSizeInBytes-1] = 0;
-            if(++(counter[blockSizeInBytes-2]) == 256) {
-                counter[blockSizeInBytes-2] = 0;
-                if(++(counter[blockSizeInBytes-3]) == 256) {
-                    counter[blockSizeInBytes-3] = 0;
-                    ++(counter[blockSizeInBytes-4]);
-                }
-            }
-        }
-    }
-};
-CTR_prototype._doDecrypt = CTR_prototype._doEncrypt;
-
-})();
+/*!
+ * Crypto-JS contribution from Simon Greatrix
+ */
+
+(function(){
+
+var C = (typeof window === 'undefined') ? require('./Crypto').Crypto : window.Crypto;
+
+// Create pad namespace
+var C_pad = C.pad = {};
+
+// Calculate the number of padding bytes required.
+function _requiredPadding(cipher, message) {
+    var blockSizeInBytes = cipher._blocksize * 4;
+    var reqd = blockSizeInBytes - message.length % blockSizeInBytes;
+    return reqd;
+};
+
+// Remove padding when the final byte gives the number of padding bytes.
+var _unpadLength = function (message) {
+        var pad = message.pop();
+        for (var i = 1; i < pad; i++) {
+            message.pop();
+        }
+    };
+
+// No-operation padding, used for stream ciphers
+C_pad.NoPadding = {
+        pad : function (cipher,message) {},
+        unpad : function (message) {}
+    };
+
+// Zero Padding.
+//
+// If the message is not an exact number of blocks, the final block is
+// completed with 0x00 bytes. There is no unpadding.
+C_pad.ZeroPadding = {
+    pad : function (cipher, message) {
+        var blockSizeInBytes = cipher._blocksize * 4;
+        var reqd = message.length % blockSizeInBytes;
+        if( reqd!=0 ) {
+            for(reqd = blockSizeInBytes - reqd; reqd>0; reqd--) {
+                message.push(0x00);
+            }
+        }
+    },
+
+    unpad : function (message) {}
+};
+
+// ISO/IEC 7816-4 padding.
+//
+// Pads the plain text with an 0x80 byte followed by as many 0x00
+// bytes are required to complete the block.
+C_pad.iso7816 = {
+    pad : function (cipher, message) {
+        var reqd = _requiredPadding(cipher, message);
+        message.push(0x80);
+        for (; reqd > 1; reqd--) {
+            message.push(0x00);
+        }
+    },
+
+    unpad : function (message) {
+        while (message.pop() != 0x80) {}
+    }
+};
+
+// ANSI X.923 padding
+//
+// The final block is padded with zeros except for the last byte of the
+// last block which contains the number of padding bytes.
+C_pad.ansix923 = {
+    pad : function (cipher, message) {
+        var reqd = _requiredPadding(cipher, message);
+        for (var i = 1; i < reqd; i++) {
+            message.push(0x00);
+        }
+        message.push(reqd);
+    },
+
+    unpad : _unpadLength
+};
+
+// ISO 10126
+//
+// The final block is padded with random bytes except for the last
+// byte of the last block which contains the number of padding bytes.
+C_pad.iso10126 = {
+    pad : function (cipher, message) {
+        var reqd = _requiredPadding(cipher, message);
+        for (var i = 1; i < reqd; i++) {
+            message.push(Math.floor(Math.random() * 256));
+        }
+        message.push(reqd);
+    },
+
+    unpad : _unpadLength
+};
+
+// PKCS7 padding
+//
+// PKCS7 is described in RFC 5652. Padding is in whole bytes. The
+// value of each added byte is the number of bytes that are added,
+// i.e. N bytes, each of value N are added.
+C_pad.pkcs7 = {
+    pad : function (cipher, message) {
+        var reqd = _requiredPadding(cipher, message);
+        for (var i = 0; i < reqd; i++) {
+            message.push(reqd);
+        }
+    },
+
+    unpad : _unpadLength
+};
+
+// Create mode namespace
+var C_mode = C.mode = {};
+
+/**
+ * Mode base "class".
+ */
+var Mode = C_mode.Mode = function (padding) {
+    if (padding) {
+        this._padding = padding;
+    }
+};
+
+Mode.prototype = {
+    encrypt: function (cipher, m, iv) {
+        this._padding.pad(cipher, m);
+        this._doEncrypt(cipher, m, iv);
+    },
+
+    decrypt: function (cipher, m, iv) {
+        this._doDecrypt(cipher, m, iv);
+        this._padding.unpad(m);
+    },
+
+    // Default padding
+    _padding: C_pad.iso7816
+};
+
+
+/**
+ * Electronic Code Book mode.
+ * 
+ * ECB applies the cipher directly against each block of the input.
+ * 
+ * ECB does not require an initialization vector.
+ */
+var ECB = C_mode.ECB = function () {
+    // Call parent constructor
+    Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var ECB_prototype = ECB.prototype = new Mode;
+
+// Concrete steps for Mode template
+ECB_prototype._doEncrypt = function (cipher, m, iv) {
+    var blockSizeInBytes = cipher._blocksize * 4;
+    // Encrypt each block
+    for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
+        cipher._encryptblock(m, offset);
+    }
+};
+ECB_prototype._doDecrypt = function (cipher, c, iv) {
+    var blockSizeInBytes = cipher._blocksize * 4;
+    // Decrypt each block
+    for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
+        cipher._decryptblock(c, offset);
+    }
+};
+
+// ECB never uses an IV
+ECB_prototype.fixOptions = function (options) {
+    options.iv = [];
+};
+
+
+/**
+ * Cipher block chaining
+ * 
+ * The first block is XORed with the IV. Subsequent blocks are XOR with the
+ * previous cipher output.
+ */
+var CBC = C_mode.CBC = function () {
+    // Call parent constructor
+    Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var CBC_prototype = CBC.prototype = new Mode;
+
+// Concrete steps for Mode template
+CBC_prototype._doEncrypt = function (cipher, m, iv) {
+    var blockSizeInBytes = cipher._blocksize * 4;
+
+    // Encrypt each block
+    for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
+        if (offset == 0) {
+            // XOR first block using IV
+            for (var i = 0; i < blockSizeInBytes; i++)
+            m[i] ^= iv[i];
+        } else {
+            // XOR this block using previous crypted block
+            for (var i = 0; i < blockSizeInBytes; i++)
+            m[offset + i] ^= m[offset + i - blockSizeInBytes];
+        }
+        // Encrypt block
+        cipher._encryptblock(m, offset);
+    }
+};
+CBC_prototype._doDecrypt = function (cipher, c, iv) {
+    var blockSizeInBytes = cipher._blocksize * 4;
+
+    // At the start, the previously crypted block is the IV
+    var prevCryptedBlock = iv;
+
+    // Decrypt each block
+    for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
+        // Save this crypted block
+        var thisCryptedBlock = c.slice(offset, offset + blockSizeInBytes);
+        // Decrypt block
+        cipher._decryptblock(c, offset);
+        // XOR decrypted block using previous crypted block
+        for (var i = 0; i < blockSizeInBytes; i++) {
+            c[offset + i] ^= prevCryptedBlock[i];
+        }
+        prevCryptedBlock = thisCryptedBlock;
+    }
+};
+
+
+/**
+ * Cipher feed back
+ * 
+ * The cipher output is XORed with the plain text to produce the cipher output,
+ * which is then fed back into the cipher to produce a bit pattern to XOR the
+ * next block with.
+ * 
+ * This is a stream cipher mode and does not require padding.
+ */
+var CFB = C_mode.CFB = function () {
+    // Call parent constructor
+    Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var CFB_prototype = CFB.prototype = new Mode;
+
+// Override padding
+CFB_prototype._padding = C_pad.NoPadding;
+
+// Concrete steps for Mode template
+CFB_prototype._doEncrypt = function (cipher, m, iv) {
+    var blockSizeInBytes = cipher._blocksize * 4,
+        keystream = iv.slice(0);
+
+    // Encrypt each byte
+    for (var i = 0; i < m.length; i++) {
+
+        var j = i % blockSizeInBytes;
+        if (j == 0) cipher._encryptblock(keystream, 0);
+
+        m[i] ^= keystream[j];
+        keystream[j] = m[i];
+    }
+};
+CFB_prototype._doDecrypt = function (cipher, c, iv) {
+    var blockSizeInBytes = cipher._blocksize * 4,
+        keystream = iv.slice(0);
+
+    // Encrypt each byte
+    for (var i = 0; i < c.length; i++) {
+
+        var j = i % blockSizeInBytes;
+        if (j == 0) cipher._encryptblock(keystream, 0);
+
+        var b = c[i];
+        c[i] ^= keystream[j];
+        keystream[j] = b;
+    }
+};
+
+
+/**
+ * Output feed back
+ * 
+ * The cipher repeatedly encrypts its own output. The output is XORed with the
+ * plain text to produce the cipher text.
+ * 
+ * This is a stream cipher mode and does not require padding.
+ */
+var OFB = C_mode.OFB = function () {
+    // Call parent constructor
+    Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var OFB_prototype = OFB.prototype = new Mode;
+
+// Override padding
+OFB_prototype._padding = C_pad.NoPadding;
+
+// Concrete steps for Mode template
+OFB_prototype._doEncrypt = function (cipher, m, iv) {
+
+    var blockSizeInBytes = cipher._blocksize * 4,
+        keystream = iv.slice(0);
+
+    // Encrypt each byte
+    for (var i = 0; i < m.length; i++) {
+
+        // Generate keystream
+        if (i % blockSizeInBytes == 0)
+            cipher._encryptblock(keystream, 0);
+
+        // Encrypt byte
+        m[i] ^= keystream[i % blockSizeInBytes];
+
+    }
+};
+OFB_prototype._doDecrypt = OFB_prototype._doEncrypt;
+
+/**
+ * Counter
+ * @author Gergely Risko
+ *
+ * After every block the last 4 bytes of the IV is increased by one
+ * with carry and that IV is used for the next block.
+ *
+ * This is a stream cipher mode and does not require padding.
+ */
+var CTR = C_mode.CTR = function () {
+    // Call parent constructor
+    Mode.apply(this, arguments);
+};
+
+// Inherit from Mode
+var CTR_prototype = CTR.prototype = new Mode;
+
+// Override padding
+CTR_prototype._padding = C_pad.NoPadding;
+
+CTR_prototype._doEncrypt = function (cipher, m, iv) {
+    var blockSizeInBytes = cipher._blocksize * 4;
+    var counter = iv.slice(0);
+
+    for (var i = 0; i < m.length;) {
+        // do not lose iv
+        var keystream = counter.slice(0);
+
+        // Generate keystream for next block
+        cipher._encryptblock(keystream, 0);
+
+        // XOR keystream with block
+        for (var j = 0; i < m.length && j < blockSizeInBytes; j++, i++) {
+            m[i] ^= keystream[j];
+        }
+
+        // Increase counter
+        if(++(counter[blockSizeInBytes-1]) == 256) {
+            counter[blockSizeInBytes-1] = 0;
+            if(++(counter[blockSizeInBytes-2]) == 256) {
+                counter[blockSizeInBytes-2] = 0;
+                if(++(counter[blockSizeInBytes-3]) == 256) {
+                    counter[blockSizeInBytes-3] = 0;
+                    ++(counter[blockSizeInBytes-4]);
+                }
+            }
+        }
+    }
+};
+CTR_prototype._doDecrypt = CTR_prototype._doEncrypt;
+
+})();

utils/lib/Crypto.js

@@ -1,155 +1,155 @@
-if (typeof Crypto == "undefined" || ! Crypto.util)
-{
-(function(){
-
-var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-// Global Crypto object
-// with browser window or with node module
-var Crypto = (typeof window === 'undefined') ? exports.Crypto = {} : window.Crypto = {}; 
-
-// Crypto utilities
-var util = Crypto.util = {
-
-	// Bit-wise rotate left
-	rotl: function (n, b) {
-		return (n << b) | (n >>> (32 - b));
-	},
-
-	// Bit-wise rotate right
-	rotr: function (n, b) {
-		return (n << (32 - b)) | (n >>> b);
-	},
-
-	// Swap big-endian to little-endian and vice versa
-	endian: function (n) {
-
-		// If number given, swap endian
-		if (n.constructor == Number) {
-			return util.rotl(n,  8) & 0x00FF00FF |
-			       util.rotl(n, 24) & 0xFF00FF00;
-		}
-
-		// Else, assume array and swap all items
-		for (var i = 0; i < n.length; i++)
-			n[i] = util.endian(n[i]);
-		return n;
-
-	},
-
-	// Generate an array of any length of random bytes
-	randomBytes: function (n) {
-		for (var bytes = []; n > 0; n--)
-			bytes.push(Math.floor(Math.random() * 256));
-		return bytes;
-	},
-
-	// Convert a byte array to big-endian 32-bit words
-	bytesToWords: function (bytes) {
-		for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8)
-			words[b >>> 5] |= (bytes[i] & 0xFF) << (24 - b % 32);
-		return words;
-	},
-
-	// Convert big-endian 32-bit words to a byte array
-	wordsToBytes: function (words) {
-		for (var bytes = [], b = 0; b < words.length * 32; b += 8)
-			bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
-		return bytes;
-	},
-
-	// Convert a byte array to a hex string
-	bytesToHex: function (bytes) {
-		for (var hex = [], i = 0; i < bytes.length; i++) {
-			hex.push((bytes[i] >>> 4).toString(16));
-			hex.push((bytes[i] & 0xF).toString(16));
-		}
-		return hex.join("");
-	},
-
-	// Convert a hex string to a byte array
-	hexToBytes: function (hex) {
-		for (var bytes = [], c = 0; c < hex.length; c += 2)
-			bytes.push(parseInt(hex.substr(c, 2), 16));
-		return bytes;
-	},
-
-	// Convert a byte array to a base-64 string
-	bytesToBase64: function (bytes) {
-
-		// Use browser-native function if it exists
-		if (typeof btoa == "function") return btoa(Binary.bytesToString(bytes));
-
-		for(var base64 = [], i = 0; i < bytes.length; i += 3) {
-			var triplet = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
-			for (var j = 0; j < 4; j++) {
-				if (i * 8 + j * 6 <= bytes.length * 8)
-					base64.push(base64map.charAt((triplet >>> 6 * (3 - j)) & 0x3F));
-				else base64.push("=");
-			}
-		}
-
-		return base64.join("");
-
-	},
-
-	// Convert a base-64 string to a byte array
-	base64ToBytes: function (base64) {
-
-		// Use browser-native function if it exists
-		if (typeof atob == "function") return Binary.stringToBytes(atob(base64));
-
-		// Remove non-base-64 characters
-		base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
-
-		for (var bytes = [], i = 0, imod4 = 0; i < base64.length; imod4 = ++i % 4) {
-			if (imod4 == 0) continue;
-			bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & (Math.pow(2, -2 * imod4 + 8) - 1)) << (imod4 * 2)) |
-			           (base64map.indexOf(base64.charAt(i)) >>> (6 - imod4 * 2)));
-		}
-
-		return bytes;
-
-	}
-
-};
-
-// Crypto character encodings
-var charenc = Crypto.charenc = {};
-
-// UTF-8 encoding
-var UTF8 = charenc.UTF8 = {
-
-	// Convert a string to a byte array
-	stringToBytes: function (str) {
-		return Binary.stringToBytes(unescape(encodeURIComponent(str)));
-	},
-
-	// Convert a byte array to a string
-	bytesToString: function (bytes) {
-		return decodeURIComponent(escape(Binary.bytesToString(bytes)));
-	}
-
-};
-
-// Binary encoding
-var Binary = charenc.Binary = {
-
-	// Convert a string to a byte array
-	stringToBytes: function (str) {
-		for (var bytes = [], i = 0; i < str.length; i++)
-			bytes.push(str.charCodeAt(i) & 0xFF);
-		return bytes;
-	},
-
-	// Convert a byte array to a string
-	bytesToString: function (bytes) {
-		for (var str = [], i = 0; i < bytes.length; i++)
-			str.push(String.fromCharCode(bytes[i]));
-		return str.join("");
-	}
-
-};
-
-})();
-}
+if (typeof Crypto == "undefined" || ! Crypto.util)
+{
+(function(){
+
+var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+// Global Crypto object
+// with browser window or with node module
+var Crypto = (typeof window === 'undefined') ? exports.Crypto = {} : window.Crypto = {}; 
+
+// Crypto utilities
+var util = Crypto.util = {
+
+	// Bit-wise rotate left
+	rotl: function (n, b) {
+		return (n << b) | (n >>> (32 - b));
+	},
+
+	// Bit-wise rotate right
+	rotr: function (n, b) {
+		return (n << (32 - b)) | (n >>> b);
+	},
+
+	// Swap big-endian to little-endian and vice versa
+	endian: function (n) {
+
+		// If number given, swap endian
+		if (n.constructor == Number) {
+			return util.rotl(n,  8) & 0x00FF00FF |
+			       util.rotl(n, 24) & 0xFF00FF00;
+		}
+
+		// Else, assume array and swap all items
+		for (var i = 0; i < n.length; i++)
+			n[i] = util.endian(n[i]);
+		return n;
+
+	},
+
+	// Generate an array of any length of random bytes
+	randomBytes: function (n) {
+		for (var bytes = []; n > 0; n--)
+			bytes.push(Math.floor(Math.random() * 256));
+		return bytes;
+	},
+
+	// Convert a byte array to big-endian 32-bit words
+	bytesToWords: function (bytes) {
+		for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8)
+			words[b >>> 5] |= (bytes[i] & 0xFF) << (24 - b % 32);
+		return words;
+	},
+
+	// Convert big-endian 32-bit words to a byte array
+	wordsToBytes: function (words) {
+		for (var bytes = [], b = 0; b < words.length * 32; b += 8)
+			bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
+		return bytes;
+	},
+
+	// Convert a byte array to a hex string
+	bytesToHex: function (bytes) {
+		for (var hex = [], i = 0; i < bytes.length; i++) {
+			hex.push((bytes[i] >>> 4).toString(16));
+			hex.push((bytes[i] & 0xF).toString(16));
+		}
+		return hex.join("");
+	},
+
+	// Convert a hex string to a byte array
+	hexToBytes: function (hex) {
+		for (var bytes = [], c = 0; c < hex.length; c += 2)
+			bytes.push(parseInt(hex.substr(c, 2), 16));
+		return bytes;
+	},
+
+	// Convert a byte array to a base-64 string
+	bytesToBase64: function (bytes) {
+
+		// Use browser-native function if it exists
+		if (typeof btoa == "function") return btoa(Binary.bytesToString(bytes));
+
+		for(var base64 = [], i = 0; i < bytes.length; i += 3) {
+			var triplet = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
+			for (var j = 0; j < 4; j++) {
+				if (i * 8 + j * 6 <= bytes.length * 8)
+					base64.push(base64map.charAt((triplet >>> 6 * (3 - j)) & 0x3F));
+				else base64.push("=");
+			}
+		}
+
+		return base64.join("");
+
+	},
+
+	// Convert a base-64 string to a byte array
+	base64ToBytes: function (base64) {
+
+		// Use browser-native function if it exists
+		if (typeof atob == "function") return Binary.stringToBytes(atob(base64));
+
+		// Remove non-base-64 characters
+		base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
+
+		for (var bytes = [], i = 0, imod4 = 0; i < base64.length; imod4 = ++i % 4) {
+			if (imod4 == 0) continue;
+			bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & (Math.pow(2, -2 * imod4 + 8) - 1)) << (imod4 * 2)) |
+			           (base64map.indexOf(base64.charAt(i)) >>> (6 - imod4 * 2)));
+		}
+
+		return bytes;
+
+	}
+
+};
+
+// Crypto character encodings
+var charenc = Crypto.charenc = {};
+
+// UTF-8 encoding
+var UTF8 = charenc.UTF8 = {
+
+	// Convert a string to a byte array
+	stringToBytes: function (str) {
+		return Binary.stringToBytes(unescape(encodeURIComponent(str)));
+	},
+
+	// Convert a byte array to a string
+	bytesToString: function (bytes) {
+		return decodeURIComponent(escape(Binary.bytesToString(bytes)));
+	}
+
+};
+
+// Binary encoding
+var Binary = charenc.Binary = {
+
+	// Convert a string to a byte array
+	stringToBytes: function (str) {
+		for (var bytes = [], i = 0; i < str.length; i++)
+			bytes.push(str.charCodeAt(i) & 0xFF);
+		return bytes;
+	},
+
+	// Convert a byte array to a string
+	bytesToString: function (bytes) {
+		for (var str = [], i = 0; i < bytes.length; i++)
+			str.push(String.fromCharCode(bytes[i]));
+		return str.join("");
+	}
+
+};
+
+})();
+}

utils/main.js

@@ -2,7 +2,7 @@ import common from '../utils/util';
 var app = getApp();
 
 function getData(url, callback) {
-  //console.log("加密前的结果为===", url);
+  console.log("加密前的结果为===", url);
   var url = common.Encrypt(url);
   //console.log("加密后的结果为===",url);
   wx.request({
@@ -23,7 +23,7 @@ function getData(url, callback) {
 
 function postData(url, postData, callback) {
   var url = common.Encrypt(url);
-  //console.log("加密后的结果为===",url);
+  console.log("加密后的结果为===",url);
   wx.request({
     url: app.globalData.serverUrl + url,
     method: "POST",