DESKTOP-H1V7IUO\51019 3 лет назад
Родитель
Сommit
4734e42ec0
47 измененных файлов с 8782 добавлено и 250 удалено
  1. 1 1
      app.js
  2. 2 7
      app.json
  3. 647 0
      components/nfc_utils/component/nfcTools.js
  4. 3 0
      components/nfc_utils/component/nfcTools.json
  5. 10 0
      components/nfc_utils/component/nfcTools.wxml
  6. 8 0
      components/nfc_utils/component/nfcTools.wxss
  7. 6192 0
      components/nfc_utils/des3/aes.js
  8. 184 0
      components/nfc_utils/des3/nfcTool.js
  9. BIN
      img/dev_img4.png
  10. BIN
      img/wechart_img1.jpg
  11. BIN
      img/编组 23@2x (6).png
  12. 204 48
      pages/index/index.js
  13. 1 1
      pages/index/index.wxml
  14. 1 1
      pages/index/indexRight/rightBar1/rightPie.js
  15. 5 0
      pages/login/login.js
  16. 2 2
      pages/login/login.wxml
  17. 351 0
      pages/nfc/encryptionNfc/encryptionNfc.js
  18. 5 0
      pages/nfc/encryptionNfc/encryptionNfc.json
  19. 81 0
      pages/nfc/encryptionNfc/encryptionNfc.wxml
  20. 201 0
      pages/nfc/encryptionNfc/encryptionNfc.wxss
  21. 1 2
      pages/nfc/zhuisu2.wxml
  22. 3 2
      pages/query/clearWarning/clearWarning.js
  23. 5 4
      pages/query/clearWarning/clearWarning.wxml
  24. 9 9
      pages/query/details.js
  25. 12 4
      pages/query/details.wxml
  26. 131 0
      pages/query/editOrder/editOrder.js
  27. 3 0
      pages/query/editOrder/editOrder.json
  28. 27 0
      pages/query/editOrder/editOrder.wxml
  29. 29 0
      pages/query/editOrder/editOrder.wxss
  30. 107 16
      pages/query/orderDetails.js
  31. 39 23
      pages/query/orderDetails.wxml
  32. 2 3
      pages/query/orderDetails.wxss
  33. 1 1
      pages/query/query.js
  34. 52 11
      pages/query/vvmInfo.js
  35. 18 5
      pages/query/vvmInfo.wxml
  36. 19 3
      pages/query/vvmInfo.wxss
  37. 9 4
      pages/user/pwdEdit.js
  38. 1 1
      pages/user/pwdEdit.wxml
  39. 3 1
      pages/workbench/scanningType/reportPdf/reportPdf.js
  40. 26 37
      pages/workbench/scanningType/reportPdf/reportPdf.wxml
  41. 2 0
      pages/workbench/scanningType/reportPdf/reportPdf.wxss
  42. 180 17
      pages/workbench/tempList/tempList.js
  43. 27 1
      pages/workbench/tempList/tempList.wxml
  44. 63 0
      pages/workbench/tempList/tempList.wxss
  45. 69 18
      pages/workbench/workbench.js
  46. 2 1
      pages/workbench/workbench.json
  47. 44 27
      pages/workbench/workbench.wxml

+ 1 - 1
app.js

@@ -3,7 +3,7 @@ var domain = "http://192.168.5.4:8088"
 // domain = "http://192.168.2.90:8088"
 // domain = "https://cansino-fxcapi.vandh.cn/prod-api"
 // domain = "https://fxc.vandh.cn/prod-api"
-domain = "https://fxcapi.zhongyihz.cn/prod-api"
+domain = "http://test-fxc.vandh.cn/prod-api"
 var serverDomain = domain + ""
 var downloadDomain = "https://oss.zhongyihz.cn"
 App({

+ 2 - 7
app.json

@@ -75,7 +75,8 @@
     "pages/index/ordersList/ordersList",
     "pages/userAuth/workerSelect",
     "pages/userinfo/editInfo",
-    "pages/components/datePicker/datePicker"
+    "pages/components/datePicker/datePicker",
+    "pages/nfc/encryptionNfc/encryptionNfc"
   ],
   "permission": {
     "scope.userLocation": {
@@ -103,12 +104,6 @@
         "text": "首页"
       },
       {
-        "pagePath": "pages/query/query",
-        "iconPath": "/img/tabIcon/search.png",
-        "selectedIconPath": "/img/tabIcon/search_blue.png",
-        "text": "查询"
-      },
-      {
         "pagePath": "pages/workbench/workbench",
         "iconPath": "/img/tabIcon/work.png",
         "selectedIconPath": "/img/tabIcon/work_blue.png",

+ 647 - 0
components/nfc_utils/component/nfcTools.js

@@ -0,0 +1,647 @@
+const app = getApp();
+import {tools} from "../des3/nfcTool"
+Component({
+  options: {
+    addGlobalClass: true,
+    multipleSlots: true,
+  },
+  properties: {
+    scanType: {
+      type: Number,
+      value: 1,
+    },
+    scanTxt: {
+      value: '',
+    },
+  },
+  data: {
+    reading:false,
+    key:"",
+    nfc:"",
+    debug:1,
+    keyA:[0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7],
+    keyB:[0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF],
+  },
+  pageLifetimes:{
+    async show() {
+      //type值,1查看有源状态,2激活有源标签,3锁闭有源标签,4读取有源标签温度,6读取防伪标签,7读取uid
+      this.initNfc(this.scanType)
+    },
+    hide() {
+      var nfc = this.nfc
+      if(nfc){
+        nfc.offDiscovered(this.discoverHandler)
+      }
+    },
+  },
+  async ready(){
+    console.log(this.data.scanType)
+  },
+  methods: {
+    offNfc(){
+      return new Promise((resolve, reject)=>{
+        if(this.nfc){
+          this.nfc.offDiscovered({
+            complete:(r)=>{
+              this.nfc.stopDiscovery({
+                complete:(res)=>{
+                  console.log(res)
+                  resolve()
+                }
+              })
+            }
+          })
+        }else{
+          resolve()
+        }
+      })
+    },
+    async initNfc(type){//初始化NFC
+      var that = this
+      if(this.data.debug)console.log(this.nfcObj)
+      if(this.nfc){
+        await this.offNfc()
+      }
+      this.type = type
+      this.type = this.data.scanType
+      const nfc = wx.getNFCAdapter()
+      this.nfc = nfc
+      return new Promise(async (resolve, reject)=>{
+        this.nfc.onDiscovered(res=>{//监听NFC接近
+          this.type = this.data.scanType
+          var techs = res.techs
+          this.techTime = new Date().getTime()
+          this.nfcObj =  this.nfc.getIsoDep();
+          //连接NFC
+          this.nfcObj.connect({
+            success:async (resc)=>{
+              this.setData({reading:true})
+              var temp = {}
+              //ACCESS验证
+              await this.COS_Access()
+              //读取有源标签温度
+              if(this.type==4)temp =await  this.read_yy()
+              //检查有源标签状态
+              if(this.type==1)temp =await  this.check_yy_status()
+              //激活有源标签
+              if(this.type==2)temp =await  this.active_yy()
+              //锁闭有源标签
+              if(this.type==3)temp =await  this.close_yy()
+              //读取防伪标签
+              if(this.type==6)temp =await  this.read_fw()
+              //读取uid
+              if(this.type==7)temp =await  this.read_uid()
+              //读取自定义信息
+              if(this.type==8)temp =await  this.read_data()
+              //写入自定义信息
+              if(this.type==9)temp =await  this.write_data(this.data.scanTxt)
+              //读采温周期
+              if(this.type==10)temp =await  this.read_interval()
+              //读采温周期
+              if(this.type==11)temp =await  this.write_interval(this.data.scanTxt)
+              //x106读取自定义信息和温度数据
+              if(this.type==101)temp =await  this.x106_end()
+              //x106读取自定义信息和温度数据
+              if(this.type==102)temp =await  this.x106_start(this.data.scanTxt)
+              this.setData({reading:false})
+              this.triggerEvent('setNfcRes', temp)
+              resolve(temp)
+            },
+            fail:err=>{
+              if(this.data.debug)console.log("connect",err)
+              reject(err)
+            }
+          })
+        })
+        this.nfc.startDiscovery({
+          fail(err) {
+            //app.globalData?.nonfc = true
+            reject(err)
+          }
+        })
+      })
+    },
+    async COS_Access(){
+      await this.authNfc()
+      var trnd = await this.setApdu([0xA2, 0xB0, 0x00, 0x10, 0x10])
+      await this.calcKey(trnd)
+    },
+    sleep(ms){
+      return new Promise(resolve => setTimeout(resolve, ms))
+    },
+    authNfc(){
+      return new Promise(async (resolve, reject)=>{
+        var authRes = await this.setApdu([0xA2, 0xA4, 0x00, 0x0C, 0x02, 0xAC, 0x01])
+        if(authRes.join("") == "99192"){//[99,192]
+          if(this.data.debug)console.log("解锁标签")
+          await this.sleep(20)
+          authRes = await this.setApdu([0xA2, 0xA4, 0x00, 0x0C, 0x02, 0xAC, 0x01])
+        }
+        if(authRes.join("") == "1440"){//[144,0]
+          resolve()
+        }else{
+          if(this.data.debug)console.log("解锁失败")
+          reject()
+        }
+      })
+    },
+    async calcKey(data){
+      var trnd_bytes = data.slice(0,8)
+      var mid_bytes = data.slice(8,17)
+      var des3_key_list = []
+      for(var i=0;i<8;i++){
+        des3_key_list[i] = trnd_bytes[i] ^ this.data.keyA[i]
+        des3_key_list[i+8] = mid_bytes[i] ^ this.data.keyB[i]
+      }
+      var des3_key_bytes = tools.numArrToHex(des3_key_list)//numArrToBit(des3_key_list)//
+      this.des3Key = des3_key_bytes
+      // this.des3Key = "11223344556677889900AABBCCDDEEFF"
+      //3des的KEY
+      var random_key_bytes = tools.numArrToHex(trnd_bytes)//numArrToBit(trnd_bytes)//
+      var trnd_encrpyt_bytes = tools.encode3des(random_key_bytes,des3_key_bytes)
+      var command_bytes = [0xA2, 0xD6, 0x00, 0x10, 0x10]
+      var rad = [1,2,3,4,5,6,7,8]//8位随机字节,直接写死试试
+      //拼三段指令
+      command_bytes= [...command_bytes,...tools.hexToNumArr(trnd_encrpyt_bytes),...rad]
+      if(this.data.debug)console.log(command_bytes)
+  
+      rad = tools.numArrToHex(rad)//numArrToBit(rad)//
+      trnd_encrpyt_bytes = tools.encode3des(rad,des3_key_bytes)
+      if(this.data.debug)console.log(tools.hexToNumArr(trnd_encrpyt_bytes))
+      var authRes = await this.setApdu(command_bytes)
+      return new Promise(async (resolve, reject)=>{
+        if(authRes.join("") == "99192"){//[99,192]
+          if(this.data.debug)console.log("解锁标签")
+          authRes = await this.setApdu(command_bytes)
+        }
+        if(authRes.join("") == "1440"){//[144,0]
+          var trnd = await this.setApdu([0xA2, 0xB0, 0x00, 0x10, 0x10])
+          if(this.data.debug)console.log(trnd)
+          if(trnd.slice(0,8).join("") == tools.hexToNumArr(trnd_encrpyt_bytes).join("")){
+            if(this.data.debug)console.log("验证通过1")
+            resolve()
+          }else{
+            if(this.data.debug)console.log("验证不通过")
+            reject()
+          }
+        }else{
+          if(this.data.debug)console.log("设备异常")
+          reject()
+        }
+      })
+    },
+    async read_yy(){
+      var data_bytes = await this.COS_Analysis(data_bytes)
+      if(this.data.debug)console.log(data_bytes)
+      return {data_bytes,timeUsed:new Date().getTime() - this.techTime}
+    },
+    async COS_Analysis(){
+      await this.setApdu([0xA2, 0xA4, 0x00, 0x0C, 0x02, 0xDA, 0x01])
+      var data_bytes = await this.ISO14443_4A_ReadBinary(0xA2, 0, 80, 56)
+      var data_bias = 24
+      var uid = data_bytes.substring(data_bias + 0, data_bias + 52)
+      var CID_bytes = data_bytes.substring(data_bias + 0, data_bias + 4)
+      var TID_bytes = data_bytes.substring(data_bias + 4, data_bias + 16)
+      var GTIN_bytes = data_bytes.substring(data_bias + 16, data_bias + 36)
+      var VID_bytes = data_bytes.substring(data_bias + 36, data_bias + 52)
+      var MID_bytes = data_bytes.substring(data_bias + 52, data_bias + 68)
+      var MAC_bytes = data_bytes.substring(data_bias + 68, data_bias + 84)
+      var TRNG_bytes = data_bytes.substring(data_bias + 84, data_bias + 100)
+      var PAGE_bytes = data_bytes.substring(data_bias + 100, data_bias + 102)
+      var RNUM_bytes = data_bytes.substring(data_bias + 102, data_bias + 110)
+      //解析校准值
+      var data_Nums = tools.hexToNumArr(data_bytes)
+      var Cal_Data = [[],[],[]]
+      Cal_Data[0][0] = ((data_Nums[data_bias/2 + 56] >> 4) + data_Nums[data_bias/2 + 55]) / 10
+      Cal_Data[0][1] = data_Nums[data_bias/2 + 57] + (data_Nums[data_bias/2 + 56] & 0x0F) * 256
+      Cal_Data[1][0] = ((data_Nums[data_bias/2 + 59] >> 4) + data_Nums[data_bias/2 + 58]) / 10
+      Cal_Data[1][1] = data_Nums[data_bias/2 + 60] + (data_Nums[data_bias/2 + 59] & 0x0F) * 256
+      Cal_Data[2][0] = tools.hex2int((data_Nums[data_bias/2 + 62] >> 4) + tools.numArrToHex([data_Nums[data_bias/2 + 61]])) / 10
+      Cal_Data[2][1] = data_Nums[data_bias/2 + 63] + (data_Nums[data_bias/2 + 62] & 0x0F) * 256
+      //计算温度长度
+      var record_number_int = tools.hex2int(RNUM_bytes)
+      var record_data_size_int = Math.ceil(record_number_int * 11 / 8)
+      var record_data_size_mod_int = record_data_size_int % 8
+      if(record_data_size_mod_int){
+        record_data_size_int = record_data_size_int + (8 - record_data_size_mod_int)
+      }
+      //读取数据
+      const NDEF_MAX_INT = 4032
+      var start_address_int = 78
+      if ((start_address_int + record_data_size_int) > NDEF_MAX_INT){
+        record_data_size_int = record_data_size_int - 8
+        record_number_int = Math.floor(record_data_size_int * 8 / 11)
+      }
+      data_bytes = await this.ISO14443_4A_ReadBinary(0xA2, start_address_int, record_data_size_int, 56)
+      data_bytes = tools.hexToNumArr(data_bytes)
+      // 解析adc
+      var tempture_data = []
+      var repeat_cnt = Math.floor(record_number_int / 8)
+      var count_residue = record_number_int % 8
+      if (count_residue > 0)
+          repeat_cnt += 1
+      var decode_count = 0
+      var temp = {}
+      for(var i=0;i<repeat_cnt;i++){
+        for(var j=0;j<8;j++){
+          if(decode_count >= record_number_int)break;
+          else decode_count += 1
+          var adc_data_int = null
+          if(j==0){
+            adc_data_int = data_bytes[i * 11] * 256 + data_bytes[i * 11 + 1]
+            adc_data_int = (adc_data_int & 0x0000FFE0) >> 5
+          }else if(j==1){
+            adc_data_int = data_bytes[i * 11 + 1] * 256 + data_bytes[i * 11 + 2]
+            adc_data_int = (adc_data_int & 0x00001FFC) >> 2
+          }else if(j==2){
+            adc_data_int = data_bytes[i * 11 + 2] * 65536 + data_bytes[i * 11 + 3] * 256 + data_bytes[
+              i * 11 + 4]
+            adc_data_int = (adc_data_int & 0x0003FF80) >> 7
+          }else if(j==3){
+            adc_data_int = data_bytes[i * 11 + 4] * 256 + data_bytes[i * 11 + 5]
+            adc_data_int = (adc_data_int & 0x00007FF0) >> 4
+          }else if(j==4){
+            adc_data_int = data_bytes[i * 11 + 5] * 256 + data_bytes[i * 11 + 6]
+            adc_data_int = (adc_data_int & 0x00000FFE) >> 1
+          }else if(j==5){
+            adc_data_int = data_bytes[i * 11 + 6] * 65536 + data_bytes[i * 11 + 7] * 256 + data_bytes[
+              i * 11 + 8]
+            adc_data_int = (adc_data_int & 0x0001FFC0) >> 6
+          }else if(j==6){
+            adc_data_int = data_bytes[i * 11 + 8] * 256 + data_bytes[i * 11 + 9]
+            adc_data_int = (adc_data_int & 0x000003FF8) >> 3
+          }else if(j==7){
+            adc_data_int = data_bytes[i * 11 + 9] * 256 + data_bytes[i * 11 + 10]
+            adc_data_int = (adc_data_int & 0x000007FF) >> 0
+          }
+          adc_data_int = Math.floor(adc_data_int)
+          temp = {}
+          // 温度小于第二个校准点,使用第一个点和第二个点计算KB值
+          var tempture1,adc1,tempture2,adc2
+          if (adc_data_int < Cal_Data[1][1]){
+            tempture1 = Cal_Data[0][0]
+            adc1 = Cal_Data[0][1]
+            tempture2 = Cal_Data[1][0]
+            adc2 = Cal_Data[1][1]
+          }else{
+            tempture1 = Cal_Data[1][0]
+            adc1 = Cal_Data[1][1]
+            tempture2 = Cal_Data[2][0]
+            adc2 = Cal_Data[2][1]
+          }
+          if ((adc1 - adc2) != 0){
+            var k = (tempture1 - tempture2) / (adc1 - adc2)
+            var b = tempture1 - (k * adc1)
+            var tempture_float = k * adc_data_int + b
+            temp['temp'] = Math.round(tempture_float*10)/10
+            temp['adc'] = adc_data_int
+          }else{
+            temp['adc'] = adc_data_int
+          }
+          tempture_data.push(temp)
+        }
+      }
+      return {
+        "CID": CID_bytes,
+        "TID": TID_bytes,
+        "GTIN": GTIN_bytes,
+        "VID": VID_bytes,
+        "MID": MID_bytes,
+        "MAC": MAC_bytes,
+        "TRNG": TRNG_bytes,
+        "PAGE": PAGE_bytes,
+        "RUNM": RNUM_bytes,
+        "CAL1": {
+            "TEMP": Cal_Data[0][0],
+            "ADC": Cal_Data[0][1]
+        },
+        "CAL2": {
+            "TEMP": Cal_Data[1][0],
+            "ADC": Cal_Data[1][1]
+        },
+        "CAL3": {
+            "TEMP": Cal_Data[2][0],
+            "ADC": Cal_Data[2][1]
+        },
+        'tempture_data':tempture_data,
+        "uid":uid,
+      }
+
+    },
+    async read_uid(){
+      await this.setApdu([0xA2, 0xA4, 0x00, 0x0C, 0x02, 0xDA, 0x01])
+      var data_bytes = await this.ISO14443_4A_ReadBinary(0xA2, 0, 80, 56)
+      var data_bias = 24
+      var uid = data_bytes.substr(data_bias,data_bias+52)
+      return {uid,timeUsed:new Date().getTime() - this.techTime}
+    },
+    async read_fw(){
+      var data_bytes = await this.ISO14443_4A_ReadBinary(0xA4, 8, 8, 8)
+      if(data_bytes?.length == 16){
+        //记录值
+        var record_adc_int_list = [tools.hex2int(data_bytes.substr(0,4)),tools.hex2int(data_bytes.substr(4,4))]
+        //当前值
+        var current_adc_int_list = [tools.hex2int(data_bytes.substr(8,4)),tools.hex2int(data_bytes.substr(12,4))]
+        if(this.data.debug)console.log('阻值为:',[record_adc_int_list,current_adc_int_list])
+        if(current_adc_int_list[0] && current_adc_int_list[1]){
+          if(record_adc_int_list[0] && record_adc_int_list[1]){
+            var abs0 = Math.abs(current_adc_int_list[0]-record_adc_int_list[0]) < record_adc_int_list[0]*0.01
+            var abs1 = Math.abs(current_adc_int_list[1]-record_adc_int_list[1]) < record_adc_int_list[0]*0.01
+            if(abs0 && abs1){
+              if(this.data.debug)console.log('标签验证通过')
+              await this.setApdu([0xA2, 0xA4, 0x00, 0x0C, 0x02, 0xDA, 0x01])
+              var data_bytes = await this.ISO14443_4A_ReadBinary(0xA2, 0, 80, 56)
+              var data_bias = 24
+              var uid = data_bytes.substr(data_bias,data_bias+110)
+              return {res:'ok',uid,timeUsed:new Date().getTime() - this.techTime}
+            }else{
+              if(this.data.debug)console.log('标签验证不通过')
+              return {res:'no',uid:null,timeUsed:new Date().getTime() - this.techTime}
+            }
+          }else{
+            if(this.data.debug)console.log('标签初始化')
+            return {res:'init',uid:null,timeUsed:new Date().getTime() - this.techTime}
+          } 
+        }else{
+          if(this.data.debug)console.log('标签未放置到位,请重试')
+          return {res:'retry',uid:null,timeUsed:new Date().getTime() - this.techTime}
+        }
+      }else{
+        if(this.data.debug)console.log('读取结果异常,请重试')
+        return {res:'retry',uid:null,timeUsed:new Date().getTime() - this.techTime}
+      }
+    },
+    async write_data(write_bytes){
+      if(!write_bytes){
+        wx.showToast({
+          title: '数据写入不能为空',
+        })
+        return {sta:0,msg:"写入不能为空",timeUsed:new Date().getTime() - this.techTime}
+      }
+      write_bytes = tools.str2NumArr(write_bytes)
+      var len = write_bytes.length
+      for(var i=0;i<(8-len%8);i++){
+        write_bytes.push(255)
+      }
+      if(this.data.debug)console.log(write_bytes)
+      var data_bytes = await this.COS_Write_Config(49316, write_bytes.length,write_bytes, 56)
+      if(data_bytes.join('') == '1440'){
+        return {sta:1,msg:"写入成功",timeUsed:new Date().getTime() - this.techTime}
+      }else{
+        return {sta:0,msg:"写入失败,请重试",timeUsed:new Date().getTime() - this.techTime}
+      }
+    },
+    async read_data(){
+      const maxData = 128
+      var data_bytes = await this.COS_Read_Config(49316,maxData,56)
+      var data_bytes = tools.hexToNumArr(data_bytes)
+      var index = data_bytes.indexOf(255)
+      index = index==-1?maxData:index
+      data_bytes = data_bytes.slice(0,index)
+      return {data:tools.numArrToBit(data_bytes),timeUsed:new Date().getTime() - this.techTime}
+    },
+    async read_interval(){
+      var data_bytes = await this.COS_Read_Config(49213,16,16)
+      console.log(data_bytes)
+      data_bytes = data_bytes.substr(0,4)
+      data_bytes = tools.hex2int(data_bytes)
+      return {data:data_bytes,timeUsed:new Date().getTime() - this.techTime}
+    },
+    async write_interval(idel_num){
+      var data_bytes = await this.COS_Read_Config(49213,16,16)
+      idel_num = ("0000" + (parseInt(idel_num)).toString(16)).substr(-4)
+      var write_bytes = idel_num+data_bytes.substr(4)
+      write_bytes = tools.hexToNumArr(write_bytes)
+      if(this.data.debug)console.log(write_bytes)
+      var data_bytes = await this.COS_Write_Config(49213, 16,write_bytes, 16)
+      if(data_bytes.join('') == '1440'){
+        return {sta:1,msg:"写入成功",timeUsed:new Date().getTime() - this.techTime}
+      }else{
+        return {sta:0,msg:"写入失败,请重试",timeUsed:new Date().getTime() - this.techTime}
+      }
+    },
+    async check_yy_status(){//检查有源标签状态
+      var data_bytes = await this.COS_Read_Config(49162,8,8)
+      var stateVal = tools.hexToNumArr(data_bytes)[0]
+      if(stateVal){
+        stateVal = tools.num2bin(stateVal) || []
+        //0b11111000 py取下标为6
+        if(stateVal[4] == '1'){
+          // wx.showToast({title: '芯片已激活',})
+          return {sta:1,msg:"设备已激活",timeUsed:new Date().getTime() - this.techTime}
+        }
+        if(stateVal[4] == '0'){
+          // wx.showToast({title: '芯片未激活',})
+          return {sta:0,msg:"设备已锁闭",timeUsed:new Date().getTime() - this.techTime}
+        }
+        return {sta:null,msg:"读取失败",timeUsed:new Date().getTime() - this.techTime}
+      }else{
+        return {sta:null,msg:"读取失败",timeUsed:new Date().getTime() - this.techTime}
+      }
+    },
+    async active_yy(){
+      //("NFC激活")
+      var data_bytes = await this.COS_Write_Config(49162, 8,[0xFC, 0x03, 0x00, 0x0F, 0x20, 0x00, 0xF6, 0x00], 8)
+      if(data_bytes.join('') == '1440'){
+        //NFC操作成功,开始读取并修改page
+        var data = await this.COS_Read_Config(49458,16,16)
+        if(this.data.debug)console.log(data)
+        if(data&&data.length ==32){
+          data = tools.hexToNumArr(data)
+          data[12] = 1
+          data = tools.numArrToHex(data)
+          data_bytes = await this.COS_Write_Config(49458, 16, data, 16)
+          if(data_bytes.join('') == '1440'){
+            // wx.showToast({title: 'NFC激活成功',})
+            if(this.data.debug)console.log("设备已激活")
+            return {sta:1,msg:"设备已激活",timeUsed:new Date().getTime() - this.techTime}
+          }else{
+            if(this.data.debug)console.log("激活失败,请重试!")
+            // wx.showToast({title: 'NFC激活失败',})
+            return {sta:null,msg:"激活失败,请重试!",timeUsed:new Date().getTime() - this.techTime}
+          }
+        }else{
+          wx.showToast({title: '激活失败,请重试!',})
+          return {sta:null,msg:"激活失败,请重试!",timeUsed:new Date().getTime() - this.techTime}
+        }
+      }else{
+        wx.showToast({title: '激活失败,请重试!',})
+        return {sta:null,msg:"激活失败,请重试!",timeUsed:new Date().getTime() - this.techTime}
+      }
+    },
+    async close_yy(){
+      //("NFC锁闭")
+      var data_bytes = await this.COS_Write_Config(49162, 8,[0xF0, 0x03, 0x00, 0x0F, 0x20, 0x00, 0xF6, 0x00], 8)
+      if(data_bytes.join('') == '1440'){
+        //NFC操作成功,开始读取并修改page
+        var data = await this.COS_Read_Config(49458,16,16)
+        if(this.data.debug)console.log(data)
+        if(data&&data.length ==32){
+          data = tools.hexToNumArr(data)
+          data[12] = 0
+          data = tools.numArrToHex(data)
+          data_bytes = await this.COS_Write_Config(49458, 16, data, 16)
+          if(data_bytes.join('') == '1440'){
+            wx.showToast({title: '设备锁闭成功',})
+            return {sta:1,msg:"设备锁闭成功",timeUsed:new Date().getTime() - this.techTime}
+          }else{
+            wx.showToast({title: '设备锁闭失败,请重试!',})
+            return {sta:null,msg:"设备锁闭失败,请重试!",timeUsed:new Date().getTime() - this.techTime}
+          }
+        }else{
+          wx.showToast({title: '设备锁闭失败,请重试!',})
+          return {sta:null,msg:"设备锁闭失败,请重试!",timeUsed:new Date().getTime() - this.techTime}
+        }
+      }else{
+        wx.showToast({title: '设备锁闭失败,请重试!',})
+        return {sta:null,msg:"设备锁闭失败,请重试!",timeUsed:new Date().getTime() - this.techTime}
+      }
+    },
+    async COS_Write_Config(address_int, length_int, write_bytes, package_size){
+      //选中CONFIG
+      var data_bytes = await this.setApdu([0xA2, 0xA4, 0x00, 0x0C, 0x02, 0xCF, 0x01])
+      write_bytes = tools.numArrToHex(write_bytes)
+      var data_write_bytes = tools.encode3des(write_bytes,this.des3Key)
+      data_write_bytes = tools.hexToNumArr(data_write_bytes)
+      data_bytes = await this.ISO14443_4A_UpdateBinary(0xA2, address_int, length_int, data_write_bytes, package_size)
+      return new Promise(async (resolve)=>{
+        resolve(data_bytes)
+      })
+    },
+    async COS_Read_Config(address_int, length_int, package_size){
+      //选中CONFIG
+      var data_bytes = await this.setApdu([0xA2, 0xA4, 0x00, 0x0C, 0x02, 0xCF, 0x01])
+      data_bytes = await this.ISO14443_4A_ReadBinary(0xA2, address_int, length_int, package_size)
+      return new Promise(async (resolve)=>{
+        resolve(data_bytes)
+      })
+    },
+    async ISO14443_4A_ReadBinary(cla_bytes, address_start_int, length_int, package_size_int){
+      var data_read_bytes = []
+      var des3_key_int_list = []
+      var package_number_int = Math.floor(length_int / package_size_int)
+      var package_bytes_left_int = length_int % package_size_int
+      var i = 0
+      //读取整包数据
+      for(;i<package_number_int;i++){
+        var data_address_int = address_start_int + i * package_size_int
+        des3_key_int_list[0] = Math.floor(data_address_int / 256)
+        des3_key_int_list[1] = data_address_int % 256
+        var data_address_bytes = des3_key_int_list
+        var rf_command_bytes = [cla_bytes,0xB0]
+        rf_command_bytes = [...rf_command_bytes,...data_address_bytes,package_size_int]
+        var data = await this.setApdu(rf_command_bytes)
+        data.pop()
+        data.pop()
+        data_read_bytes.push(...data)
+      }
+      // i--
+      // 读取剩余数据
+      if(package_bytes_left_int != 0){
+        // if(package_number_int!=0){
+        //   i = i + 1
+        // }
+        var data_address_int = address_start_int + i * package_size_int
+        des3_key_int_list[0] = Math.floor(data_address_int / 256)
+        des3_key_int_list[1] = data_address_int % 256
+        var data_address_bytes = des3_key_int_list
+        var rf_command_bytes = [cla_bytes,0xB0]
+        rf_command_bytes = [...rf_command_bytes,...data_address_bytes,package_size_int]
+        console.log(rf_command_bytes)
+        var data = await this.setApdu(rf_command_bytes)
+        data.pop()
+        data.pop()
+        data_read_bytes.push(...data)
+      }
+      var dataList = tools.numArrToHex(data_read_bytes)
+      var strTemp = ""
+      strTemp = tools.decode3des(dataList,this.des3Key)
+      // for(var i=0;i<dataList.length;){
+      //   var temp = dataList.substr(i,16)
+      //   console.log("截取:"+i,temp)
+      //   var res = tools.decode3des(temp,this.des3Key)
+      //   console.log("解密:"+i,res)
+      //   strTemp = strTemp+res
+      //   i+=16
+      // }
+      return new Promise(async (resolve)=>{
+        if(strTemp.length != dataList.length){wx.showToast({title: '解密失败',})}
+        resolve(strTemp)
+      })
+    },
+    async ISO14443_4A_UpdateBinary(cla_bytes,address_start_int, length_int, data_write_bytes, RF_PACKAGE_SIZE){
+      var des3_key_int_list = []
+      var package_size_int = RF_PACKAGE_SIZE
+      var package_number_int = Math.floor(length_int / package_size_int)
+      var package_bytes_left_int = length_int % package_size_int
+      var i = 0
+      var data_bytes = ''
+      // 写整包数据
+      for(;i<package_number_int;i++){
+        var data_address_int = address_start_int + i * package_size_int
+        des3_key_int_list[0] = Math.floor(data_address_int / 256)
+        des3_key_int_list[1] = data_address_int % 256
+        var data_address_bytes = des3_key_int_list//int_list2bytes(des3_key_int_list)
+        var rf_command_bytes = [cla_bytes, 0xD6,...data_address_bytes,package_size_int,...data_write_bytes.slice(i * package_size_int,(i + 1) * package_size_int)]
+        data_bytes = await this.setApdu(rf_command_bytes)
+        await this.sleep(10)
+      }
+      // 写剩余数据
+      if (package_bytes_left_int != 0){
+        // if (package_number_int != 0){
+        //   i = i + 1
+        // }
+        var data_address_int = address_start_int + i * package_size_int
+        des3_key_int_list[0] = Math.floor(data_address_int / 256)
+        des3_key_int_list[1] = data_address_int % 256
+        var data_address_bytes = des3_key_int_list//int_list2bytes(des3_key_int_list)
+        var rf_command_bytes = [cla_bytes, 0xD6,...data_address_bytes,package_bytes_left_int,...data_write_bytes.slice(i * package_size_int,i * package_size_int+package_bytes_left_int)]
+        data_bytes = await this.setApdu(rf_command_bytes)
+      }
+      return new Promise(async (resolve)=>{
+        resolve(data_bytes)
+      })
+    },
+    setApdu(arr){
+      var that = this
+      return new Promise((resolve, reject)=>{
+        const nfcObj = that.nfcObj
+        var key = new Uint8Array(arr).buffer
+        nfcObj.transceive({
+          data: key,
+          success: res => { 
+            var hexData = tools.ab2NumArr(res.data)
+            resolve(hexData)
+          },
+          fail:res=>{
+            if(that.data.debug)console.log("transceive",res)
+            reject(res)
+          }
+        })
+      })
+    },
+    async x106_end(){
+      //读温度
+      var data = await this.read_yy()
+      data = data.data_bytes
+      //读自定义信息
+      var str = await this.read_data()
+      data.data = str.data
+      //锁闭
+      var data = await this.close_yy()
+      //数据汇总返回
+      return {data,timeUsed:new Date().getTime() - this.techTime}
+    },
+    async x106_start(config){
+      //写入采温周期
+      var time = config.split(";")[1]
+      this.write_interval(time)
+      //写自定义信息
+      this.read_data(config)
+      //激活
+      var data = await this.active_yy()
+      //数据汇总返回
+      return {data,timeUsed:new Date().getTime() - this.techTime}
+    },
+  }
+})

+ 3 - 0
components/nfc_utils/component/nfcTools.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

+ 10 - 0
components/nfc_utils/component/nfcTools.wxml

@@ -0,0 +1,10 @@
+<view class="nfc_con" wx:if="{{false}}">
+<!-- wx:if="{{reading}}" -->
+  <view class="rd_con">
+    <view class="rd_mid">
+      <view class="rd_txt">正在处理,请勿将芯片离开NFC识别区域</view>
+      <view class="rd_bar"></view>
+    </view>
+  </view>
+  <slot name='nfctxt'></slot>
+</view>

+ 8 - 0
components/nfc_utils/component/nfcTools.wxss

@@ -0,0 +1,8 @@
+.rd_con{ position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0, 0, 0, 0.1); z-index: 99999; display: flex; justify-content: center;align-items: center;}
+.rd_mid{ width: 500rpx; padding: 20rpx; background: #ffffff; border-radius: 10rpx; box-shadow: 0 0 20rpx #cccccc;}
+.rd_bar{ width: 100%; height: 30rpx; border-radius: 50rpx; box-shadow: 0 0 10rpx #cccccc;background-image: linear-gradient(to right, transparent 0%, transparent 49.9%, #e9e9eb 50%, #e9e9eb 100%); background-size:60rpx 60rpx;animation: loaderBar 1s infinite linear;}
+@keyframes loaderBar {
+  0% {background-position-x: 0;}
+  100% {background-position-x: 60rpx;}
+}
+.rd_txt{ font-size: 20rpx; text-align: center; padding-bottom: 10rpx;}

+ 6192 - 0
components/nfc_utils/des3/aes.js

@@ -0,0 +1,6192 @@
+;
+(function (root, factory) {
+    if (typeof exports === "object") {
+        // CommonJS
+        module.exports = exports = factory();
+    } else if (typeof define === "function" && define.amd) {
+        // AMD
+        define([], factory);
+    } else {
+        // Global (browser)
+        root.CryptoJS = factory();
+    }
+}(this, function () {
+
+    /*globals window, global, require*/
+
+    /**
+     * CryptoJS core components.
+     */
+    var CryptoJS = CryptoJS || (function (Math, undefined) {
+
+        var crypto;
+
+        // Native crypto from window (Browser)
+        if (typeof window !== 'undefined' && window.crypto) {
+            crypto = window.crypto;
+        }
+
+        // Native crypto in web worker (Browser)
+        if (typeof self !== 'undefined' && self.crypto) {
+            crypto = self.crypto;
+        }
+
+        // Native crypto from worker
+        if (typeof globalThis !== 'undefined' && globalThis.crypto) {
+            crypto = globalThis.crypto;
+        }
+
+        // Native (experimental IE 11) crypto from window (Browser)
+        if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+            crypto = window.msCrypto;
+        }
+
+        // Native crypto from global (NodeJS)
+        if (!crypto && typeof global !== 'undefined' && global.crypto) {
+            crypto = global.crypto;
+        }
+
+        // Native crypto import via require (NodeJS)
+        if (!crypto && typeof require === 'function') {
+            try {
+                crypto = require('crypto');
+            } catch (err) {}
+        }
+
+        /*
+         * Cryptographically secure pseudorandom number generator
+         *
+         * As Math.random() is cryptographically not safe to use
+         */
+        var cryptoSecureRandomInt = function () {
+            if (crypto) {
+                // Use getRandomValues method (Browser)
+                if (typeof crypto.getRandomValues === 'function') {
+                    try {
+                        return crypto.getRandomValues(new Uint32Array(1))[0];
+                    } catch (err) {}
+                }
+
+                // Use randomBytes method (NodeJS)
+                if (typeof crypto.randomBytes === 'function') {
+                    try {
+                        return crypto.randomBytes(4).readInt32LE();
+                    } catch (err) {}
+                }
+            }
+
+            throw new Error('Native crypto module could not be used to get secure random number.');
+        };
+
+        /*
+         * Local polyfill of Object.create
+
+         */
+        var create = Object.create || (function () {
+            function F() {}
+
+            return function (obj) {
+                var subtype;
+
+                F.prototype = obj;
+
+                subtype = new F();
+
+                F.prototype = null;
+
+                return subtype;
+            };
+        }());
+
+        /**
+         * CryptoJS namespace.
+         */
+        var C = {};
+
+        /**
+         * Library namespace.
+         */
+        var C_lib = C.lib = {};
+
+        /**
+         * Base object for prototypal inheritance.
+         */
+        var Base = C_lib.Base = (function () {
+
+
+            return {
+                /**
+                 * Creates a new object that inherits from this object.
+                 *
+                 * @param {Object} overrides Properties to copy into the new object.
+                 *
+                 * @return {Object} The new object.
+                 *
+                 * @static
+                 *
+                 * @example
+                 *
+                 *     var MyType = CryptoJS.lib.Base.extend({
+                 *         field: 'value',
+                 *
+                 *         method: function () {
+                 *         }
+                 *     });
+                 */
+                extend: function (overrides) {
+                    // Spawn
+                    var subtype = create(this);
+
+                    // Augment
+                    if (overrides) {
+                        subtype.mixIn(overrides);
+                    }
+
+                    // Create default initializer
+                    if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+                        subtype.init = function () {
+                            subtype.$super.init.apply(this, arguments);
+                        };
+                    }
+
+                    // Initializer's prototype is the subtype object
+                    subtype.init.prototype = subtype;
+
+                    // Reference supertype
+                    subtype.$super = this;
+
+                    return subtype;
+                },
+
+                /**
+                 * Extends this object and runs the init method.
+                 * Arguments to create() will be passed to init().
+                 *
+                 * @return {Object} The new object.
+                 *
+                 * @static
+                 *
+                 * @example
+                 *
+                 *     var instance = MyType.create();
+                 */
+                create: function () {
+                    var instance = this.extend();
+                    instance.init.apply(instance, arguments);
+
+                    return instance;
+                },
+
+                /**
+                 * Initializes a newly created object.
+                 * Override this method to add some logic when your objects are created.
+                 *
+                 * @example
+                 *
+                 *     var MyType = CryptoJS.lib.Base.extend({
+                 *         init: function () {
+                 *             // ...
+                 *         }
+                 *     });
+                 */
+                init: function () {},
+
+                /**
+                 * Copies properties into this object.
+                 *
+                 * @param {Object} properties The properties to mix in.
+                 *
+                 * @example
+                 *
+                 *     MyType.mixIn({
+                 *         field: 'value'
+                 *     });
+                 */
+                mixIn: function (properties) {
+                    for (var propertyName in properties) {
+                        if (properties.hasOwnProperty(propertyName)) {
+                            this[propertyName] = properties[propertyName];
+                        }
+                    }
+
+                    // IE won't copy toString using the loop above
+                    if (properties.hasOwnProperty('toString')) {
+                        this.toString = properties.toString;
+                    }
+                },
+
+                /**
+                 * Creates a copy of this object.
+                 *
+                 * @return {Object} The clone.
+                 *
+                 * @example
+                 *
+                 *     var clone = instance.clone();
+                 */
+                clone: function () {
+                    return this.init.prototype.extend(this);
+                }
+            };
+        }());
+
+        /**
+         * An array of 32-bit words.
+         *
+         * @property {Array} words The array of 32-bit words.
+         * @property {number} sigBytes The number of significant bytes in this word array.
+         */
+        var WordArray = C_lib.WordArray = Base.extend({
+            /**
+             * Initializes a newly created word array.
+             *
+             * @param {Array} words (Optional) An array of 32-bit words.
+             * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.lib.WordArray.create();
+             *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+             *     var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+             */
+            init: function (words, sigBytes) {
+                words = this.words = words || [];
+
+                if (sigBytes != undefined) {
+                    this.sigBytes = sigBytes;
+                } else {
+                    this.sigBytes = words.length * 4;
+                }
+            },
+
+            /**
+             * Converts this word array to a string.
+             *
+             * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+             *
+             * @return {string} The stringified word array.
+             *
+             * @example
+             *
+             *     var string = wordArray + '';
+             *     var string = wordArray.toString();
+             *     var string = wordArray.toString(CryptoJS.enc.Utf8);
+             */
+            toString: function (encoder) {
+                return (encoder || Hex).stringify(this);
+            },
+
+            /**
+             * Concatenates a word array to this word array.
+             *
+             * @param {WordArray} wordArray The word array to append.
+             *
+             * @return {WordArray} This word array.
+             *
+             * @example
+             *
+             *     wordArray1.concat(wordArray2);
+             */
+            concat: function (wordArray) {
+                // Shortcuts
+                var thisWords = this.words;
+                var thatWords = wordArray.words;
+                var thisSigBytes = this.sigBytes;
+                var thatSigBytes = wordArray.sigBytes;
+
+                // Clamp excess bits
+                this.clamp();
+
+                // Concat
+                if (thisSigBytes % 4) {
+                    // Copy one byte at a time
+                    for (var i = 0; i < thatSigBytes; i++) {
+                        var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+                        thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+                    }
+                } else {
+                    // Copy one word at a time
+                    for (var j = 0; j < thatSigBytes; j += 4) {
+                        thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
+                    }
+                }
+                this.sigBytes += thatSigBytes;
+
+                // Chainable
+                return this;
+            },
+
+            /**
+             * Removes insignificant bits.
+             *
+             * @example
+             *
+             *     wordArray.clamp();
+             */
+            clamp: function () {
+                // Shortcuts
+                var words = this.words;
+                var sigBytes = this.sigBytes;
+
+                // Clamp
+                words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+                words.length = Math.ceil(sigBytes / 4);
+            },
+
+            /**
+             * Creates a copy of this word array.
+             *
+             * @return {WordArray} The clone.
+             *
+             * @example
+             *
+             *     var clone = wordArray.clone();
+             */
+            clone: function () {
+                var clone = Base.clone.call(this);
+                clone.words = this.words.slice(0);
+
+                return clone;
+            },
+
+            /**
+             * Creates a word array filled with random bytes.
+             *
+             * @param {number} nBytes The number of random bytes to generate.
+             *
+             * @return {WordArray} The random word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.lib.WordArray.random(16);
+             */
+            random: function (nBytes) {
+                var words = [];
+
+                for (var i = 0; i < nBytes; i += 4) {
+                    words.push(cryptoSecureRandomInt());
+                }
+
+                return new WordArray.init(words, nBytes);
+            }
+        });
+
+        /**
+         * Encoder namespace.
+         */
+        var C_enc = C.enc = {};
+
+        /**
+         * Hex encoding strategy.
+         */
+        var Hex = C_enc.Hex = {
+            /**
+             * Converts a word array to a hex string.
+             *
+             * @param {WordArray} wordArray The word array.
+             *
+             * @return {string} The hex string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+             */
+            stringify: function (wordArray) {
+                // Shortcuts
+                var words = wordArray.words;
+                var sigBytes = wordArray.sigBytes;
+
+                // Convert
+                var hexChars = [];
+                for (var i = 0; i < sigBytes; i++) {
+                    var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+                    hexChars.push((bite >>> 4).toString(16));
+                    hexChars.push((bite & 0x0f).toString(16));
+                }
+
+                return hexChars.join('');
+            },
+
+            /**
+             * Converts a hex string to a word array.
+             *
+             * @param {string} hexStr The hex string.
+             *
+             * @return {WordArray} The word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.enc.Hex.parse(hexString);
+             */
+            parse: function (hexStr) {
+                // Shortcut
+                var hexStrLength = hexStr.length;
+
+                // Convert
+                var words = [];
+                for (var i = 0; i < hexStrLength; i += 2) {
+                    words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+                }
+
+                return new WordArray.init(words, hexStrLength / 2);
+            }
+        };
+
+        /**
+         * Latin1 encoding strategy.
+         */
+        var Latin1 = C_enc.Latin1 = {
+            /**
+             * Converts a word array to a Latin1 string.
+             *
+             * @param {WordArray} wordArray The word array.
+             *
+             * @return {string} The Latin1 string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+             */
+            stringify: function (wordArray) {
+                // Shortcuts
+                var words = wordArray.words;
+                var sigBytes = wordArray.sigBytes;
+
+                // Convert
+                var latin1Chars = [];
+                for (var i = 0; i < sigBytes; i++) {
+                    var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+                    latin1Chars.push(String.fromCharCode(bite));
+                }
+
+                return latin1Chars.join('');
+            },
+
+            /**
+             * Converts a Latin1 string to a word array.
+             *
+             * @param {string} latin1Str The Latin1 string.
+             *
+             * @return {WordArray} The word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+             */
+            parse: function (latin1Str) {
+                // Shortcut
+                var latin1StrLength = latin1Str.length;
+
+                // Convert
+                var words = [];
+                for (var i = 0; i < latin1StrLength; i++) {
+                    words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+                }
+
+                return new WordArray.init(words, latin1StrLength);
+            }
+        };
+
+        /**
+         * UTF-8 encoding strategy.
+         */
+        var Utf8 = C_enc.Utf8 = {
+            /**
+             * Converts a word array to a UTF-8 string.
+             *
+             * @param {WordArray} wordArray The word array.
+             *
+             * @return {string} The UTF-8 string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+             */
+            stringify: function (wordArray) {
+                try {
+                    return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+                } catch (e) {
+                    throw new Error('Malformed UTF-8 data');
+                }
+            },
+
+            /**
+             * Converts a UTF-8 string to a word array.
+             *
+             * @param {string} utf8Str The UTF-8 string.
+             *
+             * @return {WordArray} The word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+             */
+            parse: function (utf8Str) {
+                return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+            }
+        };
+
+        /**
+         * Abstract buffered block algorithm template.
+         *
+         * The property blockSize must be implemented in a concrete subtype.
+         *
+         * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+         */
+        var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+            /**
+             * Resets this block algorithm's data buffer to its initial state.
+             *
+             * @example
+             *
+             *     bufferedBlockAlgorithm.reset();
+             */
+            reset: function () {
+                // Initial values
+                this._data = new WordArray.init();
+                this._nDataBytes = 0;
+            },
+
+            /**
+             * Adds new data to this block algorithm's buffer.
+             *
+             * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+             *
+             * @example
+             *
+             *     bufferedBlockAlgorithm._append('data');
+             *     bufferedBlockAlgorithm._append(wordArray);
+             */
+            _append: function (data) {
+                // Convert string to WordArray, else assume WordArray already
+                if (typeof data == 'string') {
+                    data = Utf8.parse(data);
+                }
+
+                // Append
+                this._data.concat(data);
+                this._nDataBytes += data.sigBytes;
+            },
+
+            /**
+             * Processes available data blocks.
+             *
+             * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+             *
+             * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+             *
+             * @return {WordArray} The processed data.
+             *
+             * @example
+             *
+             *     var processedData = bufferedBlockAlgorithm._process();
+             *     var processedData = bufferedBlockAlgorithm._process(!!'flush');
+             */
+            _process: function (doFlush) {
+                var processedWords;
+
+                // Shortcuts
+                var data = this._data;
+                var dataWords = data.words;
+                var dataSigBytes = data.sigBytes;
+                var blockSize = this.blockSize;
+                var blockSizeBytes = blockSize * 4;
+
+                // Count blocks ready
+                var nBlocksReady = dataSigBytes / blockSizeBytes;
+                if (doFlush) {
+                    // Round up to include partial blocks
+                    nBlocksReady = Math.ceil(nBlocksReady);
+                } else {
+                    // Round down to include only full blocks,
+                    // less the number of blocks that must remain in the buffer
+                    nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+                }
+
+                // Count words ready
+                var nWordsReady = nBlocksReady * blockSize;
+
+                // Count bytes ready
+                var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+                // Process blocks
+                if (nWordsReady) {
+                    for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+                        // Perform concrete-algorithm logic
+                        this._doProcessBlock(dataWords, offset);
+                    }
+
+                    // Remove processed words
+                    processedWords = dataWords.splice(0, nWordsReady);
+                    data.sigBytes -= nBytesReady;
+                }
+
+                // Return processed words
+                return new WordArray.init(processedWords, nBytesReady);
+            },
+
+            /**
+             * Creates a copy of this object.
+             *
+             * @return {Object} The clone.
+             *
+             * @example
+             *
+             *     var clone = bufferedBlockAlgorithm.clone();
+             */
+            clone: function () {
+                var clone = Base.clone.call(this);
+                clone._data = this._data.clone();
+
+                return clone;
+            },
+
+            _minBufferSize: 0
+        });
+
+        /**
+         * Abstract hasher template.
+         *
+         * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+         */
+        var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+            /**
+             * Configuration options.
+             */
+            cfg: Base.extend(),
+
+            /**
+             * Initializes a newly created hasher.
+             *
+             * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+             *
+             * @example
+             *
+             *     var hasher = CryptoJS.algo.SHA256.create();
+             */
+            init: function (cfg) {
+                // Apply config defaults
+                this.cfg = this.cfg.extend(cfg);
+
+                // Set initial values
+                this.reset();
+            },
+
+            /**
+             * Resets this hasher to its initial state.
+             *
+             * @example
+             *
+             *     hasher.reset();
+             */
+            reset: function () {
+                // Reset data buffer
+                BufferedBlockAlgorithm.reset.call(this);
+
+                // Perform concrete-hasher logic
+                this._doReset();
+            },
+
+            /**
+             * Updates this hasher with a message.
+             *
+             * @param {WordArray|string} messageUpdate The message to append.
+             *
+             * @return {Hasher} This hasher.
+             *
+             * @example
+             *
+             *     hasher.update('message');
+             *     hasher.update(wordArray);
+             */
+            update: function (messageUpdate) {
+                // Append
+                this._append(messageUpdate);
+
+                // Update the hash
+                this._process();
+
+                // Chainable
+                return this;
+            },
+
+            /**
+             * Finalizes the hash computation.
+             * Note that the finalize operation is effectively a destructive, read-once operation.
+             *
+             * @param {WordArray|string} messageUpdate (Optional) A final message update.
+             *
+             * @return {WordArray} The hash.
+             *
+             * @example
+             *
+             *     var hash = hasher.finalize();
+             *     var hash = hasher.finalize('message');
+             *     var hash = hasher.finalize(wordArray);
+             */
+            finalize: function (messageUpdate) {
+                // Final message update
+                if (messageUpdate) {
+                    this._append(messageUpdate);
+                }
+
+                // Perform concrete-hasher logic
+                var hash = this._doFinalize();
+
+                return hash;
+            },
+
+            blockSize: 512 / 32,
+
+            /**
+             * Creates a shortcut function to a hasher's object interface.
+             *
+             * @param {Hasher} hasher The hasher to create a helper for.
+             *
+             * @return {Function} The shortcut function.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+             */
+            _createHelper: function (hasher) {
+                return function (message, cfg) {
+                    return new hasher.init(cfg).finalize(message);
+                };
+            },
+
+            /**
+             * Creates a shortcut function to the HMAC's object interface.
+             *
+             * @param {Hasher} hasher The hasher to use in this HMAC helper.
+             *
+             * @return {Function} The shortcut function.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+             */
+            _createHmacHelper: function (hasher) {
+                return function (message, key) {
+                    return new C_algo.HMAC.init(hasher, key).finalize(message);
+                };
+            }
+        });
+
+        /**
+         * Algorithm namespace.
+         */
+        var C_algo = C.algo = {};
+
+        return C;
+    }(Math));
+
+
+    (function (undefined) {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var Base = C_lib.Base;
+        var X32WordArray = C_lib.WordArray;
+
+        /**
+         * x64 namespace.
+         */
+        var C_x64 = C.x64 = {};
+
+        /**
+         * A 64-bit word.
+         */
+        var X64Word = C_x64.Word = Base.extend({
+            /**
+             * Initializes a newly created 64-bit word.
+             *
+             * @param {number} high The high 32 bits.
+             * @param {number} low The low 32 bits.
+             *
+             * @example
+             *
+             *     var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+             */
+            init: function (high, low) {
+                this.high = high;
+                this.low = low;
+            }
+
+            /**
+             * Bitwise NOTs this word.
+             *
+             * @return {X64Word} A new x64-Word object after negating.
+             *
+             * @example
+             *
+             *     var negated = x64Word.not();
+             */
+            // not: function () {
+            // var high = ~this.high;
+            // var low = ~this.low;
+
+            // return X64Word.create(high, low);
+            // },
+
+            /**
+             * Bitwise ANDs this word with the passed word.
+             *
+             * @param {X64Word} word The x64-Word to AND with this word.
+             *
+             * @return {X64Word} A new x64-Word object after ANDing.
+             *
+             * @example
+             *
+             *     var anded = x64Word.and(anotherX64Word);
+             */
+            // and: function (word) {
+            // var high = this.high & word.high;
+            // var low = this.low & word.low;
+
+            // return X64Word.create(high, low);
+            // },
+
+            /**
+             * Bitwise ORs this word with the passed word.
+             *
+             * @param {X64Word} word The x64-Word to OR with this word.
+             *
+             * @return {X64Word} A new x64-Word object after ORing.
+             *
+             * @example
+             *
+             *     var ored = x64Word.or(anotherX64Word);
+             */
+            // or: function (word) {
+            // var high = this.high | word.high;
+            // var low = this.low | word.low;
+
+            // return X64Word.create(high, low);
+            // },
+
+            /**
+             * Bitwise XORs this word with the passed word.
+             *
+             * @param {X64Word} word The x64-Word to XOR with this word.
+             *
+             * @return {X64Word} A new x64-Word object after XORing.
+             *
+             * @example
+             *
+             *     var xored = x64Word.xor(anotherX64Word);
+             */
+            // xor: function (word) {
+            // var high = this.high ^ word.high;
+            // var low = this.low ^ word.low;
+
+            // return X64Word.create(high, low);
+            // },
+
+            /**
+             * Shifts this word n bits to the left.
+             *
+             * @param {number} n The number of bits to shift.
+             *
+             * @return {X64Word} A new x64-Word object after shifting.
+             *
+             * @example
+             *
+             *     var shifted = x64Word.shiftL(25);
+             */
+            // shiftL: function (n) {
+            // if (n < 32) {
+            // var high = (this.high << n) | (this.low >>> (32 - n));
+            // var low = this.low << n;
+            // } else {
+            // var high = this.low << (n - 32);
+            // var low = 0;
+            // }
+
+            // return X64Word.create(high, low);
+            // },
+
+            /**
+             * Shifts this word n bits to the right.
+             *
+             * @param {number} n The number of bits to shift.
+             *
+             * @return {X64Word} A new x64-Word object after shifting.
+             *
+             * @example
+             *
+             *     var shifted = x64Word.shiftR(7);
+             */
+            // shiftR: function (n) {
+            // if (n < 32) {
+            // var low = (this.low >>> n) | (this.high << (32 - n));
+            // var high = this.high >>> n;
+            // } else {
+            // var low = this.high >>> (n - 32);
+            // var high = 0;
+            // }
+
+            // return X64Word.create(high, low);
+            // },
+
+            /**
+             * Rotates this word n bits to the left.
+             *
+             * @param {number} n The number of bits to rotate.
+             *
+             * @return {X64Word} A new x64-Word object after rotating.
+             *
+             * @example
+             *
+             *     var rotated = x64Word.rotL(25);
+             */
+            // rotL: function (n) {
+            // return this.shiftL(n).or(this.shiftR(64 - n));
+            // },
+
+            /**
+             * Rotates this word n bits to the right.
+             *
+             * @param {number} n The number of bits to rotate.
+             *
+             * @return {X64Word} A new x64-Word object after rotating.
+             *
+             * @example
+             *
+             *     var rotated = x64Word.rotR(7);
+             */
+            // rotR: function (n) {
+            // return this.shiftR(n).or(this.shiftL(64 - n));
+            // },
+
+            /**
+             * Adds this word with the passed word.
+             *
+             * @param {X64Word} word The x64-Word to add with this word.
+             *
+             * @return {X64Word} A new x64-Word object after adding.
+             *
+             * @example
+             *
+             *     var added = x64Word.add(anotherX64Word);
+             */
+            // add: function (word) {
+            // var low = (this.low + word.low) | 0;
+            // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+            // var high = (this.high + word.high + carry) | 0;
+
+            // return X64Word.create(high, low);
+            // }
+        });
+
+        /**
+         * An array of 64-bit words.
+         *
+         * @property {Array} words The array of CryptoJS.x64.Word objects.
+         * @property {number} sigBytes The number of significant bytes in this word array.
+         */
+        var X64WordArray = C_x64.WordArray = Base.extend({
+            /**
+             * Initializes a newly created word array.
+             *
+             * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+             * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.x64.WordArray.create();
+             *
+             *     var wordArray = CryptoJS.x64.WordArray.create([
+             *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+             *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+             *     ]);
+             *
+             *     var wordArray = CryptoJS.x64.WordArray.create([
+             *         CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+             *         CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+             *     ], 10);
+             */
+            init: function (words, sigBytes) {
+                words = this.words = words || [];
+
+                if (sigBytes != undefined) {
+                    this.sigBytes = sigBytes;
+                } else {
+                    this.sigBytes = words.length * 8;
+                }
+            },
+
+            /**
+             * Converts this 64-bit word array to a 32-bit word array.
+             *
+             * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+             *
+             * @example
+             *
+             *     var x32WordArray = x64WordArray.toX32();
+             */
+            toX32: function () {
+                // Shortcuts
+                var x64Words = this.words;
+                var x64WordsLength = x64Words.length;
+
+                // Convert
+                var x32Words = [];
+                for (var i = 0; i < x64WordsLength; i++) {
+                    var x64Word = x64Words[i];
+                    x32Words.push(x64Word.high);
+                    x32Words.push(x64Word.low);
+                }
+
+                return X32WordArray.create(x32Words, this.sigBytes);
+            },
+
+            /**
+             * Creates a copy of this word array.
+             *
+             * @return {X64WordArray} The clone.
+             *
+             * @example
+             *
+             *     var clone = x64WordArray.clone();
+             */
+            clone: function () {
+                var clone = Base.clone.call(this);
+
+                // Clone "words" array
+                var words = clone.words = this.words.slice(0);
+
+                // Clone each X64Word object
+                var wordsLength = words.length;
+                for (var i = 0; i < wordsLength; i++) {
+                    words[i] = words[i].clone();
+                }
+
+                return clone;
+            }
+        });
+    }());
+
+
+    (function () {
+        // Check if typed arrays are supported
+        if (typeof ArrayBuffer != 'function') {
+            return;
+        }
+
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+
+        // Reference original init
+        var superInit = WordArray.init;
+
+        // Augment WordArray.init to handle typed arrays
+        var subInit = WordArray.init = function (typedArray) {
+            // Convert buffers to uint8
+            if (typedArray instanceof ArrayBuffer) {
+                typedArray = new Uint8Array(typedArray);
+            }
+
+            // Convert other array views to uint8
+            if (
+                typedArray instanceof Int8Array ||
+                (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+                typedArray instanceof Int16Array ||
+                typedArray instanceof Uint16Array ||
+                typedArray instanceof Int32Array ||
+                typedArray instanceof Uint32Array ||
+                typedArray instanceof Float32Array ||
+                typedArray instanceof Float64Array
+            ) {
+                typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+            }
+
+            // Handle Uint8Array
+            if (typedArray instanceof Uint8Array) {
+                // Shortcut
+                var typedArrayByteLength = typedArray.byteLength;
+
+                // Extract bytes
+                var words = [];
+                for (var i = 0; i < typedArrayByteLength; i++) {
+                    words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+                }
+
+                // Initialize this word array
+                superInit.call(this, words, typedArrayByteLength);
+            } else {
+                // Else call normal init
+                superInit.apply(this, arguments);
+            }
+        };
+
+        subInit.prototype = WordArray;
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var C_enc = C.enc;
+
+        /**
+         * UTF-16 BE encoding strategy.
+         */
+        var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
+            /**
+             * Converts a word array to a UTF-16 BE string.
+             *
+             * @param {WordArray} wordArray The word array.
+             *
+             * @return {string} The UTF-16 BE string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
+             */
+            stringify: function (wordArray) {
+                // Shortcuts
+                var words = wordArray.words;
+                var sigBytes = wordArray.sigBytes;
+
+                // Convert
+                var utf16Chars = [];
+                for (var i = 0; i < sigBytes; i += 2) {
+                    var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
+                    utf16Chars.push(String.fromCharCode(codePoint));
+                }
+
+                return utf16Chars.join('');
+            },
+
+            /**
+             * Converts a UTF-16 BE string to a word array.
+             *
+             * @param {string} utf16Str The UTF-16 BE string.
+             *
+             * @return {WordArray} The word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
+             */
+            parse: function (utf16Str) {
+                // Shortcut
+                var utf16StrLength = utf16Str.length;
+
+                // Convert
+                var words = [];
+                for (var i = 0; i < utf16StrLength; i++) {
+                    words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+                }
+
+                return WordArray.create(words, utf16StrLength * 2);
+            }
+        };
+
+        /**
+         * UTF-16 LE encoding strategy.
+         */
+        C_enc.Utf16LE = {
+            /**
+             * Converts a word array to a UTF-16 LE string.
+             *
+             * @param {WordArray} wordArray The word array.
+             *
+             * @return {string} The UTF-16 LE string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
+             */
+            stringify: function (wordArray) {
+                // Shortcuts
+                var words = wordArray.words;
+                var sigBytes = wordArray.sigBytes;
+
+                // Convert
+                var utf16Chars = [];
+                for (var i = 0; i < sigBytes; i += 2) {
+                    var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
+                    utf16Chars.push(String.fromCharCode(codePoint));
+                }
+
+                return utf16Chars.join('');
+            },
+
+            /**
+             * Converts a UTF-16 LE string to a word array.
+             *
+             * @param {string} utf16Str The UTF-16 LE string.
+             *
+             * @return {WordArray} The word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
+             */
+            parse: function (utf16Str) {
+                // Shortcut
+                var utf16StrLength = utf16Str.length;
+
+                // Convert
+                var words = [];
+                for (var i = 0; i < utf16StrLength; i++) {
+                    words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+                }
+
+                return WordArray.create(words, utf16StrLength * 2);
+            }
+        };
+
+        function swapEndian(word) {
+            return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+        }
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var C_enc = C.enc;
+
+        /**
+         * Base64 encoding strategy.
+         */
+        var Base64 = C_enc.Base64 = {
+            /**
+             * Converts a word array to a Base64 string.
+             *
+             * @param {WordArray} wordArray The word array.
+             *
+             * @return {string} The Base64 string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+             */
+            stringify: function (wordArray) {
+                // Shortcuts
+                var words = wordArray.words;
+                var sigBytes = wordArray.sigBytes;
+                var map = this._map;
+
+                // Clamp excess bits
+                wordArray.clamp();
+
+                // Convert
+                var base64Chars = [];
+                for (var i = 0; i < sigBytes; i += 3) {
+                    var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+                    var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+                    var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+                    var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+                    for (var j = 0;
+                        (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+                        base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+                    }
+                }
+
+                // Add padding
+                var paddingChar = map.charAt(64);
+                if (paddingChar) {
+                    while (base64Chars.length % 4) {
+                        base64Chars.push(paddingChar);
+                    }
+                }
+
+                return base64Chars.join('');
+            },
+
+            /**
+             * Converts a Base64 string to a word array.
+             *
+             * @param {string} base64Str The Base64 string.
+             *
+             * @return {WordArray} The word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.enc.Base64.parse(base64String);
+             */
+            parse: function (base64Str) {
+                // Shortcuts
+                var base64StrLength = base64Str.length;
+                var map = this._map;
+                var reverseMap = this._reverseMap;
+
+                if (!reverseMap) {
+                    reverseMap = this._reverseMap = [];
+                    for (var j = 0; j < map.length; j++) {
+                        reverseMap[map.charCodeAt(j)] = j;
+                    }
+                }
+
+                // Ignore padding
+                var paddingChar = map.charAt(64);
+                if (paddingChar) {
+                    var paddingIndex = base64Str.indexOf(paddingChar);
+                    if (paddingIndex !== -1) {
+                        base64StrLength = paddingIndex;
+                    }
+                }
+
+                // Convert
+                return parseLoop(base64Str, base64StrLength, reverseMap);
+
+            },
+
+            _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+        };
+
+        function parseLoop(base64Str, base64StrLength, reverseMap) {
+            var words = [];
+            var nBytes = 0;
+            for (var i = 0; i < base64StrLength; i++) {
+                if (i % 4) {
+                    var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+                    var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+                    var bitsCombined = bits1 | bits2;
+                    words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+                    nBytes++;
+                }
+            }
+            return WordArray.create(words, nBytes);
+        }
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var C_enc = C.enc;
+
+        /**
+         * Base64url encoding strategy.
+         */
+        var Base64url = C_enc.Base64url = {
+            /**
+             * Converts a word array to a Base64url string.
+             *
+             * @param {WordArray} wordArray The word array.
+             *
+             * @param {boolean} urlSafe Whether to use url safe
+             *
+             * @return {string} The Base64url string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
+             */
+            stringify: function (wordArray, urlSafe = true) {
+                // Shortcuts
+                var words = wordArray.words;
+                var sigBytes = wordArray.sigBytes;
+                var map = urlSafe ? this._safe_map : this._map;
+
+                // Clamp excess bits
+                wordArray.clamp();
+
+                // Convert
+                var base64Chars = [];
+                for (var i = 0; i < sigBytes; i += 3) {
+                    var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+                    var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+                    var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+                    var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+                    for (var j = 0;
+                        (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+                        base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+                    }
+                }
+
+                // Add padding
+                var paddingChar = map.charAt(64);
+                if (paddingChar) {
+                    while (base64Chars.length % 4) {
+                        base64Chars.push(paddingChar);
+                    }
+                }
+
+                return base64Chars.join('');
+            },
+
+            /**
+             * Converts a Base64url string to a word array.
+             *
+             * @param {string} base64Str The Base64url string.
+             *
+             * @param {boolean} urlSafe Whether to use url safe
+             *
+             * @return {WordArray} The word array.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var wordArray = CryptoJS.enc.Base64url.parse(base64String);
+             */
+            parse: function (base64Str, urlSafe = true) {
+                // Shortcuts
+                var base64StrLength = base64Str.length;
+                var map = urlSafe ? this._safe_map : this._map;
+                var reverseMap = this._reverseMap;
+
+                if (!reverseMap) {
+                    reverseMap = this._reverseMap = [];
+                    for (var j = 0; j < map.length; j++) {
+                        reverseMap[map.charCodeAt(j)] = j;
+                    }
+                }
+
+                // Ignore padding
+                var paddingChar = map.charAt(64);
+                if (paddingChar) {
+                    var paddingIndex = base64Str.indexOf(paddingChar);
+                    if (paddingIndex !== -1) {
+                        base64StrLength = paddingIndex;
+                    }
+                }
+
+                // Convert
+                return parseLoop(base64Str, base64StrLength, reverseMap);
+
+            },
+
+            _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+            _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
+        };
+
+        function parseLoop(base64Str, base64StrLength, reverseMap) {
+            var words = [];
+            var nBytes = 0;
+            for (var i = 0; i < base64StrLength; i++) {
+                if (i % 4) {
+                    var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+                    var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+                    var bitsCombined = bits1 | bits2;
+                    words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+                    nBytes++;
+                }
+            }
+            return WordArray.create(words, nBytes);
+        }
+    }());
+
+    (function (Math) {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var Hasher = C_lib.Hasher;
+        var C_algo = C.algo;
+
+        // Constants table
+        var T = [];
+
+        // Compute constants
+        (function () {
+            for (var i = 0; i < 64; i++) {
+                T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+            }
+        }());
+
+        /**
+         * MD5 hash algorithm.
+         */
+        var MD5 = C_algo.MD5 = Hasher.extend({
+            _doReset: function () {
+                this._hash = new WordArray.init([
+                    0x67452301, 0xefcdab89,
+                    0x98badcfe, 0x10325476
+                ]);
+            },
+
+            _doProcessBlock: function (M, offset) {
+                // Swap endian
+                for (var i = 0; i < 16; i++) {
+                    // Shortcuts
+                    var offset_i = offset + i;
+                    var M_offset_i = M[offset_i];
+
+                    M[offset_i] = (
+                        (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+                        (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+                    );
+                }
+
+                // Shortcuts
+                var H = this._hash.words;
+
+                var M_offset_0 = M[offset + 0];
+                var M_offset_1 = M[offset + 1];
+                var M_offset_2 = M[offset + 2];
+                var M_offset_3 = M[offset + 3];
+                var M_offset_4 = M[offset + 4];
+                var M_offset_5 = M[offset + 5];
+                var M_offset_6 = M[offset + 6];
+                var M_offset_7 = M[offset + 7];
+                var M_offset_8 = M[offset + 8];
+                var M_offset_9 = M[offset + 9];
+                var M_offset_10 = M[offset + 10];
+                var M_offset_11 = M[offset + 11];
+                var M_offset_12 = M[offset + 12];
+                var M_offset_13 = M[offset + 13];
+                var M_offset_14 = M[offset + 14];
+                var M_offset_15 = M[offset + 15];
+
+                // Working varialbes
+                var a = H[0];
+                var b = H[1];
+                var c = H[2];
+                var d = H[3];
+
+                // Computation
+                a = FF(a, b, c, d, M_offset_0, 7, T[0]);
+                d = FF(d, a, b, c, M_offset_1, 12, T[1]);
+                c = FF(c, d, a, b, M_offset_2, 17, T[2]);
+                b = FF(b, c, d, a, M_offset_3, 22, T[3]);
+                a = FF(a, b, c, d, M_offset_4, 7, T[4]);
+                d = FF(d, a, b, c, M_offset_5, 12, T[5]);
+                c = FF(c, d, a, b, M_offset_6, 17, T[6]);
+                b = FF(b, c, d, a, M_offset_7, 22, T[7]);
+                a = FF(a, b, c, d, M_offset_8, 7, T[8]);
+                d = FF(d, a, b, c, M_offset_9, 12, T[9]);
+                c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+                b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+                a = FF(a, b, c, d, M_offset_12, 7, T[12]);
+                d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+                c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+                b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+                a = GG(a, b, c, d, M_offset_1, 5, T[16]);
+                d = GG(d, a, b, c, M_offset_6, 9, T[17]);
+                c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+                b = GG(b, c, d, a, M_offset_0, 20, T[19]);
+                a = GG(a, b, c, d, M_offset_5, 5, T[20]);
+                d = GG(d, a, b, c, M_offset_10, 9, T[21]);
+                c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+                b = GG(b, c, d, a, M_offset_4, 20, T[23]);
+                a = GG(a, b, c, d, M_offset_9, 5, T[24]);
+                d = GG(d, a, b, c, M_offset_14, 9, T[25]);
+                c = GG(c, d, a, b, M_offset_3, 14, T[26]);
+                b = GG(b, c, d, a, M_offset_8, 20, T[27]);
+                a = GG(a, b, c, d, M_offset_13, 5, T[28]);
+                d = GG(d, a, b, c, M_offset_2, 9, T[29]);
+                c = GG(c, d, a, b, M_offset_7, 14, T[30]);
+                b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+                a = HH(a, b, c, d, M_offset_5, 4, T[32]);
+                d = HH(d, a, b, c, M_offset_8, 11, T[33]);
+                c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+                b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+                a = HH(a, b, c, d, M_offset_1, 4, T[36]);
+                d = HH(d, a, b, c, M_offset_4, 11, T[37]);
+                c = HH(c, d, a, b, M_offset_7, 16, T[38]);
+                b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+                a = HH(a, b, c, d, M_offset_13, 4, T[40]);
+                d = HH(d, a, b, c, M_offset_0, 11, T[41]);
+                c = HH(c, d, a, b, M_offset_3, 16, T[42]);
+                b = HH(b, c, d, a, M_offset_6, 23, T[43]);
+                a = HH(a, b, c, d, M_offset_9, 4, T[44]);
+                d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+                c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+                b = HH(b, c, d, a, M_offset_2, 23, T[47]);
+
+                a = II(a, b, c, d, M_offset_0, 6, T[48]);
+                d = II(d, a, b, c, M_offset_7, 10, T[49]);
+                c = II(c, d, a, b, M_offset_14, 15, T[50]);
+                b = II(b, c, d, a, M_offset_5, 21, T[51]);
+                a = II(a, b, c, d, M_offset_12, 6, T[52]);
+                d = II(d, a, b, c, M_offset_3, 10, T[53]);
+                c = II(c, d, a, b, M_offset_10, 15, T[54]);
+                b = II(b, c, d, a, M_offset_1, 21, T[55]);
+                a = II(a, b, c, d, M_offset_8, 6, T[56]);
+                d = II(d, a, b, c, M_offset_15, 10, T[57]);
+                c = II(c, d, a, b, M_offset_6, 15, T[58]);
+                b = II(b, c, d, a, M_offset_13, 21, T[59]);
+                a = II(a, b, c, d, M_offset_4, 6, T[60]);
+                d = II(d, a, b, c, M_offset_11, 10, T[61]);
+                c = II(c, d, a, b, M_offset_2, 15, T[62]);
+                b = II(b, c, d, a, M_offset_9, 21, T[63]);
+
+                // Intermediate hash value
+                H[0] = (H[0] + a) | 0;
+                H[1] = (H[1] + b) | 0;
+                H[2] = (H[2] + c) | 0;
+                H[3] = (H[3] + d) | 0;
+            },
+
+            _doFinalize: function () {
+                // Shortcuts
+                var data = this._data;
+                var dataWords = data.words;
+
+                var nBitsTotal = this._nDataBytes * 8;
+                var nBitsLeft = data.sigBytes * 8;
+
+                // Add padding
+                dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+                var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+                var nBitsTotalL = nBitsTotal;
+                dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+                    (((nBitsTotalH << 8) | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+                    (((nBitsTotalH << 24) | (nBitsTotalH >>> 8)) & 0xff00ff00)
+                );
+                dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+                    (((nBitsTotalL << 8) | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+                    (((nBitsTotalL << 24) | (nBitsTotalL >>> 8)) & 0xff00ff00)
+                );
+
+                data.sigBytes = (dataWords.length + 1) * 4;
+
+                // Hash final blocks
+                this._process();
+
+                // Shortcuts
+                var hash = this._hash;
+                var H = hash.words;
+
+                // Swap endian
+                for (var i = 0; i < 4; i++) {
+                    // Shortcut
+                    var H_i = H[i];
+
+                    H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+                        (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+                }
+
+                // Return final computed hash
+                return hash;
+            },
+
+            clone: function () {
+                var clone = Hasher.clone.call(this);
+                clone._hash = this._hash.clone();
+
+                return clone;
+            }
+        });
+
+        function FF(a, b, c, d, x, s, t) {
+            var n = a + ((b & c) | (~b & d)) + x + t;
+            return ((n << s) | (n >>> (32 - s))) + b;
+        }
+
+        function GG(a, b, c, d, x, s, t) {
+            var n = a + ((b & d) | (c & ~d)) + x + t;
+            return ((n << s) | (n >>> (32 - s))) + b;
+        }
+
+        function HH(a, b, c, d, x, s, t) {
+            var n = a + (b ^ c ^ d) + x + t;
+            return ((n << s) | (n >>> (32 - s))) + b;
+        }
+
+        function II(a, b, c, d, x, s, t) {
+            var n = a + (c ^ (b | ~d)) + x + t;
+            return ((n << s) | (n >>> (32 - s))) + b;
+        }
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.MD5('message');
+         *     var hash = CryptoJS.MD5(wordArray);
+         */
+        C.MD5 = Hasher._createHelper(MD5);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacMD5(message, key);
+         */
+        C.HmacMD5 = Hasher._createHmacHelper(MD5);
+    }(Math));
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var Hasher = C_lib.Hasher;
+        var C_algo = C.algo;
+
+        // Reusable object
+        var W = [];
+
+        /**
+         * SHA-1 hash algorithm.
+         */
+        var SHA1 = C_algo.SHA1 = Hasher.extend({
+            _doReset: function () {
+                this._hash = new WordArray.init([
+                    0x67452301, 0xefcdab89,
+                    0x98badcfe, 0x10325476,
+                    0xc3d2e1f0
+                ]);
+            },
+
+            _doProcessBlock: function (M, offset) {
+                // Shortcut
+                var H = this._hash.words;
+
+                // Working variables
+                var a = H[0];
+                var b = H[1];
+                var c = H[2];
+                var d = H[3];
+                var e = H[4];
+
+                // Computation
+                for (var i = 0; i < 80; i++) {
+                    if (i < 16) {
+                        W[i] = M[offset + i] | 0;
+                    } else {
+                        var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+                        W[i] = (n << 1) | (n >>> 31);
+                    }
+
+                    var t = ((a << 5) | (a >>> 27)) + e + W[i];
+                    if (i < 20) {
+                        t += ((b & c) | (~b & d)) + 0x5a827999;
+                    } else if (i < 40) {
+                        t += (b ^ c ^ d) + 0x6ed9eba1;
+                    } else if (i < 60) {
+                        t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+                    } else /* if (i < 80) */ {
+                        t += (b ^ c ^ d) - 0x359d3e2a;
+                    }
+
+                    e = d;
+                    d = c;
+                    c = (b << 30) | (b >>> 2);
+                    b = a;
+                    a = t;
+                }
+
+                // Intermediate hash value
+                H[0] = (H[0] + a) | 0;
+                H[1] = (H[1] + b) | 0;
+                H[2] = (H[2] + c) | 0;
+                H[3] = (H[3] + d) | 0;
+                H[4] = (H[4] + e) | 0;
+            },
+
+            _doFinalize: function () {
+                // Shortcuts
+                var data = this._data;
+                var dataWords = data.words;
+
+                var nBitsTotal = this._nDataBytes * 8;
+                var nBitsLeft = data.sigBytes * 8;
+
+                // Add padding
+                dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+                dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+                dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+                data.sigBytes = dataWords.length * 4;
+
+                // Hash final blocks
+                this._process();
+
+                // Return final computed hash
+                return this._hash;
+            },
+
+            clone: function () {
+                var clone = Hasher.clone.call(this);
+                clone._hash = this._hash.clone();
+
+                return clone;
+            }
+        });
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.SHA1('message');
+         *     var hash = CryptoJS.SHA1(wordArray);
+         */
+        C.SHA1 = Hasher._createHelper(SHA1);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacSHA1(message, key);
+         */
+        C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+    }());
+
+
+    (function (Math) {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var Hasher = C_lib.Hasher;
+        var C_algo = C.algo;
+
+        // Initialization and round constants tables
+        var H = [];
+        var K = [];
+
+        // Compute constants
+        (function () {
+            function isPrime(n) {
+                var sqrtN = Math.sqrt(n);
+                for (var factor = 2; factor <= sqrtN; factor++) {
+                    if (!(n % factor)) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            function getFractionalBits(n) {
+                return ((n - (n | 0)) * 0x100000000) | 0;
+            }
+
+            var n = 2;
+            var nPrime = 0;
+            while (nPrime < 64) {
+                if (isPrime(n)) {
+                    if (nPrime < 8) {
+                        H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+                    }
+                    K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+                    nPrime++;
+                }
+
+                n++;
+            }
+        }());
+
+        // Reusable object
+        var W = [];
+
+        /**
+         * SHA-256 hash algorithm.
+         */
+        var SHA256 = C_algo.SHA256 = Hasher.extend({
+            _doReset: function () {
+                this._hash = new WordArray.init(H.slice(0));
+            },
+
+            _doProcessBlock: function (M, offset) {
+                // Shortcut
+                var H = this._hash.words;
+
+                // Working variables
+                var a = H[0];
+                var b = H[1];
+                var c = H[2];
+                var d = H[3];
+                var e = H[4];
+                var f = H[5];
+                var g = H[6];
+                var h = H[7];
+
+                // Computation
+                for (var i = 0; i < 64; i++) {
+                    if (i < 16) {
+                        W[i] = M[offset + i] | 0;
+                    } else {
+                        var gamma0x = W[i - 15];
+                        var gamma0 = ((gamma0x << 25) | (gamma0x >>> 7)) ^
+                            ((gamma0x << 14) | (gamma0x >>> 18)) ^
+                            (gamma0x >>> 3);
+
+                        var gamma1x = W[i - 2];
+                        var gamma1 = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+                            ((gamma1x << 13) | (gamma1x >>> 19)) ^
+                            (gamma1x >>> 10);
+
+                        W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+                    }
+
+                    var ch = (e & f) ^ (~e & g);
+                    var maj = (a & b) ^ (a & c) ^ (b & c);
+
+                    var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+                    var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7) | (e >>> 25));
+
+                    var t1 = h + sigma1 + ch + K[i] + W[i];
+                    var t2 = sigma0 + maj;
+
+                    h = g;
+                    g = f;
+                    f = e;
+                    e = (d + t1) | 0;
+                    d = c;
+                    c = b;
+                    b = a;
+                    a = (t1 + t2) | 0;
+                }
+
+                // Intermediate hash value
+                H[0] = (H[0] + a) | 0;
+                H[1] = (H[1] + b) | 0;
+                H[2] = (H[2] + c) | 0;
+                H[3] = (H[3] + d) | 0;
+                H[4] = (H[4] + e) | 0;
+                H[5] = (H[5] + f) | 0;
+                H[6] = (H[6] + g) | 0;
+                H[7] = (H[7] + h) | 0;
+            },
+
+            _doFinalize: function () {
+                // Shortcuts
+                var data = this._data;
+                var dataWords = data.words;
+
+                var nBitsTotal = this._nDataBytes * 8;
+                var nBitsLeft = data.sigBytes * 8;
+
+                // Add padding
+                dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+                dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+                dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+                data.sigBytes = dataWords.length * 4;
+
+                // Hash final blocks
+                this._process();
+
+                // Return final computed hash
+                return this._hash;
+            },
+
+            clone: function () {
+                var clone = Hasher.clone.call(this);
+                clone._hash = this._hash.clone();
+
+                return clone;
+            }
+        });
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.SHA256('message');
+         *     var hash = CryptoJS.SHA256(wordArray);
+         */
+        C.SHA256 = Hasher._createHelper(SHA256);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacSHA256(message, key);
+         */
+        C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+    }(Math));
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var C_algo = C.algo;
+        var SHA256 = C_algo.SHA256;
+
+        /**
+         * SHA-224 hash algorithm.
+         */
+        var SHA224 = C_algo.SHA224 = SHA256.extend({
+            _doReset: function () {
+                this._hash = new WordArray.init([
+                    0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+                    0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+                ]);
+            },
+
+            _doFinalize: function () {
+                var hash = SHA256._doFinalize.call(this);
+
+                hash.sigBytes -= 4;
+
+                return hash;
+            }
+        });
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.SHA224('message');
+         *     var hash = CryptoJS.SHA224(wordArray);
+         */
+        C.SHA224 = SHA256._createHelper(SHA224);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacSHA224(message, key);
+         */
+        C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var Hasher = C_lib.Hasher;
+        var C_x64 = C.x64;
+        var X64Word = C_x64.Word;
+        var X64WordArray = C_x64.WordArray;
+        var C_algo = C.algo;
+
+        function X64Word_create() {
+            return X64Word.create.apply(X64Word, arguments);
+        }
+
+        // Constants
+        var K = [
+            X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+            X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+            X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+            X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+            X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+            X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+            X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+            X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+            X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+            X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+            X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+            X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+            X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+            X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+            X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+            X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+            X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+            X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+            X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+            X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+            X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+            X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+            X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+            X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+            X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+            X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+            X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+            X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+            X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+            X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+            X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+            X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+            X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+            X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+            X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+            X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+            X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+            X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+            X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+            X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+        ];
+
+        // Reusable objects
+        var W = [];
+        (function () {
+            for (var i = 0; i < 80; i++) {
+                W[i] = X64Word_create();
+            }
+        }());
+
+        /**
+         * SHA-512 hash algorithm.
+         */
+        var SHA512 = C_algo.SHA512 = Hasher.extend({
+            _doReset: function () {
+                this._hash = new X64WordArray.init([
+                    new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+                    new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+                    new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+                    new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+                ]);
+            },
+
+            _doProcessBlock: function (M, offset) {
+                // Shortcuts
+                var H = this._hash.words;
+
+                var H0 = H[0];
+                var H1 = H[1];
+                var H2 = H[2];
+                var H3 = H[3];
+                var H4 = H[4];
+                var H5 = H[5];
+                var H6 = H[6];
+                var H7 = H[7];
+
+                var H0h = H0.high;
+                var H0l = H0.low;
+                var H1h = H1.high;
+                var H1l = H1.low;
+                var H2h = H2.high;
+                var H2l = H2.low;
+                var H3h = H3.high;
+                var H3l = H3.low;
+                var H4h = H4.high;
+                var H4l = H4.low;
+                var H5h = H5.high;
+                var H5l = H5.low;
+                var H6h = H6.high;
+                var H6l = H6.low;
+                var H7h = H7.high;
+                var H7l = H7.low;
+
+                // Working variables
+                var ah = H0h;
+                var al = H0l;
+                var bh = H1h;
+                var bl = H1l;
+                var ch = H2h;
+                var cl = H2l;
+                var dh = H3h;
+                var dl = H3l;
+                var eh = H4h;
+                var el = H4l;
+                var fh = H5h;
+                var fl = H5l;
+                var gh = H6h;
+                var gl = H6l;
+                var hh = H7h;
+                var hl = H7l;
+
+                // Rounds
+                for (var i = 0; i < 80; i++) {
+                    var Wil;
+                    var Wih;
+
+                    // Shortcut
+                    var Wi = W[i];
+
+                    // Extend message
+                    if (i < 16) {
+                        Wih = Wi.high = M[offset + i * 2] | 0;
+                        Wil = Wi.low = M[offset + i * 2 + 1] | 0;
+                    } else {
+                        // Gamma0
+                        var gamma0x = W[i - 15];
+                        var gamma0xh = gamma0x.high;
+                        var gamma0xl = gamma0x.low;
+                        var gamma0h = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+                        var gamma0l = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+                        // Gamma1
+                        var gamma1x = W[i - 2];
+                        var gamma1xh = gamma1x.high;
+                        var gamma1xl = gamma1x.low;
+                        var gamma1h = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+                        var gamma1l = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+                        // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+                        var Wi7 = W[i - 7];
+                        var Wi7h = Wi7.high;
+                        var Wi7l = Wi7.low;
+
+                        var Wi16 = W[i - 16];
+                        var Wi16h = Wi16.high;
+                        var Wi16l = Wi16.low;
+
+                        Wil = gamma0l + Wi7l;
+                        Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+                        Wil = Wil + gamma1l;
+                        Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+                        Wil = Wil + Wi16l;
+                        Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+                        Wi.high = Wih;
+                        Wi.low = Wil;
+                    }
+
+                    var chh = (eh & fh) ^ (~eh & gh);
+                    var chl = (el & fl) ^ (~el & gl);
+                    var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+                    var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+                    var sigma0h = ((ah >>> 28) | (al << 4)) ^ ((ah << 30) | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+                    var sigma0l = ((al >>> 28) | (ah << 4)) ^ ((al << 30) | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+                    var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+                    var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+                    // t1 = h + sigma1 + ch + K[i] + W[i]
+                    var Ki = K[i];
+                    var Kih = Ki.high;
+                    var Kil = Ki.low;
+
+                    var t1l = hl + sigma1l;
+                    var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+                    var t1l = t1l + chl;
+                    var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+                    var t1l = t1l + Kil;
+                    var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+                    var t1l = t1l + Wil;
+                    var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+                    // t2 = sigma0 + maj
+                    var t2l = sigma0l + majl;
+                    var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+                    // Update working variables
+                    hh = gh;
+                    hl = gl;
+                    gh = fh;
+                    gl = fl;
+                    fh = eh;
+                    fl = el;
+                    el = (dl + t1l) | 0;
+                    eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+                    dh = ch;
+                    dl = cl;
+                    ch = bh;
+                    cl = bl;
+                    bh = ah;
+                    bl = al;
+                    al = (t1l + t2l) | 0;
+                    ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+                }
+
+                // Intermediate hash value
+                H0l = H0.low = (H0l + al);
+                H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+                H1l = H1.low = (H1l + bl);
+                H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+                H2l = H2.low = (H2l + cl);
+                H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+                H3l = H3.low = (H3l + dl);
+                H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+                H4l = H4.low = (H4l + el);
+                H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+                H5l = H5.low = (H5l + fl);
+                H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+                H6l = H6.low = (H6l + gl);
+                H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+                H7l = H7.low = (H7l + hl);
+                H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+            },
+
+            _doFinalize: function () {
+                // Shortcuts
+                var data = this._data;
+                var dataWords = data.words;
+
+                var nBitsTotal = this._nDataBytes * 8;
+                var nBitsLeft = data.sigBytes * 8;
+
+                // Add padding
+                dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+                dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+                dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+                data.sigBytes = dataWords.length * 4;
+
+                // Hash final blocks
+                this._process();
+
+                // Convert hash to 32-bit word array before returning
+                var hash = this._hash.toX32();
+
+                // Return final computed hash
+                return hash;
+            },
+
+            clone: function () {
+                var clone = Hasher.clone.call(this);
+                clone._hash = this._hash.clone();
+
+                return clone;
+            },
+
+            blockSize: 1024 / 32
+        });
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.SHA512('message');
+         *     var hash = CryptoJS.SHA512(wordArray);
+         */
+        C.SHA512 = Hasher._createHelper(SHA512);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacSHA512(message, key);
+         */
+        C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_x64 = C.x64;
+        var X64Word = C_x64.Word;
+        var X64WordArray = C_x64.WordArray;
+        var C_algo = C.algo;
+        var SHA512 = C_algo.SHA512;
+
+        /**
+         * SHA-384 hash algorithm.
+         */
+        var SHA384 = C_algo.SHA384 = SHA512.extend({
+            _doReset: function () {
+                this._hash = new X64WordArray.init([
+                    new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
+                    new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
+                    new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
+                    new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
+                ]);
+            },
+
+            _doFinalize: function () {
+                var hash = SHA512._doFinalize.call(this);
+
+                hash.sigBytes -= 16;
+
+                return hash;
+            }
+        });
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.SHA384('message');
+         *     var hash = CryptoJS.SHA384(wordArray);
+         */
+        C.SHA384 = SHA512._createHelper(SHA384);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacSHA384(message, key);
+         */
+        C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
+    }());
+
+
+    (function (Math) {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var Hasher = C_lib.Hasher;
+        var C_x64 = C.x64;
+        var X64Word = C_x64.Word;
+        var C_algo = C.algo;
+
+        // Constants tables
+        var RHO_OFFSETS = [];
+        var PI_INDEXES = [];
+        var ROUND_CONSTANTS = [];
+
+        // Compute Constants
+        (function () {
+            // Compute rho offset constants
+            var x = 1,
+                y = 0;
+            for (var t = 0; t < 24; t++) {
+                RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+
+                var newX = y % 5;
+                var newY = (2 * x + 3 * y) % 5;
+                x = newX;
+                y = newY;
+            }
+
+            // Compute pi index constants
+            for (var x = 0; x < 5; x++) {
+                for (var y = 0; y < 5; y++) {
+                    PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+                }
+            }
+
+            // Compute round constants
+            var LFSR = 0x01;
+            for (var i = 0; i < 24; i++) {
+                var roundConstantMsw = 0;
+                var roundConstantLsw = 0;
+
+                for (var j = 0; j < 7; j++) {
+                    if (LFSR & 0x01) {
+                        var bitPosition = (1 << j) - 1;
+                        if (bitPosition < 32) {
+                            roundConstantLsw ^= 1 << bitPosition;
+                        } else /* if (bitPosition >= 32) */ {
+                            roundConstantMsw ^= 1 << (bitPosition - 32);
+                        }
+                    }
+
+                    // Compute next LFSR
+                    if (LFSR & 0x80) {
+                        // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
+                        LFSR = (LFSR << 1) ^ 0x71;
+                    } else {
+                        LFSR <<= 1;
+                    }
+                }
+
+                ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+            }
+        }());
+
+        // Reusable objects for temporary values
+        var T = [];
+        (function () {
+            for (var i = 0; i < 25; i++) {
+                T[i] = X64Word.create();
+            }
+        }());
+
+        /**
+         * SHA-3 hash algorithm.
+         */
+        var SHA3 = C_algo.SHA3 = Hasher.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {number} outputLength
+             *   The desired number of bits in the output hash.
+             *   Only values permitted are: 224, 256, 384, 512.
+             *   Default: 512
+             */
+            cfg: Hasher.cfg.extend({
+                outputLength: 512
+            }),
+
+            _doReset: function () {
+                var state = this._state = []
+                for (var i = 0; i < 25; i++) {
+                    state[i] = new X64Word.init();
+                }
+
+                this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+            },
+
+            _doProcessBlock: function (M, offset) {
+                // Shortcuts
+                var state = this._state;
+                var nBlockSizeLanes = this.blockSize / 2;
+
+                // Absorb
+                for (var i = 0; i < nBlockSizeLanes; i++) {
+                    // Shortcuts
+                    var M2i = M[offset + 2 * i];
+                    var M2i1 = M[offset + 2 * i + 1];
+
+                    // Swap endian
+                    M2i = (
+                        (((M2i << 8) | (M2i >>> 24)) & 0x00ff00ff) |
+                        (((M2i << 24) | (M2i >>> 8)) & 0xff00ff00)
+                    );
+                    M2i1 = (
+                        (((M2i1 << 8) | (M2i1 >>> 24)) & 0x00ff00ff) |
+                        (((M2i1 << 24) | (M2i1 >>> 8)) & 0xff00ff00)
+                    );
+
+                    // Absorb message into state
+                    var lane = state[i];
+                    lane.high ^= M2i1;
+                    lane.low ^= M2i;
+                }
+
+                // Rounds
+                for (var round = 0; round < 24; round++) {
+                    // Theta
+                    for (var x = 0; x < 5; x++) {
+                        // Mix column lanes
+                        var tMsw = 0,
+                            tLsw = 0;
+                        for (var y = 0; y < 5; y++) {
+                            var lane = state[x + 5 * y];
+                            tMsw ^= lane.high;
+                            tLsw ^= lane.low;
+                        }
+
+                        // Temporary values
+                        var Tx = T[x];
+                        Tx.high = tMsw;
+                        Tx.low = tLsw;
+                    }
+                    for (var x = 0; x < 5; x++) {
+                        // Shortcuts
+                        var Tx4 = T[(x + 4) % 5];
+                        var Tx1 = T[(x + 1) % 5];
+                        var Tx1Msw = Tx1.high;
+                        var Tx1Lsw = Tx1.low;
+
+                        // Mix surrounding columns
+                        var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
+                        var tLsw = Tx4.low ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+                        for (var y = 0; y < 5; y++) {
+                            var lane = state[x + 5 * y];
+                            lane.high ^= tMsw;
+                            lane.low ^= tLsw;
+                        }
+                    }
+
+                    // Rho Pi
+                    for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
+                        var tMsw;
+                        var tLsw;
+
+                        // Shortcuts
+                        var lane = state[laneIndex];
+                        var laneMsw = lane.high;
+                        var laneLsw = lane.low;
+                        var rhoOffset = RHO_OFFSETS[laneIndex];
+
+                        // Rotate lanes
+                        if (rhoOffset < 32) {
+                            tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
+                            tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+                        } else /* if (rhoOffset >= 32) */ {
+                            tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
+                            tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+                        }
+
+                        // Transpose lanes
+                        var TPiLane = T[PI_INDEXES[laneIndex]];
+                        TPiLane.high = tMsw;
+                        TPiLane.low = tLsw;
+                    }
+
+                    // Rho pi at x = y = 0
+                    var T0 = T[0];
+                    var state0 = state[0];
+                    T0.high = state0.high;
+                    T0.low = state0.low;
+
+                    // Chi
+                    for (var x = 0; x < 5; x++) {
+                        for (var y = 0; y < 5; y++) {
+                            // Shortcuts
+                            var laneIndex = x + 5 * y;
+                            var lane = state[laneIndex];
+                            var TLane = T[laneIndex];
+                            var Tx1Lane = T[((x + 1) % 5) + 5 * y];
+                            var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+
+                            // Mix rows
+                            lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
+                            lane.low = TLane.low ^ (~Tx1Lane.low & Tx2Lane.low);
+                        }
+                    }
+
+                    // Iota
+                    var lane = state[0];
+                    var roundConstant = ROUND_CONSTANTS[round];
+                    lane.high ^= roundConstant.high;
+                    lane.low ^= roundConstant.low;
+                }
+            },
+
+            _doFinalize: function () {
+                // Shortcuts
+                var data = this._data;
+                var dataWords = data.words;
+                var nBitsTotal = this._nDataBytes * 8;
+                var nBitsLeft = data.sigBytes * 8;
+                var blockSizeBits = this.blockSize * 32;
+
+                // Add padding
+                dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
+                dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
+                data.sigBytes = dataWords.length * 4;
+
+                // Hash final blocks
+                this._process();
+
+                // Shortcuts
+                var state = this._state;
+                var outputLengthBytes = this.cfg.outputLength / 8;
+                var outputLengthLanes = outputLengthBytes / 8;
+
+                // Squeeze
+                var hashWords = [];
+                for (var i = 0; i < outputLengthLanes; i++) {
+                    // Shortcuts
+                    var lane = state[i];
+                    var laneMsw = lane.high;
+                    var laneLsw = lane.low;
+
+                    // Swap endian
+                    laneMsw = (
+                        (((laneMsw << 8) | (laneMsw >>> 24)) & 0x00ff00ff) |
+                        (((laneMsw << 24) | (laneMsw >>> 8)) & 0xff00ff00)
+                    );
+                    laneLsw = (
+                        (((laneLsw << 8) | (laneLsw >>> 24)) & 0x00ff00ff) |
+                        (((laneLsw << 24) | (laneLsw >>> 8)) & 0xff00ff00)
+                    );
+
+                    // Squeeze state to retrieve hash
+                    hashWords.push(laneLsw);
+                    hashWords.push(laneMsw);
+                }
+
+                // Return final computed hash
+                return new WordArray.init(hashWords, outputLengthBytes);
+            },
+
+            clone: function () {
+                var clone = Hasher.clone.call(this);
+
+                var state = clone._state = this._state.slice(0);
+                for (var i = 0; i < 25; i++) {
+                    state[i] = state[i].clone();
+                }
+
+                return clone;
+            }
+        });
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.SHA3('message');
+         *     var hash = CryptoJS.SHA3(wordArray);
+         */
+        C.SHA3 = Hasher._createHelper(SHA3);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacSHA3(message, key);
+         */
+        C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+    }(Math));
+
+
+    /** @preserve
+    (c) 2012 by Cédric Mesnil. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+        - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+        - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    */
+
+    (function (Math) {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var Hasher = C_lib.Hasher;
+        var C_algo = C.algo;
+
+        // Constants table
+        var _zl = WordArray.create([
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+            7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8,
+            3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12,
+            1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2,
+            4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13
+        ]);
+        var _zr = WordArray.create([
+            5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12,
+            6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2,
+            15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13,
+            8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14,
+            12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11
+        ]);
+        var _sl = WordArray.create([
+            11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8,
+            7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12,
+            11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5,
+            11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12,
+            9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6
+        ]);
+        var _sr = WordArray.create([
+            8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6,
+            9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11,
+            9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5,
+            15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8,
+            8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11
+        ]);
+
+        var _hl = WordArray.create([0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
+        var _hr = WordArray.create([0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+
+        /**
+         * RIPEMD160 hash algorithm.
+         */
+        var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
+            _doReset: function () {
+                this._hash = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+            },
+
+            _doProcessBlock: function (M, offset) {
+
+                // Swap endian
+                for (var i = 0; i < 16; i++) {
+                    // Shortcuts
+                    var offset_i = offset + i;
+                    var M_offset_i = M[offset_i];
+
+                    // Swap
+                    M[offset_i] = (
+                        (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+                        (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+                    );
+                }
+                // Shortcut
+                var H = this._hash.words;
+                var hl = _hl.words;
+                var hr = _hr.words;
+                var zl = _zl.words;
+                var zr = _zr.words;
+                var sl = _sl.words;
+                var sr = _sr.words;
+
+                // Working variables
+                var al, bl, cl, dl, el;
+                var ar, br, cr, dr, er;
+
+                ar = al = H[0];
+                br = bl = H[1];
+                cr = cl = H[2];
+                dr = dl = H[3];
+                er = el = H[4];
+                // Computation
+                var t;
+                for (var i = 0; i < 80; i += 1) {
+                    t = (al + M[offset + zl[i]]) | 0;
+                    if (i < 16) {
+                        t += f1(bl, cl, dl) + hl[0];
+                    } else if (i < 32) {
+                        t += f2(bl, cl, dl) + hl[1];
+                    } else if (i < 48) {
+                        t += f3(bl, cl, dl) + hl[2];
+                    } else if (i < 64) {
+                        t += f4(bl, cl, dl) + hl[3];
+                    } else { // if (i<80) {
+                        t += f5(bl, cl, dl) + hl[4];
+                    }
+                    t = t | 0;
+                    t = rotl(t, sl[i]);
+                    t = (t + el) | 0;
+                    al = el;
+                    el = dl;
+                    dl = rotl(cl, 10);
+                    cl = bl;
+                    bl = t;
+
+                    t = (ar + M[offset + zr[i]]) | 0;
+                    if (i < 16) {
+                        t += f5(br, cr, dr) + hr[0];
+                    } else if (i < 32) {
+                        t += f4(br, cr, dr) + hr[1];
+                    } else if (i < 48) {
+                        t += f3(br, cr, dr) + hr[2];
+                    } else if (i < 64) {
+                        t += f2(br, cr, dr) + hr[3];
+                    } else { // if (i<80) {
+                        t += f1(br, cr, dr) + hr[4];
+                    }
+                    t = t | 0;
+                    t = rotl(t, sr[i]);
+                    t = (t + er) | 0;
+                    ar = er;
+                    er = dr;
+                    dr = rotl(cr, 10);
+                    cr = br;
+                    br = t;
+                }
+                // Intermediate hash value
+                t = (H[1] + cl + dr) | 0;
+                H[1] = (H[2] + dl + er) | 0;
+                H[2] = (H[3] + el + ar) | 0;
+                H[3] = (H[4] + al + br) | 0;
+                H[4] = (H[0] + bl + cr) | 0;
+                H[0] = t;
+            },
+
+            _doFinalize: function () {
+                // Shortcuts
+                var data = this._data;
+                var dataWords = data.words;
+
+                var nBitsTotal = this._nDataBytes * 8;
+                var nBitsLeft = data.sigBytes * 8;
+
+                // Add padding
+                dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+                dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+                    (((nBitsTotal << 8) | (nBitsTotal >>> 24)) & 0x00ff00ff) |
+                    (((nBitsTotal << 24) | (nBitsTotal >>> 8)) & 0xff00ff00)
+                );
+                data.sigBytes = (dataWords.length + 1) * 4;
+
+                // Hash final blocks
+                this._process();
+
+                // Shortcuts
+                var hash = this._hash;
+                var H = hash.words;
+
+                // Swap endian
+                for (var i = 0; i < 5; i++) {
+                    // Shortcut
+                    var H_i = H[i];
+
+                    // Swap
+                    H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+                        (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+                }
+
+                // Return final computed hash
+                return hash;
+            },
+
+            clone: function () {
+                var clone = Hasher.clone.call(this);
+                clone._hash = this._hash.clone();
+
+                return clone;
+            }
+        });
+
+
+        function f1(x, y, z) {
+            return ((x) ^ (y) ^ (z));
+
+        }
+
+        function f2(x, y, z) {
+            return (((x) & (y)) | ((~x) & (z)));
+        }
+
+        function f3(x, y, z) {
+            return (((x) | (~(y))) ^ (z));
+        }
+
+        function f4(x, y, z) {
+            return (((x) & (z)) | ((y) & (~(z))));
+        }
+
+        function f5(x, y, z) {
+            return ((x) ^ ((y) | (~(z))));
+
+        }
+
+        function rotl(x, n) {
+            return (x << n) | (x >>> (32 - n));
+        }
+
+
+        /**
+         * Shortcut function to the hasher's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         *
+         * @return {WordArray} The hash.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hash = CryptoJS.RIPEMD160('message');
+         *     var hash = CryptoJS.RIPEMD160(wordArray);
+         */
+        C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+
+        /**
+         * Shortcut function to the HMAC's object interface.
+         *
+         * @param {WordArray|string} message The message to hash.
+         * @param {WordArray|string} key The secret key.
+         *
+         * @return {WordArray} The HMAC.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var hmac = CryptoJS.HmacRIPEMD160(message, key);
+         */
+        C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+    }(Math));
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var Base = C_lib.Base;
+        var C_enc = C.enc;
+        var Utf8 = C_enc.Utf8;
+        var C_algo = C.algo;
+
+        /**
+         * HMAC algorithm.
+         */
+        var HMAC = C_algo.HMAC = Base.extend({
+            /**
+             * Initializes a newly created HMAC.
+             *
+             * @param {Hasher} hasher The hash algorithm to use.
+             * @param {WordArray|string} key The secret key.
+             *
+             * @example
+             *
+             *     var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
+             */
+            init: function (hasher, key) {
+                // Init hasher
+                hasher = this._hasher = new hasher.init();
+
+                // Convert string to WordArray, else assume WordArray already
+                if (typeof key == 'string') {
+                    key = Utf8.parse(key);
+                }
+
+                // Shortcuts
+                var hasherBlockSize = hasher.blockSize;
+                var hasherBlockSizeBytes = hasherBlockSize * 4;
+
+                // Allow arbitrary length keys
+                if (key.sigBytes > hasherBlockSizeBytes) {
+                    key = hasher.finalize(key);
+                }
+
+                // Clamp excess bits
+                key.clamp();
+
+                // Clone key for inner and outer pads
+                var oKey = this._oKey = key.clone();
+                var iKey = this._iKey = key.clone();
+
+                // Shortcuts
+                var oKeyWords = oKey.words;
+                var iKeyWords = iKey.words;
+
+                // XOR keys with pad constants
+                for (var i = 0; i < hasherBlockSize; i++) {
+                    oKeyWords[i] ^= 0x5c5c5c5c;
+                    iKeyWords[i] ^= 0x36363636;
+                }
+                oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+
+                // Set initial values
+                this.reset();
+            },
+
+            /**
+             * Resets this HMAC to its initial state.
+             *
+             * @example
+             *
+             *     hmacHasher.reset();
+             */
+            reset: function () {
+                // Shortcut
+                var hasher = this._hasher;
+
+                // Reset
+                hasher.reset();
+                hasher.update(this._iKey);
+            },
+
+            /**
+             * Updates this HMAC with a message.
+             *
+             * @param {WordArray|string} messageUpdate The message to append.
+             *
+             * @return {HMAC} This HMAC instance.
+             *
+             * @example
+             *
+             *     hmacHasher.update('message');
+             *     hmacHasher.update(wordArray);
+             */
+            update: function (messageUpdate) {
+                this._hasher.update(messageUpdate);
+
+                // Chainable
+                return this;
+            },
+
+            /**
+             * Finalizes the HMAC computation.
+             * Note that the finalize operation is effectively a destructive, read-once operation.
+             *
+             * @param {WordArray|string} messageUpdate (Optional) A final message update.
+             *
+             * @return {WordArray} The HMAC.
+             *
+             * @example
+             *
+             *     var hmac = hmacHasher.finalize();
+             *     var hmac = hmacHasher.finalize('message');
+             *     var hmac = hmacHasher.finalize(wordArray);
+             */
+            finalize: function (messageUpdate) {
+                // Shortcut
+                var hasher = this._hasher;
+
+                // Compute HMAC
+                var innerHash = hasher.finalize(messageUpdate);
+                hasher.reset();
+                var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+
+                return hmac;
+            }
+        });
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var Base = C_lib.Base;
+        var WordArray = C_lib.WordArray;
+        var C_algo = C.algo;
+        var SHA1 = C_algo.SHA1;
+        var HMAC = C_algo.HMAC;
+
+        /**
+         * Password-Based Key Derivation Function 2 algorithm.
+         */
+        var PBKDF2 = C_algo.PBKDF2 = Base.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+             * @property {Hasher} hasher The hasher to use. Default: SHA1
+             * @property {number} iterations The number of iterations to perform. Default: 1
+             */
+            cfg: Base.extend({
+                keySize: 128 / 32,
+                hasher: SHA1,
+                iterations: 1
+            }),
+
+            /**
+             * Initializes a newly created key derivation function.
+             *
+             * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+             *
+             * @example
+             *
+             *     var kdf = CryptoJS.algo.PBKDF2.create();
+             *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
+             *     var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
+             */
+            init: function (cfg) {
+                this.cfg = this.cfg.extend(cfg);
+            },
+
+            /**
+             * Computes the Password-Based Key Derivation Function 2.
+             *
+             * @param {WordArray|string} password The password.
+             * @param {WordArray|string} salt A salt.
+             *
+             * @return {WordArray} The derived key.
+             *
+             * @example
+             *
+             *     var key = kdf.compute(password, salt);
+             */
+            compute: function (password, salt) {
+                // Shortcut
+                var cfg = this.cfg;
+
+                // Init HMAC
+                var hmac = HMAC.create(cfg.hasher, password);
+
+                // Initial values
+                var derivedKey = WordArray.create();
+                var blockIndex = WordArray.create([0x00000001]);
+
+                // Shortcuts
+                var derivedKeyWords = derivedKey.words;
+                var blockIndexWords = blockIndex.words;
+                var keySize = cfg.keySize;
+                var iterations = cfg.iterations;
+
+                // Generate key
+                while (derivedKeyWords.length < keySize) {
+                    var block = hmac.update(salt).finalize(blockIndex);
+                    hmac.reset();
+
+                    // Shortcuts
+                    var blockWords = block.words;
+                    var blockWordsLength = blockWords.length;
+
+                    // Iterations
+                    var intermediate = block;
+                    for (var i = 1; i < iterations; i++) {
+                        intermediate = hmac.finalize(intermediate);
+                        hmac.reset();
+
+                        // Shortcut
+                        var intermediateWords = intermediate.words;
+
+                        // XOR intermediate with block
+                        for (var j = 0; j < blockWordsLength; j++) {
+                            blockWords[j] ^= intermediateWords[j];
+                        }
+                    }
+
+                    derivedKey.concat(block);
+                    blockIndexWords[0]++;
+                }
+                derivedKey.sigBytes = keySize * 4;
+
+                return derivedKey;
+            }
+        });
+
+        /**
+         * Computes the Password-Based Key Derivation Function 2.
+         *
+         * @param {WordArray|string} password The password.
+         * @param {WordArray|string} salt A salt.
+         * @param {Object} cfg (Optional) The configuration options to use for this computation.
+         *
+         * @return {WordArray} The derived key.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var key = CryptoJS.PBKDF2(password, salt);
+         *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
+         *     var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
+         */
+        C.PBKDF2 = function (password, salt, cfg) {
+            return PBKDF2.create(cfg).compute(password, salt);
+        };
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var Base = C_lib.Base;
+        var WordArray = C_lib.WordArray;
+        var C_algo = C.algo;
+        var MD5 = C_algo.MD5;
+
+        /**
+         * This key derivation function is meant to conform with EVP_BytesToKey.
+         * www.openssl.org/docs/crypto/EVP_BytesToKey.html
+         */
+        var EvpKDF = C_algo.EvpKDF = Base.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+             * @property {Hasher} hasher The hash algorithm to use. Default: MD5
+             * @property {number} iterations The number of iterations to perform. Default: 1
+             */
+            cfg: Base.extend({
+                keySize: 128 / 32,
+                hasher: MD5,
+                iterations: 1
+            }),
+
+            /**
+             * Initializes a newly created key derivation function.
+             *
+             * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+             *
+             * @example
+             *
+             *     var kdf = CryptoJS.algo.EvpKDF.create();
+             *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
+             *     var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
+             */
+            init: function (cfg) {
+                this.cfg = this.cfg.extend(cfg);
+            },
+
+            /**
+             * Derives a key from a password.
+             *
+             * @param {WordArray|string} password The password.
+             * @param {WordArray|string} salt A salt.
+             *
+             * @return {WordArray} The derived key.
+             *
+             * @example
+             *
+             *     var key = kdf.compute(password, salt);
+             */
+            compute: function (password, salt) {
+                var block;
+
+                // Shortcut
+                var cfg = this.cfg;
+
+                // Init hasher
+                var hasher = cfg.hasher.create();
+
+                // Initial values
+                var derivedKey = WordArray.create();
+
+                // Shortcuts
+                var derivedKeyWords = derivedKey.words;
+                var keySize = cfg.keySize;
+                var iterations = cfg.iterations;
+
+                // Generate key
+                while (derivedKeyWords.length < keySize) {
+                    if (block) {
+                        hasher.update(block);
+                    }
+                    block = hasher.update(password).finalize(salt);
+                    hasher.reset();
+
+                    // Iterations
+                    for (var i = 1; i < iterations; i++) {
+                        block = hasher.finalize(block);
+                        hasher.reset();
+                    }
+
+                    derivedKey.concat(block);
+                }
+                derivedKey.sigBytes = keySize * 4;
+
+                return derivedKey;
+            }
+        });
+
+        /**
+         * Derives a key from a password.
+         *
+         * @param {WordArray|string} password The password.
+         * @param {WordArray|string} salt A salt.
+         * @param {Object} cfg (Optional) The configuration options to use for this computation.
+         *
+         * @return {WordArray} The derived key.
+         *
+         * @static
+         *
+         * @example
+         *
+         *     var key = CryptoJS.EvpKDF(password, salt);
+         *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
+         *     var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
+         */
+        C.EvpKDF = function (password, salt, cfg) {
+            return EvpKDF.create(cfg).compute(password, salt);
+        };
+    }());
+
+
+    /**
+     * Cipher core components.
+     */
+    CryptoJS.lib.Cipher || (function (undefined) {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var Base = C_lib.Base;
+        var WordArray = C_lib.WordArray;
+        var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
+        var C_enc = C.enc;
+        var Utf8 = C_enc.Utf8;
+        var Base64 = C_enc.Base64;
+        var C_algo = C.algo;
+        var EvpKDF = C_algo.EvpKDF;
+
+        /**
+         * Abstract base cipher template.
+         *
+         * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
+         * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
+         * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
+         * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
+         */
+        var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {WordArray} iv The IV to use for this operation.
+             */
+            cfg: Base.extend(),
+
+            /**
+             * Creates this cipher in encryption mode.
+             *
+             * @param {WordArray} key The key.
+             * @param {Object} cfg (Optional) The configuration options to use for this operation.
+             *
+             * @return {Cipher} A cipher instance.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
+             */
+            createEncryptor: function (key, cfg) {
+                return this.create(this._ENC_XFORM_MODE, key, cfg);
+            },
+
+            /**
+             * Creates this cipher in decryption mode.
+             *
+             * @param {WordArray} key The key.
+             * @param {Object} cfg (Optional) The configuration options to use for this operation.
+             *
+             * @return {Cipher} A cipher instance.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
+             */
+            createDecryptor: function (key, cfg) {
+                return this.create(this._DEC_XFORM_MODE, key, cfg);
+            },
+
+            /**
+             * Initializes a newly created cipher.
+             *
+             * @param {number} xformMode Either the encryption or decryption transormation mode constant.
+             * @param {WordArray} key The key.
+             * @param {Object} cfg (Optional) The configuration options to use for this operation.
+             *
+             * @example
+             *
+             *     var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
+             */
+            init: function (xformMode, key, cfg) {
+                // Apply config defaults
+                this.cfg = this.cfg.extend(cfg);
+
+                // Store transform mode and key
+                this._xformMode = xformMode;
+                this._key = key;
+
+                // Set initial values
+                this.reset();
+            },
+
+            /**
+             * Resets this cipher to its initial state.
+             *
+             * @example
+             *
+             *     cipher.reset();
+             */
+            reset: function () {
+                // Reset data buffer
+                BufferedBlockAlgorithm.reset.call(this);
+
+                // Perform concrete-cipher logic
+                this._doReset();
+            },
+
+            /**
+             * Adds data to be encrypted or decrypted.
+             *
+             * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
+             *
+             * @return {WordArray} The data after processing.
+             *
+             * @example
+             *
+             *     var encrypted = cipher.process('data');
+             *     var encrypted = cipher.process(wordArray);
+             */
+            process: function (dataUpdate) {
+                // Append
+                this._append(dataUpdate);
+
+                // Process available blocks
+                return this._process();
+            },
+
+            /**
+             * Finalizes the encryption or decryption process.
+             * Note that the finalize operation is effectively a destructive, read-once operation.
+             *
+             * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
+             *
+             * @return {WordArray} The data after final processing.
+             *
+             * @example
+             *
+             *     var encrypted = cipher.finalize();
+             *     var encrypted = cipher.finalize('data');
+             *     var encrypted = cipher.finalize(wordArray);
+             */
+            finalize: function (dataUpdate) {
+                // Final data update
+                if (dataUpdate) {
+                    this._append(dataUpdate);
+                }
+
+                // Perform concrete-cipher logic
+                var finalProcessedData = this._doFinalize();
+
+                return finalProcessedData;
+            },
+
+            keySize: 128 / 32,
+
+            ivSize: 128 / 32,
+
+            _ENC_XFORM_MODE: 1,
+
+            _DEC_XFORM_MODE: 2,
+
+            /**
+             * Creates shortcut functions to a cipher's object interface.
+             *
+             * @param {Cipher} cipher The cipher to create a helper for.
+             *
+             * @return {Object} An object with encrypt and decrypt shortcut functions.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
+             */
+            _createHelper: (function () {
+                function selectCipherStrategy(key) {
+                    if (typeof key == 'string') {
+                        return PasswordBasedCipher;
+                    } else {
+                        return SerializableCipher;
+                    }
+                }
+
+                return function (cipher) {
+                    return {
+                        encrypt: function (message, key, cfg) {
+                            return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+                        },
+
+                        decrypt: function (ciphertext, key, cfg) {
+                            return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+                        }
+                    };
+                };
+            }())
+        });
+
+        /**
+         * Abstract base stream cipher template.
+         *
+         * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
+         */
+        var StreamCipher = C_lib.StreamCipher = Cipher.extend({
+            _doFinalize: function () {
+                // Process partial blocks
+                var finalProcessedBlocks = this._process(!!'flush');
+
+                return finalProcessedBlocks;
+            },
+
+            blockSize: 1
+        });
+
+        /**
+         * Mode namespace.
+         */
+        var C_mode = C.mode = {};
+
+        /**
+         * Abstract base block cipher mode template.
+         */
+        var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
+            /**
+             * Creates this mode for encryption.
+             *
+             * @param {Cipher} cipher A block cipher instance.
+             * @param {Array} iv The IV words.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
+             */
+            createEncryptor: function (cipher, iv) {
+                return this.Encryptor.create(cipher, iv);
+            },
+
+            /**
+             * Creates this mode for decryption.
+             *
+             * @param {Cipher} cipher A block cipher instance.
+             * @param {Array} iv The IV words.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
+             */
+            createDecryptor: function (cipher, iv) {
+                return this.Decryptor.create(cipher, iv);
+            },
+
+            /**
+             * Initializes a newly created mode.
+             *
+             * @param {Cipher} cipher A block cipher instance.
+             * @param {Array} iv The IV words.
+             *
+             * @example
+             *
+             *     var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
+             */
+            init: function (cipher, iv) {
+                this._cipher = cipher;
+                this._iv = iv;
+            }
+        });
+
+        /**
+         * Cipher Block Chaining mode.
+         */
+        var CBC = C_mode.CBC = (function () {
+            /**
+             * Abstract base CBC mode.
+             */
+            var CBC = BlockCipherMode.extend();
+
+            /**
+             * CBC encryptor.
+             */
+            CBC.Encryptor = CBC.extend({
+                /**
+                 * Processes the data block at offset.
+                 *
+                 * @param {Array} words The data words to operate on.
+                 * @param {number} offset The offset where the block starts.
+                 *
+                 * @example
+                 *
+                 *     mode.processBlock(data.words, offset);
+                 */
+                processBlock: function (words, offset) {
+                    // Shortcuts
+                    var cipher = this._cipher;
+                    var blockSize = cipher.blockSize;
+
+                    // XOR and encrypt
+                    xorBlock.call(this, words, offset, blockSize);
+                    cipher.encryptBlock(words, offset);
+
+                    // Remember this block to use with next block
+                    this._prevBlock = words.slice(offset, offset + blockSize);
+                }
+            });
+
+            /**
+             * CBC decryptor.
+             */
+            CBC.Decryptor = CBC.extend({
+                /**
+                 * Processes the data block at offset.
+                 *
+                 * @param {Array} words The data words to operate on.
+                 * @param {number} offset The offset where the block starts.
+                 *
+                 * @example
+                 *
+                 *     mode.processBlock(data.words, offset);
+                 */
+                processBlock: function (words, offset) {
+                    // Shortcuts
+                    var cipher = this._cipher;
+                    var blockSize = cipher.blockSize;
+
+                    // Remember this block to use with next block
+                    var thisBlock = words.slice(offset, offset + blockSize);
+
+                    // Decrypt and XOR
+                    cipher.decryptBlock(words, offset);
+                    xorBlock.call(this, words, offset, blockSize);
+
+                    // This block becomes the previous block
+                    this._prevBlock = thisBlock;
+                }
+            });
+
+            function xorBlock(words, offset, blockSize) {
+                var block;
+
+                // Shortcut
+                var iv = this._iv;
+
+                // Choose mixing block
+                if (iv) {
+                    block = iv;
+
+                    // Remove IV for subsequent blocks
+                    this._iv = undefined;
+                } else {
+                    block = this._prevBlock;
+                }
+
+                // XOR blocks
+                for (var i = 0; i < blockSize; i++) {
+                    words[offset + i] ^= block[i];
+                }
+            }
+
+            return CBC;
+        }());
+
+        /**
+         * Padding namespace.
+         */
+        var C_pad = C.pad = {};
+
+        /**
+         * PKCS #5/7 padding strategy.
+         */
+        var Pkcs7 = C_pad.Pkcs7 = {
+            /**
+             * Pads data using the algorithm defined in PKCS #5/7.
+             *
+             * @param {WordArray} data The data to pad.
+             * @param {number} blockSize The multiple that the data should be padded to.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+             */
+            pad: function (data, blockSize) {
+                // Shortcut
+                var blockSizeBytes = blockSize * 4;
+
+                // Count padding bytes
+                var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+                // Create padding word
+                var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+
+                // Create padding
+                var paddingWords = [];
+                for (var i = 0; i < nPaddingBytes; i += 4) {
+                    paddingWords.push(paddingWord);
+                }
+                var padding = WordArray.create(paddingWords, nPaddingBytes);
+
+                // Add padding
+                data.concat(padding);
+            },
+
+            /**
+             * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+             *
+             * @param {WordArray} data The data to unpad.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+             */
+            unpad: function (data) {
+                // Get number of padding bytes from last byte
+                var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+                // Remove padding
+                data.sigBytes -= nPaddingBytes;
+            }
+        };
+
+        /**
+         * Abstract base block cipher template.
+         *
+         * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
+         */
+        var BlockCipher = C_lib.BlockCipher = Cipher.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {Mode} mode The block mode to use. Default: CBC
+             * @property {Padding} padding The padding strategy to use. Default: Pkcs7
+             */
+            cfg: Cipher.cfg.extend({
+                mode: CBC,
+                padding: Pkcs7
+            }),
+
+            reset: function () {
+                var modeCreator;
+
+                // Reset cipher
+                Cipher.reset.call(this);
+
+                // Shortcuts
+                var cfg = this.cfg;
+                var iv = cfg.iv;
+                var mode = cfg.mode;
+
+                // Reset block mode
+                if (this._xformMode == this._ENC_XFORM_MODE) {
+                    modeCreator = mode.createEncryptor;
+                } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+                    modeCreator = mode.createDecryptor;
+                    // Keep at least one block in the buffer for unpadding
+                    this._minBufferSize = 1;
+                }
+
+                if (this._mode && this._mode.__creator == modeCreator) {
+                    this._mode.init(this, iv && iv.words);
+                } else {
+                    this._mode = modeCreator.call(mode, this, iv && iv.words);
+                    this._mode.__creator = modeCreator;
+                }
+            },
+
+            _doProcessBlock: function (words, offset) {
+                this._mode.processBlock(words, offset);
+            },
+
+            _doFinalize: function () {
+                var finalProcessedBlocks;
+
+                // Shortcut
+                var padding = this.cfg.padding;
+
+                // Finalize
+                if (this._xformMode == this._ENC_XFORM_MODE) {
+                    // Pad data
+                    padding.pad(this._data, this.blockSize);
+
+                    // Process final blocks
+                    finalProcessedBlocks = this._process(!!'flush');
+                } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+                    // Process final blocks
+                    finalProcessedBlocks = this._process(!!'flush');
+
+                    // Unpad data
+                    padding.unpad(finalProcessedBlocks);
+                }
+
+                return finalProcessedBlocks;
+            },
+
+            blockSize: 128 / 32
+        });
+
+        /**
+         * A collection of cipher parameters.
+         *
+         * @property {WordArray} ciphertext The raw ciphertext.
+         * @property {WordArray} key The key to this ciphertext.
+         * @property {WordArray} iv The IV used in the ciphering operation.
+         * @property {WordArray} salt The salt used with a key derivation function.
+         * @property {Cipher} algorithm The cipher algorithm.
+         * @property {Mode} mode The block mode used in the ciphering operation.
+         * @property {Padding} padding The padding scheme used in the ciphering operation.
+         * @property {number} blockSize The block size of the cipher.
+         * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
+         */
+        var CipherParams = C_lib.CipherParams = Base.extend({
+            /**
+             * Initializes a newly created cipher params object.
+             *
+             * @param {Object} cipherParams An object with any of the possible cipher parameters.
+             *
+             * @example
+             *
+             *     var cipherParams = CryptoJS.lib.CipherParams.create({
+             *         ciphertext: ciphertextWordArray,
+             *         key: keyWordArray,
+             *         iv: ivWordArray,
+             *         salt: saltWordArray,
+             *         algorithm: CryptoJS.algo.AES,
+             *         mode: CryptoJS.mode.CBC,
+             *         padding: CryptoJS.pad.PKCS7,
+             *         blockSize: 4,
+             *         formatter: CryptoJS.format.OpenSSL
+             *     });
+             */
+            init: function (cipherParams) {
+                this.mixIn(cipherParams);
+            },
+
+            /**
+             * Converts this cipher params object to a string.
+             *
+             * @param {Format} formatter (Optional) The formatting strategy to use.
+             *
+             * @return {string} The stringified cipher params.
+             *
+             * @throws Error If neither the formatter nor the default formatter is set.
+             *
+             * @example
+             *
+             *     var string = cipherParams + '';
+             *     var string = cipherParams.toString();
+             *     var string = cipherParams.toString(CryptoJS.format.OpenSSL);
+             */
+            toString: function (formatter) {
+                return (formatter || this.formatter).stringify(this);
+            }
+        });
+
+        /**
+         * Format namespace.
+         */
+        var C_format = C.format = {};
+
+        /**
+         * OpenSSL formatting strategy.
+         */
+        var OpenSSLFormatter = C_format.OpenSSL = {
+            /**
+             * Converts a cipher params object to an OpenSSL-compatible string.
+             *
+             * @param {CipherParams} cipherParams The cipher params object.
+             *
+             * @return {string} The OpenSSL-compatible string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
+             */
+            stringify: function (cipherParams) {
+                var wordArray;
+
+                // Shortcuts
+                var ciphertext = cipherParams.ciphertext;
+                var salt = cipherParams.salt;
+
+                // Format
+                if (salt) {
+                    wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+                } else {
+                    wordArray = ciphertext;
+                }
+
+                return wordArray.toString(Base64);
+            },
+
+            /**
+             * Converts an OpenSSL-compatible string to a cipher params object.
+             *
+             * @param {string} openSSLStr The OpenSSL-compatible string.
+             *
+             * @return {CipherParams} The cipher params object.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
+             */
+            parse: function (openSSLStr) {
+                var salt;
+
+                // Parse base64
+                var ciphertext = Base64.parse(openSSLStr);
+
+                // Shortcut
+                var ciphertextWords = ciphertext.words;
+
+                // Test for salt
+                if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
+                    // Extract salt
+                    salt = WordArray.create(ciphertextWords.slice(2, 4));
+
+                    // Remove salt from ciphertext
+                    ciphertextWords.splice(0, 4);
+                    ciphertext.sigBytes -= 16;
+                }
+
+                return CipherParams.create({
+                    ciphertext: ciphertext,
+                    salt: salt
+                });
+            }
+        };
+
+        /**
+         * A cipher wrapper that returns ciphertext as a serializable cipher params object.
+         */
+        var SerializableCipher = C_lib.SerializableCipher = Base.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
+             */
+            cfg: Base.extend({
+                format: OpenSSLFormatter
+            }),
+
+            /**
+             * Encrypts a message.
+             *
+             * @param {Cipher} cipher The cipher algorithm to use.
+             * @param {WordArray|string} message The message to encrypt.
+             * @param {WordArray} key The key.
+             * @param {Object} cfg (Optional) The configuration options to use for this operation.
+             *
+             * @return {CipherParams} A cipher params object.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
+             *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
+             *     var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+             */
+            encrypt: function (cipher, message, key, cfg) {
+                // Apply config defaults
+                cfg = this.cfg.extend(cfg);
+
+                // Encrypt
+                var encryptor = cipher.createEncryptor(key, cfg);
+                var ciphertext = encryptor.finalize(message);
+
+                // Shortcut
+                var cipherCfg = encryptor.cfg;
+
+                // Create and return serializable cipher params
+                return CipherParams.create({
+                    ciphertext: ciphertext,
+                    key: key,
+                    iv: cipherCfg.iv,
+                    algorithm: cipher,
+                    mode: cipherCfg.mode,
+                    padding: cipherCfg.padding,
+                    blockSize: cipher.blockSize,
+                    formatter: cfg.format
+                });
+            },
+
+            /**
+             * Decrypts serialized ciphertext.
+             *
+             * @param {Cipher} cipher The cipher algorithm to use.
+             * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+             * @param {WordArray} key The key.
+             * @param {Object} cfg (Optional) The configuration options to use for this operation.
+             *
+             * @return {WordArray} The plaintext.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+             *     var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+             */
+            decrypt: function (cipher, ciphertext, key, cfg) {
+                // Apply config defaults
+                cfg = this.cfg.extend(cfg);
+
+                // Convert string to CipherParams
+                ciphertext = this._parse(ciphertext, cfg.format);
+
+                // Decrypt
+                var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+
+                return plaintext;
+            },
+
+            /**
+             * Converts serialized ciphertext to CipherParams,
+             * else assumed CipherParams already and returns ciphertext unchanged.
+             *
+             * @param {CipherParams|string} ciphertext The ciphertext.
+             * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
+             *
+             * @return {CipherParams} The unserialized ciphertext.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
+             */
+            _parse: function (ciphertext, format) {
+                if (typeof ciphertext == 'string') {
+                    return format.parse(ciphertext, this);
+                } else {
+                    return ciphertext;
+                }
+            }
+        });
+
+        /**
+         * Key derivation function namespace.
+         */
+        var C_kdf = C.kdf = {};
+
+        /**
+         * OpenSSL key derivation function.
+         */
+        var OpenSSLKdf = C_kdf.OpenSSL = {
+            /**
+             * Derives a key and IV from a password.
+             *
+             * @param {string} password The password to derive from.
+             * @param {number} keySize The size in words of the key to generate.
+             * @param {number} ivSize The size in words of the IV to generate.
+             * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
+             *
+             * @return {CipherParams} A cipher params object with the key, IV, and salt.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
+             *     var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
+             */
+            execute: function (password, keySize, ivSize, salt) {
+                // Generate random salt
+                if (!salt) {
+                    salt = WordArray.random(64 / 8);
+                }
+
+                // Derive key and IV
+                var key = EvpKDF.create({
+                    keySize: keySize + ivSize
+                }).compute(password, salt);
+
+                // Separate key and IV
+                var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
+                key.sigBytes = keySize * 4;
+
+                // Return params
+                return CipherParams.create({
+                    key: key,
+                    iv: iv,
+                    salt: salt
+                });
+            }
+        };
+
+        /**
+         * A serializable cipher wrapper that derives the key from a password,
+         * and returns ciphertext as a serializable cipher params object.
+         */
+        var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
+             */
+            cfg: SerializableCipher.cfg.extend({
+                kdf: OpenSSLKdf
+            }),
+
+            /**
+             * Encrypts a message using a password.
+             *
+             * @param {Cipher} cipher The cipher algorithm to use.
+             * @param {WordArray|string} message The message to encrypt.
+             * @param {string} password The password.
+             * @param {Object} cfg (Optional) The configuration options to use for this operation.
+             *
+             * @return {CipherParams} A cipher params object.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
+             *     var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
+             */
+            encrypt: function (cipher, message, password, cfg) {
+                // Apply config defaults
+                cfg = this.cfg.extend(cfg);
+
+                // Derive key and other params
+                var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize);
+
+                // Add IV to config
+                cfg.iv = derivedParams.iv;
+
+                // Encrypt
+                var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+
+                // Mix in derived params
+                ciphertext.mixIn(derivedParams);
+
+                return ciphertext;
+            },
+
+            /**
+             * Decrypts serialized ciphertext using a password.
+             *
+             * @param {Cipher} cipher The cipher algorithm to use.
+             * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+             * @param {string} password The password.
+             * @param {Object} cfg (Optional) The configuration options to use for this operation.
+             *
+             * @return {WordArray} The plaintext.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
+             *     var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
+             */
+            decrypt: function (cipher, ciphertext, password, cfg) {
+                // Apply config defaults
+                cfg = this.cfg.extend(cfg);
+
+                // Convert string to CipherParams
+                ciphertext = this._parse(ciphertext, cfg.format);
+
+                // Derive key and other params
+                var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt);
+
+                // Add IV to config
+                cfg.iv = derivedParams.iv;
+
+                // Decrypt
+                var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+
+                return plaintext;
+            }
+        });
+    }());
+
+
+    /**
+     * Cipher Feedback block mode.
+     */
+    CryptoJS.mode.CFB = (function () {
+        var CFB = CryptoJS.lib.BlockCipherMode.extend();
+
+        CFB.Encryptor = CFB.extend({
+            processBlock: function (words, offset) {
+                // Shortcuts
+                var cipher = this._cipher;
+                var blockSize = cipher.blockSize;
+
+                generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+                // Remember this block to use with next block
+                this._prevBlock = words.slice(offset, offset + blockSize);
+            }
+        });
+
+        CFB.Decryptor = CFB.extend({
+            processBlock: function (words, offset) {
+                // Shortcuts
+                var cipher = this._cipher;
+                var blockSize = cipher.blockSize;
+
+                // Remember this block to use with next block
+                var thisBlock = words.slice(offset, offset + blockSize);
+
+                generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+                // This block becomes the previous block
+                this._prevBlock = thisBlock;
+            }
+        });
+
+        function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
+            var keystream;
+
+            // Shortcut
+            var iv = this._iv;
+
+            // Generate keystream
+            if (iv) {
+                keystream = iv.slice(0);
+
+                // Remove IV for subsequent blocks
+                this._iv = undefined;
+            } else {
+                keystream = this._prevBlock;
+            }
+            cipher.encryptBlock(keystream, 0);
+
+            // Encrypt
+            for (var i = 0; i < blockSize; i++) {
+                words[offset + i] ^= keystream[i];
+            }
+        }
+
+        return CFB;
+    }());
+
+
+    /**
+     * Counter block mode.
+     */
+    CryptoJS.mode.CTR = (function () {
+        var CTR = CryptoJS.lib.BlockCipherMode.extend();
+
+        var Encryptor = CTR.Encryptor = CTR.extend({
+            processBlock: function (words, offset) {
+                // Shortcuts
+                var cipher = this._cipher
+                var blockSize = cipher.blockSize;
+                var iv = this._iv;
+                var counter = this._counter;
+
+                // Generate keystream
+                if (iv) {
+                    counter = this._counter = iv.slice(0);
+
+                    // Remove IV for subsequent blocks
+                    this._iv = undefined;
+                }
+                var keystream = counter.slice(0);
+                cipher.encryptBlock(keystream, 0);
+
+                // Increment counter
+                counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
+
+                // Encrypt
+                for (var i = 0; i < blockSize; i++) {
+                    words[offset + i] ^= keystream[i];
+                }
+            }
+        });
+
+        CTR.Decryptor = Encryptor;
+
+        return CTR;
+    }());
+
+
+    /** @preserve
+     * Counter block mode compatible with  Dr Brian Gladman fileenc.c
+     * derived from CryptoJS.mode.CTR
+     * Jan Hruby jhruby.web@gmail.com
+     */
+    CryptoJS.mode.CTRGladman = (function () {
+        var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+
+        function incWord(word) {
+            if (((word >> 24) & 0xff) === 0xff) { //overflow
+                var b1 = (word >> 16) & 0xff;
+                var b2 = (word >> 8) & 0xff;
+                var b3 = word & 0xff;
+
+                if (b1 === 0xff) // overflow b1
+                {
+                    b1 = 0;
+                    if (b2 === 0xff) {
+                        b2 = 0;
+                        if (b3 === 0xff) {
+                            b3 = 0;
+                        } else {
+                            ++b3;
+                        }
+                    } else {
+                        ++b2;
+                    }
+                } else {
+                    ++b1;
+                }
+
+                word = 0;
+                word += (b1 << 16);
+                word += (b2 << 8);
+                word += b3;
+            } else {
+                word += (0x01 << 24);
+            }
+            return word;
+        }
+
+        function incCounter(counter) {
+            if ((counter[0] = incWord(counter[0])) === 0) {
+                // encr_data in fileenc.c from  Dr Brian Gladman's counts only with DWORD j < 8
+                counter[1] = incWord(counter[1]);
+            }
+            return counter;
+        }
+
+        var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
+            processBlock: function (words, offset) {
+                // Shortcuts
+                var cipher = this._cipher
+                var blockSize = cipher.blockSize;
+                var iv = this._iv;
+                var counter = this._counter;
+
+                // Generate keystream
+                if (iv) {
+                    counter = this._counter = iv.slice(0);
+
+                    // Remove IV for subsequent blocks
+                    this._iv = undefined;
+                }
+
+                incCounter(counter);
+
+                var keystream = counter.slice(0);
+                cipher.encryptBlock(keystream, 0);
+
+                // Encrypt
+                for (var i = 0; i < blockSize; i++) {
+                    words[offset + i] ^= keystream[i];
+                }
+            }
+        });
+
+        CTRGladman.Decryptor = Encryptor;
+
+        return CTRGladman;
+    }());
+
+
+
+
+    /**
+     * Output Feedback block mode.
+     */
+    CryptoJS.mode.OFB = (function () {
+        var OFB = CryptoJS.lib.BlockCipherMode.extend();
+
+        var Encryptor = OFB.Encryptor = OFB.extend({
+            processBlock: function (words, offset) {
+                // Shortcuts
+                var cipher = this._cipher
+                var blockSize = cipher.blockSize;
+                var iv = this._iv;
+                var keystream = this._keystream;
+
+                // Generate keystream
+                if (iv) {
+                    keystream = this._keystream = iv.slice(0);
+
+                    // Remove IV for subsequent blocks
+                    this._iv = undefined;
+                }
+                cipher.encryptBlock(keystream, 0);
+
+                // Encrypt
+                for (var i = 0; i < blockSize; i++) {
+                    words[offset + i] ^= keystream[i];
+                }
+            }
+        });
+
+        OFB.Decryptor = Encryptor;
+
+        return OFB;
+    }());
+
+
+    /**
+     * Electronic Codebook block mode.
+     */
+    CryptoJS.mode.ECB = (function () {
+        var ECB = CryptoJS.lib.BlockCipherMode.extend();
+
+        ECB.Encryptor = ECB.extend({
+            processBlock: function (words, offset) {
+                this._cipher.encryptBlock(words, offset);
+            }
+        });
+
+        ECB.Decryptor = ECB.extend({
+            processBlock: function (words, offset) {
+                this._cipher.decryptBlock(words, offset);
+            }
+        });
+
+        return ECB;
+    }());
+
+
+    /**
+     * ANSI X.923 padding strategy.
+     */
+    CryptoJS.pad.AnsiX923 = {
+        pad: function (data, blockSize) {
+            // Shortcuts
+            var dataSigBytes = data.sigBytes;
+            var blockSizeBytes = blockSize * 4;
+
+            // Count padding bytes
+            var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+
+            // Compute last byte position
+            var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+
+            // Pad
+            data.clamp();
+            data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
+            data.sigBytes += nPaddingBytes;
+        },
+
+        unpad: function (data) {
+            // Get number of padding bytes from last byte
+            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+            // Remove padding
+            data.sigBytes -= nPaddingBytes;
+        }
+    };
+
+
+    /**
+     * ISO 10126 padding strategy.
+     */
+    CryptoJS.pad.Iso10126 = {
+        pad: function (data, blockSize) {
+            // Shortcut
+            var blockSizeBytes = blockSize * 4;
+
+            // Count padding bytes
+            var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+            // Pad
+            data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
+            concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+        },
+
+        unpad: function (data) {
+            // Get number of padding bytes from last byte
+            var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+            // Remove padding
+            data.sigBytes -= nPaddingBytes;
+        }
+    };
+
+
+    /**
+     * ISO/IEC 9797-1 Padding Method 2.
+     */
+    CryptoJS.pad.Iso97971 = {
+        pad: function (data, blockSize) {
+            // Add 0x80 byte
+            data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+
+            // Zero pad the rest
+            CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+        },
+
+        unpad: function (data) {
+            // Remove zero padding
+            CryptoJS.pad.ZeroPadding.unpad(data);
+
+            // Remove one more byte -- the 0x80 byte
+            data.sigBytes--;
+        }
+    };
+
+
+    /**
+     * Zero padding strategy.
+     */
+    CryptoJS.pad.ZeroPadding = {
+        pad: function (data, blockSize) {
+            // Shortcut
+            var blockSizeBytes = blockSize * 4;
+
+            // Pad
+            data.clamp();
+            data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+        },
+
+        unpad: function (data) {
+            // Shortcut
+            var dataWords = data.words;
+
+            // Unpad
+            var i = data.sigBytes - 1;
+            for (var i = data.sigBytes - 1; i >= 0; i--) {
+                if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+                    data.sigBytes = i + 1;
+                    break;
+                }
+            }
+        }
+    };
+
+
+    /**
+     * A noop padding strategy.
+     */
+    CryptoJS.pad.NoPadding = {
+        pad: function () {},
+
+        unpad: function () {}
+    };
+
+
+    (function (undefined) {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var CipherParams = C_lib.CipherParams;
+        var C_enc = C.enc;
+        var Hex = C_enc.Hex;
+        var C_format = C.format;
+
+        var HexFormatter = C_format.Hex = {
+            /**
+             * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
+             *
+             * @param {CipherParams} cipherParams The cipher params object.
+             *
+             * @return {string} The hexadecimally encoded string.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);
+             */
+            stringify: function (cipherParams) {
+                return cipherParams.ciphertext.toString(Hex);
+            },
+
+            /**
+             * Converts a hexadecimally encoded ciphertext string to a cipher params object.
+             *
+             * @param {string} input The hexadecimally encoded string.
+             *
+             * @return {CipherParams} The cipher params object.
+             *
+             * @static
+             *
+             * @example
+             *
+             *     var cipherParams = CryptoJS.format.Hex.parse(hexString);
+             */
+            parse: function (input) {
+                var ciphertext = Hex.parse(input);
+                return CipherParams.create({
+                    ciphertext: ciphertext
+                });
+            }
+        };
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var BlockCipher = C_lib.BlockCipher;
+        var C_algo = C.algo;
+
+        // Lookup tables
+        var SBOX = [];
+        var INV_SBOX = [];
+        var SUB_MIX_0 = [];
+        var SUB_MIX_1 = [];
+        var SUB_MIX_2 = [];
+        var SUB_MIX_3 = [];
+        var INV_SUB_MIX_0 = [];
+        var INV_SUB_MIX_1 = [];
+        var INV_SUB_MIX_2 = [];
+        var INV_SUB_MIX_3 = [];
+
+        // Compute lookup tables
+        (function () {
+            // Compute double table
+            var d = [];
+            for (var i = 0; i < 256; i++) {
+                if (i < 128) {
+                    d[i] = i << 1;
+                } else {
+                    d[i] = (i << 1) ^ 0x11b;
+                }
+            }
+
+            // Walk GF(2^8)
+            var x = 0;
+            var xi = 0;
+            for (var i = 0; i < 256; i++) {
+                // Compute sbox
+                var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+                sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+                SBOX[x] = sx;
+                INV_SBOX[sx] = x;
+
+                // Compute multiplication
+                var x2 = d[x];
+                var x4 = d[x2];
+                var x8 = d[x4];
+
+                // Compute sub bytes, mix columns tables
+                var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+                SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+                SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+                SUB_MIX_2[x] = (t << 8) | (t >>> 24);
+                SUB_MIX_3[x] = t;
+
+                // Compute inv sub bytes, inv mix columns tables
+                var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+                INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+                INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+                INV_SUB_MIX_2[sx] = (t << 8) | (t >>> 24);
+                INV_SUB_MIX_3[sx] = t;
+
+                // Compute next counter
+                if (!x) {
+                    x = xi = 1;
+                } else {
+                    x = x2 ^ d[d[d[x8 ^ x2]]];
+                    xi ^= d[d[xi]];
+                }
+            }
+        }());
+
+        // Precomputed Rcon lookup
+        var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+        /**
+         * AES block cipher algorithm.
+         */
+        var AES = C_algo.AES = BlockCipher.extend({
+            _doReset: function () {
+                var t;
+
+                // Skip reset of nRounds has been set before and key did not change
+                if (this._nRounds && this._keyPriorReset === this._key) {
+                    return;
+                }
+
+                // Shortcuts
+                var key = this._keyPriorReset = this._key;
+                var keyWords = key.words;
+                var keySize = key.sigBytes / 4;
+
+                // Compute number of rounds
+                var nRounds = this._nRounds = keySize + 6;
+
+                // Compute number of key schedule rows
+                var ksRows = (nRounds + 1) * 4;
+
+                // Compute key schedule
+                var keySchedule = this._keySchedule = [];
+                for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+                    if (ksRow < keySize) {
+                        keySchedule[ksRow] = keyWords[ksRow];
+                    } else {
+                        t = keySchedule[ksRow - 1];
+
+                        if (!(ksRow % keySize)) {
+                            // Rot word
+                            t = (t << 8) | (t >>> 24);
+
+                            // Sub word
+                            t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+                            // Mix Rcon
+                            t ^= RCON[(ksRow / keySize) | 0] << 24;
+                        } else if (keySize > 6 && ksRow % keySize == 4) {
+                            // Sub word
+                            t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+                        }
+
+                        keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+                    }
+                }
+
+                // Compute inv key schedule
+                var invKeySchedule = this._invKeySchedule = [];
+                for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+                    var ksRow = ksRows - invKsRow;
+
+                    if (invKsRow % 4) {
+                        var t = keySchedule[ksRow];
+                    } else {
+                        var t = keySchedule[ksRow - 4];
+                    }
+
+                    if (invKsRow < 4 || ksRow <= 4) {
+                        invKeySchedule[invKsRow] = t;
+                    } else {
+                        invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+                            INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+                    }
+                }
+            },
+
+            encryptBlock: function (M, offset) {
+                this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+            },
+
+            decryptBlock: function (M, offset) {
+                // Swap 2nd and 4th rows
+                var t = M[offset + 1];
+                M[offset + 1] = M[offset + 3];
+                M[offset + 3] = t;
+
+                this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+                // Inv swap 2nd and 4th rows
+                var t = M[offset + 1];
+                M[offset + 1] = M[offset + 3];
+                M[offset + 3] = t;
+            },
+
+            _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+                // Shortcut
+                var nRounds = this._nRounds;
+
+                // Get input, add round key
+                var s0 = M[offset] ^ keySchedule[0];
+                var s1 = M[offset + 1] ^ keySchedule[1];
+                var s2 = M[offset + 2] ^ keySchedule[2];
+                var s3 = M[offset + 3] ^ keySchedule[3];
+
+                // Key schedule row counter
+                var ksRow = 4;
+
+                // Rounds
+                for (var round = 1; round < nRounds; round++) {
+                    // Shift rows, sub bytes, mix columns, add round key
+                    var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+                    var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+                    var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+                    var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+                    // Update state
+                    s0 = t0;
+                    s1 = t1;
+                    s2 = t2;
+                    s3 = t3;
+                }
+
+                // Shift rows, sub bytes, add round key
+                var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+                var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+                var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+                var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+                // Set output
+                M[offset] = t0;
+                M[offset + 1] = t1;
+                M[offset + 2] = t2;
+                M[offset + 3] = t3;
+            },
+
+            keySize: 256 / 32
+        });
+
+        /**
+         * Shortcut functions to the cipher's object interface.
+         *
+         * @example
+         *
+         *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+         *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+         */
+        C.AES = BlockCipher._createHelper(AES);
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var WordArray = C_lib.WordArray;
+        var BlockCipher = C_lib.BlockCipher;
+        var C_algo = C.algo;
+
+        // Permuted Choice 1 constants
+        var PC1 = [
+            57, 49, 41, 33, 25, 17, 9, 1,
+            58, 50, 42, 34, 26, 18, 10, 2,
+            59, 51, 43, 35, 27, 19, 11, 3,
+            60, 52, 44, 36, 63, 55, 47, 39,
+            31, 23, 15, 7, 62, 54, 46, 38,
+            30, 22, 14, 6, 61, 53, 45, 37,
+            29, 21, 13, 5, 28, 20, 12, 4
+        ];
+
+        // Permuted Choice 2 constants
+        var PC2 = [
+            14, 17, 11, 24, 1, 5,
+            3, 28, 15, 6, 21, 10,
+            23, 19, 12, 4, 26, 8,
+            16, 7, 27, 20, 13, 2,
+            41, 52, 31, 37, 47, 55,
+            30, 40, 51, 45, 33, 48,
+            44, 49, 39, 56, 34, 53,
+            46, 42, 50, 36, 29, 32
+        ];
+
+        // Cumulative bit shift constants
+        var BIT_SHIFTS = [1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+
+        // SBOXes and round permutation constants
+        var SBOX_P = [{
+                0x0: 0x808200,
+                0x10000000: 0x8000,
+                0x20000000: 0x808002,
+                0x30000000: 0x2,
+                0x40000000: 0x200,
+                0x50000000: 0x808202,
+                0x60000000: 0x800202,
+                0x70000000: 0x800000,
+                0x80000000: 0x202,
+                0x90000000: 0x800200,
+                0xa0000000: 0x8200,
+                0xb0000000: 0x808000,
+                0xc0000000: 0x8002,
+                0xd0000000: 0x800002,
+                0xe0000000: 0x0,
+                0xf0000000: 0x8202,
+                0x8000000: 0x0,
+                0x18000000: 0x808202,
+                0x28000000: 0x8202,
+                0x38000000: 0x8000,
+                0x48000000: 0x808200,
+                0x58000000: 0x200,
+                0x68000000: 0x808002,
+                0x78000000: 0x2,
+                0x88000000: 0x800200,
+                0x98000000: 0x8200,
+                0xa8000000: 0x808000,
+                0xb8000000: 0x800202,
+                0xc8000000: 0x800002,
+                0xd8000000: 0x8002,
+                0xe8000000: 0x202,
+                0xf8000000: 0x800000,
+                0x1: 0x8000,
+                0x10000001: 0x2,
+                0x20000001: 0x808200,
+                0x30000001: 0x800000,
+                0x40000001: 0x808002,
+                0x50000001: 0x8200,
+                0x60000001: 0x200,
+                0x70000001: 0x800202,
+                0x80000001: 0x808202,
+                0x90000001: 0x808000,
+                0xa0000001: 0x800002,
+                0xb0000001: 0x8202,
+                0xc0000001: 0x202,
+                0xd0000001: 0x800200,
+                0xe0000001: 0x8002,
+                0xf0000001: 0x0,
+                0x8000001: 0x808202,
+                0x18000001: 0x808000,
+                0x28000001: 0x800000,
+                0x38000001: 0x200,
+                0x48000001: 0x8000,
+                0x58000001: 0x800002,
+                0x68000001: 0x2,
+                0x78000001: 0x8202,
+                0x88000001: 0x8002,
+                0x98000001: 0x800202,
+                0xa8000001: 0x202,
+                0xb8000001: 0x808200,
+                0xc8000001: 0x800200,
+                0xd8000001: 0x0,
+                0xe8000001: 0x8200,
+                0xf8000001: 0x808002
+            },
+            {
+                0x0: 0x40084010,
+                0x1000000: 0x4000,
+                0x2000000: 0x80000,
+                0x3000000: 0x40080010,
+                0x4000000: 0x40000010,
+                0x5000000: 0x40084000,
+                0x6000000: 0x40004000,
+                0x7000000: 0x10,
+                0x8000000: 0x84000,
+                0x9000000: 0x40004010,
+                0xa000000: 0x40000000,
+                0xb000000: 0x84010,
+                0xc000000: 0x80010,
+                0xd000000: 0x0,
+                0xe000000: 0x4010,
+                0xf000000: 0x40080000,
+                0x800000: 0x40004000,
+                0x1800000: 0x84010,
+                0x2800000: 0x10,
+                0x3800000: 0x40004010,
+                0x4800000: 0x40084010,
+                0x5800000: 0x40000000,
+                0x6800000: 0x80000,
+                0x7800000: 0x40080010,
+                0x8800000: 0x80010,
+                0x9800000: 0x0,
+                0xa800000: 0x4000,
+                0xb800000: 0x40080000,
+                0xc800000: 0x40000010,
+                0xd800000: 0x84000,
+                0xe800000: 0x40084000,
+                0xf800000: 0x4010,
+                0x10000000: 0x0,
+                0x11000000: 0x40080010,
+                0x12000000: 0x40004010,
+                0x13000000: 0x40084000,
+                0x14000000: 0x40080000,
+                0x15000000: 0x10,
+                0x16000000: 0x84010,
+                0x17000000: 0x4000,
+                0x18000000: 0x4010,
+                0x19000000: 0x80000,
+                0x1a000000: 0x80010,
+                0x1b000000: 0x40000010,
+                0x1c000000: 0x84000,
+                0x1d000000: 0x40004000,
+                0x1e000000: 0x40000000,
+                0x1f000000: 0x40084010,
+                0x10800000: 0x84010,
+                0x11800000: 0x80000,
+                0x12800000: 0x40080000,
+                0x13800000: 0x4000,
+                0x14800000: 0x40004000,
+                0x15800000: 0x40084010,
+                0x16800000: 0x10,
+                0x17800000: 0x40000000,
+                0x18800000: 0x40084000,
+                0x19800000: 0x40000010,
+                0x1a800000: 0x40004010,
+                0x1b800000: 0x80010,
+                0x1c800000: 0x0,
+                0x1d800000: 0x4010,
+                0x1e800000: 0x40080010,
+                0x1f800000: 0x84000
+            },
+            {
+                0x0: 0x104,
+                0x100000: 0x0,
+                0x200000: 0x4000100,
+                0x300000: 0x10104,
+                0x400000: 0x10004,
+                0x500000: 0x4000004,
+                0x600000: 0x4010104,
+                0x700000: 0x4010000,
+                0x800000: 0x4000000,
+                0x900000: 0x4010100,
+                0xa00000: 0x10100,
+                0xb00000: 0x4010004,
+                0xc00000: 0x4000104,
+                0xd00000: 0x10000,
+                0xe00000: 0x4,
+                0xf00000: 0x100,
+                0x80000: 0x4010100,
+                0x180000: 0x4010004,
+                0x280000: 0x0,
+                0x380000: 0x4000100,
+                0x480000: 0x4000004,
+                0x580000: 0x10000,
+                0x680000: 0x10004,
+                0x780000: 0x104,
+                0x880000: 0x4,
+                0x980000: 0x100,
+                0xa80000: 0x4010000,
+                0xb80000: 0x10104,
+                0xc80000: 0x10100,
+                0xd80000: 0x4000104,
+                0xe80000: 0x4010104,
+                0xf80000: 0x4000000,
+                0x1000000: 0x4010100,
+                0x1100000: 0x10004,
+                0x1200000: 0x10000,
+                0x1300000: 0x4000100,
+                0x1400000: 0x100,
+                0x1500000: 0x4010104,
+                0x1600000: 0x4000004,
+                0x1700000: 0x0,
+                0x1800000: 0x4000104,
+                0x1900000: 0x4000000,
+                0x1a00000: 0x4,
+                0x1b00000: 0x10100,
+                0x1c00000: 0x4010000,
+                0x1d00000: 0x104,
+                0x1e00000: 0x10104,
+                0x1f00000: 0x4010004,
+                0x1080000: 0x4000000,
+                0x1180000: 0x104,
+                0x1280000: 0x4010100,
+                0x1380000: 0x0,
+                0x1480000: 0x10004,
+                0x1580000: 0x4000100,
+                0x1680000: 0x100,
+                0x1780000: 0x4010004,
+                0x1880000: 0x10000,
+                0x1980000: 0x4010104,
+                0x1a80000: 0x10104,
+                0x1b80000: 0x4000004,
+                0x1c80000: 0x4000104,
+                0x1d80000: 0x4010000,
+                0x1e80000: 0x4,
+                0x1f80000: 0x10100
+            },
+            {
+                0x0: 0x80401000,
+                0x10000: 0x80001040,
+                0x20000: 0x401040,
+                0x30000: 0x80400000,
+                0x40000: 0x0,
+                0x50000: 0x401000,
+                0x60000: 0x80000040,
+                0x70000: 0x400040,
+                0x80000: 0x80000000,
+                0x90000: 0x400000,
+                0xa0000: 0x40,
+                0xb0000: 0x80001000,
+                0xc0000: 0x80400040,
+                0xd0000: 0x1040,
+                0xe0000: 0x1000,
+                0xf0000: 0x80401040,
+                0x8000: 0x80001040,
+                0x18000: 0x40,
+                0x28000: 0x80400040,
+                0x38000: 0x80001000,
+                0x48000: 0x401000,
+                0x58000: 0x80401040,
+                0x68000: 0x0,
+                0x78000: 0x80400000,
+                0x88000: 0x1000,
+                0x98000: 0x80401000,
+                0xa8000: 0x400000,
+                0xb8000: 0x1040,
+                0xc8000: 0x80000000,
+                0xd8000: 0x400040,
+                0xe8000: 0x401040,
+                0xf8000: 0x80000040,
+                0x100000: 0x400040,
+                0x110000: 0x401000,
+                0x120000: 0x80000040,
+                0x130000: 0x0,
+                0x140000: 0x1040,
+                0x150000: 0x80400040,
+                0x160000: 0x80401000,
+                0x170000: 0x80001040,
+                0x180000: 0x80401040,
+                0x190000: 0x80000000,
+                0x1a0000: 0x80400000,
+                0x1b0000: 0x401040,
+                0x1c0000: 0x80001000,
+                0x1d0000: 0x400000,
+                0x1e0000: 0x40,
+                0x1f0000: 0x1000,
+                0x108000: 0x80400000,
+                0x118000: 0x80401040,
+                0x128000: 0x0,
+                0x138000: 0x401000,
+                0x148000: 0x400040,
+                0x158000: 0x80000000,
+                0x168000: 0x80001040,
+                0x178000: 0x40,
+                0x188000: 0x80000040,
+                0x198000: 0x1000,
+                0x1a8000: 0x80001000,
+                0x1b8000: 0x80400040,
+                0x1c8000: 0x1040,
+                0x1d8000: 0x80401000,
+                0x1e8000: 0x400000,
+                0x1f8000: 0x401040
+            },
+            {
+                0x0: 0x80,
+                0x1000: 0x1040000,
+                0x2000: 0x40000,
+                0x3000: 0x20000000,
+                0x4000: 0x20040080,
+                0x5000: 0x1000080,
+                0x6000: 0x21000080,
+                0x7000: 0x40080,
+                0x8000: 0x1000000,
+                0x9000: 0x20040000,
+                0xa000: 0x20000080,
+                0xb000: 0x21040080,
+                0xc000: 0x21040000,
+                0xd000: 0x0,
+                0xe000: 0x1040080,
+                0xf000: 0x21000000,
+                0x800: 0x1040080,
+                0x1800: 0x21000080,
+                0x2800: 0x80,
+                0x3800: 0x1040000,
+                0x4800: 0x40000,
+                0x5800: 0x20040080,
+                0x6800: 0x21040000,
+                0x7800: 0x20000000,
+                0x8800: 0x20040000,
+                0x9800: 0x0,
+                0xa800: 0x21040080,
+                0xb800: 0x1000080,
+                0xc800: 0x20000080,
+                0xd800: 0x21000000,
+                0xe800: 0x1000000,
+                0xf800: 0x40080,
+                0x10000: 0x40000,
+                0x11000: 0x80,
+                0x12000: 0x20000000,
+                0x13000: 0x21000080,
+                0x14000: 0x1000080,
+                0x15000: 0x21040000,
+                0x16000: 0x20040080,
+                0x17000: 0x1000000,
+                0x18000: 0x21040080,
+                0x19000: 0x21000000,
+                0x1a000: 0x1040000,
+                0x1b000: 0x20040000,
+                0x1c000: 0x40080,
+                0x1d000: 0x20000080,
+                0x1e000: 0x0,
+                0x1f000: 0x1040080,
+                0x10800: 0x21000080,
+                0x11800: 0x1000000,
+                0x12800: 0x1040000,
+                0x13800: 0x20040080,
+                0x14800: 0x20000000,
+                0x15800: 0x1040080,
+                0x16800: 0x80,
+                0x17800: 0x21040000,
+                0x18800: 0x40080,
+                0x19800: 0x21040080,
+                0x1a800: 0x0,
+                0x1b800: 0x21000000,
+                0x1c800: 0x1000080,
+                0x1d800: 0x40000,
+                0x1e800: 0x20040000,
+                0x1f800: 0x20000080
+            },
+            {
+                0x0: 0x10000008,
+                0x100: 0x2000,
+                0x200: 0x10200000,
+                0x300: 0x10202008,
+                0x400: 0x10002000,
+                0x500: 0x200000,
+                0x600: 0x200008,
+                0x700: 0x10000000,
+                0x800: 0x0,
+                0x900: 0x10002008,
+                0xa00: 0x202000,
+                0xb00: 0x8,
+                0xc00: 0x10200008,
+                0xd00: 0x202008,
+                0xe00: 0x2008,
+                0xf00: 0x10202000,
+                0x80: 0x10200000,
+                0x180: 0x10202008,
+                0x280: 0x8,
+                0x380: 0x200000,
+                0x480: 0x202008,
+                0x580: 0x10000008,
+                0x680: 0x10002000,
+                0x780: 0x2008,
+                0x880: 0x200008,
+                0x980: 0x2000,
+                0xa80: 0x10002008,
+                0xb80: 0x10200008,
+                0xc80: 0x0,
+                0xd80: 0x10202000,
+                0xe80: 0x202000,
+                0xf80: 0x10000000,
+                0x1000: 0x10002000,
+                0x1100: 0x10200008,
+                0x1200: 0x10202008,
+                0x1300: 0x2008,
+                0x1400: 0x200000,
+                0x1500: 0x10000000,
+                0x1600: 0x10000008,
+                0x1700: 0x202000,
+                0x1800: 0x202008,
+                0x1900: 0x0,
+                0x1a00: 0x8,
+                0x1b00: 0x10200000,
+                0x1c00: 0x2000,
+                0x1d00: 0x10002008,
+                0x1e00: 0x10202000,
+                0x1f00: 0x200008,
+                0x1080: 0x8,
+                0x1180: 0x202000,
+                0x1280: 0x200000,
+                0x1380: 0x10000008,
+                0x1480: 0x10002000,
+                0x1580: 0x2008,
+                0x1680: 0x10202008,
+                0x1780: 0x10200000,
+                0x1880: 0x10202000,
+                0x1980: 0x10200008,
+                0x1a80: 0x2000,
+                0x1b80: 0x202008,
+                0x1c80: 0x200008,
+                0x1d80: 0x0,
+                0x1e80: 0x10000000,
+                0x1f80: 0x10002008
+            },
+            {
+                0x0: 0x100000,
+                0x10: 0x2000401,
+                0x20: 0x400,
+                0x30: 0x100401,
+                0x40: 0x2100401,
+                0x50: 0x0,
+                0x60: 0x1,
+                0x70: 0x2100001,
+                0x80: 0x2000400,
+                0x90: 0x100001,
+                0xa0: 0x2000001,
+                0xb0: 0x2100400,
+                0xc0: 0x2100000,
+                0xd0: 0x401,
+                0xe0: 0x100400,
+                0xf0: 0x2000000,
+                0x8: 0x2100001,
+                0x18: 0x0,
+                0x28: 0x2000401,
+                0x38: 0x2100400,
+                0x48: 0x100000,
+                0x58: 0x2000001,
+                0x68: 0x2000000,
+                0x78: 0x401,
+                0x88: 0x100401,
+                0x98: 0x2000400,
+                0xa8: 0x2100000,
+                0xb8: 0x100001,
+                0xc8: 0x400,
+                0xd8: 0x2100401,
+                0xe8: 0x1,
+                0xf8: 0x100400,
+                0x100: 0x2000000,
+                0x110: 0x100000,
+                0x120: 0x2000401,
+                0x130: 0x2100001,
+                0x140: 0x100001,
+                0x150: 0x2000400,
+                0x160: 0x2100400,
+                0x170: 0x100401,
+                0x180: 0x401,
+                0x190: 0x2100401,
+                0x1a0: 0x100400,
+                0x1b0: 0x1,
+                0x1c0: 0x0,
+                0x1d0: 0x2100000,
+                0x1e0: 0x2000001,
+                0x1f0: 0x400,
+                0x108: 0x100400,
+                0x118: 0x2000401,
+                0x128: 0x2100001,
+                0x138: 0x1,
+                0x148: 0x2000000,
+                0x158: 0x100000,
+                0x168: 0x401,
+                0x178: 0x2100400,
+                0x188: 0x2000001,
+                0x198: 0x2100000,
+                0x1a8: 0x0,
+                0x1b8: 0x2100401,
+                0x1c8: 0x100401,
+                0x1d8: 0x400,
+                0x1e8: 0x2000400,
+                0x1f8: 0x100001
+            },
+            {
+                0x0: 0x8000820,
+                0x1: 0x20000,
+                0x2: 0x8000000,
+                0x3: 0x20,
+                0x4: 0x20020,
+                0x5: 0x8020820,
+                0x6: 0x8020800,
+                0x7: 0x800,
+                0x8: 0x8020000,
+                0x9: 0x8000800,
+                0xa: 0x20800,
+                0xb: 0x8020020,
+                0xc: 0x820,
+                0xd: 0x0,
+                0xe: 0x8000020,
+                0xf: 0x20820,
+                0x80000000: 0x800,
+                0x80000001: 0x8020820,
+                0x80000002: 0x8000820,
+                0x80000003: 0x8000000,
+                0x80000004: 0x8020000,
+                0x80000005: 0x20800,
+                0x80000006: 0x20820,
+                0x80000007: 0x20,
+                0x80000008: 0x8000020,
+                0x80000009: 0x820,
+                0x8000000a: 0x20020,
+                0x8000000b: 0x8020800,
+                0x8000000c: 0x0,
+                0x8000000d: 0x8020020,
+                0x8000000e: 0x8000800,
+                0x8000000f: 0x20000,
+                0x10: 0x20820,
+                0x11: 0x8020800,
+                0x12: 0x20,
+                0x13: 0x800,
+                0x14: 0x8000800,
+                0x15: 0x8000020,
+                0x16: 0x8020020,
+                0x17: 0x20000,
+                0x18: 0x0,
+                0x19: 0x20020,
+                0x1a: 0x8020000,
+                0x1b: 0x8000820,
+                0x1c: 0x8020820,
+                0x1d: 0x20800,
+                0x1e: 0x820,
+                0x1f: 0x8000000,
+                0x80000010: 0x20000,
+                0x80000011: 0x800,
+                0x80000012: 0x8020020,
+                0x80000013: 0x20820,
+                0x80000014: 0x20,
+                0x80000015: 0x8020000,
+                0x80000016: 0x8000000,
+                0x80000017: 0x8000820,
+                0x80000018: 0x8020820,
+                0x80000019: 0x8000020,
+                0x8000001a: 0x8000800,
+                0x8000001b: 0x0,
+                0x8000001c: 0x20800,
+                0x8000001d: 0x820,
+                0x8000001e: 0x20020,
+                0x8000001f: 0x8020800
+            }
+        ];
+
+        // Masks that select the SBOX input
+        var SBOX_MASK = [
+            0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
+            0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
+        ];
+
+        /**
+         * DES block cipher algorithm.
+         */
+        var DES = C_algo.DES = BlockCipher.extend({
+            _doReset: function () {
+                // Shortcuts
+                var key = this._key;
+                var keyWords = key.words;
+
+                // Select 56 bits according to PC1
+                var keyBits = [];
+                for (var i = 0; i < 56; i++) {
+                    var keyBitPos = PC1[i] - 1;
+                    keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+                }
+
+                // Assemble 16 subkeys
+                var subKeys = this._subKeys = [];
+                for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
+                    // Create subkey
+                    var subKey = subKeys[nSubKey] = [];
+
+                    // Shortcut
+                    var bitShift = BIT_SHIFTS[nSubKey];
+
+                    // Select 48 bits according to PC2
+                    for (var i = 0; i < 24; i++) {
+                        // Select from the left 28 key bits
+                        subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+
+                        // Select from the right 28 key bits
+                        subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+                    }
+
+                    // Since each subkey is applied to an expanded 32-bit input,
+                    // the subkey can be broken into 8 values scaled to 32-bits,
+                    // which allows the key to be used without expansion
+                    subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+                    for (var i = 1; i < 7; i++) {
+                        subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+                    }
+                    subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+                }
+
+                // Compute inverse subkeys
+                var invSubKeys = this._invSubKeys = [];
+                for (var i = 0; i < 16; i++) {
+                    invSubKeys[i] = subKeys[15 - i];
+                }
+            },
+
+            encryptBlock: function (M, offset) {
+                this._doCryptBlock(M, offset, this._subKeys);
+            },
+
+            decryptBlock: function (M, offset) {
+                this._doCryptBlock(M, offset, this._invSubKeys);
+            },
+
+            _doCryptBlock: function (M, offset, subKeys) {
+                // Get input
+                this._lBlock = M[offset];
+                this._rBlock = M[offset + 1];
+
+                // Initial permutation
+                exchangeLR.call(this, 4, 0x0f0f0f0f);
+                exchangeLR.call(this, 16, 0x0000ffff);
+                exchangeRL.call(this, 2, 0x33333333);
+                exchangeRL.call(this, 8, 0x00ff00ff);
+                exchangeLR.call(this, 1, 0x55555555);
+
+                // Rounds
+                for (var round = 0; round < 16; round++) {
+                    // Shortcuts
+                    var subKey = subKeys[round];
+                    var lBlock = this._lBlock;
+                    var rBlock = this._rBlock;
+
+                    // Feistel function
+                    var f = 0;
+                    for (var i = 0; i < 8; i++) {
+                        f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+                    }
+                    this._lBlock = rBlock;
+                    this._rBlock = lBlock ^ f;
+                }
+
+                // Undo swap from last round
+                var t = this._lBlock;
+                this._lBlock = this._rBlock;
+                this._rBlock = t;
+
+                // Final permutation
+                exchangeLR.call(this, 1, 0x55555555);
+                exchangeRL.call(this, 8, 0x00ff00ff);
+                exchangeRL.call(this, 2, 0x33333333);
+                exchangeLR.call(this, 16, 0x0000ffff);
+                exchangeLR.call(this, 4, 0x0f0f0f0f);
+
+                // Set output
+                M[offset] = this._lBlock;
+                M[offset + 1] = this._rBlock;
+            },
+
+            keySize: 64 / 32,
+
+            ivSize: 64 / 32,
+
+            blockSize: 64 / 32
+        });
+
+        // Swap bits across the left and right words
+        function exchangeLR(offset, mask) {
+            var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
+            this._rBlock ^= t;
+            this._lBlock ^= t << offset;
+        }
+
+        function exchangeRL(offset, mask) {
+            var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
+            this._lBlock ^= t;
+            this._rBlock ^= t << offset;
+        }
+
+        /**
+         * Shortcut functions to the cipher's object interface.
+         *
+         * @example
+         *
+         *     var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
+         *     var plaintext  = CryptoJS.DES.decrypt(ciphertext, key, cfg);
+         */
+        C.DES = BlockCipher._createHelper(DES);
+
+        /**
+         * Triple-DES block cipher algorithm.
+         */
+        var TripleDES = C_algo.TripleDES = BlockCipher.extend({
+            _doReset: function () {
+                // Shortcuts
+                var key = this._key;
+                var keyWords = key.words;
+                // Make sure the key length is valid (64, 128 or >= 192 bit)
+                if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
+                    throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
+                }
+
+                // Extend the key according to the keying options defined in 3DES standard
+                var key1 = keyWords.slice(0, 2);
+                var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
+                var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
+
+                // Create DES instances
+                this._des1 = DES.createEncryptor(WordArray.create(key1));
+                this._des2 = DES.createEncryptor(WordArray.create(key2));
+                this._des3 = DES.createEncryptor(WordArray.create(key3));
+            },
+
+            encryptBlock: function (M, offset) {
+                this._des1.encryptBlock(M, offset);
+                this._des2.decryptBlock(M, offset);
+                this._des3.encryptBlock(M, offset);
+            },
+
+            decryptBlock: function (M, offset) {
+                this._des3.decryptBlock(M, offset);
+                this._des2.encryptBlock(M, offset);
+                this._des1.decryptBlock(M, offset);
+            },
+
+            keySize: 192 / 32,
+
+            ivSize: 64 / 32,
+
+            blockSize: 64 / 32
+        });
+
+        /**
+         * Shortcut functions to the cipher's object interface.
+         *
+         * @example
+         *
+         *     var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
+         *     var plaintext  = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
+         */
+        C.TripleDES = BlockCipher._createHelper(TripleDES);
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var StreamCipher = C_lib.StreamCipher;
+        var C_algo = C.algo;
+
+        /**
+         * RC4 stream cipher algorithm.
+         */
+        var RC4 = C_algo.RC4 = StreamCipher.extend({
+            _doReset: function () {
+                // Shortcuts
+                var key = this._key;
+                var keyWords = key.words;
+                var keySigBytes = key.sigBytes;
+
+                // Init sbox
+                var S = this._S = [];
+                for (var i = 0; i < 256; i++) {
+                    S[i] = i;
+                }
+
+                // Key setup
+                for (var i = 0, j = 0; i < 256; i++) {
+                    var keyByteIndex = i % keySigBytes;
+                    var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+
+                    j = (j + S[i] + keyByte) % 256;
+
+                    // Swap
+                    var t = S[i];
+                    S[i] = S[j];
+                    S[j] = t;
+                }
+
+                // Counters
+                this._i = this._j = 0;
+            },
+
+            _doProcessBlock: function (M, offset) {
+                M[offset] ^= generateKeystreamWord.call(this);
+            },
+
+            keySize: 256 / 32,
+
+            ivSize: 0
+        });
+
+        function generateKeystreamWord() {
+            // Shortcuts
+            var S = this._S;
+            var i = this._i;
+            var j = this._j;
+
+            // Generate keystream word
+            var keystreamWord = 0;
+            for (var n = 0; n < 4; n++) {
+                i = (i + 1) % 256;
+                j = (j + S[i]) % 256;
+
+                // Swap
+                var t = S[i];
+                S[i] = S[j];
+                S[j] = t;
+
+                keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+            }
+
+            // Update counters
+            this._i = i;
+            this._j = j;
+
+            return keystreamWord;
+        }
+
+        /**
+         * Shortcut functions to the cipher's object interface.
+         *
+         * @example
+         *
+         *     var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
+         *     var plaintext  = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
+         */
+        C.RC4 = StreamCipher._createHelper(RC4);
+
+        /**
+         * Modified RC4 stream cipher algorithm.
+         */
+        var RC4Drop = C_algo.RC4Drop = RC4.extend({
+            /**
+             * Configuration options.
+             *
+             * @property {number} drop The number of keystream words to drop. Default 192
+             */
+            cfg: RC4.cfg.extend({
+                drop: 192
+            }),
+
+            _doReset: function () {
+                RC4._doReset.call(this);
+
+                // Drop
+                for (var i = this.cfg.drop; i > 0; i--) {
+                    generateKeystreamWord.call(this);
+                }
+            }
+        });
+
+        /**
+         * Shortcut functions to the cipher's object interface.
+         *
+         * @example
+         *
+         *     var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
+         *     var plaintext  = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
+         */
+        C.RC4Drop = StreamCipher._createHelper(RC4Drop);
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var StreamCipher = C_lib.StreamCipher;
+        var C_algo = C.algo;
+
+        // Reusable objects
+        var S = [];
+        var C_ = [];
+        var G = [];
+
+        /**
+         * Rabbit stream cipher algorithm
+         */
+        var Rabbit = C_algo.Rabbit = StreamCipher.extend({
+            _doReset: function () {
+                // Shortcuts
+                var K = this._key.words;
+                var iv = this.cfg.iv;
+
+                // Swap endian
+                for (var i = 0; i < 4; i++) {
+                    K[i] = (((K[i] << 8) | (K[i] >>> 24)) & 0x00ff00ff) |
+                        (((K[i] << 24) | (K[i] >>> 8)) & 0xff00ff00);
+                }
+
+                // Generate initial state values
+                var X = this._X = [
+                    K[0], (K[3] << 16) | (K[2] >>> 16),
+                    K[1], (K[0] << 16) | (K[3] >>> 16),
+                    K[2], (K[1] << 16) | (K[0] >>> 16),
+                    K[3], (K[2] << 16) | (K[1] >>> 16)
+                ];
+
+                // Generate initial counter values
+                var C = this._C = [
+                    (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+                    (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+                    (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+                    (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+                ];
+
+                // Carry bit
+                this._b = 0;
+
+                // Iterate the system four times
+                for (var i = 0; i < 4; i++) {
+                    nextState.call(this);
+                }
+
+                // Modify the counters
+                for (var i = 0; i < 8; i++) {
+                    C[i] ^= X[(i + 4) & 7];
+                }
+
+                // IV setup
+                if (iv) {
+                    // Shortcuts
+                    var IV = iv.words;
+                    var IV_0 = IV[0];
+                    var IV_1 = IV[1];
+
+                    // Generate four subvectors
+                    var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+                    var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+                    var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+                    var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+                    // Modify counter values
+                    C[0] ^= i0;
+                    C[1] ^= i1;
+                    C[2] ^= i2;
+                    C[3] ^= i3;
+                    C[4] ^= i0;
+                    C[5] ^= i1;
+                    C[6] ^= i2;
+                    C[7] ^= i3;
+
+                    // Iterate the system four times
+                    for (var i = 0; i < 4; i++) {
+                        nextState.call(this);
+                    }
+                }
+            },
+
+            _doProcessBlock: function (M, offset) {
+                // Shortcut
+                var X = this._X;
+
+                // Iterate the system
+                nextState.call(this);
+
+                // Generate four keystream words
+                S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+                S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+                S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+                S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+                for (var i = 0; i < 4; i++) {
+                    // Swap endian
+                    S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+                        (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+                    // Encrypt
+                    M[offset + i] ^= S[i];
+                }
+            },
+
+            blockSize: 128 / 32,
+
+            ivSize: 64 / 32
+        });
+
+        function nextState() {
+            // Shortcuts
+            var X = this._X;
+            var C = this._C;
+
+            // Save old counter values
+            for (var i = 0; i < 8; i++) {
+                C_[i] = C[i];
+            }
+
+            // Calculate new counter values
+            C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+            C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+            C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+            C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+            C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+            C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+            C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+            C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+            this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+            // Calculate the g-values
+            for (var i = 0; i < 8; i++) {
+                var gx = X[i] + C[i];
+
+                // Construct high and low argument for squaring
+                var ga = gx & 0xffff;
+                var gb = gx >>> 16;
+
+                // Calculate high and low result of squaring
+                var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+                var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+                // High XOR low
+                G[i] = gh ^ gl;
+            }
+
+            // Calculate new state values
+            X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+            X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+            X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+            X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+            X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+            X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+            X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+            X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+        }
+
+        /**
+         * Shortcut functions to the cipher's object interface.
+         *
+         * @example
+         *
+         *     var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
+         *     var plaintext  = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
+         */
+        C.Rabbit = StreamCipher._createHelper(Rabbit);
+    }());
+
+
+    (function () {
+        // Shortcuts
+        var C = CryptoJS;
+        var C_lib = C.lib;
+        var StreamCipher = C_lib.StreamCipher;
+        var C_algo = C.algo;
+
+        // Reusable objects
+        var S = [];
+        var C_ = [];
+        var G = [];
+
+        /**
+         * Rabbit stream cipher algorithm.
+         *
+         * This is a legacy version that neglected to convert the key to little-endian.
+         * This error doesn't affect the cipher's security,
+         * but it does affect its compatibility with other implementations.
+         */
+        var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
+            _doReset: function () {
+                // Shortcuts
+                var K = this._key.words;
+                var iv = this.cfg.iv;
+
+                // Generate initial state values
+                var X = this._X = [
+                    K[0], (K[3] << 16) | (K[2] >>> 16),
+                    K[1], (K[0] << 16) | (K[3] >>> 16),
+                    K[2], (K[1] << 16) | (K[0] >>> 16),
+                    K[3], (K[2] << 16) | (K[1] >>> 16)
+                ];
+
+                // Generate initial counter values
+                var C = this._C = [
+                    (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+                    (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+                    (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+                    (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+                ];
+
+                // Carry bit
+                this._b = 0;
+
+                // Iterate the system four times
+                for (var i = 0; i < 4; i++) {
+                    nextState.call(this);
+                }
+
+                // Modify the counters
+                for (var i = 0; i < 8; i++) {
+                    C[i] ^= X[(i + 4) & 7];
+                }
+
+                // IV setup
+                if (iv) {
+                    // Shortcuts
+                    var IV = iv.words;
+                    var IV_0 = IV[0];
+                    var IV_1 = IV[1];
+
+                    // Generate four subvectors
+                    var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+                    var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+                    var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+                    var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+                    // Modify counter values
+                    C[0] ^= i0;
+                    C[1] ^= i1;
+                    C[2] ^= i2;
+                    C[3] ^= i3;
+                    C[4] ^= i0;
+                    C[5] ^= i1;
+                    C[6] ^= i2;
+                    C[7] ^= i3;
+
+                    // Iterate the system four times
+                    for (var i = 0; i < 4; i++) {
+                        nextState.call(this);
+                    }
+                }
+            },
+
+            _doProcessBlock: function (M, offset) {
+                // Shortcut
+                var X = this._X;
+
+                // Iterate the system
+                nextState.call(this);
+
+                // Generate four keystream words
+                S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+                S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+                S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+                S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+                for (var i = 0; i < 4; i++) {
+                    // Swap endian
+                    S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+                        (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+                    // Encrypt
+                    M[offset + i] ^= S[i];
+                }
+            },
+
+            blockSize: 128 / 32,
+
+            ivSize: 64 / 32
+        });
+
+        function nextState() {
+            // Shortcuts
+            var X = this._X;
+            var C = this._C;
+
+            // Save old counter values
+            for (var i = 0; i < 8; i++) {
+                C_[i] = C[i];
+            }
+
+            // Calculate new counter values
+            C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+            C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+            C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+            C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+            C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+            C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+            C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+            C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+            this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+            // Calculate the g-values
+            for (var i = 0; i < 8; i++) {
+                var gx = X[i] + C[i];
+
+                // Construct high and low argument for squaring
+                var ga = gx & 0xffff;
+                var gb = gx >>> 16;
+
+                // Calculate high and low result of squaring
+                var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+                var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+                // High XOR low
+                G[i] = gh ^ gl;
+            }
+
+            // Calculate new state values
+            X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+            X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+            X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+            X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+            X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+            X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+            X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+            X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+        }
+
+        /**
+         * Shortcut functions to the cipher's object interface.
+         *
+         * @example
+         *
+         *     var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
+         *     var plaintext  = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
+         */
+        C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
+    }());
+
+
+    return CryptoJS;
+
+}));

+ 184 - 0
components/nfc_utils/des3/nfcTool.js

@@ -0,0 +1,184 @@
+const CryptoJS1 = require("./aes.js");
+//3DES hex 16进制字符串加密
+// const encodeHexString = (data, key) => {
+//   let keyHex = CryptoJS.enc.Hex.parse(key);
+//   let dataHex = CryptoJS.enc.Hex.parse(data);
+//   let encrypted = CryptoJS.TripleDES.encrypt(dataHex, keyHex, {
+//     mode: CryptoJS_mode_ECB,
+//     padding: CryptoJS.pad.Pkcs7  //java 和 android pkcs5填充,js对应pkcs7
+//   });
+//   return encrypted.toString().toUpperCase();
+//   // return encrypted.ciphertext.toString();
+// };
+const encodeHexString = (data, key) => {
+    var byteKey =CryptoJS1.enc.Hex.parse(key);
+    var byteData =CryptoJS1.enc.Hex.parse(data);
+    var encrypt =CryptoJS1.TripleDES.encrypt(byteData, byteKey, { mode:CryptoJS1.mode.ECB, padding:CryptoJS1.pad.NoPadding });
+    var encryptedStr = encrypt.ciphertext.toString();
+    return encryptedStr;
+     // return encrypted.ciphertext.toString();
+   }; 
+
+//3DES hex 16进制字符串解密
+const decodeHexString = (data, key) => {
+  let keyHex = CryptoJS1.enc.Hex.parse(key);
+  let dataHex = CryptoJS1.enc.Hex.parse(data);
+  dataHex = CryptoJS1.enc.Base64.stringify(dataHex)
+  let decrypted = CryptoJS1.TripleDES.decrypt(dataHex, keyHex, { 
+    mode: CryptoJS1.mode.ECB, 
+    padding: CryptoJS1.pad.NoPadding 
+  });
+  return decrypted.toString(CryptoJS1.enc.Hex)//decrypted.toString();
+};
+ 
+const encodeHex = (data, key) =>
+{
+  // key 不是16个字节,或者 24 字节返回空,
+  if (key.length != 32 && key.length != 48)
+    return null;
+  if (key.length == 32) {
+    //16字节密钥,则K1 = K3, 使用前8字节填充
+    key = key + key.substr(0, 16);
+  }
+ 
+  let encData = encodeHexString(data, key);
+  return encData//.substr(0, 16);
+};
+ 
+const decodeHex = (data, key) =>
+{
+  // key 不是16个字节,或者 24 字节返回空,
+  if (key.length != 32 && key.length != 48)
+    return null;
+ 
+  if (key.length == 32) {
+    //16字节密钥,则K1 = K3, 使用前8字节填充
+    key = key + key.substr(0, 16);
+  }
+ 
+  // //由于加密结果的后面8字节固定使用0808080808080808的密文 ,9F4AB5416A6D9DE5 填充,因此固定在需要解密的密文,后面增加9F4AB5416A6D9DE5
+  // if (data.length == 32) {
+  //   data = data + "9F4AB5416A6D9DE5";
+  // }
+  return decodeHexString(data, key);
+};
+ 
+//buffer转16进制,解析nfc扫描结果的id
+function ab2hex(buffer) {
+  var hexArr = Array.prototype.map.call(
+      new Uint8Array(buffer),
+      function (bit) {
+          return ('00' + bit.toString(16)).slice(-2)
+      }
+  )
+  return hexArr.join('').toUpperCase();
+}
+
+//buffer转num数组
+function ab2NumArr(buffer) {
+  var numArr = Array.prototype.map.call(
+      new Uint8Array(buffer),
+      function (bit) {
+          return bit
+      }
+  )
+  return numArr
+}
+
+//num数组转字节字符串
+function numArrToBit(numArr){
+  var bitArr = []
+  for(var i in numArr){
+    bitArr.push(String.fromCharCode(numArr[i]))
+  }
+  return bitArr.join('')
+}
+
+//num数组转16进制字符串
+function numArrToHex(numArr){
+  var bitArr = []
+  for(var i in numArr){
+    var temp = numArr[i].toString(16).toUpperCase()
+    if(temp.length == 1)temp = "0"+temp
+    bitArr.push(temp)
+  }
+  return bitArr.join('')
+}
+function hex2int(hex) {
+  var len = hex.length, a = new Array(len), code;
+  for (var i = 0; i < len; i++) {
+      code = hex.charCodeAt(i);
+      if (48<=code && code < 58) {
+          code -= 48;
+      } else {
+          code = (code & 0xdf) - 65 + 10;
+      }
+      a[i] = code;
+  }
+  return a.reduce(function(acc, c) {
+      acc = 16 * acc + c;
+      return acc;
+  }, 0);
+}
+//16进制字符串转num数组
+function hexToNumArr(hex){
+  var numArr = []
+  for (var i = 0; i < hex.length;i = i + 2) {
+    numArr.push(parseInt(hex.substr(i, 2), 16));
+  }
+  return numArr
+}
+function str2ab(str) {
+  var buf = new ArrayBuffer(str.length*2); // 每个字符占用2个字节
+  var bufView = new Uint16Array(buf);
+  for (var i=0, strLen=str.length; i<strLen; i++) {
+       bufView[i] = str.charCodeAt(i);
+  }
+  return buf;
+}
+function str2NumArr(str) {
+  var len = str.length
+  var arr = new Array(len);
+  for (var i=0; i<len; i++) {
+    arr[i] = str.charCodeAt(i);
+  }
+  return arr;
+}
+//
+function hexToStr(hex) {
+  var trimedStr = hex.trim();
+  var rawStr = trimedStr.substr(0, 2).toLowerCase() === "0x" ? trimedStr.substr(2) : trimedStr;
+  var len = rawStr.length;
+  var curCharCode;
+  var resultStr = [];
+  for (var i = 0; i < len; i = i + 2) {
+    curCharCode = parseInt(rawStr.substr(i, 2), 16);
+    resultStr.push(curCharCode);
+  }
+  var bytesView = new Uint8Array(resultStr);
+  var str = String.fromCharCode(...bytesView);
+  // str = unescape(str.replace(/\\u/g, '%u'))
+  return str;
+}
+//hex转2进制
+function num2bin(num){
+  return ("00000000" + (parseInt(num)).toString(2)).substr(-8);
+}
+let tools = {
+  encode3des:encodeHex,
+  decode3des:decodeHex,
+  ab2hex,
+  ab2NumArr,
+  numArrToBit,
+  numArrToHex,
+  hexToNumArr,
+  str2ab,
+  hexToStr,
+  num2bin,
+  hex2int,
+  str2NumArr,
+}
+
+module.exports = {
+  tools
+}

BIN
img/dev_img4.png


BIN
img/wechart_img1.jpg


BIN
img/编组 23@2x (6).png


+ 204 - 48
pages/index/index.js

@@ -57,19 +57,14 @@ Page({
         path: 'find',
       },
       {
-        menuName: '冷链管理',
+        menuName: '监测列表',
         icon: '/img/dev_img4.png',
         path: 'coldChain'
       },
       {
-        menuName: '产品管理',
-        icon: '/img/idx_img4.png',
-        path: 'productManager'
-      },
-      {
-        menuName: '员工管理',
-        icon: '/img/idx_img5.png',
-        path: 'workerManager'
+        menuName: '激活锁闭',
+        icon: 'http://oss.zhongyihz.cn/group156/default/20220815/17/51/6/4dcc7eb59450f00227dd7e20380f9c94.png',
+        path: 'onAndOff'
       },
     ],
     isAuth: false,
@@ -150,21 +145,13 @@ Page({
       token,
       tempList:[]
     })
-
+    var that = this;
     if (!token) {
       setTimeout(function () {
         that.noLogin()
       }, 500)
       return;
     }
-    //地区产品统计
-    this.setCardLeftFive({
-      name:['北京', '云南', '广州', '辽宁', '山东', '重庆'],
-      data:[
-        {name:'2022',data:[18203, 23489, 29034, 104970, 131744, 630230]},
-        {name:'2012',data:[19325, 23438, 31000, 121594, 134141, 681807]},
-      ]
-    });
 
     // 主产品查询
     this.getsignProduct();
@@ -247,8 +234,8 @@ Page({
     for (var i in markers) {
       if(i==0){
         points.push({
-          width:54,
-          height:54,
+          width:35,
+          height:35,
           latitude:Number(markers[i].lat),
           longitude:Number(markers[i].lng),
           iconPath:"/img/map_icon1.png",
@@ -356,11 +343,72 @@ Page({
       },
     ]
     this.showMap(markerList);
+    this.setCard_top_right_butChart([
+      {total:10,city:'河北省'},
+      {total:25,city:'河南省'},
+      {total:27,city:'广东省'},
+      {total:32,city:'江苏省'},
+    ])
+    var klineList = [{
+        maps:[{total:10,},{total:15,},{total:19,},{total:13,},{total:18,},],
+        productInfo:{name:'阿莫西林'}
+      },{
+        maps:[{total:16,},{total:11,},{total:14,},{total:13,},{total:18,},],
+        productInfo:{name:'红霉素'}
+      },{
+        maps:[{total:18,},{total:14,},{total:11,},{total:8,},{total:17,},],
+        productInfo:{name:'新型冠状病毒疫苗'}
+      }
+    ];
+    this.setKLine(klineList);   
     this.setData({
       tempList:temp,
     },()=>{
       this.setTemp(temp);
     })
+    this.setData({
+      statisticSproductList:[
+        {product_name: "阿莫西林",data:[{data: 1,index: 39,color:"#2D59E6"},{data:1,index:872,color:"#71CCFF"}]},
+        {product_name: "红霉素",data:[{data:1,index: 266,color: "#2D59E6"},{data: 1,index: 862,color:"#71CCFF"}]},
+        {product_name: "新型冠状病毒疫苗",data:[{data:10,index: 555, color: "#2D59E6"},{data:1,index:200,color:"#71CCFF"}]},
+      ]
+    },()=>{
+      var list1 = this.data.statisticSproductList;
+      for (let index = 0; index < list1.length; index++) {
+        for (let lindex = 0; lindex < list1[index].data.length; lindex++) {
+          var color = list1[index].data[lindex].color;
+          var total = list1[index].data[lindex].data;
+          var itemIndex = list1[index].data[lindex].index;
+          this.setCardFivePie_rght(color,total,itemIndex);
+        }
+      }
+    })
+    const rawData = [
+      ['2021/12/31', '25.8', '26.8', '-33.69', '-0.94%', '24.5', '27.2', '176963664', '25403106', '-'], 
+      ['2021/12/30', '28.2', '26.3', '9.14', '0.26%', '25', '27.3', '26778766', '26778766', '-'], 
+      ['2021/12/29', '32.4', '28.74', '29.96', '0.85%', '26.2', '28.2', '182551920', '25093890', '-'], 
+      ['2021/12/28', '36.3', '35.3', '-94.13', '-2.59%', '35.3', '36.4', '269983264', '36904280', '-'], 
+      ['2021/12/25', '36.1', '36.2', '15.43', '0.43%', '36', '36.35', '198451120', '27466004', '-'], 
+      ['2021/12/24', '36.3', '36.1', '-23.6', '-0.65%', '35.7', '36.4', '227785216', '31542126', '-'], 
+      ['2021/12/23', '36.5', '36.3', '-15.68', '-0.43%', '36.3', '36.8', '298201792', '41990292', '-'], 
+      ['2021/12/22', '36.4', '36.5', '9.3', '0.26%', '36.1', '36.5', '261178752', '36084604', '-'], 
+      ['2021/12/21', '35.6', '36.4', '63.51', '1.77%', '35.6', '36.50', '299849280', '39831696', '-'], 
+      ['2021/12/18', '35.70', '35.90', '-1.03', '-0.03%', '35.60', '36.10', '273707904', '36538580', '-'], 
+      ['2021/12/17', '35.30', '35.80', '63.81', '1.81%', '35.30', '35.80', '283856480', '38143960', '-'], 
+      ['2021/12/16', '35.20', '35.10', '5.83', '0.17%', '35.00', '35.30', '193482304', '26528864', '-'], 
+      ['2021/12/15', '35.18', '35.10', '-10.31', '-0.29%', '34.90', '35.20', '200471344', '27627494', '-'], 
+      ['2021/12/14', '34.00', '35.20', '86.09', '2.51%', '33.90', '35.20', '215374624', '27921354', '-'], 
+      ['2021/12/11', '34.40', '34.30', '-20.91', '-0.61%', '34.0', '34.50', '182908880', '24507642', '-'], 
+      ['2021/12/10', '34.60', '34.50', '-16.94', '-0.49%', '34.40', '35.0', '200427520', '27949970', '-'], 
+      ['2021/12/9', '34.60', '34.70', '2.37', '0.07%', '34.50', '34.90', '195698848', '26785488', '-'], 
+      ['2021/12/8', '35.10', '34.70', '-66.86', '-1.89%', '34.60', '35.10', '224367312', '29782174', '-'], 
+      ['2021/12/7', '35.20', '35.30', '11.94', '0.34%', '35.00', '35.40', '208302576', '28056158', '-'], 
+      ['2021/12/4', '35.50', '35.20', '-59.83', '-1.67%', '35.10', '35.60', '251736416', '31976682', '-'], 
+      ['2021/12/3', '35.20', '35.80', '47.92', '1.35%', '35.10', '35.90', '281111232', '33885908', '-'], 
+      ['2021/12/2', '34.50', '35.30', '80.6', '2.33%', '34.20', '35.30', '301491488', '36918304', '-'], 
+      ['2021/12/1', '34.40', '34.50', '10.9', '0.32%', '34.10', '34.80', '252390752', '33025674', '-']
+    ];
+    this.setEchartkline(rawData);
     //地区产品统计
     this.setCardLeftFive({
       name:['北京', '云南', '广州', '辽宁', '山东', '重庆'],
@@ -381,39 +429,20 @@ Page({
       {normal: 0, warning: 1, product_name: "红霉素"},
       {normal: 1, warning: 9, product_name: "新型冠状病毒疫苗"}
     ]);
-    var list = [
-      {product_name: "阿莫西林",data:[{data: 1,index: 39,color:"#2D59E6"},{data:1,index:872,color:"#71CCFF"}]},
-      {product_name: "红霉素",data:[{data:1,index: 266,color: "#2D59E6"},{data: 1,index: 862,color:"#71CCFF"}]},
-      {product_name: "新型冠状病毒疫苗",data:[{data:10,index: 555, color: "#2D59E6"},{data:1,index:200,color:"#71CCFF"}]},
-
-    ];
-    for (let index = 0; index < list.length; index++) {
-      for (let lindex = 0; lindex < list[index].data.length; lindex++) {
-        var color = list[index].data[lindex].color;
-        var total = list[index].data[lindex].data;
-        var itemIndex = list[index].data[lindex].index;
-        that.setCardFivePie_rght(color,total,itemIndex);
-      }
-    }
     var seriesSixBar = [
       {name: 2022, type: "line", stack: "Total",data:[1, 1, 6]},
       {name: 2021, type: "line", stack: "Total",data:[4, 0,0]},
     ]
     var cardSixLineList = ["阿莫西林", "红霉素", "新型冠状病毒疫苗"];
     this.setCardSixBar(seriesSixBar,cardSixLineList);
-    var klineList = [
-      {
-        maps:[{total:10,},{total:15,},{total:19,},{total:13,},{total:18,},],
-        productInfo:{name:'阿莫西林'}
-      },{
-        maps:[{total:16,},{total:11,},{total:14,},{total:13,},{total:18,},],
-        productInfo:{name:'红霉素'}
-      },{
-        maps:[{total:18,},{total:14,},{total:11,},{total:8,},{total:17,},],
-        productInfo:{name:'新型冠状病毒疫苗'}
-      }
-    ];
-    this.setKLine(klineList);
+    //地区产品统计
+    this.setCardLeftFive({
+      name:['北京', '云南', '广州', '辽宁', '山东', '重庆'],
+      data:[
+        {name:'2022',data:[18203, 23489, 29034, 104970, 131744, 630230]},
+        {name:'2012',data:[19325, 23438, 31000, 121594, 134141, 681807]},
+      ]
+    });
   },
   showMap1(markers) {
     var that = this;
@@ -1697,13 +1726,14 @@ Page({
             var itemIndex = list[index].data[lindex].index;
             that.setCardFivePie_rght(color,total,itemIndex);
           }
-      }
+        }
       })
     }).catch(err=>{
       app.showToptip(this,'err',err.data.msg)
     })
   },
   setCardFivePie_rght(color,total,itemIndex){
+    console.log(color,total,itemIndex);
     var that = this;
     var placeHolderStyle = {
       normal: {
@@ -2384,4 +2414,130 @@ Page({
       app.showToptip(this,'err',err.data.msg)
     })
   },
+  setEchartkline(rawData){
+    var that = this;
+    const dates = rawData.map(function (item) {
+      return item[0];
+    });
+    const data = rawData.map(function (item) {
+      return [+item[1], +item[2], +item[5], +item[6]];
+    });
+    that.selectComponent('#kline').init((canvas, width, height, dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr
+      });
+      var option = {
+        legend: {
+          data: ['日K', 'MA5', 'MA10', 'MA20', 'MA30'],
+          inactiveColor: '#777'
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            animation: false,
+            type: 'cross',
+            lineStyle: {
+              color: '#376df4',
+              width: 2,
+              opacity: 1
+            }
+          }
+        },
+        xAxis: {
+          type: 'category',
+          data: dates,
+          axisLabel: {
+            color: 'white',
+            fontSize: 8,
+          },
+          axisLine: { lineStyle: { color: '#8392A5' } }
+        },
+        yAxis: {
+          scale: true,
+          axisLabel: {
+            color: 'white',
+            fontSize: 8,
+          },
+          axisLine: { lineStyle: { color: '#8392A5' } },
+          splitLine: { show: false }
+        },
+        grid: {
+          bottom: "20",
+          left: "1%",
+          right: "5%",
+          top:'5%',
+          containLabel: true,
+        },
+        dataZoom:{show:false,},
+        series: [
+          {
+            type: 'candlestick',
+            data: data,
+            itemStyle: {
+              color: '#FD1050',
+              color0: '#0CF49B',
+              borderColor: '#FD1050',
+              borderColor0: '#0CF49B'
+            }
+          },
+          {
+            type: 'line',
+            data: this.calculateMA(5, data),
+            smooth: true,
+            showSymbol: false,
+            lineStyle: {
+              width: 1
+            }
+          },
+          {
+            type: 'line',
+            data: this.calculateMA(10, data),
+            smooth: true,
+            showSymbol: false,
+            lineStyle: {
+              width: 1
+            }
+          },
+          {
+            type: 'line',
+            data: this.calculateMA(20, data),
+            smooth: true,
+            showSymbol: false,
+            lineStyle: {
+              width: 1
+            }
+          },
+          {
+            type: 'line',
+            data: this.calculateMA(30, data),
+            smooth: true,
+            showSymbol: false,
+            lineStyle: {
+              width: 1
+            }
+          }
+        ]
+      }
+      chart.setOption(option);
+      return chart;
+    })
+
+  },
+  calculateMA(dayCount, data) {
+    var result = [];
+    for (var i = 0, len = data.length; i < len; i++) {
+        if (i < dayCount) {
+        result.push('-');
+        continue;
+        }
+        var sum = 0;
+        for (var j = 0; j < dayCount; j++) {
+        sum += +data[i - j][1];
+        }
+        result.push(sum / dayCount);
+    }
+    return result;
+}
 })

+ 1 - 1
pages/index/index.wxml

@@ -105,7 +105,7 @@
           <view class="card_text">温度统计</view>
         </view>
         <view class="card_but">
-          
+          <ec-canvas id="kline" canvas-id="kline" ec="{{ Ec }}"></ec-canvas>
         </view>
         <!-- <view class="card_left">
           <ec-canvas id="product_three_left_one" canvas-id="product_three_left" ec="{{ Ec }}"></ec-canvas>

+ 1 - 1
pages/index/indexRight/rightBar1/rightPie.js

@@ -14,7 +14,7 @@ Component({
           {name:"箱",data:[{name:"北京",value:50,},{name:"上海",value:30,},{name:"杭州",value:30,},{name:"天津",value:30,}]},
           {name:"托盘",data:[{name:"北京",value:50,},{name:"上海",value:30,},{name:"杭州",value:30,},{name:"天津",value:30,}]},
         ]
-        this.init(list);
+        this.initChart(list);
       }
     },
     moved: function () { },

+ 5 - 0
pages/login/login.js

@@ -191,5 +191,10 @@ Page({
         img:'data:image/gif;base64,'+res.data.img
       })
     })
+  },
+  loginFpwd(){
+    wx.navigateTo({
+      url: '/pages/user/pwdEdit',
+    })
   }
 })

+ 2 - 2
pages/login/login.wxml

@@ -28,8 +28,8 @@
       <input placeholder="请输入图形验证码" type='text' bindinput="setCaptChaImage" value='{{code}}'></input>
       <image class="captChaImage" src="{{img}}" bindtap="getCaptchaImage"></image>
     </view>
-    <view class="login_fpwd">
-      <navigator url="/pages/user/pwdEdit">忘记密码</navigator>
+    <view class="login_fpwd" bindtap="loginFpwd">
+      忘记密码
     </view>
     <view class='cu-btn bg-color lg login_form_btn' bindtap="loginIn">立即登录</view>
     <!-- <view class="login_form_reg">

+ 351 - 0
pages/nfc/encryptionNfc/encryptionNfc.js

@@ -0,0 +1,351 @@
+// pages/nfc/encryptionNfc/encryptionNfc.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    type:null,
+    path:null,
+    showDialog: false,// 详情弹窗
+    activeText:'--',
+    scanType:'7', //1查看当前激活状态 2激活  3锁闭  4读温度  7读取UID  8读自定义信息 9写入自定义信息  10读采温周期  X106:X106端读卡
+    seleteType:[{transportStatus:'00',transportStatusName:'入库'},{transportStatus:'10',transportStatusName:'出库'},{transportStatus:'20',transportStatusName:'结束'}],
+    modalHidden:true,
+    region:[],
+    modalName: null,
+    chainId:null,
+  },
+  getNfcRes(e){
+    const {sta,msg} = e.detail;
+    var type1 = ['X101','X102','X103','X104','X106','X107'];
+    var type = this.data.type;
+    var path = this.data.path;
+    switch (path) {
+      case 'find':
+        this.goDetailInfo(msg.uid,type)
+        break;
+      case 'factorycheck':
+        this.getInfo(msg.uid,type)
+        break;
+      case 'iodep':
+        this.iodep(msg.uid,type)
+        break;
+      case 'addLabel':
+        this.chainBind(msg.uid,type,this.data.chainId);
+        break;
+      default:
+        break;
+    }
+    // this.setData({
+    //   activeText:msg
+    // })
+
+  },
+  // 绑定标签
+  chainBind(deviceCode,type,chainId){
+    var that = this;
+    const {latitude,longitude} = that.data;
+    app.requestP({
+      url:'/chainBound/checkBind',
+      method:'post',
+      data:{
+        deviceCode,
+      }
+    }).then(res=>{
+      if(res.data.data == 0){
+        app.requestP({
+          url:'/chainBound/bind',
+          method:'post',
+          contentType:' application/json',
+          data:{
+            chainId,
+            deviceCode,
+            type:type,
+            lat:latitude,
+            lng:longitude
+          }
+        }).then(response=>{
+          app.showToptip(that,'success',response.data.msg)
+        }).catch(err=>{
+          app.showToptip(that,'error',err.data.msg)
+        })
+      }else{
+        app.showToptip(that,'error',res.data.msg);
+      }
+    }).catch(err=>{
+      app.showToptip(that,'error',err.data.msg)
+    })
+  },
+  // 查一查
+  goDetailInfo(message,type){
+    var that = this;
+    app.requestP({
+      url:'/chainBound/checkBind',
+      method:'post',
+      // contentType:' application/json',
+      data:{
+        deviceCode:message,
+      }
+    }).then(res=>{
+      if(res.data.data !=1){
+        app.showToptip(that,'error',res.data.msg);
+        return;
+      }
+      app.requestP({
+        url:'/chain/scan',
+        method:'post',
+        contentType:' application/json',
+        data:{
+          inoculatorId:'',
+          payload:message,
+          type
+        }
+      }).then(res=>{
+        var id = res.data.msg;
+        that.setData({
+          showDialog: !this.data.showDialog,
+          detailId:id,
+          deviceCode:message
+        });
+      }).catch(err=>{
+        app.showToptip(that,'error',err.data.msg)
+      })
+    }).catch(err=>{
+      app.showToptip(that,'error',err.data.msg);
+    })
+  },
+  goDetail(){
+    var detailId = this.data.detailId;
+    var deviceCode = this.data.deviceCode || '';
+    wx.navigateTo({
+      url: '/pages/query/details?id='+detailId+'&deviceCode='+deviceCode,
+    })
+    this.setData({
+      showDialog:!this.data.showDialog,
+    })
+  },
+  // 出厂检测
+  getInfo(message){
+    var that = this;
+    app.requestP({
+      url: "/query/scanChip1",
+      method:"post",
+      needToken:false,
+      contentType:' application/json',
+      data:{
+        payload:message
+      }
+    }).then(res=>{
+      wx.navigateTo({
+        url: '/pages/nfc/outNfcTempInfo/outNfcTempInfo?data='+JSON.stringify(res.data.data),
+      })
+    }).catch(err=>{
+      app.showToptip(that,'error',err.data.msg)
+    })
+  },
+  // 出入库
+  iodep(code,type){
+    var that =this;
+    app.requestP({
+      url:'/chainBound/checkBind',
+      method:'post',
+      // contentType:' application/json',
+      data:{
+        deviceCode:code,
+      }
+    }).then(res=>{
+      if(res.data.data!=1){
+        app.showToptip(that,'error',res.data.msg);
+        return;
+      }
+      app.requestP({
+        url:'/chain/scan',
+        method:'post',
+        contentType:' application/json',
+        data:{
+          inoculatorId:'',
+          payload:code,
+          type,
+        }
+      }).then(res=>{
+        const {transportStatus,id,code} = res.data.chain;
+        that.setData({
+          transportStatus,
+          iodepId:id,
+          modalHidden:!that.data.modalHidden,
+          seleteType:that.setSeleteType(transportStatus),
+        });
+      }).catch(err=>{
+        app.showToptip(that,'error',err.data.msg)
+      })
+    }).catch(err=>{
+      app.showToptip(that,'error',err.data.msg);
+    })
+  },
+  setTransportStatus(transportStatus){
+    var seleteType = this.data.seleteType;
+    var deptType;
+    for(var i=0;i<seleteType.length;i++){
+      if(seleteType[i].transportStatus == transportStatus){
+        deptType = i;
+        break;
+      }
+    }
+    return deptType;
+  },
+  setSeleteType(transportStatus){
+    var seleteType = this.data.seleteType;
+    var type;
+    for(var i=0;i<seleteType.length;i++){
+      if(seleteType[i].transportStatus == transportStatus){
+        seleteType.splice(i,1);
+        break;
+      }
+    }
+    this.setTransportStatus(transportStatus);
+    return seleteType;
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options);
+    const {type,path,chainId} = options;
+    this.setData({
+      type,path,chainId
+    })
+    //获取定位信息
+    wx.getLocation({
+      altitude: 'altitude',
+      success(res) {
+        that.setData({
+          latitude: res.latitude,
+          longitude: res.longitude,
+        })
+      },
+      error() {
+        app.showToptip(that, "worning", "获取位置信息失败")
+      }
+    })
+    //判断是否是iOS
+    wx.getSystemInfo({
+      success:function(res){
+        if(res.platform=="ios"){
+          that.isIOS = true; 
+        }
+      }
+    })
+  },
+  //取消按钮点击事件
+  modalBindcancel:function(){
+    this.setData({
+      modalHidden:!this.data.modalHidden,
+      region:[],
+      modalVal:'',
+      iodepId:'',
+    })
+  },
+  regionChange: function(e) {
+    this.setData({
+      region: e.detail.value
+    })
+  },
+  modalBindaconfirm(){  //一型保存地址
+    var that = this;
+    var {region,modalVal,transportStatus,iodepId,seleteType,deptType} = that.data;
+    var addr = region.join('')+modalVal;
+    if(region.join('') && modalVal && seleteType[deptType].transportStatus){
+      app.requestP({
+        url:'/chain/editTransport',
+        // contentType:' application/json',
+        method:'post',
+        data:{
+          addr,
+          chainId:iodepId,  // 00 在库 //10 运输 // 20 已结束
+          // transportStatus:transportStatus == '00' ? '10':transportStatus == '10' ?'00':'',
+          transportStatus:seleteType[deptType].transportStatus,
+        }
+      }).then(res=>{
+        that.setData({
+          modalHidden:!that.data.modalHidden,
+          region:[],
+          modalVal:'',
+          iodepId:'',
+        })
+        app.showToptip(that,'success',res.data.msg);
+      }).catch(err=>{
+        app.showToptip(that,'error',err.data.msg);
+      })
+    }else{
+      app.showToptip(that,'error','地址不能为空');
+    }
+  },
+  setType(e){
+    var value = e.detail.value;
+    var that = this;
+    that.setData({
+      deptType:value
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    if(that.data.isIOS){
+      that.goApp()
+      return;
+    }
+  },
+  goApp(e) {
+    this.setData({
+      modalName: "goApp"
+    })
+  },
+  hideModal(e) {
+    this.setData({
+      modalName: null
+    })
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 5 - 0
pages/nfc/encryptionNfc/encryptionNfc.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nfc-tools": "/components/nfc_utils/component/nfcTools"
+  }
+}

+ 81 - 0
pages/nfc/encryptionNfc/encryptionNfc.wxml

@@ -0,0 +1,81 @@
+<view class="toptip {{tipStaus}} text-white {{tipType}}" style='top:{{CustomBar}}px;'>{{tipText}}</view>
+<cu-custom bgColor="bg-color" isBack="{{true}}" title="扫描">
+  <!-- <view slot="content">追溯标签</view> -->
+</cu-custom>
+<nfc-tools id="nfcCon" scanType="{{scanType}}" bind:setNfcRes="getNfcRes">
+  <view slot='nfctxt'></view>
+</nfc-tools>
+<view class="toptip {{tipStaus}} text-white {{tipType}}" style='top:{{CustomBar}}px;'>{{tipText}}</view>
+<view class="nfc_mid">
+  <image src="/img/nfc_img1.png"></image>
+  <view>请将设备贴近NFC天线处</view>
+</view>
+<view class="nfc_foot">
+  <view>请将芯片贴在您的手机的顶部</view>
+  <view>靠近NFC位置进行扫描</view>
+</view>
+<view class="zan-dialog {{ showDialog ? 'zan-dialog--show' : '' }}">
+  <!-- 如果想点击弹窗外不隐藏,取消bindtap点击事件即可 -->
+  <view class="zan-dialog__mask" bindtap="toggleDialog" />
+  <view class="zan-dialog__container">
+    <view class="cha_win_tit">请选择</view>
+    <view class="selectInfo">
+      <view bindtap="goDetail">
+        <image src="/img/infoDetail.png"></image>
+        <view>查看详情</view>
+      </view>
+      <view bindtap="clearBind">
+        <image src="/img/clearBind.png"></image>
+        <view>解除绑定</view>
+      </view>
+    </view>
+    <view class="cha_win_close" bindtap="toggleDialog">
+      <text>×</text>
+    </view>
+  </view>
+</view>
+<!--出库入库地址  -->
+<view>
+  <modal title="修改地址" hidden="{{modalHidden}}" confirm-text="保存" cancel-text="取消" bindconfirm="modalBindaconfirm" bindcancel="modalBindcancel">
+    <view class="info_item">
+      <view class="info_text">
+        <image src="/img/warnAddr.png"></image>
+        <view>
+          <block>
+            <picker mode="selector" bindchange="setType" value="{{deptType}}" range="{{seleteType}}" range-key="transportStatusName">
+              <view class="picker">
+                <text>{{deptType ?'运输状态选择为:'+seleteType[deptType].transportStatusName :'请选择运输状态'}}</text>
+              </view>
+            </picker>
+          </block>
+        </view>
+      </view>
+      <view class="time">
+        <picker mode="region" bindchange="regionChange" value="{{region}}" custom-item="{{customItem}}">
+          <view class="picker" wx:if="{{region.length != 0}}">
+            {{region[0]}},{{region[1]}},{{region[2]}}
+          </view>
+          <view wx:else>
+            请选择地址
+          </view>
+        </picker>
+      </view>
+    </view>
+    <input type="text" class="modalVal" placeholder="详细地址(如街道、小区、乡镇、村)" value="{{modalVal}}" bindinput="setModalVal"></input>
+  </modal>
+</view>
+<view class="content">提示</view>
+<view class="action" bindtap="hideModal">
+  <text class="cuIcon-close text-red"></text>
+</view>
+<view>
+  <view class="padding-xl">
+    <view class="app_con">
+      <image src="/img/wechatCode.png"></image>
+      <view>您的手机暂不支持在小程序进行操作此项功能,请扫描二维码下载APP安装后继续操作</view>
+    </view>
+  </view>
+  <view class="cu-bar bg-white">
+    <view class="action margin-0 flex-sub  solid-left" bindtap="saveCode">保存二维码</view>
+  </view>
+</view>

+ 201 - 0
pages/nfc/encryptionNfc/encryptionNfc.wxss

@@ -0,0 +1,201 @@
+page {
+  background: #ffffff;
+}
+
+.nfc_mid {
+  padding: 184rpx 0 0 0;
+  text-align: center;
+}
+
+.nfc_mid image {
+  width: 400rpx;
+  height: 400rpx;
+}
+
+.nfc_mid view {
+  font-size: 34rpx;
+  color: #0D6EE6;
+  margin-top: 180rpx;
+}
+
+.nfc_foot {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 0 0 48rpx 0;
+  text-align: center;
+  font-size: 26rpx;
+  color: #999999;
+}
+
+.info_text {
+  padding: 15rpx;
+  display: flex;
+  align-items: center;
+  background: #FFFAF3;
+  color: #A15D20;
+}
+
+.info_text image {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.time {
+  padding: 25rpx 0;
+  color: #333;
+  border-bottom: 2.5rpx solid #f1f1f1;
+}
+
+.modalVal {
+  word-break: break-all;
+  height: 120rpx;
+  padding: 10rpx;
+}
+.cha_win_close {
+  text-align: center;
+  color: #999999;
+  font-size: 50rpx;
+  font-weight: 100;
+  line-height: 120rpx;
+}
+.zan-dialog__mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10;
+  background: rgba(0, 0, 0, .3);   /*设置阴影半透明背景如: background: rgba(0, 0, 0, 0.4);*/
+  display: none;
+}
+
+.zan-dialog__container {
+  position: fixed;
+  bottom: 0rpx;
+  width: 100%;
+  /* height: 350rpx; */
+  background: #fff;
+  transform: translateY(300%);
+  transition: all 0.4s ease;
+  z-index: 12;
+  z-index: 12;
+  box-shadow: 0px 3px 3px 2px gainsboro;  /*弹框的悬浮阴影效果,如不需要可注释该行*/
+}
+.cha_win_tit {
+  text-align: center;
+  line-height: 120rpx;
+  font-size: 32rpx;
+  color: #333333;
+}
+
+.cha_win_btn {
+  display: flex;
+  justify-content: space-between;
+}
+.selectInfo{
+  height: 100%;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.selectInfo>view{
+  text-align: center;
+}
+.selectInfo image{
+  width: 90rpx;
+  height: 90rpx;
+}
+.zan-dialog--show .zan-dialog__container {
+  transform: translateY(0);
+}
+
+.zan-dialog--show .zan-dialog__mask {
+  display: block;
+}
+.info_text {
+  padding: 15rpx;
+  display: flex;
+  align-items: center;
+  background: #FFFAF3;
+  color: #A15D20;
+}
+
+.info_text image {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.time {
+  padding: 25rpx 0;
+  color: #333;
+  border-bottom: 2.5rpx solid #f1f1f1;
+}
+
+.modalVal {
+  word-break: break-all;
+  height: 120rpx;
+  padding: 10rpx;
+}
+.cha_win_close {
+  text-align: center;
+  color: #999999;
+  font-size: 50rpx;
+  font-weight: 100;
+  line-height: 120rpx;
+}
+.zan-dialog__mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10;
+  background: rgba(0, 0, 0, .3);   /*设置阴影半透明背景如: background: rgba(0, 0, 0, 0.4);*/
+  display: none;
+}
+
+.zan-dialog__container {
+  position: fixed;
+  bottom: 0rpx;
+  width: 100%;
+  /* height: 350rpx; */
+  background: #fff;
+  transform: translateY(300%);
+  transition: all 0.4s ease;
+  z-index: 12;
+  z-index: 12;
+  box-shadow: 0px 3px 3px 2px gainsboro;  /*弹框的悬浮阴影效果,如不需要可注释该行*/
+}
+.cha_win_tit {
+  text-align: center;
+  line-height: 120rpx;
+  font-size: 32rpx;
+  color: #333333;
+}
+
+.cha_win_btn {
+  display: flex;
+  justify-content: space-between;
+}
+.selectInfo{
+  height: 100%;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.selectInfo>view{
+  text-align: center;
+}
+.selectInfo image{
+  width: 90rpx;
+  height: 90rpx;
+}
+.zan-dialog--show .zan-dialog__container {
+  transform: translateY(0);
+}
+
+.zan-dialog--show .zan-dialog__mask {
+  display: block;
+}

+ 1 - 2
pages/nfc/zhuisu2.wxml

@@ -1,6 +1,5 @@
 <view class="toptip {{tipStaus}} text-white {{tipType}}" style='top:{{CustomBar}}px;'>{{tipText}}</view>
-<cu-custom bgColor="bg-color" isBack="{{true}}" title="{{type == 11 ? '追溯标签' : '实时追溯'}}">
-  <!-- <view slot="content">追溯标签</view> -->
+<cu-custom bgColor="bg-color" isBack="{{true}}" title="扫描">
 </cu-custom>
 <view class="toptip {{tipStaus}} text-white {{tipType}}" style='top:{{CustomBar}}px;'>{{tipText}}</view>
 <view class="nfc_mid">

+ 3 - 2
pages/query/clearWarning/clearWarning.js

@@ -6,10 +6,11 @@ Page({
    */
   data: {
     worningList:[],
-    newsNavIndex:20,
+    newsNavIndex:'X101',
     modalHidden:true,
     modalVal:'',// 解除预警信息
-    deviceCode:''
+    deviceCode:'',
+    labelName:['X101','X102','X106','X107','X201','X202','X203']
   },
 
   /**

+ 5 - 4
pages/query/clearWarning/clearWarning.wxml

@@ -3,14 +3,15 @@
   <!-- <view slot="content">预警列表</view> -->
 </cu-custom>
 <view class="news_nav">
-  <view class="news_nav_item {{newsNavIndex == 11 && ' sec'}}" bindtap="setTab" data-val="11">
+  <view wx:for="{{labelName}}" wx:for-item="item" class="news_nav_item {{newsNavIndex == item && 'sec'}}" bindtap="setTab" data-val="{{item}}">
+    <view>{{item}}</view>
+  </view>
+  <!-- <view class="news_nav_item {{newsNavIndex == 11 && ' sec'}}" bindtap="setTab" data-val="11">
     <view>I型有源</view>
-    <!-- <text>12</text> -->
   </view>
   <view class="news_nav_item {{newsNavIndex == 20 && ' sec'}}" bindtap="setTab" data-val="X202">
     <view>II型有源</view>
-    <!-- <text>6</text> -->
-  </view>
+  </view> -->
 </view>
 
 <view class="worningList" wx:if="{{worningList.length > 0}}">

+ 9 - 9
pages/query/details.js

@@ -305,16 +305,16 @@ Page({
           delete data[key]
         }else{
           if(key == 'childNum'){
-            bound.push({title:'子冷链',info:data[key],isChild:true,code:key})
+            // bound.push({title:'子冷链',info:data[key],isChild:true,code:key})
           }else if(key.indexOf('X') == -1 ){
-            if(key == '10'){
-              name = '追溯标签'
-            }else if(key == '11'){
-              name = '全程温控'
-            }else if(key == '20'){
-              name = '实时追溯'
-            }
-            bound.push({title:name,info:data[key],isChild:false,code:key})
+            // if(key == '10'){
+            //   name = '追溯标签'
+            // }else if(key == '11'){
+            //   name = '全程温控'
+            // }else if(key == '20'){
+            //   name = '实时追溯'
+            // }
+            // bound.push({title:name,info:data[key],isChild:false,code:key})
           }else{
             bound.push({title:key,info:data[key],isChild:false,code:key})
           }

+ 12 - 4
pages/query/details.wxml

@@ -32,9 +32,13 @@
     </view>
     <view class="query_item_txt">
       <text class="query_item_label">运输状态:</text>
-      <text class="{{details.status == 00 ? 'query_zc': details.status == 10 ? 'query_jb': 'query_wx'}}" wx:if="{{details.transportStatus == 00}}">在库</text>
-      <text class="{{details.status == 00 ? 'query_zc': details.status == 10 ? 'query_jb': 'query_wx'}}" wx:if="{{details.transportStatus == 10}}">运输中</text>
-      <text class="{{details.status == 00 ? 'query_zc': details.status == 10 ? 'query_jb': 'query_wx'}}" wx:if="{{details.transportStatus == 20}}">已结束</text>
+      <text wx:if="{{details.transportStatus == 00}}">在库</text>
+      <text wx:if="{{details.transportStatus == 10}}">运输中</text>
+      <text wx:if="{{details.transportStatus == 20}}">已结束</text>
+    </view>
+    <view class="query_item_txt">
+      <text class="query_item_label">冷链规则:</text>
+      <text class="{{details.status == 00 ? 'query_zc': details.status == 10 ? 'query_jb': 'query_wx'}}">{{details.ruleGroupName}}</text>
     </view>
     <view class="query_item_txt">
       <text class="query_item_label">负责人:</text>
@@ -101,10 +105,14 @@
         <text>获取报告</text>
       </view> -->
     </view>
+    <view class="query_item_txt">
+      <text class="query_item_label">电话:</text>
+      <text>{{details.telephone}}</text>
+    </view>
   </view>
   <view>
     <view class="detailsTitle">
-      <text>设备与子冷链</text>
+      <text>设备</text>
     </view>
     <view class="detailsCode">
       <view>

+ 131 - 0
pages/query/editOrder/editOrder.js

@@ -0,0 +1,131 @@
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    transportName:null,
+    transport:null,
+    driverName:null,
+    plateNum:null,
+    //运输类型id  10 汽车 20船 30火车 40飞机 50其他
+    transportType:[
+      {name:'汽车',type:'10'},
+      {name:'船运',type:'20'},
+      {name:'火车',type:'30'},
+      {name:'飞机',type:'40'},
+      {name:'其他',type:'50'},
+    ],
+  },
+  setTransportName(e){
+    this.setData({
+      transportName:e.detail.value
+    })
+  },
+  setDriverName(e){
+    this.setData({
+      driverName:e.detail.value
+    })
+  },
+  setPlateNum(e){
+    this.setData({
+      plateNum:e.detail.value
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const {transportName,transport,driverName,plateNum,code,uid} = options;
+    this.setData({
+      transportName,driverName,plateNum,code,uid
+    })
+    this.setOptonsType(transport)
+  },
+  setOptonsType(transport){
+    var transportType = this.data.transportType;
+    for(var i=0;i<transportType.length;i++){
+      if(transport == transportType[i].name){
+        this.setData({
+          transport:i
+        })
+        break;
+      }
+    }
+  },
+  setTransportType(e){
+    var value = e.detail.value;
+    this.setData({
+      transport:value+''
+    })
+  },
+  addLabel(){
+    const {transportName,transport,driverName,plateNum,code,uid} = this.data;
+    this.updteVvmTransportOrder({transportName,transport,driverName,plateNum,code,uid})
+  },
+  updteVvmTransportOrder(form){
+    var that = this;
+    app.requestP({
+      url: '/transport/updteVvmTransportOrder',
+      method: 'post',
+      contentType: 'application/json',
+      data: form
+    }).then(res=>{
+      app.showToptip(that, 'success', res.data.msg);
+      wx.navigateBack({
+        delta: 1,
+      })
+    }).catch(err=>{
+      app.showToptip(that, 'error', err.data.msg)
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 3 - 0
pages/query/editOrder/editOrder.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 27 - 0
pages/query/editOrder/editOrder.wxml

@@ -0,0 +1,27 @@
+<view class="toptip {{tipStaus}} text-white {{tipType}}" style='top:{{CustomBar}}px;'>{{tipText}}</view>
+<cu-custom bgColor="bg-color" isBack="{{true}}" title="修改订单">
+  <!-- <view slot="content">修改用户名</view> -->
+</cu-custom>
+<view class="info_item">
+  <view class="info_label">承运商</view>
+  <input type="text" class="info_val" placeholder="请输入承运商" value="{{transportName}}" bindinput="setTransportName"></input>
+</view>
+<view class="info_item">
+  <view class="info_label">运输方式</view>
+  <picker mode="selector" bindchange="setTransportType" name="transport" value="{{transport}}" range="{{transportType}}" range-key="name">
+    <view class="info_val">
+      {{transport+'' ? transportType[transport].name : '请选择'}}
+    </view>
+  </picker>
+</view>
+<view class="info_item">
+  <view class="info_label">司机名称</view>
+  <input type="text" class="info_val" placeholder="请输入承运商" value="{{driverName}}" bindinput="setDriverName"></input>
+</view>
+<view class="info_item">
+  <view class="info_label">车牌</view>
+  <input type="text" class="info_val" placeholder="请输入车牌" value="{{plateNum}}" bindinput="setPlateNum"></input>
+</view>
+<view class="addLabel" bindtap="addLabel">
+  <text>保存</text>
+</view>

+ 29 - 0
pages/query/editOrder/editOrder.wxss

@@ -0,0 +1,29 @@
+.info_item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 28rpx;
+  color: #333333;
+  background: #ffffff;
+  line-height: 120rpx;
+  padding: 0 26rpx;
+  border-top: 1px solid #F8F8F8;
+}
+
+.info_item:first-child {
+  border: none;
+}
+.info_label {
+  flex: none;
+  font-size: 30rpx;
+  width: 300rpx;
+  color: #333333;
+}
+.info_val {
+  flex: auto;
+  width: 100%;
+  font-size: 28rpx;
+  color: #999;
+  text-align: right;
+  padding: 0 10rpx 0 0;
+}

+ 107 - 16
pages/query/orderDetails.js

@@ -1,4 +1,5 @@
 import * as echarts from '../../ec-canvas/echarts';
+var dateTimePicker = require('../../utils/dateTimePicker');
 const app = getApp();
 Page({
 
@@ -111,6 +112,13 @@ Page({
     transportOrder:{},
     allActive: '展开更多',
     isAll: false,
+    showChainTimeStatus:false,// 运单补录展示状态
+    // 时间
+    dateTimeArray1: null,
+    dateTime1: null,
+    startYear: null,
+    endYear: null,
+    estiTime:null,
   },
 
   /**
@@ -143,6 +151,7 @@ Page({
       options,
       userInfo: wx.getStorageSync('userInfo')
     });
+    this.getTime();
     //获取定位信息
     wx.getLocation({
       altitude: 'altitude',
@@ -318,6 +327,10 @@ Page({
         if (data[key].length == 0) {
           delete data[key]
         }
+        // 没有子冷链概念
+        if(key == 'childNum'){
+          delete data[key]
+        }
       })
       that.setData({
         boundDevice: data
@@ -838,25 +851,36 @@ Page({
   addChain(e) {
     const type = e.currentTarget.dataset.type;
     var details = this.data.details;
-    const noAdd = ['lableX101', 'lableX102', 'lableX103', 'lableX105', 'lableX106', 'lableX107','NFC'];
-    if (noAdd.indexOf(type) != -1) {
-      app.showToptip(this, 'error', '该标签暂不支持在小程序添加,请移动到APP操作!')
-      return;
-    }
-    // 104 一型无源
-    switch (type) {
-      case 'lableX104':
+    var type1 = ['X201','X202','X203'];
+    var type2 = ['X101','X102','X103','X104','X106','X107'];
+    if(type1.indexOf(type) != -1){
+      this.setData({
+        showDialog:true,
+        devicetype:type
+      })
+    }else{
+      if(type == 'X105'){
+        app.showToptip(this,'error','当前设备不支持RFID形式')
+      }else if(type2.indexOf(type) != -1){
         wx.navigateTo({
-          url: '/pages/nfc/zhuisu2?id='+details.chainId+'&type=X104&addLabel=20',
-        })
-        break;
-      default:
-        this.setData({
-          showDialog: !this.data.showDialog,
-          devicetype:type
+          url: '/pages/nfc/encryptionNfc/encryptionNfc?type='+type+'&path=addLabel'+"&chainId="+details.chainId,
         })
-        break;
+      }
     }
+    // 104 一型无源
+    // switch (type) {
+    //   case 'lableX104':
+    //     wx.navigateTo({
+    //       url: '/pages/nfc/zhuisu2?id='+details.chainId+'&type=X104&addLabel=20',
+    //     })
+    //     break;
+    //   default:
+    //     this.setData({
+    //       showDialog: !this.data.showDialog,
+    //       devicetype:type
+    //     })
+    //     break;
+    // }
   },
   toggleDialog() { //弹窗关闭
     this.setData({
@@ -954,4 +978,71 @@ Page({
       })
     }
   },
+  // 运单补录
+  showChainTime(){
+    this.setData({
+      showChainTimeStatus:!this.data.showChainTimeStatus
+    })
+  },
+  getTime(){
+    // 获取完整的年月日 时分秒,以及默认显示的数组
+    var obj = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
+    var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
+    // 精确到分的处理,将数组的秒去掉
+    //var lastArray = obj1.dateTimeArray.pop();
+    //var lastTime = obj1.dateTime.pop();
+    this.setData({
+      dateTimeArray1: obj1.dateTimeArray,
+      dateTime1: obj1.dateTime
+    });
+  },
+  // 选择日期时间
+  changeDateTime1(e) {
+    var that = this;
+    this.setData({
+      dateTime1: e.detail.value,
+      // estiTime:
+    },()=>{
+      var dateTimeArray1 = that.data.dateTimeArray1;
+      var dateTime1 = that.data.dateTime1;
+      var years = dateTimeArray1[0][dateTime1[0]] //年
+      var month = dateTimeArray1[1][dateTime1[1]] // 月
+      var day = dateTimeArray1[2][dateTime1[2]] // 日
+      var hours = dateTimeArray1[3][dateTime1[3]] // 时
+      var min = dateTimeArray1[4][dateTime1[4]] // 分
+      var seconds = dateTimeArray1[5][dateTime1[5]] // 秒
+      var startTime = years+'-'+month+'-'+day+' '+hours+':'+min+':'+seconds;
+      const {code,uid} = that.data.transportOrder;
+      this.updteVvmTransportOrder({code,uid,startTime})
+    });
+  },
+  changeDateTimeColumn1(e) {
+    var arr = this.data.dateTime1,
+    dateArr = this.data.dateTimeArray1;
+    arr[e.detail.column] = e.detail.value;
+    dateArr[2] = dateTimePicker.getMonthDay(dateArr[0][arr[0]], dateArr[1][arr[1]]);
+    this.setData({
+      dateTimeArray1: dateArr,
+      dateTime1: arr
+    });
+  },
+  updteVvmTransportOrder(form){
+    var that = this;
+    app.requestP({
+      url: '/transport/updteVvmTransportOrder',
+      method: 'post',
+      contentType: 'application/json',
+      data: form
+    }).then(res=>{
+      app.showToptip(that, 'success', res.data.msg)
+    }).catch(err=>{
+      app.showToptip(that, 'error', err.data.msg)
+    })
+  },
+  goEditOrder(){
+    const {transportName,transportType,driverName,plateNum,code,uid} = this.data.transportOrder;
+    wx.navigateTo({
+      url: '/pages/query/editOrder/editOrder?transportName='+transportName+'&transport='+transportType+'&driverName='+driverName+'&plateNum='+plateNum+'&code='+code+'&uid='+uid,
+    })
+  }
 })

+ 39 - 23
pages/query/orderDetails.wxml

@@ -3,51 +3,51 @@
 <view>
   <view class="detailsItem" style="{{isAll ? 'margin-bottom:20rpx': 'margin-bottom:0'}}">
     <view class="query_item_txt">
-      <text class="query_item_label">订单号:</text>
+      <text class="query_item_label">订单号</text>
       <text>{{transportOrder.code}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">下单日期:</text>
+      <text class="query_item_label">下单日期</text>
       <text>{{transportOrder.orderTime}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">发运日期:</text>
+      <text class="query_item_label">发运日期</text>
       <text>{{transportOrder.startTime}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">产品名称:</text>
+      <text class="query_item_label">产品名称</text>
       <text>{{transportOrder.goodsName}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">生产厂家:</text>
+      <text class="query_item_label">生产厂家</text>
       <text>{{transportOrder.manufac}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">客户名称:</text>
+      <text class="query_item_label">客户名称</text>
       <text>{{transportOrder.cusName}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">运抵省份:</text>
+      <text class="query_item_label">运抵省份</text>
       <text>{{transportOrder.province}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">承运商:</text>
+      <text class="query_item_label">承运商</text>
       <text>{{transportOrder.transportName}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">运输方式:</text>
+      <text class="query_item_label">运输方式</text>
       <text>{{transportOrder.transportType}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">车牌:</text>
+      <text class="query_item_label">车牌</text>
       <text>{{transportOrder.plateNum}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">送货地点:</text>
+      <text class="query_item_label">送货地点</text>
       <text>{{transportOrder.sendAreaName}}</text>
     </view>
     <view class="query_item_txt">
-      <text class="query_item_label">运抵目的地:</text>
+      <text class="query_item_label">运抵目的地</text>
       <text>{{transportOrder.desti}}</text>
     </view>
   </view>
@@ -84,9 +84,13 @@
     </view>
     <view class="query_item_txt">
       <text class="query_item_label">运输状态:</text>
-      <text class="{{details.status == 00 ? 'query_zc': details.status == 10 ? 'query_jb': 'query_wx'}}" wx:if="{{details.transportStatus == 00}}">在库</text>
-      <text class="{{details.status == 00 ? 'query_zc': details.status == 10 ? 'query_jb': 'query_wx'}}" wx:if="{{details.transportStatus == 10}}">运输中</text>
-      <text class="{{details.status == 00 ? 'query_zc': details.status == 10 ? 'query_jb': 'query_wx'}}" wx:if="{{details.transportStatus == 20}}">已结束</text>
+      <text wx:if="{{details.transportStatus == 00}}">在库</text>
+      <text wx:if="{{details.transportStatus == 10}}">运输中</text>
+      <text wx:if="{{details.transportStatus == 20}}">已结束</text>
+    </view>
+    <view class="query_item_txt">
+      <text class="query_item_label">预警名称:</text>
+      <text class="{{details.transportStatus == 00 ? 'query_zc': details.transportStatus == 10 ? 'query_jb': 'query_wx'}}">{{details.ruleGroupName}}</text>
     </view>
     <view class="query_item_txt">
       <text class="query_item_label">负责人:</text>
@@ -153,18 +157,22 @@
         <text>获取报告</text>
       </view> -->
     </view>
+    <view class="query_item_txt">
+      <text class="query_item_label">备注:</text>
+      <text>{{details.remark}}</text>
+    </view>
   </view>
   <view bindtap="onAll" class="onAll">
     <text>{{allActive}}</text>
   </view>
   <view>
     <view class="detailsTitle">
-      <text>设备与子冷链</text>
+      <text>设备</text>
     </view>
     <view class="detailsCode">
       <view>
-        <view wx:for="{{boundDevice}}" wx:for-item='item' wx:key="key" wx:for-index='key'>
-          <view wx:if="{{item.length != 0}}">
+        <view wx:for="{{boundDevice}}" wx:for-item='item' wx:for-index='key' wx:key="key">
+          <view wx:if="{{item.length != 0}}" style="background-size: 100% 100%;background-image: {{index == 0 ? 'url(/img/label_img.png)' : 'url(/img/label_img.png)'}}">
             <view class="details_title">
               <text>总数量</text>
               <text>></text>
@@ -179,10 +187,10 @@
               <view class="details_name" wx:if="{{key == '11'}}">全程温控</view>
               <view class="details_name" wx:if="{{key == '20'}}">实时追溯</view>
             </view>
-            <view wx:if="{{key == 'childNum'}}" bindtap="goChainCold">
+            <!-- <view wx:if="{{key == 'childNum'}}" bindtap="goChainCold">
               <view class="details_num">{{item}}</view>
               <view class="details_name">子冷链</view>
-            </view>
+            </view> -->
           </view>
         </view>
       </view>
@@ -298,9 +306,16 @@
         <text wx:if="{{details.transportStatus == 20}}" bindtap="setmodalHidden" data-transportStatus="{{details.transportStatus}}">已结束</text>
       </view>
       <view class="expand" wx:if="{{allMoer}}">
-        <view style="display: none;">查看详情</view>
         <view bindtap="showChaWin">绑定标签</view>
         <view wx:if="{{ispdfBut}}" bindtap="goPdf" data-orderId="{{transportOrder.uid}}" data-id="{{details.chainId}}">获取报告</view>
+        <view>
+          <picker mode="multiSelector" value="{{dateTime1}}" bindchange="changeDateTime1" bindcolumnchange="changeDateTimeColumn1" range="{{dateTimeArray1}}">
+            <view class="text">
+              发运时间
+            </view>
+          </picker>
+        </view>
+        <view bindtap="goEditOrder">运单补录</view>
       </view>
     </view>
     <view bindtap="cleanWarning" data-status="{{details.status}}" class="{{details.status == 20 ?'query_clear20':details.status == 10 ? 'query_clear10':'query_clear00'}}">
@@ -346,7 +361,7 @@
     </view>
     <view class="cha_win_btn">
       <block wx:for="{{tableCoin}}" wx:for-index='index' wx:index='index' wx:for-item="item">
-        <view class="cha_btn_item" bindtap="addChain" data-type="{{item.type}}" wx:if="{{item.status}}">
+        <view class="cha_btn_item" bindtap="addChain" data-type="{{item.name}}" wx:if="{{item.status}}">
             <image src="{{item.img}}"></image>
             <view>{{item.name}}</view>
         </view>
@@ -380,4 +395,5 @@
       <text>×</text>
     </view>
   </view>
-</view>
+</view>
+<!-- 修改发运时间 -->

+ 2 - 3
pages/query/orderDetails.wxss

@@ -16,7 +16,6 @@
 .pdfFlex{
   display: flex;
   align-items: center;
-  padding-top: 0;
   justify-content: space-between;
 }
 .pdfclick{
@@ -120,10 +119,10 @@
   padding:0
 }
 .detailsCode > view > view >view{
-  width: 90%;
+  width: 95%;
   background: #FFF;
   border-radius: 15rpx;
-  padding: 8rpx 6%;
+  padding: 11rpx 6%;
   text-align: left;
 }
 .detailsCode > view > view .details_title{

+ 1 - 1
pages/query/query.js

@@ -32,7 +32,7 @@ Page({
     ],
     // 运输状态
     seleteType:[{type:'00',name:'已入库',isSelete:false},{type:'10',name:'已出库',isSelete:false},{type:'20',name:'已结束',isSelete:false}],
-    isTab:false
+    isTab:false // 筛选框显示隐藏
   },
   onShow: function (options) {
     //获取列表

+ 52 - 11
pages/query/vvmInfo.js

@@ -12,6 +12,7 @@ Page({
     startX: 0, // 开始X坐标
     startY: 0, // 开始Y坐标
     showDialog: false,// 选择弹窗
+    isAddLabel:false,
   },
 
   /**
@@ -34,7 +35,7 @@ Page({
     })
     var name = ['X201','X202','X203','X101','X102','X103','X104','X105','X106','X107',];
     this.setData({
-      detailsList:details,
+      detailsList:details.map(item=>{return {...item,deviceSign1:item.deviceSign}}),
       devicetype,
       devicetypeName: name.indexOf(devicetype) != -1 ? name[name.indexOf(devicetype)] : devicetype == 10 ?'追溯标签': devicetype == 11 ? '全程温控': '实时追溯',
       id:options.id
@@ -43,7 +44,7 @@ Page({
   toInfo(e){
     var that = this;
     const deviceCode = e.currentTarget.dataset.devicecode;
-    const {devicetype,id} =that.data;
+    const {devicetype,id} = that.data;
     var deviceId = e.currentTarget.dataset.id;
     wx.redirectTo({
       url: '/pages/query/details?deviceCode=' + deviceCode+'&deviceType='+devicetype+'&id='+id+'&chainBoundId='+deviceId,
@@ -52,15 +53,55 @@ Page({
   addLabel(){
     var that = this;
     var {id,devicetype} = that.data;
-    if(devicetype == 'X101' || devicetype == 'X202' ||devicetype == 'X203'){
-      // that.chainBind();
-      this.setData({
-        showDialog:!this.data.showDialog
-      })
-    }else {
-      wx.navigateTo({
-        url: '/pages/nfc/zhuisu2?id='+id+'&type='+devicetype+'&addLabel=20',
-      })
+    this.setData({
+      isAddLabel:true
+    })
+  },
+  setTempRange(e){
+    const id = e.currentTarget.dataset.id;
+    console.log(id);
+    var detailsList = this.data.detailsList;
+    for (var index = 0; index < detailsList.length; index++) {
+      var dataStr = 'detailsList['+index+'].deviceSign';
+      if(detailsList[index].id == id){
+        this.setData({
+          [dataStr]:1
+        })
+      }else{
+        this.setData({
+          [dataStr]:0
+        })
+      }
+    }
+  },
+  setAddlabelStatus(){
+    var that = this;
+    var id = null;
+    var detailsList = this.data.detailsList;
+    for (var index = 0; index < detailsList.length; index++) {
+      var dataStr = 'detailsList['+index+'].deviceSign1';
+      if(detailsList[index].deviceSign == 1){
+        id = detailsList[index].id;
+        app.requestP({
+          url:'/vvm/chainBound/updateDeviceSign',
+          method:'post',
+          data:{
+            id,
+          }
+        }).then(res=>{
+          app.showToptip(that, 'success', res.data.msg);
+          this.setData({
+            isAddLabel:false,
+            [dataStr]:1
+          })
+          wx.navigateBack({
+            delta: 1,
+          })
+        }).catch(err=>{
+          app.showToptip(that, 'error', err.data.msg);
+        })
+        break;
+      }
     }
   },
   chainBind(){

+ 18 - 5
pages/query/vvmInfo.wxml

@@ -12,7 +12,10 @@
       <block wx:for="{{ detailsList }}" wx:for-item="item" wx:for-index="index" wx:key="index">
         <view class="list {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart="touchStart"
           bindtouchmove="touchMove" data-index="{{ index }}">
-          <view class="listInfo" data-deviceCode="{{item.deviceCode}}" bindtap="toInfo" data-id="{{item.id}}">
+          <view class="listInfo" data-deviceCode="{{item.deviceCode}}" bindtap="{{!isAddLabel ? 'toInfo':'setTempRange'}}" data-id="{{item.id}}" style="padding-top: {{item.deviceSign == 1 ? '':''}}">
+            <text class="mainLabel" wx:if="{{item.deviceSign1 == 1}}">
+              主标签
+            </text>
             <view class="code">
               <text style="width: 13%;">编号:</text>
               <text style="width: 87%;">{{item.deviceCode || '-'}}</text>
@@ -22,9 +25,15 @@
               <text wx:if="{{item.bindStatus == 1}}">监测中</text>
               <text wx:if="{{item.bindStatus == 0}}">已解除绑定</text>
             </view>
-            <view>
-              <text>起始时间:</text>
-              <text>{{item.bindTime || '--'}}</text>
+            <view class="flexBox">
+              <view>
+                <text>起始时间:</text>
+                <text>{{item.bindTime || '--'}}</text>
+              </view>
+              <view wx:if="{{isAddLabel}}">
+                <icon class="icon-box-img" type="success" color="#2D59E6" size="20"  wx:if="{{item.deviceSign == 1}}"></icon>
+                <icon class="icon-small" type="circle" size="20" wx:else></icon>
+              </view>
             </view>
             <view>
               <text>结束时间:</text>
@@ -40,8 +49,12 @@
     </view>
   </scroll-view>
 </view>
-<view class="addLabel" bindtap="addLabel" wx:if="{{devicetypeName == 'X201' || devicetypeName == 'X202'||devicetypeName == 'X203' || devicetypeName == 'X104'}}">
+<!-- <view class="addLabel" bindtap="addLabel" wx:if="{{devicetypeName == 'X201' || devicetypeName == 'X202'||devicetypeName == 'X203' || devicetypeName == 'X104'}}">
   <text>添加</text>
+</view> -->
+<view class="addLabel" bindtap="{{!isAddLabel ? 'addLabel':'setAddlabelStatus'}}">
+  <text wx:if="{{!isAddLabel}}">更换主标签</text>
+  <text wx:else>完成</text>
 </view>
 <view class="zan-dialog {{ showDialog ? 'zan-dialog--show' : '' }}">
   <!-- 如果想点击弹窗外不隐藏,取消bindtap点击事件即可 -->

+ 19 - 3
pages/query/vvmInfo.wxss

@@ -45,11 +45,12 @@
   border-bottom: 5rpx solid #f8f8f8;
   margin-bottom: 20rpx;
   overflow: hidden;
+  border-radius: 12rpx;
 }
 .list >.listInfo>view{
-  padding: 10rpx 0;
+  padding: 10rpx 30rpx;
 }
-.list > .listInfo >view >text{
+.list > .listInfo >view text{
   color: #666666;
 }
 .scrollText{
@@ -75,7 +76,6 @@
   justify-content: space-between;
   margin-left: -120rpx;
   background-color: #fff;
-  padding: 0 30rpx;
 }
 .code{
   display: flex;
@@ -147,3 +147,19 @@
   font-weight: 100;
   line-height: 120rpx;
 }
+.mainLabel{
+  background: #2D59E6;
+  color: #fff;
+  padding: 10rpx 30rpx;
+  display: block;
+  width: 10%;
+  text-align: center;
+  height: 25rpx;
+  line-height: 11rpx;
+  font-size: 22rpx;
+}
+.flexBox{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}

+ 9 - 4
pages/user/pwdEdit.js

@@ -18,7 +18,7 @@ Page({
     var phonereg = /^[1][0-9]{10}$/;
     let token = wx.getStorageSync('token');
     if (!phonereg.test(phoneNumber)) {
-      app.showToptip(that, "worning", "手机号输入有误")
+      app.showToptip(that, "error", "手机号输入有误")
       return;
     }
     var smsCode = that.data.code
@@ -26,14 +26,19 @@ Page({
       app.showToptip(that, "worning", "验证码输入有误")
       return;
     }
-    var password = that.data.password
+    var password = that.data.password;
     if (!password) {
-      app.showToptip(that, "worning", "密码不能为空")
+      app.showToptip(that, "error", "密码不能为空")
+      return;
+    }
+    var reg = /^(?=.{8,20})(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[$#~%]).*$/;
+    if(!reg.test(password)){
+      app.showToptip(that, "error", "密码必须为至少8位字母数字和符号$#~%")
       return;
     }
     var repassword = that.data.password2
     if (password != repassword) {
-      app.showToptip(that, "worning", "两次密码输入不一致")
+      app.showToptip(that, "error", "两次密码输入不一致")
       return;
     }
     wx.showLoading({

+ 1 - 1
pages/user/pwdEdit.wxml

@@ -19,6 +19,6 @@
     <view>再次确认新密码</view>
     <input placeholder="请确认新密码" type='password' bindinput="setPwd2" value='{{password2}}'></input>
   </view>
-  <view class="reg_form_tip">密码确保至少6个字(包括数字和大小写字母)</view>
+  <view class="reg_form_tip">密码确保至少8位(其中包括数字、大小写字母和特殊符号)</view>
   <view class='cu-btn bg-color lg reg_form_btn' bindtap="goSubmit">提交</view>
 </view>

+ 3 - 1
pages/workbench/scanningType/reportPdf/reportPdf.js

@@ -47,6 +47,9 @@ Page({
     }).then(res => {
       let content = [];
       var arr = [];
+      that.setData({
+        productInfo: res.data.data,
+      })
       var datacontent = JSON.parse(res.data.data.content);
       if(typeof datacontent[0] == 'string'){
         datacontent.map((item,index)=>{
@@ -66,7 +69,6 @@ Page({
         arr = datacontent;
       }
       that.setData({
-        productInfo: res.data.data,
         productContent:arr
       })
     }).catch(err=>{

+ 26 - 37
pages/workbench/scanningType/reportPdf/reportPdf.wxml

@@ -1,5 +1,5 @@
 <view class="toptip {{tipStaus}} text-white {{tipType}}" style='top:{{CustomBar}}px;'>{{tipText}}</view>
-<cu-custom bgColor="bg-color" isBack="{{true}}" title="PDF报告">
+<cu-custom bgColor="bg-color" isBack="{{true}}" title="全程冷链追溯报告">
   <!-- <view slot="content">PDF报告</view> -->
 </cu-custom>
 <view>
@@ -7,52 +7,52 @@
   <view class="pdfProduct" wx:if="{{orderid}}">
     <view class="ccxx_btm_tit">订单详情</view>
     <view>
-      <text>订单号:</text>
-      <text>{{transportOrder.code}}</text>
+      <text>客户名称:</text>
+      <view>{{transportOrder.cusName}}</view>
     </view>
     <view>
-      <text>下单日期:</text>
-      <text>{{transportOrder.orderTime}}</text>
+      <text>订单号:</text>
+      <view>{{transportOrder.code}}</view>
     </view>
     <view>
-      <text>发运日期:</text>
-      <text>{{transportOrder.startTime}}</text>
+      <text>下单日期:</text>
+      <view>{{transportOrder.orderTime}}</view>
     </view>
     <view>
-      <text>产品名称:</text>
-      <text>{{transportOrder.goodsName}}</text>
+      <text>运抵省份:</text>
+      <view>{{transportOrder.province}}</view>
     </view>
     <view>
-      <text>生产厂家:</text>
-      <text>{{transportOrder.manufac}}</text>
+      <text>送货地点:</text>
+      <view>{{transportOrder.sendAreaName}}</view>
     </view>
     <view>
-      <text>客户名称:</text>
-      <text>{{transportOrder.cusName}}</text>
+      <text>运抵目的地:</text>
+      <view>{{transportOrder.desti}}</view>
     </view>
     <view>
-      <text>运抵省份:</text>
-      <text>{{transportOrder.province}}</text>
+      <text>产品名称:</text>
+      <view>{{transportOrder.goodsName}}</view>
     </view>
     <view>
-      <text>承运商:</text>
-      <text>{{transportOrder.transportName}}</text>
+      <text>生产厂家:</text>
+      <view>{{transportOrder.manufac}}</view>
     </view>
     <view>
-      <text>运输方式:</text>
-      <text>{{transportOrder.transportType}}</text>
+      <text>承运商:</text>
+      <view>{{transportOrder.transportName}}</view>
     </view>
     <view>
-      <text>车牌:</text>
-      <text>{{transportOrder.plateNum}}</text>
+      <text>运输方式:</text>
+      <view>{{transportOrder.transportType}}</view>
     </view>
     <view>
-      <text>送货地点:</text>
-      <text>{{transportOrder.sendAreaName}}</text>
+      <text>车牌:</text>
+      <view>{{transportOrder.plateNum}}</view>
     </view>
     <view>
-      <text>运抵目的地:</text>
-      <text>{{transportOrder.desti}}</text>
+      <text>发运日期:</text>
+      <view>{{transportOrder.startTime}}</view>
     </view>
   </view>
   <view class="pdfProduct" style="{{orderid ? 'margin:0rpx auto 20rpx auto' : ''}}">
@@ -79,14 +79,6 @@
       <text>{{companyInfo.managerName || '--'}}</text>
     </view>
     <view>
-      <view>批准文号有效期:</view>
-      <text></text>
-    </view>
-    <view>
-      <view>生产日期:</view>
-      <text>{{companyInfo.createTime || '--'}}</text>
-    </view>
-    <view>
       <view>地址:</view>
       <text>{{companyInfo.address || '--'}}</text>
     </view>
@@ -210,9 +202,6 @@
     <view class="activeText">
       <view class="text">中华人民共和国疫苗管理法规定:国家对疫苗实行最严格的管理制度,坚持安全第一、风险管理、全程管控、科学监管、社会共治。疫苗在整个运输、储存过程中,应有经营规模和经营品种相适应的冷藏(冻)储存、运输设施及设备,且应当在规定的时间内完成疫苗运输,并在有效期内使用,以保证疫苗的合理效价不受损害。建议医生应当对所接种的疫苗进行严格的核查,三查:1、查应接种者的健康状况和禁忌症;2、查应接种者的接种卡和接种证;3、查疫苗和注射器、外观、批号、有效期。
       </view>
-      <view>
-        <image src="/img/wechart_img1.png"></image>
-      </view>
     </view>
     <view class="botActive">
       本报告基于VVM® 监测结果发布
@@ -237,7 +226,7 @@
       </view>
     </view>
     <view class="cu-bar bg-white">
-      <view class="action margin-0 flex-sub  solid-left" bindtap="saveCode">保存二维码</view>
+      <view class="action margin-0 flex-sub" bindtap="saveCode">保存二维码</view>
     </view>
   </view>
 </view>

+ 2 - 0
pages/workbench/scanningType/reportPdf/reportPdf.wxss

@@ -26,9 +26,11 @@
 }
 .pdfProduct > view >view,.pdfCompany > view >view{
   color: #000;
+  font-size: 24rpx;
 }
 .pdfProduct > view >text,.pdfCompany > view >text{
   color: #999999;
+  font-size: 24rpx;
 }
 
 .ccxx_btm {

+ 180 - 17
pages/workbench/tempList/tempList.js

@@ -7,15 +7,173 @@ Page({
   data: {
     keyword: '',
     list:[],
-    status:[{statu:'已入库',type:'00'},{statu:'已出库',type:'10'},{statu:'已结束',type:'20'}],
+    tabDetail:[{name:'222',type:'1',isSelete:false}],
     text:'已入库',
     isStatus:false,
     type:'00',
     scrollHeight: 0, // scroll-view高度
     startX: 0, // 开始X坐标
     startY: 0, // 开始Y坐标
+    transportType:[
+      {name:'汽车',type:'10',isSelete:false},
+      {name:'船',type:'20',isSelete:false},
+      {name:'火车',type:'30',isSelete:false},
+      {name:'飞机',type:'40',isSelete:false},
+      {name:'其他',type:'50',isSelete:false},
+    ],
+    packageType:[
+      {name:'支',type:'10',isSelete:false},
+      {name:'包',type:'20',isSelete:false},
+      {name:'箱',type:'30',isSelete:false},
+      {name:'托盘',type:'40',isSelete:false},
+      {name:'其他',type:'50',isSelete:false},
+    ], 
+    status:[{name:'已入库',type:'00',isSelete:false},{name:'已出库',type:'10',isSelete:false},{name:'已结束',type:'20',isSelete:false}],
+    isTab:false, // 筛选框显示隐藏
+    packageTypeInit:'',
+    transportTypeInit:'',
+    transportStatusInit:'',
+  },
+  setTab(e){
+    var that = this;
+    const type = e.currentTarget.dataset.type;
+    var seleteTabType = this.data.seleteTabType;
+    if(seleteTabType == type && this.data.isTab == true){
+      this.setData({
+        isTab:false
+      })
+      return ;
+    }
+    if(seleteTabType == 'transportStatus'){
+      this.setData({
+        packageTypeInit:'',
+        transportTypeInit:'',
+        transportStatusInit:'',
+        packageType:that.data.packageType.map(item=>{return{...item,isSelete:false}}),
+        status:that.data.status.map(item=>{return{...item,isSelete:false}}),
+        transportType:that.data.transportType.map(item=>{return{...item,isSelete:false}}),
+      })
+    }
+    if(type == 'packageType'){
+      this.setData({
+        tabDetail:this.data.packageType,
+        seleteTabType:type,
+        isTab:true
+      })
+    }else if(type == 'transportType'){
+      this.setData({
+        tabDetail:this.data.transportType,
+        isTab:true,
+        seleteTabType:type,
+      })
+    }else if(type == 'transportStatus'){
+      this.setData({
+        tabDetail:this.data.status,
+        isTab:true,
+        seleteTabType:type,
+      })
+    }
+  },
+  seleteTab(e){
+    const item = e.currentTarget.dataset.item;
+    const type = e.currentTarget.dataset.type;
+    var seleteTabType = this.data.seleteTabType;
+    var tabDetail = this.data.tabDetail;
+    var seleteArr = tabDetail.map(itemTabType=>{
+      if(itemTabType.type == type){
+        return {...itemTabType,isSelete:true}
+      }else{
+        return {...itemTabType,isSelete:false}
+      }
+    })
+    if(seleteTabType == 'packageType'){
+      this.setData({
+        packageTypeInit:type,
+      })
+    }else if(seleteTabType == 'transportType'){
+      this.setData({
+        transportTypeInit:type,
+      })
+    }else if(seleteTabType == 'transportStatus'){
+      this.setData({
+        transportStatusInit:type,
+      })
+    }
+    this.setData({
+      tabDetail:seleteArr,
+    })
+  },
+  cancel(){
+    this.setData({
+      packageType:this.data.packageType.map(item=>{
+        if(item.isSelete){
+          return {...item,isSelete:false}
+        }else{
+          return item
+        }
+      }),
+      transportType:this.data.transportType.map(item=>{
+        if(item.isSelete){
+          return {...item,isSelete:false}
+        }else{
+          return item
+        }
+      }),
+      status:this.data.status.map(item=>{
+        if(item.isSelete){
+          return {...item,isSelete:false}
+        }else{
+          return item
+        }
+      }),
+      isTab:false,
+      packageTypeInit:'',
+      transportTypeInit:'',
+      transportStatusInit:'',
+    },()=>{
+      this.getChainList();
+    })
+  },
+  searchType(){
+    var tabDetail = this.data.tabDetail;
+    var type = this.data.seleteTabType;
+    var seleteType = '';
+    var name = '';
+    tabDetail.map(item=>{
+      if(item.isSelete){
+        seleteType = item.type
+        name = item.name
+      }
+    })
+    if(type == 'packageType'){
+      this.setData({
+        packageTypeInit:seleteType,
+        transportTypeInit:'',
+        transportStatusInit:'',
+        isTab:false
+      },()=>{
+        this.getChainList()
+      })
+    }else if(type == 'transportType'){
+      this.setData({
+        packageTypeInit:'',
+        transportTypeInit:seleteType,
+        transportStatusInit:'',
+        isTab:false
+      },()=>{
+        this.getChainList()
+      })
+    }else if(type == 'transportStatus'){
+      this.setData({
+        packageTypeInit:'',
+        transportTypeInit:'',
+        transportStatusInit:seleteType,
+        isTab:false
+      },()=>{
+        this.getChainList()
+      })
+    }
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
@@ -26,6 +184,9 @@ Page({
     this.getChainList();
   },
   getChainList() {
+    var packageType = this.data.packageTypeInit;
+    var transportType = this.data.transportTypeInit;
+    var transportStatus = this.data.transportStatusInit;
     var that = this;
     wx.showLoading({
       title: '正在加载...',
@@ -39,7 +200,9 @@ Page({
         pageNum: 1,
         pageSize: 1000,
         parentId: 0,
-        transportStatus: that.data.type,
+        packageType:packageType || '',
+        transportType: transportType ||'',
+        transportStatus:transportStatus || '',
         keyword: that.data.keyword || ''
       }
     }).catch(err => {
@@ -77,20 +240,20 @@ Page({
       })
     }
   },
-  setStatus(e){
-    var type = e.currentTarget.dataset.type;
-    for(var i in this.data.status){
-      if(this.data.status[i].type == type){
-        this.setData({
-          text:this.data.status[i].statu,
-          isStatus:false,
-          type:type + '',
-        })
-        this.getChainList()
-        break;
-      }
-    }
-  },
+  // setStatus(e){  已废弃
+  //   var type = e.currentTarget.dataset.type;
+  //   for(var i in this.data.status){
+  //     if(this.data.status[i].type == type){
+  //       this.setData({
+  //         text:this.data.status[i].statu,
+  //         isStatus:false,
+  //         type:type + '',
+  //       })
+  //       this.getChainList()
+  //       break;
+  //     }
+  //   }
+  // },
   addLabel(){
     wx.removeStorageSync('orderSelect')
     wx.navigateTo({

+ 27 - 1
pages/workbench/tempList/tempList.wxml

@@ -10,7 +10,7 @@
 </view>
 <view class="query_list">
   <view class="querLabel">
-    <text>冷链状态</text>
+    <!-- <text>冷链状态</text>
     <view>
       <view class="label" bindtap="allStatus">{{text}}<image src="/img/down.png"></image>
       </view>
@@ -19,6 +19,32 @@
           {{item.statu}}
         </text>
       </view>
+    </view> -->
+    <view class="tabs">
+      <view bindtap="setTab" data-type="packageType">
+        <view style="{{packageTypeInit ?'color:#2D59E6':''}}">{{packageTypeInit ? seleteName:'包装方式'}}</view>
+        <image src="../../../img/query.png"></image>
+      </view>
+      <view bindtap="setTab" data-type="transportType">
+        <view style="{{transportTypeInit ?'color:#2D59E6':''}}">{{transportTypeInit ? seleteName:'运输方式'}}</view>
+        <image src="../../../img/query.png"></image>
+      </view>
+      <view bindtap="setTab" data-type="transportStatus">
+        <view style="{{transportStatusInit ?'color:#2D59E6':''}}">{{transportStatusInit ? seleteName:'出入库'}}</view>
+        <image src="../../../img/query.png"></image>
+      </view>
+    </view>
+    <view class="selectTab" style="{{isTab ? 'display:block':'display:none'}}">
+      <view class="tabText">
+        <block wx:for="{{tabDetail}}" wx:for-item="item" wx:for-index="index" wx:key='index'>
+          <view bindtap="seleteTab" data-item="{{item}}" data-type="{{item.type}}"
+            class="{{item.isSelete ? 'isActive' :''}}">{{item.name}}</view>
+        </block>
+      </view>
+      <view class="tabBut">
+        <text class="cancel" bindtap="cancel">重置</text>
+        <text class="query" bindtap="searchType">确定</text>
+      </view>
     </view>
   </view>
   <view>

+ 63 - 0
pages/workbench/tempList/tempList.wxss

@@ -95,6 +95,7 @@
   padding: 22rpx;
   border-bottom: 2.5rpx solid #f5f5f5;
   justify-content: space-between;
+  flex-direction: column;
 }
 .querLabel>text{
   color: #000;
@@ -159,4 +160,66 @@
 .touch-move-active .info,.touch-move-active .del,.touch-move-active .edit {
   -webkit-transform: translateX(0);
   transform: translateX(0);
+}
+.tabs{
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20rpx;
+  padding: 0 0rpx;
+  position: relative;
+  z-index: 101;
+  width: 100%;
+}
+.tabs > view{
+  background: #F1F1F1;
+  font-size: 24rpx;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  justify-content: space-between;
+  padding: 5rpx 20rpx;
+  border-radius: 50rpx;
+  margin-right: 40rpx;
+}
+.tabs > view > view{
+  /* color: #333333; */
+}
+.tabs > view> image{
+  width: 40rpx;
+  height: 35rpx;
+}
+.selectTab{
+  background:#F8F8F8;
+  padding: 20rpx 30rpx;
+  margin-top: 20rpx;
+  position: relative;
+  z-index: 101;
+}
+.tabText{
+  display: flex;
+  justify-content: space-between;
+  color: #333333;
+}
+.tabBut{
+  margin-top: 30rpx;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+}
+.tabBut .cancel{
+  display: block;
+  background: #FFF;
+  width: 35%;
+  padding: 20rpx;
+  color: #1476FE;
+}
+.tabBut .query{
+  display: block;
+  background: #2D59E6;
+  width: 35%;
+  color: #FFF;
+  padding: 20rpx;
+}
+.isActive{
+ color: #2D59E6;
 }

+ 69 - 18
pages/workbench/workbench.js

@@ -6,6 +6,7 @@ Page({
     showChaType: false,
     isPrem:false,
     device:false,
+    activationLockStatu:false,// 激活锁闭按钮控制
     modalHidden:true,
     region: [],
     systemMenu:[],
@@ -74,7 +75,13 @@ Page({
         type: 'lableX107'
       },
     ],
-  },
+    scanType:'', //1查看当前激活状态 2激活  3锁闭  4读温度  7读取UID  8读自定义信息 9写入自定义信息  10读采温周期  X106:X106端读卡
+    menuList:[
+      {label: "激活查询",path:'workConsole',children:[
+        {id:1134,label: "查一查",path: "find",icon: "http://oss.zhongyihz.cn/group156/images/67db3b48ee5d54561e687cb76cf68900.png"},
+        {id:1137,label: "监测列表",path: "coldChain",icon: "http://oss.zhongyihz.cn/group156/images/55b55029256deb87f6769d006e090754.png"},
+        {id:1278,label: "激活锁闭",path: "onAndOff",icon: "http://oss.zhongyihz.cn/group156/default/20220815/17/51/6/4dcc7eb59450f00227dd7e20380f9c94.png"},
+      ]}]},
   onShow: function () {
     var that = this;
     //判断token,若有则假设已经登录
@@ -104,7 +111,6 @@ Page({
       this.matchPage(loginRole,ifOverFlow,status,path);
     }
     var coinStatus = JSON.parse(wx.getStorageSync('labelStatus'));
-    console.log(coinStatus)
     var tableCoin = this.data.tableCoin;
     var temp = '';
     tableCoin.map((coinType, index) => {
@@ -256,7 +262,8 @@ Page({
         })
       }else if(path == 'onAndOff'){
         // 激活锁闭
-        app.showToptip(this,'worning','小程序暂不支持此功能,请移动到APP操作!');
+        // app.showToptip(this,'worning','小程序暂不支持此功能,请移动到APP操作!');
+        this.activationLock();
       }else {
         app.showToptip(this,'worning','您当前身份暂无权限');
       }
@@ -291,7 +298,7 @@ Page({
       }
     }).then(function (res) {
       that.setData({
-        menuList: res.data.data
+        // menuList: res.data.data
       })
     }).catch(err=>{
       app.showToptip(that,'error',err.data.msg)
@@ -401,7 +408,8 @@ Page({
   closeChaWin() {
     this.setData({
       showChaType: false,
-      device:false
+      device:false,
+      activationLockStatu:false
     })
   },
   device(){
@@ -409,6 +417,12 @@ Page({
       device: true
     })
   },
+  // 激活锁闭按钮控制
+  activationLock(){
+    this.setData({
+      activationLockStatu: true
+    })
+  },
   //开启扫码系统
   goScan(e) {
     var type = e.currentTarget.dataset.item;
@@ -748,26 +762,63 @@ Page({
   },
   addChain(e) {
     const type = e.currentTarget.dataset.type;
+    const title = e.currentTarget.dataset.title;
     const path = this.data.path;
-    const noAdd = ['lableX101', 'lableX102', 'lableX103', 'lableX105', 'lableX106', 'lableX107','NFC'];
-    if (noAdd.indexOf(type) != -1) {
-      app.showToptip(this, 'error', '该标签暂不支持在小程序操作,请移动到APP操作!')
-      return;
-    }
-    // 104 一型无源
-    switch (type) {
-      case 'lableX104':
+    var type1 = ['X201','X202','X203'];
+    var type2 = ['X101','X102','X103','X104','X106','X107'];
+    switch (title) {
+      case 'showChaType':
+        this.screenLabel(type,path,type2,type1);
+        break;
+      case 'device':
+        this.screenLabel(type,path,type2,type1);
+        break;
+      case 'iodep':
+        this.screenLabel(type,path,type2,type1);
+        break;
+      case 'activationLockStatu':
         wx.navigateTo({
-          url: '/pages/nfc/zhuisu2?path='+path+'&type=X104&loginRole='+this.data.loginRole,
+          url: '/pages/workbench/activationLock/activationLock?title='+type,
         })
         break;
       default:
-        this.setData({
-          showDialogChild:!this.data.showDialogChild,
-          devicetype:type.substr(5)
-        })
         break;
     }
+    // const noAdd = ['lableX101', 'lableX102', 'lableX103', 'lableX105', 'lableX106', 'lableX107','NFC'];
+    // if (noAdd.indexOf(type) != -1) {
+    //   app.showToptip(this, 'error', '该标签暂不支持在小程序操作,请移动到APP操作!')
+    //   return;
+    // }
+    // // 104 一型无源
+    // switch (type) {
+    //   case 'lableX104':
+    //     wx.navigateTo({
+    //       url: '/pages/nfc/zhuisu2?path='+path+'&type=X104&loginRole='+this.data.loginRole,
+    //     })
+    //     break;
+    //   default:
+    //     this.setData({
+    //       showDialogChild:!this.data.showDialogChild,
+    //       devicetype:type.substr(5)
+    //     })
+    //     break;
+    // }
+  },
+  screenLabel(type,path,type2,type1){
+    if(type1.indexOf(type) != -1){
+      this.setData({
+        showDialogChild:true,
+        devicetype:type.substr(5)
+      })
+    }else{
+      if(type == 'X105'){
+        app.showToptip(this,'error','当前设备不支持RFID形式')
+      }else if(type2.indexOf(type) != -1){
+        wx.navigateTo({
+          url: '/pages/nfc/encryptionNfc/encryptionNfc?type='+type+'&path='+path,
+        })
+      }
+    }
   },
   toggleDialog() { //弹窗关闭
     this.setData({

+ 2 - 1
pages/workbench/workbench.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "cu-tabBar": "/colorui/components/cu-tabBar"
+    "cu-tabBar": "/colorui/components/cu-tabBar",
+    "nfc-tools": "/components/nfc_utils/component/nfcTools"
   }
 }

+ 44 - 27
pages/workbench/workbench.wxml

@@ -1,12 +1,12 @@
 <view class="toptip {{tipStaus}} text-white {{tipType}}" style='top:{{CustomBar}}px;'>{{tipText}}</view>
-<cu-custom bgColor="bg-color" isBack="{{false}}" title="工作台" isSystem="{{true}}" bindmyevent="myevent"></cu-custom>
+<cu-custom bgColor="bg-color" isBack="{{false}}" title="工作台" isSystem="{{false}}" bindmyevent="myevent"></cu-custom>
 <view class="work_top">
   <view class="work_top_bg">
     <image mode="widthFix" src="/img/work_img1.png"></image>
   </view>
   <view class="work_top_txt">一键连线冷链追溯系统</view>
 </view>
-<block wx:if="{{isIcon == 'Y'}}">
+<!-- <block wx:if="{{isIcon == 'Y'}}">
   <view class="work_card">
     <view class="work_card_tit">常用功能</view>
     <view class="work_list">
@@ -19,7 +19,7 @@
       </view>
     </view>
   </view>
-</block>
+</block> -->
 <view class="work_card" wx:for="{{menuList}}" wx:key="orderNum" wx:for-item="item">
   <view class="work_card_tit">{{item.label}}</view>
   <view class="work_list">
@@ -69,15 +69,31 @@
     </view>
   </view>
 </view> -->
-<view class="{{showChaType ?'cha_win':''}}" bindtap="closeChaWin">
-  <view class="cha_win_con {{showChaType ?'cha_btn_con_transform':''}}">
+<view class="{{showChaType ? 'cha_win' : device ? 'cha_win': activationLockStatu?'cha_win':''}}" bindtap="closeChaWin">
+  <view class="cha_win_con {{showChaType ?'cha_btn_con_transform':device ? 'cha_btn_con_transform':activationLockStatu?'cha_btn_con_transform':''}}">
     <view class="cha_win_tit">
       <text>选择扫描方式</text>
-      <view bindtap="goScanSetting">编辑</view>
+      <!-- <view bindtap="goScanSetting">编辑</view> -->
     </view>
-    <view class="cha_win_btn">
+    <view class="cha_win_btn" wx:if="{{showChaType}}">
+      <block wx:for="{{tableCoin}}" wx:for-index='index' wx:index='index' wx:for-item="item">
+        <view class="cha_btn_item" bindtap="addChain" data-title="showChaType" data-type="{{item.name}}" wx:if="{{item.status}}">
+            <image src="{{item.img}}"></image>
+            <view>{{item.name}}</view>
+        </view>
+      </block>
+    </view>
+    <view class="cha_win_btn" wx:elif="{{device}}">
+      <block wx:for="{{tableCoin}}" wx:for-index='index' wx:index='index' wx:for-item="item">
+        <view class="cha_btn_item" bindtap="addChain" data-title="device" data-type="{{item.name}}" wx:if="{{item.status && item.name != 'X103' && item.name != 'X104' && item.name != 'X105'}}">
+            <image src="{{item.img}}"></image>
+            <view>{{item.name}}</view>
+        </view>
+      </block>
+    </view>
+    <view class="cha_win_btn" wx:elif="{{activationLockStatu}}">
       <block wx:for="{{tableCoin}}" wx:for-index='index' wx:index='index' wx:for-item="item">
-        <view class="cha_btn_item" bindtap="addChain" data-type="{{item.type}}" wx:if="{{item.status}}">
+        <view class="cha_btn_item" bindtap="addChain" data-title="activationLockStatu" data-type="{{item.name}}" wx:if="{{item.status && item.name != 'X201' && item.name != 'X203' && item.name != 'X103' && item.name != 'X104' && item.name != 'X105'}}">
             <image src="{{item.img}}"></image>
             <view>{{item.name}}</view>
         </view>
@@ -88,6 +104,26 @@
     </view>
   </view>
 </view>
+<!-- 出厂检测 -->
+<!-- <view class="{{device ?'cha_win':''}}" bindtap="closeChaWin">
+  <view class="cha_win_con {{device ?'cha_btn_con_transform':''}}">
+    <view class="cha_win_tit">
+      <text>选择扫描方式</text>
+      <view bindtap="goScanSetting" data-type="chuchang">编辑</view>
+    </view>
+    <view class="cha_win_btn">
+      <block wx:for="{{tableCoin}}" wx:for-index='index' wx:index='index' wx:for-item="item">
+        <view class="cha_btn_item" bindtap="addChain" data-type="{{item.type}}" wx:if="{{item.status && item.name != 'X103' && item.name != 'X104' && item.name != 'X105'}}">
+            <image src="{{item.img}}"></image>
+            <view>{{item.name}}</view>
+        </view>
+      </block>
+    </view>
+    <view class="cha_win_close" bindtap="closeChaWin">
+      <text>×</text>
+    </view>
+  </view>
+</view> -->
 <!-- 口令 -->
 <view class="prem_win" wx:if="{{isPrem}}">
   <view class="prem_win_mid">
@@ -121,25 +157,6 @@
     </view>
   </view>
 </view> -->
-<view class="{{device ?'cha_win':''}}" bindtap="closeChaWin">
-  <view class="cha_win_con {{device ?'cha_btn_con_transform':''}}">
-    <view class="cha_win_tit">
-      <text>选择扫描方式</text>
-      <view bindtap="goScanSetting" data-type="chuchang">编辑</view>
-    </view>
-    <view class="cha_win_btn">
-      <block wx:for="{{tableCoin}}" wx:for-index='index' wx:index='index' wx:for-item="item">
-        <view class="cha_btn_item" bindtap="addChain" data-type="{{item.type}}" wx:if="{{item.status && item.name != 'X103' && item.name != 'X104' && item.name != 'X105'}}">
-            <image src="{{item.img}}"></image>
-            <view>{{item.name}}</view>
-        </view>
-      </block>
-    </view>
-    <view class="cha_win_close" bindtap="closeChaWin">
-      <text>×</text>
-    </view>
-  </view>
-</view>
 <!--出库入库地址  -->
 <view>
   <modal title="填写地址" hidden="{{modalHidden}}" confirm-text="保存" cancel-text="取消" bindconfirm="modalBindaconfirm"