From 1906294411841d272c480666eb3a6ba5015bd49d Mon Sep 17 00:00:00 2001
From: YXQ <yukfeng@163.com>
Date: Sat, 8 Jul 2023 18:32:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BA=A4=E6=8E=A5=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8A=9F=E8=83=BD,?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             |   2 +-
 app.json                           |   2 +-
 app.wxss                           |   5 +-
 images/qrcode.jpg                  | Bin 0 -> 25920 bytes
 package-lock.json                  |  24 ++
 package.json                       |   5 +
 pages/details/details.js           |   1 +
 pages/handover/handover.js         | 107 +++++++-
 pages/handover/handover.wxml       |  63 +++--
 pages/handover/handover.wxss       |  99 +++++--
 pages/index/index.js               |  23 --
 pages/index/index.wxml             |   6 +-
 pages/index/index.wxss             |  20 +-
 pages/meLogistics/meLogistics.js   |  69 +++--
 pages/meLogistics/meLogistics.wxml |   8 +-
 utils/weapp-qrcode.js              | 426 +++++++++++++++++++++++++++++
 utils/weapp.qrcode.esm.js          |   5 +
 17 files changed, 743 insertions(+), 122 deletions(-)
 create mode 100644 images/qrcode.jpg
 create mode 100644 package-lock.json
 create mode 100644 package.json
 create mode 100644 utils/weapp-qrcode.js
 create mode 100644 utils/weapp.qrcode.esm.js

diff --git a/app.js b/app.js
index caa4cff..bb1e811 100644
--- a/app.js
+++ b/app.js
@@ -16,7 +16,7 @@ App({
 
   globalData: {
     // 本地环境
-    baseUrl:'http://192.168.51.22:8201/mall-portal',
+    baseUrl:'http://192.168.51.200:8201/mall-portal',
     // 线上环境
     // baseUrl:'https://portal-api.macrozheng.com',
     token: '',
diff --git a/app.json b/app.json
index 2cd0e7b..f6f76f2 100644
--- a/app.json
+++ b/app.json
@@ -18,7 +18,7 @@
     "navigationBarBackgroundColor": "#27adb0",
     "navigationBarTitleText": "物流端",
     "navigationBarTextStyle": "white",
-    "backgroundColor": "#27adb0"
+    "backgroundColor": "#F8F8F8"
   },
   "tabBar": {
     "color": "#000",
diff --git a/app.wxss b/app.wxss
index dcf8047..42bc5bd 100644
--- a/app.wxss
+++ b/app.wxss
@@ -5,14 +5,13 @@ page{
 
 .box{
   background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1);
-  min-height: 1300rpx;
+  min-height: 1400rpx;
   padding: 20rpx;
   font-size: 28rpx;
 }
 
 .back{
   padding: 20rpx;
-  border-radius: 15rpx;
+  border-radius: 5rpx;
   background-color: #fff;
-  border: 1rpx #eceaea solid;
 }
diff --git a/images/qrcode.jpg b/images/qrcode.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3725d3c72000f12c868599622e988e38576b4c0e
GIT binary patch
literal 25920
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
G+y4Wbt5_NU

literal 0
HcmV?d00001

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..8fdfbd5
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,24 @@
+{
+  "name": "yyt_logistics",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "weapp-qrcode-canvas-2d": "^1.1.2"
+      }
+    },
+    "node_modules/weapp-qrcode-canvas-2d": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/weapp-qrcode-canvas-2d/-/weapp-qrcode-canvas-2d-1.1.2.tgz",
+      "integrity": "sha512-HQef+xpZiiWDcq8aLZdXnVdNljoYsEWiEKiBYnAnfgqXTeYfC8ApzoB9pMI5mnPFbhtu5xCi8oId1g/86uUl8Q=="
+    }
+  },
+  "dependencies": {
+    "weapp-qrcode-canvas-2d": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/weapp-qrcode-canvas-2d/-/weapp-qrcode-canvas-2d-1.1.2.tgz",
+      "integrity": "sha512-HQef+xpZiiWDcq8aLZdXnVdNljoYsEWiEKiBYnAnfgqXTeYfC8ApzoB9pMI5mnPFbhtu5xCi8oId1g/86uUl8Q=="
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..bac6482
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "weapp-qrcode-canvas-2d": "^1.1.2"
+  }
+}
diff --git a/pages/details/details.js b/pages/details/details.js
index 812d14c..8adfba1 100644
--- a/pages/details/details.js
+++ b/pages/details/details.js
@@ -31,6 +31,7 @@ Page({
       status:item.status,
       logisticsNo:item.logisticsNo,
       unitType:item.unitType,
+      entryDate:item.entryDate,
       cost:item.cost,
       expectedEndTime:item.expectedEndTime,
       boxNum:item.boxNum,
diff --git a/pages/handover/handover.js b/pages/handover/handover.js
index a0104b8..685c89b 100644
--- a/pages/handover/handover.js
+++ b/pages/handover/handover.js
@@ -1,25 +1,116 @@
 // pages/handover/handover.js
+const request = require('../../utils/http')
+import drawQrcode from '../../utils/weapp.qrcode.esm.js'
+// var app = getApp();
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
     date: '',
-    start:'2020-01-01',
-    end:'',
+    start: '',
+    end: '',
+    logisticsCodeList: [], //物流单列表
+    sampleList: [], //样本列表
+    showDialog: false
   },
 
-  sx(){
+  //刷新按钮
+  refresh() {
     this.onLoad()
     console.log("123");
   },
 
-  bindDateChange(e){
-    // console.log(e.detail.value)
+  bindDateChange(e) {
     this.setData({
-      date:e.detail.value
+      date: e.detail.value
+    })
+  },
+
+  //查询物流单列表
+  selTranLogistics() {
+    var reqData = {
+      startTime: this.data.date,
+      pageNum: 1,
+      pageSize: 100
+    }
+    request.post(`/batch/selectTranLogistics`, reqData).then(res => {
+      console.log(JSON.stringify(res));
+      // this.data.logisticsCodeList = res.data.data
+      this.setData({
+        logisticsCodeList: res.data.data
+      })
+    })
+  },
+
+  //查询物流单下的样本列表
+  selSampleList(e) {
+    var _this = this;
+    // console.log('selSampleList run' + JSON.stringify(e.target.dataset.id));
+    var reqData = {
+      'logisticsNo': e.target.dataset.id
+    }
+
+    request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
+      console.log(res.data.data);
+      this.setData({
+        sampleList: res.data.data,
+        // sampleCount: res.data.data.length
+      })
     })
+
+    //生成二维码
+    this.drawQrImg(e.target.dataset.id)
+  },
+
+  drawQrImg(text) {
+    var _this = this;
+    const query = wx.createSelectorQuery()
+    query.select('#myQrcode')
+      .fields({
+        node: true,
+        size: true
+      })
+      .exec((res) => {
+        var canvas = res[0].node
+
+        // 调用方法drawQrcode生成二维码
+        drawQrcode({
+          canvas: canvas,
+          canvasId: 'myQrcode',
+          width: 100,
+          padding: 0,
+          background: '#ffffff',
+          foreground: '#000000',
+          text: text,
+        })
+
+        // 获取临时路径
+        wx.canvasToTempFilePath({
+          canvasId: 'myQrcode',
+          canvas: canvas,
+          x: 0,
+          y: 0,
+          width: 100,
+          height: 100,
+          destWidth: 100,
+          destHeight: 100,
+          success(res) {
+            console.log('二维码临时路径：', res.tempFilePath)
+            _this.toggleDialog()
+          },
+          fail(res) {
+            console.error(res)
+          }
+        })
+      })
+  },
+
+  //控制二维码弹窗
+  toggleDialog() {
+    this.setData({
+      showDialog: !this.data.showDialog
+    });
   },
 
   /**
@@ -32,6 +123,8 @@ Page({
     this.setData({
       end: '' + year + '-' + (Array(2).join(0) + month).slice(-2) + '-' + (Array(2).join(0) + now.getDate()).slice(-2),
     }) //当前的时间
+
+    this.selTranLogistics()
   },
 
   /**
diff --git a/pages/handover/handover.wxml b/pages/handover/handover.wxml
index 01d3981..f16e31a 100644
--- a/pages/handover/handover.wxml
+++ b/pages/handover/handover.wxml
@@ -6,23 +6,22 @@
     <view style="display: flex;" class="from-con">
       <text>日 期：</text>
       <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChange" class="from-con">
-        <input type="text" disabled="true" placeholder="请选择日期 >" placeholder-class="place" value="{{date}}"/>
+        <input type="text" disabled="true" placeholder="请选择日期" placeholder-class="place" value="{{date}}" />
       </picker>
-      <button class="f5" bindtap="sx">刷 新</button>
+      <button class="f5" bindtap="refresh">查 询</button>
     </view>
-    
+    <view style="margin-top: 10rpx;">物流单号</view>
     <scroll-view scroll-y class="allordernum">
-      <view style="background-color: #ffe4c4;">物流单号：M2023051500231</view>
-      <view style="background-color: #ddd;">物流单号：M2023051500232</view>
-      <view style="background-color: #e0f7ac;">物流单号：M2023051500233</view>
-      <view style="background-color: #e0f7ac;">物流单号：M2023051500234</view>
-      <view style="background-color: #e0f7ac;">物流单号：M2023051500235</view>
+
+      <view wx:for="{{logisticsCodeList}}" wx:key="idx">
+        <view style="background-color: #ffe4c4;" bindtap="selSampleList" data-id="{{item.logisticsNo}}">{{item.logisticsNo}}</view>
+      </view>
     </scroll-view>
   </view>
 
   <view class="back">
-    <scroll-view scroll-x  style="width: 100%; border: 1rpx #ddd solid;">
-      <view class="tr top1" >
+    <scroll-view scroll-x style="width: 100%; border: 1rpx #ddd solid;">
+      <view class="tr top1">
         <view class="td td1">序号</view>
         <view class="td">样本号</view>
         <view class="td">送检机构</view>
@@ -31,24 +30,30 @@
         <view class="td">交接人</view>
         <view class="td">状态</view>
       </view>
-      <view class="tr" >
-        <view class="td td1">1</view>
-        <view class="td">Y100008645</view>
-        <view class="td">XX卫生院</view>
-        <view class="td td2">2023-6-26</view>
-        <view class="td">X254687</view>
-        <view class="td">李四</view>
-        <view class="td">已核收</view>
-      </view>
-      <view class="tr" >
-        <view class="td td1">2</view>
-        <view class="td">Y100008645</view>
-        <view class="td">XX卫生院</view>
-        <view class="td td2">2023-6-26</view>
-        <view class="td">X254687</view>
-        <view class="td">张三</view>
-        <view class="td">已核收</view>
-      </view>
+      <block wx:for="{{sampleList}}" wx:key="idx">
+        <view class="tr">
+          <view class="td td1">{{idx+1}}</view>
+          <view class="td">{{item.barCode}}</view>
+          <view class="td">{{item.institutionName}}</view>
+          <view class="td td2">{{item.entryDate}}</view>
+          <view class="td">{{item.boxNum}}</view>
+          <view class="td">{{item.logisticsMen}}</view>
+          <view class="td" wx:if="{{item.status == 0}}" class="td">未采样</view>
+          <view class="td" wx:elif="{{item.status == 1}}" class="td">已采样</view>
+          <view class="td" wx:elif="{{item.status == 2}}" class="td">已发货</view>
+          <view class="td" wx:elif="{{item.status == 3}}" class="td">已接收</view>
+          <view class="td" wx:elif="{{item.status == 4}}" class="td">重新采样</view>
+          <view class="td" wx:else class="td">其它</view>
+        </view>
+      </block>
     </scroll-view>
   </view>
-</view>
+  <view class="zan-dialog {{ showDialog ? 'zan-dialog--show' : 'pop_hidden' }}">
+    <view class="zan-dialog__mask" bindtap="toggleDialog" />
+    <view class="zan-dialog__container">
+      <view style='padding:80rpx;'>
+        <canvas type="2d" class="canvas" id="myQrcode"></canvas>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/handover/handover.wxss b/pages/handover/handover.wxss
index d93d963..0c85af9 100644
--- a/pages/handover/handover.wxss
+++ b/pages/handover/handover.wxss
@@ -1,29 +1,40 @@
 /* pages/handover/handover.wxss */
-.back{
+.back {
   margin-top: 15rpx;
 }
-.top{
+
+.top {
   background-color: #fff;
   padding: 10rpx 10rpx;
   font-size: 22rpx;
-  border-radius: 15rpx;
+  border-radius: 5rpx;
 }
 
-.from-con{
+.from-con {
   display: flex;
   align-items: center;
   position: relative;
 }
-.from-con input{
+
+.from-con input {
   width: 250rpx;
+  border-radius: 5rpx;
   border: 1rpx #666 solid;
   padding: 3rpx 10rpx;
-  text-align: right;
+  text-align: center;
+}
+
+.canvas {
+  width: 100px;
+  height: 100px;
+  background-color: #6bc9ca;
 }
-.place{
-  color:#c4bfbf;
+
+.place {
+  color: #c4bfbf;
 }
-.f5{
+
+.f5 {
   width: 200rpx !important;
   font-size: 28rpx;
   background-color: #eee;
@@ -37,48 +48,96 @@
 }
 
 
-.allordernum{
+.allordernum {
   margin-top: 20rpx;
   /* border: 1rpx #999 solid; */
   background-color: #f1f1f1;
   border: 1rpx #eee solid;
-  border-radius: 15rpx;
+  border-radius: 5rpx;
   width: 100%;
   height: 350rpx;
-  padding: 20rpx 0 ;
+  padding: 20rpx 0;
 }
-.allordernum view{
+
+.allordernum view view {
   padding: 20rpx;
   background-color: #eee;
   width: 88%;
   margin: 0 auto;
   margin-bottom: 15rpx;
-  border-radius: 15rpx;
+  border-radius: 5rpx;
 }
 
 
-.tr{
+.tr {
   display: flex;
   width: 100%;
 
 }
-.tr .td{
+
+.tr .td {
   /* border-right:#ddd solid 1rpx ;
   border-top: #ddd solid 1rpx; */
   border: 1rpx #ddd solid;
-  padding: 15rpx 0;
+  padding: 10rpx 0;
   font-size: 22rpx;
   display: flex;
   justify-content: center;
   align-items: center;
   flex-wrap: nowrap;
   white-space: nowrap;
-  min-width: 150rpx;
+  min-width: 200rpx;
 }
-.top1 view{
+
+.top1 view {
   background-color: #6bc9ca;
   color: #fff;
 }
-.td1{
+
+.td1 {
   min-width: 100rpx !important;
 }
+
+
+.zan-dialog__mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10;
+  background: rgba(0, 0, 0, 0);
+  /* 设置阴影半透明背景如： background: rgba(0, 0, 0, 0.4); */
+  display: none;
+}
+
+.zan-dialog__container {
+  position: fixed;
+  bottom: 200rpx;
+  width: 350rpx;
+  /* 弹窗布局宽 */
+  height: 300rpx;
+  /* 弹窗布局高，与下面弹出距离transform有关 */
+  margin-left: 180rpx;
+  background: #f8f8f8;
+  transform: translateY(300%);
+  /* 弹框弹出距离，与弹框布局高度有关，如300%表示弹起距离为3倍弹窗高度 */
+  transition: all 0.4s ease;
+  z-index: 12;
+  border-radius: 10rpx;
+  box-shadow: 0px 3px 3px 2px gainsboro;
+  /* 弹框的悬浮阴影效果，如不需要可注释该行 */
+}
+
+.zan-dialog--show .zan-dialog__container {
+  transform: translateY(0);
+}
+
+.zan-dialog--show .zan-dialog__mask {
+  display: block;
+}
+
+/*隐藏*/
+.pop_hidden {
+  display: none;
+}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 3e0c21b..6723860 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -63,7 +63,6 @@ Page({
 
   //跳转对应界面
   goLogisticsType(e){
-    console.log(JSON.stringify(e));
     var tag = e.currentTarget.dataset.id
     var url
     //自建物流
@@ -90,28 +89,6 @@ Page({
     })
   },
   
-  //自建物流
-  goMelogistics(){
-    wx.navigateTo({
-      url: '../meLogistics/meLogistics',
-    })
-  },
-
-  //第三方物流
-  goThreelogistics(){
-    wx.navigateTo({
-      url: '../threeLogistics/threeLogistics',
-    })
-  },
-
-  //物流交接
-  goHandover(){
-    wx.navigateTo({
-      url: '../freiLogistics/freiLogistics',
-      // url: '../handover/handover',
-    })
-  },
-
   /**
    * 生命周期函数--监听页面加载
    */
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 566e0de..1c6dddf 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/index/index.wxml-->
-<swiper class="banner" autoplay="true" interval="3000" circular="true" indicator-dots='true'>
+<swiper class="banner" autoplay="true" interval="4000" circular="true" indicator-dots='true'>
   <swiper-item>
     <image src="../../images/banner.png" />
   </swiper-item>
@@ -28,9 +28,11 @@
     </view>
   </view>
 
+  <button class="btn" bindtap="goLogisticsType" data-id="goHandover">物流交接</button>
+
   <view class="ec-container">
     <ec-canvas canvas-id="echart-pie" ec="{{ec}}"></ec-canvas>
   </view>
 
-  <button class="btn" bindtap="goLogisticsType" data-id="goHandover">物流交接</button>
+  
 </view>
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c499b55..fec4a7f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,17 +1,20 @@
 /* pages/index/index.wxss */
+page {
+  background: -webkit-linear-gradient(top, #27adb0, #b6f0f0, #f8f8f8);
+}
 .banner{
   width: 100%;
-  height: 400rpx;
+  height: 350rpx;
 }
 .banner image{
   width: 100%;
-  height: 400rpx;
+  height: 350rpx;
 }
 
 .msg{
   border-radius: 5px;
-  margin-top: 20rpx;
-  height: 30rpx;
+  margin: 20rpx 20rpx 0rpx;
+  height: 40rpx;
   background-color: #fff;
   font-size: 26rpx;
   padding: 10rpx;
@@ -19,7 +22,7 @@
 }
 
 .produck-type{
-  border-radius: 15rpx ;
+  border-radius: 5rpx ;
   display: flex;
   width: 100%;
   background-color: #fff;
@@ -45,8 +48,7 @@
   background-color: #3ec6c9;
   color: #fff;
   margin-top: 20rpx;
-  border: 1rpx #d1d0d0 solid;
-  width: 500rpx !important;
+  width: 100% !important;
 }
 
 
@@ -58,8 +60,8 @@
   width: 100%;
   height: 450rpx;
   background-color: #fff;
-  border-radius: 15rpx;
-  margin-top: 15rpx;
+  border-radius: 5rpx;
+  margin-top: 20rpx;
   padding: 20rpx 0;
 }
 
diff --git a/pages/meLogistics/meLogistics.js b/pages/meLogistics/meLogistics.js
index 12aae34..98fbdd0 100644
--- a/pages/meLogistics/meLogistics.js
+++ b/pages/meLogistics/meLogistics.js
@@ -126,23 +126,10 @@ Page({
   //物流车、转运箱拍照
   photograph(e) {
     var potoIdx = 0;
-    console.log(e.target.dataset.id);
-    if (e.target.dataset.id === 'car_1') {
-      console.log(e.target.dataset.id);
-      potoIdx = 0
-    }
-    if (e.target.dataset.id === 'car_2') {
-      console.log(e.target.dataset.id);
-      potoIdx = 1
-    }
-    if (e.target.dataset.id === 'box_1') {
-      console.log(e.target.dataset.id);
-      potoIdx = 2
-    }
-    if (e.target.dataset.id === 'box_2') {
-      console.log(e.target.dataset.id);
-      potoIdx = 3
-    }
+    if (e.target.dataset.id === 'car_1') potoIdx = 0
+    if (e.target.dataset.id === 'car_2') potoIdx = 1
+    if (e.target.dataset.id === 'box_1') potoIdx = 2
+    if (e.target.dataset.id === 'box_2') potoIdx = 3
 
     //回显所拍摄照片
     var _this = this;
@@ -153,14 +140,37 @@ Page({
       sizeType: ['compressed'],
       camera: 'back',
       success: res => {
-        console.log(res.tempFiles[0].tempFilePath)
-        _this.data.poto[potoIdx] = res.tempFiles[0].tempFilePath
+        _this.upImg(res.tempFiles[0].tempFilePath, potoIdx) //上传照片
+      }
+    })
+  },
+
+  //上传照片 imageSrc照片临时路径  potoIdx 点击的哪一个图片框
+  upImg(imageSrc, potoIdx) {
+    var _this = this;
+    request.upImgFile(`/feedBack/upload`, imageSrc).then(res => {
+      var resObj = JSON.parse(res.data)
+      console.log('upImgFile data =' + resObj.data.url);
+      console.log('upImgFile res=' + JSON.stringify(res.data));
+      if (resObj.code > 400) {
+        wx.showModal({
+          title: '提示',
+          content: resObj.message,
+          complete: (res) => {
+            if (res.cancel) {}
+            if (res.confirm) {}
+            //上传失败后移除图片
+          }
+        })
+      } else {
+        //保存图片路径到数组
+        // this.data.upImageArr.push(resObj.data.url);
+        _this.data.poto[potoIdx] = resObj.data.url
         _this.setData({
           poto: _this.data.poto
         })
       }
-    })
-
+    });
   },
 
   //显示回调图片
@@ -344,6 +354,17 @@ Page({
     }
   },
 
+  //显示必选项为空提示
+  showErrInfo(field, errInfo){
+    if (field === undefined || field.length == 0) {
+      wx.showToast({
+        icon: 'error',
+        title: errInfo,
+      })
+      return true;
+    }
+  },
+
   //保存样本信息
   saveInfo() {
     var temp = this.data;
@@ -352,6 +373,9 @@ Page({
     //处理到达时间
     var endTime = dateUtils.customizeDateFormat(temp.time1);
 
+    if(this.showErrInfo(startTime, '出发时间不可为空')) return
+    if(this.showErrInfo(endTime, '到过时间不可为空')) return
+
     //处理物流车拍照
     var carPoto = []
     var boxPoto = []
@@ -391,12 +415,11 @@ Page({
       "updateTime": ""
     }
 
-    console.log('saveInfo=' + JSON.stringify(tempData));
     request.post(`/batch/addTranLogistics`, tempData).then(res => {
       console.log(JSON.stringify(res.data));
       if (res.data.code === 200) {
         //保存成功后,查询底部列表
-
+        this.selSampleList();
       } else {
         wx.showModal({
           title: '错误',
diff --git a/pages/meLogistics/meLogistics.wxml b/pages/meLogistics/meLogistics.wxml
index ab5c6bd..412677f 100644
--- a/pages/meLogistics/meLogistics.wxml
+++ b/pages/meLogistics/meLogistics.wxml
@@ -103,10 +103,10 @@
         <view class="td1">{{index + 1}}</view>
         <view class="td">{{item.barCode}}</view>
         <view class="td">{{item.receiveTime}}</view>
-        <view wx:if="{{item.status == 0}}" class="td">已采样</view>
-        <view wx:elif="{{item.status == 1}}" class="td">已接收</view>
-        <view wx:elif="{{item.status == 2}}" class="td">已核收</view>
-        <view wx:elif="{{item.status == 3}}" class="td">已拒收</view>
+        <view wx:if="{{item.status == 0}}" class="td">未采样</view>
+        <view wx:elif="{{item.status == 1}}" class="td">已采样</view>
+        <view wx:elif="{{item.status == 2}}" class="td">已发货</view>
+        <view wx:elif="{{item.status == 3}}" class="td">已接收</view>
         <view wx:elif="{{item.status == 4}}" class="td">重新采样</view>
         <view wx:else class="td">其它</view>
         <view class="td">{{item.logisticsMen}}</view>
diff --git a/utils/weapp-qrcode.js b/utils/weapp-qrcode.js
new file mode 100644
index 0000000..ac26779
--- /dev/null
+++ b/utils/weapp-qrcode.js
@@ -0,0 +1,426 @@
+//Core code comes from https://github.com/davidshimjs/qrcodejs
+
+var QRCode;
+
+(function () {
+    /**
+         * Get the type by string length
+         * 
+         * @private
+         * @param {String} sText
+         * @param {Number} nCorrectLevel
+         * @return {Number} type
+         */
+    function _getTypeNumber(sText, nCorrectLevel) {
+        var nType = 1;
+        var length = _getUTF8Length(sText);
+
+        for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
+            var nLimit = 0;
+
+            switch (nCorrectLevel) {
+                case QRErrorCorrectLevel.L:
+                    nLimit = QRCodeLimitLength[i][0];
+                    break;
+                case QRErrorCorrectLevel.M:
+                    nLimit = QRCodeLimitLength[i][1];
+                    break;
+                case QRErrorCorrectLevel.Q:
+                    nLimit = QRCodeLimitLength[i][2];
+                    break;
+                case QRErrorCorrectLevel.H:
+                    nLimit = QRCodeLimitLength[i][3];
+                    break;
+            }
+
+            if (length <= nLimit) {
+                break;
+            } else {
+                nType++;
+            }
+        }
+
+        if (nType > QRCodeLimitLength.length) {
+            throw new Error("Too long data");
+        }
+
+        return nType;
+    }
+
+    function _getUTF8Length(sText) {
+        var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
+        return replacedText.length + (replacedText.length != sText ? 3 : 0);
+    }
+
+    function QR8bitByte(data) {
+        this.mode = QRMode.MODE_8BIT_BYTE;
+        this.data = data;
+        this.parsedData = [];
+
+        // Added to support UTF-8 Characters
+        for (var i = 0, l = this.data.length; i < l; i++) {
+            var byteArray = [];
+            var code = this.data.charCodeAt(i);
+
+            if (code > 0x10000) {
+                byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
+                byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
+                byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
+                byteArray[3] = 0x80 | (code & 0x3F);
+            } else if (code > 0x800) {
+                byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
+                byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
+                byteArray[2] = 0x80 | (code & 0x3F);
+            } else if (code > 0x80) {
+                byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
+                byteArray[1] = 0x80 | (code & 0x3F);
+            } else {
+                byteArray[0] = code;
+            }
+
+            this.parsedData.push(byteArray);
+        }
+
+        this.parsedData = Array.prototype.concat.apply([], this.parsedData);
+
+        if (this.parsedData.length != this.data.length) {
+            this.parsedData.unshift(191);
+            this.parsedData.unshift(187);
+            this.parsedData.unshift(239);
+        }
+    }
+
+    QR8bitByte.prototype = {
+        getLength: function (buffer) {
+            return this.parsedData.length;
+        },
+        write: function (buffer) {
+            for (var i = 0, l = this.parsedData.length; i < l; i++) {
+                buffer.put(this.parsedData[i], 8);
+            }
+        }
+    };
+
+
+    // QRCodeModel
+    function QRCodeModel(typeNumber, errorCorrectLevel) {
+        this.typeNumber = typeNumber;
+        this.errorCorrectLevel = errorCorrectLevel;
+        this.modules = null;
+        this.moduleCount = 0;
+        this.dataCache = null;
+        this.dataList = [];
+    }
+    QRCodeModel.prototype = {
+        addData: function (data) { var newData = new QR8bitByte(data); this.dataList.push(newData); this.dataCache = null; }, isDark: function (row, col) {
+            if (row < 0 || this.moduleCount <= row || col < 0 || this.moduleCount <= col) { throw new Error(row + "," + col); }
+            return this.modules[row][col];
+        }, getModuleCount: function () { return this.moduleCount; }, make: function () { this.makeImpl(false, this.getBestMaskPattern()); }, makeImpl: function (test, maskPattern) {
+            this.moduleCount = this.typeNumber * 4 + 17; this.modules = new Array(this.moduleCount); for (var row = 0; row < this.moduleCount; row++) { this.modules[row] = new Array(this.moduleCount); for (var col = 0; col < this.moduleCount; col++) { this.modules[row][col] = null; } }
+            this.setupPositionProbePattern(0, 0); this.setupPositionProbePattern(this.moduleCount - 7, 0); this.setupPositionProbePattern(0, this.moduleCount - 7); this.setupPositionAdjustPattern(); this.setupTimingPattern(); this.setupTypeInfo(test, maskPattern); if (this.typeNumber >= 7) { this.setupTypeNumber(test); }
+            if (this.dataCache == null) { this.dataCache = QRCodeModel.createData(this.typeNumber, this.errorCorrectLevel, this.dataList); }
+            this.mapData(this.dataCache, maskPattern);
+        }, setupPositionProbePattern: function (row, col) { for (var r = -1; r <= 7; r++) { if (row + r <= -1 || this.moduleCount <= row + r) continue; for (var c = -1; c <= 7; c++) { if (col + c <= -1 || this.moduleCount <= col + c) continue; if ((0 <= r && r <= 6 && (c == 0 || c == 6)) || (0 <= c && c <= 6 && (r == 0 || r == 6)) || (2 <= r && r <= 4 && 2 <= c && c <= 4)) { this.modules[row + r][col + c] = true; } else { this.modules[row + r][col + c] = false; } } } }, getBestMaskPattern: function () {
+            var minLostPoint = 0; var pattern = 0; for (var i = 0; i < 8; i++) { this.makeImpl(true, i); var lostPoint = QRUtil.getLostPoint(this); if (i == 0 || minLostPoint > lostPoint) { minLostPoint = lostPoint; pattern = i; } }
+            return pattern;
+        }, createMovieClip: function (target_mc, instance_name, depth) {
+            var qr_mc = target_mc.createEmptyMovieClip(instance_name, depth); var cs = 1; this.make(); for (var row = 0; row < this.modules.length; row++) { var y = row * cs; for (var col = 0; col < this.modules[row].length; col++) { var x = col * cs; var dark = this.modules[row][col]; if (dark) { qr_mc.beginFill(0, 100); qr_mc.moveTo(x, y); qr_mc.lineTo(x + cs, y); qr_mc.lineTo(x + cs, y + cs); qr_mc.lineTo(x, y + cs); qr_mc.endFill(); } } }
+            return qr_mc;
+        }, setupTimingPattern: function () {
+            for (var r = 8; r < this.moduleCount - 8; r++) {
+                if (this.modules[r][6] != null) { continue; }
+                this.modules[r][6] = (r % 2 == 0);
+            }
+            for (var c = 8; c < this.moduleCount - 8; c++) {
+                if (this.modules[6][c] != null) { continue; }
+                this.modules[6][c] = (c % 2 == 0);
+            }
+        }, setupPositionAdjustPattern: function () {
+            var pos = QRUtil.getPatternPosition(this.typeNumber); for (var i = 0; i < pos.length; i++) {
+                for (var j = 0; j < pos.length; j++) {
+                    var row = pos[i]; var col = pos[j]; if (this.modules[row][col] != null) { continue; }
+                    for (var r = -2; r <= 2; r++) { for (var c = -2; c <= 2; c++) { if (r == -2 || r == 2 || c == -2 || c == 2 || (r == 0 && c == 0)) { this.modules[row + r][col + c] = true; } else { this.modules[row + r][col + c] = false; } } }
+                }
+            }
+        }, setupTypeNumber: function (test) {
+            var bits = QRUtil.getBCHTypeNumber(this.typeNumber); for (var i = 0; i < 18; i++) { var mod = (!test && ((bits >> i) & 1) == 1); this.modules[Math.floor(i / 3)][i % 3 + this.moduleCount - 8 - 3] = mod; }
+            for (var i = 0; i < 18; i++) { var mod = (!test && ((bits >> i) & 1) == 1); this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod; }
+        }, setupTypeInfo: function (test, maskPattern) {
+            var data = (this.errorCorrectLevel << 3) | maskPattern; var bits = QRUtil.getBCHTypeInfo(data); for (var i = 0; i < 15; i++) { var mod = (!test && ((bits >> i) & 1) == 1); if (i < 6) { this.modules[i][8] = mod; } else if (i < 8) { this.modules[i + 1][8] = mod; } else { this.modules[this.moduleCount - 15 + i][8] = mod; } }
+            for (var i = 0; i < 15; i++) { var mod = (!test && ((bits >> i) & 1) == 1); if (i < 8) { this.modules[8][this.moduleCount - i - 1] = mod; } else if (i < 9) { this.modules[8][15 - i - 1 + 1] = mod; } else { this.modules[8][15 - i - 1] = mod; } }
+            this.modules[this.moduleCount - 8][8] = (!test);
+        }, mapData: function (data, maskPattern) {
+            var inc = -1; var row = this.moduleCount - 1; var bitIndex = 7; var byteIndex = 0; for (var col = this.moduleCount - 1; col > 0; col -= 2) {
+                if (col == 6) col--; while (true) {
+                    for (var c = 0; c < 2; c++) {
+                        if (this.modules[row][col - c] == null) {
+                            var dark = false; if (byteIndex < data.length) { dark = (((data[byteIndex] >>> bitIndex) & 1) == 1); }
+                            var mask = QRUtil.getMask(maskPattern, row, col - c); if (mask) { dark = !dark; }
+                            this.modules[row][col - c] = dark; bitIndex--; if (bitIndex == -1) { byteIndex++; bitIndex = 7; }
+                        }
+                    }
+                    row += inc; if (row < 0 || this.moduleCount <= row) { row -= inc; inc = -inc; break; }
+                }
+            }
+        }
+    };
+    QRCodeModel.PAD0 = 0xEC;
+    QRCodeModel.PAD1 = 0x11;
+    QRCodeModel.createData = function (typeNumber, errorCorrectLevel, dataList) {
+        var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel); var buffer = new QRBitBuffer(); for (var i = 0; i < dataList.length; i++) { var data = dataList[i]; buffer.put(data.mode, 4); buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber)); data.write(buffer); }
+        var totalDataCount = 0; for (var i = 0; i < rsBlocks.length; i++) { totalDataCount += rsBlocks[i].dataCount; }
+        if (buffer.getLengthInBits() > totalDataCount * 8) {
+            throw new Error("code length overflow. ("
+                + buffer.getLengthInBits()
+                + ">"
+                + totalDataCount * 8
+                + ")");
+        }
+        if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) { buffer.put(0, 4); }
+        while (buffer.getLengthInBits() % 8 != 0) { buffer.putBit(false); }
+        while (true) {
+            if (buffer.getLengthInBits() >= totalDataCount * 8) { break; }
+            buffer.put(QRCodeModel.PAD0, 8); if (buffer.getLengthInBits() >= totalDataCount * 8) { break; }
+            buffer.put(QRCodeModel.PAD1, 8);
+        }
+        return QRCodeModel.createBytes(buffer, rsBlocks);
+    };
+    QRCodeModel.createBytes = function (buffer, rsBlocks) {
+        var offset = 0; var maxDcCount = 0; var maxEcCount = 0; var dcdata = new Array(rsBlocks.length); var ecdata = new Array(rsBlocks.length); for (var r = 0; r < rsBlocks.length; r++) {
+            var dcCount = rsBlocks[r].dataCount; var ecCount = rsBlocks[r].totalCount - dcCount; maxDcCount = Math.max(maxDcCount, dcCount); maxEcCount = Math.max(maxEcCount, ecCount); dcdata[r] = new Array(dcCount); for (var i = 0; i < dcdata[r].length; i++) { dcdata[r][i] = 0xff & buffer.buffer[i + offset]; }
+            offset += dcCount; var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount); var rawPoly = new QRPolynomial(dcdata[r], rsPoly.getLength() - 1); var modPoly = rawPoly.mod(rsPoly); ecdata[r] = new Array(rsPoly.getLength() - 1); for (var i = 0; i < ecdata[r].length; i++) { var modIndex = i + modPoly.getLength() - ecdata[r].length; ecdata[r][i] = (modIndex >= 0) ? modPoly.get(modIndex) : 0; }
+        }
+        var totalCodeCount = 0; for (var i = 0; i < rsBlocks.length; i++) { totalCodeCount += rsBlocks[i].totalCount; }
+        var data = new Array(totalCodeCount); var index = 0; for (var i = 0; i < maxDcCount; i++) { for (var r = 0; r < rsBlocks.length; r++) { if (i < dcdata[r].length) { data[index++] = dcdata[r][i]; } } }
+        for (var i = 0; i < maxEcCount; i++) { for (var r = 0; r < rsBlocks.length; r++) { if (i < ecdata[r].length) { data[index++] = ecdata[r][i]; } } }
+        return data;
+    };
+    var QRMode = { MODE_NUMBER: 1 << 0, MODE_ALPHA_NUM: 1 << 1, MODE_8BIT_BYTE: 1 << 2, MODE_KANJI: 1 << 3 };
+    var QRErrorCorrectLevel = { L: 1, M: 0, Q: 3, H: 2 };
+    var QRMaskPattern = { PATTERN000: 0, PATTERN001: 1, PATTERN010: 2, PATTERN011: 3, PATTERN100: 4, PATTERN101: 5, PATTERN110: 6, PATTERN111: 7 };
+    var QRUtil = {
+        PATTERN_POSITION_TABLE: [[], [6, 18], [6, 22], [6, 26], [6, 30], [6, 34], [6, 22, 38], [6, 24, 42], [6, 26, 46], [6, 28, 50], [6, 30, 54], [6, 32, 58], [6, 34, 62], [6, 26, 46, 66], [6, 26, 48, 70], [6, 26, 50, 74], [6, 30, 54, 78], [6, 30, 56, 82], [6, 30, 58, 86], [6, 34, 62, 90], [6, 28, 50, 72, 94], [6, 26, 50, 74, 98], [6, 30, 54, 78, 102], [6, 28, 54, 80, 106], [6, 32, 58, 84, 110], [6, 30, 58, 86, 114], [6, 34, 62, 90, 118], [6, 26, 50, 74, 98, 122], [6, 30, 54, 78, 102, 126], [6, 26, 52, 78, 104, 130], [6, 30, 56, 82, 108, 134], [6, 34, 60, 86, 112, 138], [6, 30, 58, 86, 114, 142], [6, 34, 62, 90, 118, 146], [6, 30, 54, 78, 102, 126, 150], [6, 24, 50, 76, 102, 128, 154], [6, 28, 54, 80, 106, 132, 158], [6, 32, 58, 84, 110, 136, 162], [6, 26, 54, 82, 110, 138, 166], [6, 30, 58, 86, 114, 142, 170]], G15: (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0), G18: (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0), G15_MASK: (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1), getBCHTypeInfo: function (data) {
+            var d = data << 10; while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0) { d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15))); }
+            return ((data << 10) | d) ^ QRUtil.G15_MASK;
+        }, getBCHTypeNumber: function (data) {
+            var d = data << 12; while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0) { d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18))); }
+            return (data << 12) | d;
+        }, getBCHDigit: function (data) {
+            var digit = 0; while (data != 0) { digit++; data >>>= 1; }
+            return digit;
+        }, getPatternPosition: function (typeNumber) { return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1]; }, getMask: function (maskPattern, i, j) { switch (maskPattern) { case QRMaskPattern.PATTERN000: return (i + j) % 2 == 0; case QRMaskPattern.PATTERN001: return i % 2 == 0; case QRMaskPattern.PATTERN010: return j % 3 == 0; case QRMaskPattern.PATTERN011: return (i + j) % 3 == 0; case QRMaskPattern.PATTERN100: return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0; case QRMaskPattern.PATTERN101: return (i * j) % 2 + (i * j) % 3 == 0; case QRMaskPattern.PATTERN110: return ((i * j) % 2 + (i * j) % 3) % 2 == 0; case QRMaskPattern.PATTERN111: return ((i * j) % 3 + (i + j) % 2) % 2 == 0; default: throw new Error("bad maskPattern:" + maskPattern); } }, getErrorCorrectPolynomial: function (errorCorrectLength) {
+            var a = new QRPolynomial([1], 0); for (var i = 0; i < errorCorrectLength; i++) { a = a.multiply(new QRPolynomial([1, QRMath.gexp(i)], 0)); }
+            return a;
+        }, getLengthInBits: function (mode, type) { if (1 <= type && type < 10) { switch (mode) { case QRMode.MODE_NUMBER: return 10; case QRMode.MODE_ALPHA_NUM: return 9; case QRMode.MODE_8BIT_BYTE: return 8; case QRMode.MODE_KANJI: return 8; default: throw new Error("mode:" + mode); } } else if (type < 27) { switch (mode) { case QRMode.MODE_NUMBER: return 12; case QRMode.MODE_ALPHA_NUM: return 11; case QRMode.MODE_8BIT_BYTE: return 16; case QRMode.MODE_KANJI: return 10; default: throw new Error("mode:" + mode); } } else if (type < 41) { switch (mode) { case QRMode.MODE_NUMBER: return 14; case QRMode.MODE_ALPHA_NUM: return 13; case QRMode.MODE_8BIT_BYTE: return 16; case QRMode.MODE_KANJI: return 12; default: throw new Error("mode:" + mode); } } else { throw new Error("type:" + type); } }, getLostPoint: function (qrCode) {
+            var moduleCount = qrCode.getModuleCount(); var lostPoint = 0; for (var row = 0; row < moduleCount; row++) {
+                for (var col = 0; col < moduleCount; col++) {
+                    var sameCount = 0; var dark = qrCode.isDark(row, col); for (var r = -1; r <= 1; r++) {
+                        if (row + r < 0 || moduleCount <= row + r) { continue; }
+                        for (var c = -1; c <= 1; c++) {
+                            if (col + c < 0 || moduleCount <= col + c) { continue; }
+                            if (r == 0 && c == 0) { continue; }
+                            if (dark == qrCode.isDark(row + r, col + c)) { sameCount++; }
+                        }
+                    }
+                    if (sameCount > 5) { lostPoint += (3 + sameCount - 5); }
+                }
+            }
+            for (var row = 0; row < moduleCount - 1; row++) { for (var col = 0; col < moduleCount - 1; col++) { var count = 0; if (qrCode.isDark(row, col)) count++; if (qrCode.isDark(row + 1, col)) count++; if (qrCode.isDark(row, col + 1)) count++; if (qrCode.isDark(row + 1, col + 1)) count++; if (count == 0 || count == 4) { lostPoint += 3; } } }
+            for (var row = 0; row < moduleCount; row++) { for (var col = 0; col < moduleCount - 6; col++) { if (qrCode.isDark(row, col) && !qrCode.isDark(row, col + 1) && qrCode.isDark(row, col + 2) && qrCode.isDark(row, col + 3) && qrCode.isDark(row, col + 4) && !qrCode.isDark(row, col + 5) && qrCode.isDark(row, col + 6)) { lostPoint += 40; } } }
+            for (var col = 0; col < moduleCount; col++) { for (var row = 0; row < moduleCount - 6; row++) { if (qrCode.isDark(row, col) && !qrCode.isDark(row + 1, col) && qrCode.isDark(row + 2, col) && qrCode.isDark(row + 3, col) && qrCode.isDark(row + 4, col) && !qrCode.isDark(row + 5, col) && qrCode.isDark(row + 6, col)) { lostPoint += 40; } } }
+            var darkCount = 0; for (var col = 0; col < moduleCount; col++) { for (var row = 0; row < moduleCount; row++) { if (qrCode.isDark(row, col)) { darkCount++; } } }
+            var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5; lostPoint += ratio * 10; return lostPoint;
+        }
+    };
+    var QRMath = {
+        glog: function (n) {
+            if (n < 1) { throw new Error("glog(" + n + ")"); }
+            return QRMath.LOG_TABLE[n];
+        }, gexp: function (n) {
+            while (n < 0) { n += 255; }
+            while (n >= 256) { n -= 255; }
+            return QRMath.EXP_TABLE[n];
+        }, EXP_TABLE: new Array(256), LOG_TABLE: new Array(256)
+    }; for (var i = 0; i < 8; i++) { QRMath.EXP_TABLE[i] = 1 << i; }
+    for (var i = 8; i < 256; i++) { QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4] ^ QRMath.EXP_TABLE[i - 5] ^ QRMath.EXP_TABLE[i - 6] ^ QRMath.EXP_TABLE[i - 8]; }
+    for (var i = 0; i < 255; i++) { QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]] = i; }
+    function QRPolynomial(num, shift) {
+        if (num.length == undefined) { throw new Error(num.length + "/" + shift); }
+        var offset = 0; while (offset < num.length && num[offset] == 0) { offset++; }
+        this.num = new Array(num.length - offset + shift); for (var i = 0; i < num.length - offset; i++) { this.num[i] = num[i + offset]; }
+    }
+    QRPolynomial.prototype = {
+        get: function (index) { return this.num[index]; }, getLength: function () { return this.num.length; }, multiply: function (e) {
+            var num = new Array(this.getLength() + e.getLength() - 1); for (var i = 0; i < this.getLength(); i++) { for (var j = 0; j < e.getLength(); j++) { num[i + j] ^= QRMath.gexp(QRMath.glog(this.get(i)) + QRMath.glog(e.get(j))); } }
+            return new QRPolynomial(num, 0);
+        }, mod: function (e) {
+            if (this.getLength() - e.getLength() < 0) { return this; }
+            var ratio = QRMath.glog(this.get(0)) - QRMath.glog(e.get(0)); var num = new Array(this.getLength()); for (var i = 0; i < this.getLength(); i++) { num[i] = this.get(i); }
+            for (var i = 0; i < e.getLength(); i++) { num[i] ^= QRMath.gexp(QRMath.glog(e.get(i)) + ratio); }
+            return new QRPolynomial(num, 0).mod(e);
+        }
+    };
+    function QRRSBlock(totalCount, dataCount) { this.totalCount = totalCount; this.dataCount = dataCount; }
+    QRRSBlock.RS_BLOCK_TABLE = [[1, 26, 19], [1, 26, 16], [1, 26, 13], [1, 26, 9], [1, 44, 34], [1, 44, 28], [1, 44, 22], [1, 44, 16], [1, 70, 55], [1, 70, 44], [2, 35, 17], [2, 35, 13], [1, 100, 80], [2, 50, 32], [2, 50, 24], [4, 25, 9], [1, 134, 108], [2, 67, 43], [2, 33, 15, 2, 34, 16], [2, 33, 11, 2, 34, 12], [2, 86, 68], [4, 43, 27], [4, 43, 19], [4, 43, 15], [2, 98, 78], [4, 49, 31], [2, 32, 14, 4, 33, 15], [4, 39, 13, 1, 40, 14], [2, 121, 97], [2, 60, 38, 2, 61, 39], [4, 40, 18, 2, 41, 19], [4, 40, 14, 2, 41, 15], [2, 146, 116], [3, 58, 36, 2, 59, 37], [4, 36, 16, 4, 37, 17], [4, 36, 12, 4, 37, 13], [2, 86, 68, 2, 87, 69], [4, 69, 43, 1, 70, 44], [6, 43, 19, 2, 44, 20], [6, 43, 15, 2, 44, 16], [4, 101, 81], [1, 80, 50, 4, 81, 51], [4, 50, 22, 4, 51, 23], [3, 36, 12, 8, 37, 13], [2, 116, 92, 2, 117, 93], [6, 58, 36, 2, 59, 37], [4, 46, 20, 6, 47, 21], [7, 42, 14, 4, 43, 15], [4, 133, 107], [8, 59, 37, 1, 60, 38], [8, 44, 20, 4, 45, 21], [12, 33, 11, 4, 34, 12], [3, 145, 115, 1, 146, 116], [4, 64, 40, 5, 65, 41], [11, 36, 16, 5, 37, 17], [11, 36, 12, 5, 37, 13], [5, 109, 87, 1, 110, 88], [5, 65, 41, 5, 66, 42], [5, 54, 24, 7, 55, 25], [11, 36, 12], [5, 122, 98, 1, 123, 99], [7, 73, 45, 3, 74, 46], [15, 43, 19, 2, 44, 20], [3, 45, 15, 13, 46, 16], [1, 135, 107, 5, 136, 108], [10, 74, 46, 1, 75, 47], [1, 50, 22, 15, 51, 23], [2, 42, 14, 17, 43, 15], [5, 150, 120, 1, 151, 121], [9, 69, 43, 4, 70, 44], [17, 50, 22, 1, 51, 23], [2, 42, 14, 19, 43, 15], [3, 141, 113, 4, 142, 114], [3, 70, 44, 11, 71, 45], [17, 47, 21, 4, 48, 22], [9, 39, 13, 16, 40, 14], [3, 135, 107, 5, 136, 108], [3, 67, 41, 13, 68, 42], [15, 54, 24, 5, 55, 25], [15, 43, 15, 10, 44, 16], [4, 144, 116, 4, 145, 117], [17, 68, 42], [17, 50, 22, 6, 51, 23], [19, 46, 16, 6, 47, 17], [2, 139, 111, 7, 140, 112], [17, 74, 46], [7, 54, 24, 16, 55, 25], [34, 37, 13], [4, 151, 121, 5, 152, 122], [4, 75, 47, 14, 76, 48], [11, 54, 24, 14, 55, 25], [16, 45, 15, 14, 46, 16], [6, 147, 117, 4, 148, 118], [6, 73, 45, 14, 74, 46], [11, 54, 24, 16, 55, 25], [30, 46, 16, 2, 47, 17], [8, 132, 106, 4, 133, 107], [8, 75, 47, 13, 76, 48], [7, 54, 24, 22, 55, 25], [22, 45, 15, 13, 46, 16], [10, 142, 114, 2, 143, 115], [19, 74, 46, 4, 75, 47], [28, 50, 22, 6, 51, 23], [33, 46, 16, 4, 47, 17], [8, 152, 122, 4, 153, 123], [22, 73, 45, 3, 74, 46], [8, 53, 23, 26, 54, 24], [12, 45, 15, 28, 46, 16], [3, 147, 117, 10, 148, 118], [3, 73, 45, 23, 74, 46], [4, 54, 24, 31, 55, 25], [11, 45, 15, 31, 46, 16], [7, 146, 116, 7, 147, 117], [21, 73, 45, 7, 74, 46], [1, 53, 23, 37, 54, 24], [19, 45, 15, 26, 46, 16], [5, 145, 115, 10, 146, 116], [19, 75, 47, 10, 76, 48], [15, 54, 24, 25, 55, 25], [23, 45, 15, 25, 46, 16], [13, 145, 115, 3, 146, 116], [2, 74, 46, 29, 75, 47], [42, 54, 24, 1, 55, 25], [23, 45, 15, 28, 46, 16], [17, 145, 115], [10, 74, 46, 23, 75, 47], [10, 54, 24, 35, 55, 25], [19, 45, 15, 35, 46, 16], [17, 145, 115, 1, 146, 116], [14, 74, 46, 21, 75, 47], [29, 54, 24, 19, 55, 25], [11, 45, 15, 46, 46, 16], [13, 145, 115, 6, 146, 116], [14, 74, 46, 23, 75, 47], [44, 54, 24, 7, 55, 25], [59, 46, 16, 1, 47, 17], [12, 151, 121, 7, 152, 122], [12, 75, 47, 26, 76, 48], [39, 54, 24, 14, 55, 25], [22, 45, 15, 41, 46, 16], [6, 151, 121, 14, 152, 122], [6, 75, 47, 34, 76, 48], [46, 54, 24, 10, 55, 25], [2, 45, 15, 64, 46, 16], [17, 152, 122, 4, 153, 123], [29, 74, 46, 14, 75, 47], [49, 54, 24, 10, 55, 25], [24, 45, 15, 46, 46, 16], [4, 152, 122, 18, 153, 123], [13, 74, 46, 32, 75, 47], [48, 54, 24, 14, 55, 25], [42, 45, 15, 32, 46, 16], [20, 147, 117, 4, 148, 118], [40, 75, 47, 7, 76, 48], [43, 54, 24, 22, 55, 25], [10, 45, 15, 67, 46, 16], [19, 148, 118, 6, 149, 119], [18, 75, 47, 31, 76, 48], [34, 54, 24, 34, 55, 25], [20, 45, 15, 61, 46, 16]];
+    QRRSBlock.getRSBlocks = function (typeNumber, errorCorrectLevel) {
+        var rsBlock = QRRSBlock.getRsBlockTable(typeNumber, errorCorrectLevel); if (rsBlock == undefined) { throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + errorCorrectLevel); }
+        var length = rsBlock.length / 3; var list = []; for (var i = 0; i < length; i++) { var count = rsBlock[i * 3 + 0]; var totalCount = rsBlock[i * 3 + 1]; var dataCount = rsBlock[i * 3 + 2]; for (var j = 0; j < count; j++) { list.push(new QRRSBlock(totalCount, dataCount)); } }
+        return list;
+    };
+    QRRSBlock.getRsBlockTable = function (typeNumber, errorCorrectLevel) { switch (errorCorrectLevel) { case QRErrorCorrectLevel.L: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0]; case QRErrorCorrectLevel.M: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1]; case QRErrorCorrectLevel.Q: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2]; case QRErrorCorrectLevel.H: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3]; default: return undefined; } };
+    function QRBitBuffer() { this.buffer = []; this.length = 0; }
+    QRBitBuffer.prototype = {
+        get: function (index) { var bufIndex = Math.floor(index / 8); return ((this.buffer[bufIndex] >>> (7 - index % 8)) & 1) == 1; }, put: function (num, length) { for (var i = 0; i < length; i++) { this.putBit(((num >>> (length - i - 1)) & 1) == 1); } }, getLengthInBits: function () { return this.length; }, putBit: function (bit) {
+            var bufIndex = Math.floor(this.length / 8); if (this.buffer.length <= bufIndex) { this.buffer.push(0); }
+            if (bit) { this.buffer[bufIndex] |= (0x80 >>> (this.length % 8)); }
+            this.length++;
+        }
+    };
+    var QRCodeLimitLength = [[17, 14, 11, 7], [32, 26, 20, 14], [53, 42, 32, 24], [78, 62, 46, 34], [106, 84, 60, 44], [134, 106, 74, 58], [154, 122, 86, 64], [192, 152, 108, 84], [230, 180, 130, 98], [271, 213, 151, 119], [321, 251, 177, 137], [367, 287, 203, 155], [425, 331, 241, 177], [458, 362, 258, 194], [520, 412, 292, 220], [586, 450, 322, 250], [644, 504, 364, 280], [718, 560, 394, 310], [792, 624, 442, 338], [858, 666, 482, 382], [929, 711, 509, 403], [1003, 779, 565, 439], [1091, 857, 611, 461], [1171, 911, 661, 511], [1273, 997, 715, 535], [1367, 1059, 751, 593], [1465, 1125, 805, 625], [1528, 1190, 868, 658], [1628, 1264, 908, 698], [1732, 1370, 982, 742], [1840, 1452, 1030, 790], [1952, 1538, 1112, 842], [2068, 1628, 1168, 898], [2188, 1722, 1228, 958], [2303, 1809, 1283, 983], [2431, 1911, 1351, 1051], [2563, 1989, 1423, 1093], [2699, 2099, 1499, 1139], [2809, 2213, 1579, 1219], [2953, 2331, 1663, 1273]];
+
+    // QRCode object
+    QRCode = function (canvasId, vOption) {
+        this._htOption = {
+            width: 256,
+            height: 256,
+            typeNumber: 4,
+            colorDark: "#000000",
+            colorLight: "#ffffff",
+            correctLevel: QRErrorCorrectLevel.H
+        };
+
+        if (typeof vOption === 'string') {
+            vOption = {
+                text: vOption
+            };
+        }
+
+        // Overwrites options
+        if (vOption) {
+            for (var i in vOption) {
+                this._htOption[i] = vOption[i];
+            }
+        }
+
+        this._oQRCode = null;
+        this.canvasId = canvasId
+
+        if (this._htOption.text && this.canvasId) {
+            this.makeCode(this._htOption.text);
+        }
+    };
+
+    QRCode.prototype.makeCode = function (sText, callback) {
+        this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
+        this._oQRCode.addData(sText);
+        this._oQRCode.make();
+        this.makeImage(callback);
+    };
+
+    QRCode.prototype.makeImage = function (callback) {
+        var _oContext
+        if (this._htOption.usingIn) {
+            _oContext = wx.createCanvasContext(this.canvasId, this._htOption.usingIn)
+        }
+        else {
+            _oContext = wx.createCanvasContext(this.canvasId)
+        }
+        var _htOption = this._htOption;
+        var oQRCode = this._oQRCode
+
+        var nCount = oQRCode.getModuleCount();
+        var nWidth = _htOption.width / nCount;
+        var nHeight = _htOption.height / nCount;
+        var nRoundedWidth = Math.round(nWidth);
+        var nRoundedHeight = Math.round(nHeight);
+
+        if (_htOption.image && _htOption.image != '') {
+            _oContext.drawImage(_htOption.image, 0, 0, _htOption.width, _htOption.height)
+        }
+
+        for (var row = 0; row < nCount; row++) {
+            for (var col = 0; col < nCount; col++) {
+                var bIsDark = oQRCode.isDark(row, col);
+                var nLeft = col * nWidth;
+                var nTop = row * nHeight;
+                _oContext.setStrokeStyle(bIsDark ? _htOption.colorDark : _htOption.colorLight)
+                // _oContext.setStrokeStyle('yellow')
+                _oContext.setLineWidth(1)
+                _oContext.setFillStyle(bIsDark ? _htOption.colorDark : _htOption.colorLight)
+                // _oContext.setFillStyle('red')
+                // if (bIsDark) {
+                _oContext.fillRect(nLeft, nTop, nWidth, nHeight);
+                // }
+
+                // 안티 앨리어싱 방지 처리
+                // if (bIsDark) {
+                _oContext.strokeRect(
+                    Math.floor(nLeft) + 0.5,
+                    Math.floor(nTop) + 0.5,
+                    nRoundedWidth,
+                    nRoundedHeight
+                );
+
+                _oContext.strokeRect(
+                    Math.ceil(nLeft) - 0.5,
+                    Math.ceil(nTop) - 0.5,
+                    nRoundedWidth,
+                    nRoundedHeight
+                );
+                // }
+                // _oContext.fillRect(
+                //     Math.floor(nLeft) + 0.5,
+                //     Math.floor(nTop) + 0.5,
+                //     nRoundedWidth,
+                //     nRoundedHeight
+                // );
+                // _oContext.fillRect(
+                //     Math.ceil(nLeft) - 0.5,
+                //     Math.ceil(nTop) - 0.5,
+                //     nRoundedWidth,
+                //     nRoundedHeight
+                // );
+                // _oContext.clearRect(
+                //     Math.floor(nLeft) + 0.5,
+                //     Math.floor(nTop) + 0.5,
+                //     nRoundedWidth,
+                //     nRoundedHeight
+                // );
+                // _oContext.clearRect(
+                //     Math.ceil(nLeft) - 0.5,
+                //     Math.ceil(nTop) - 0.5,
+                //     nRoundedWidth,
+                //     nRoundedHeight
+                // );
+            }
+        }
+
+        _oContext.draw(false, callback)
+    };
+
+    // 保存为图片，将临时路径传给回调
+    QRCode.prototype.exportImage = function (callback) {
+        if (!callback) {
+            return
+        }
+        wx.canvasToTempFilePath({
+            x: 0,
+            y: 0,
+            width: this._htOption.width,
+            height: this._htOption.height,
+            destWidth: this._htOption.width,
+            destHeight: this._htOption.height,
+            canvasId: this.canvasId,
+            success: function (res) {
+                callback(res.tempFilePath)
+            },
+            fail:res=>{
+                console.log(res)
+            }
+        }, this._htOption.usingIn)
+    }
+
+    QRCode.CorrectLevel = QRErrorCorrectLevel;
+})();
+
+module.exports = QRCode
\ No newline at end of file
diff --git a/utils/weapp.qrcode.esm.js b/utils/weapp.qrcode.esm.js
new file mode 100644
index 0000000..46c52be
--- /dev/null
+++ b/utils/weapp.qrcode.esm.js
@@ -0,0 +1,5 @@
+/**
+ * weapp.qrcode.js v1.1.1 (undefined)
+ */
+
+var hasOwn=Object.prototype.hasOwnProperty,toStr=Object.prototype.toString,defineProperty=Object.defineProperty,gOPD=Object.getOwnPropertyDescriptor,isArray=function(t){return"function"==typeof Array.isArray?Array.isArray(t):"[object Array]"===toStr.call(t)},isPlainObject=function(t){if(!t||"[object Object]"!==toStr.call(t))return!1;var e,r=hasOwn.call(t,"constructor"),o=t.constructor&&t.constructor.prototype&&hasOwn.call(t.constructor.prototype,"isPrototypeOf");if(t.constructor&&!r&&!o)return!1;for(e in t);return void 0===e||hasOwn.call(t,e)},setProperty=function(t,e){defineProperty&&"__proto__"===e.name?defineProperty(t,e.name,{enumerable:!0,configurable:!0,value:e.newValue,writable:!0}):t[e.name]=e.newValue},getProperty=function(t,e){if("__proto__"===e){if(!hasOwn.call(t,e))return;if(gOPD)return gOPD(t,e).value}return t[e]},extend=function t(){var e,r,o,n,i,a,s=arguments[0],u=1,l=arguments.length,h=!1;for("boolean"==typeof s&&(h=s,s=arguments[1]||{},u=2),(null==s||"object"!=typeof s&&"function"!=typeof s)&&(s={});u<l;++u)if(null!=(e=arguments[u]))for(r in e)o=getProperty(s,r),s!==(n=getProperty(e,r))&&(h&&n&&(isPlainObject(n)||(i=isArray(n)))?(i?(i=!1,a=o&&isArray(o)?o:[]):a=o&&isPlainObject(o)?o:{},setProperty(s,{name:r,newValue:t(h,a,n)})):void 0!==n&&setProperty(s,{name:r,newValue:n}));return s};function QR8bitByte(t){this.mode=QRMode.MODE_8BIT_BYTE,this.data=t}function QRCode(t,e){this.typeNumber=t,this.errorCorrectLevel=e,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=new Array}QR8bitByte.prototype={getLength:function(t){return this.data.length},write:function(t){for(var e=0;e<this.data.length;e++)t.put(this.data.charCodeAt(e),8)}},QRCode.prototype={addData:function(t){var e=new QR8bitByte(t);this.dataList.push(e),this.dataCache=null},isDark:function(t,e){if(t<0||this.moduleCount<=t||e<0||this.moduleCount<=e)throw new Error(t+","+e);return this.modules[t][e]},getModuleCount:function(){return this.moduleCount},make:function(){if(this.typeNumber<1){var t=1;for(t=1;t<40;t++){for(var e=QRRSBlock.getRSBlocks(t,this.errorCorrectLevel),r=new QRBitBuffer,o=0,n=0;n<e.length;n++)o+=e[n].dataCount;for(n=0;n<this.dataList.length;n++){var i=this.dataList[n];r.put(i.mode,4),r.put(i.getLength(),QRUtil.getLengthInBits(i.mode,t)),i.write(r)}if(r.getLengthInBits()<=8*o)break}this.typeNumber=t}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(t,e){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var r=0;r<this.moduleCount;r++){this.modules[r]=new Array(this.moduleCount);for(var o=0;o<this.moduleCount;o++)this.modules[r][o]=null}this.setupPositionProbePattern(0,0),this.setupPositionProbePattern(this.moduleCount-7,0),this.setupPositionProbePattern(0,this.moduleCount-7),this.setupPositionAdjustPattern(),this.setupTimingPattern(),this.setupTypeInfo(t,e),this.typeNumber>=7&&this.setupTypeNumber(t),null==this.dataCache&&(this.dataCache=QRCode.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,e)},setupPositionProbePattern:function(t,e){for(var r=-1;r<=7;r++)if(!(t+r<=-1||this.moduleCount<=t+r))for(var o=-1;o<=7;o++)e+o<=-1||this.moduleCount<=e+o||(this.modules[t+r][e+o]=0<=r&&r<=6&&(0==o||6==o)||0<=o&&o<=6&&(0==r||6==r)||2<=r&&r<=4&&2<=o&&o<=4)},getBestMaskPattern:function(){for(var t=0,e=0,r=0;r<8;r++){this.makeImpl(!0,r);var o=QRUtil.getLostPoint(this);(0==r||t>o)&&(t=o,e=r)}return e},createMovieClip:function(t,e,r){var o=t.createEmptyMovieClip(e,r);this.make();for(var n=0;n<this.modules.length;n++)for(var i=1*n,a=0;a<this.modules[n].length;a++){var s=1*a;this.modules[n][a]&&(o.beginFill(0,100),o.moveTo(s,i),o.lineTo(s+1,i),o.lineTo(s+1,i+1),o.lineTo(s,i+1),o.endFill())}return o},setupTimingPattern:function(){for(var t=8;t<this.moduleCount-8;t++)null==this.modules[t][6]&&(this.modules[t][6]=t%2==0);for(var e=8;e<this.moduleCount-8;e++)null==this.modules[6][e]&&(this.modules[6][e]=e%2==0)},setupPositionAdjustPattern:function(){for(var t=QRUtil.getPatternPosition(this.typeNumber),e=0;e<t.length;e++)for(var r=0;r<t.length;r++){var o=t[e],n=t[r];if(null==this.modules[o][n])for(var i=-2;i<=2;i++)for(var a=-2;a<=2;a++)this.modules[o+i][n+a]=-2==i||2==i||-2==a||2==a||0==i&&0==a}},setupTypeNumber:function(t){for(var e=QRUtil.getBCHTypeNumber(this.typeNumber),r=0;r<18;r++){var o=!t&&1==(e>>r&1);this.modules[Math.floor(r/3)][r%3+this.moduleCount-8-3]=o}for(r=0;r<18;r++){o=!t&&1==(e>>r&1);this.modules[r%3+this.moduleCount-8-3][Math.floor(r/3)]=o}},setupTypeInfo:function(t,e){for(var r=this.errorCorrectLevel<<3|e,o=QRUtil.getBCHTypeInfo(r),n=0;n<15;n++){var i=!t&&1==(o>>n&1);n<6?this.modules[n][8]=i:n<8?this.modules[n+1][8]=i:this.modules[this.moduleCount-15+n][8]=i}for(n=0;n<15;n++){i=!t&&1==(o>>n&1);n<8?this.modules[8][this.moduleCount-n-1]=i:n<9?this.modules[8][15-n-1+1]=i:this.modules[8][15-n-1]=i}this.modules[this.moduleCount-8][8]=!t},mapData:function(t,e){for(var r=-1,o=this.moduleCount-1,n=7,i=0,a=this.moduleCount-1;a>0;a-=2)for(6==a&&a--;;){for(var s=0;s<2;s++)if(null==this.modules[o][a-s]){var u=!1;i<t.length&&(u=1==(t[i]>>>n&1)),QRUtil.getMask(e,o,a-s)&&(u=!u),this.modules[o][a-s]=u,-1==--n&&(i++,n=7)}if((o+=r)<0||this.moduleCount<=o){o-=r,r=-r;break}}}},QRCode.PAD0=236,QRCode.PAD1=17,QRCode.createData=function(t,e,r){for(var o=QRRSBlock.getRSBlocks(t,e),n=new QRBitBuffer,i=0;i<r.length;i++){var a=r[i];n.put(a.mode,4),n.put(a.getLength(),QRUtil.getLengthInBits(a.mode,t)),a.write(n)}var s=0;for(i=0;i<o.length;i++)s+=o[i].dataCount;if(n.getLengthInBits()>8*s)throw new Error("code length overflow. ("+n.getLengthInBits()+">"+8*s+")");for(n.getLengthInBits()+4<=8*s&&n.put(0,4);n.getLengthInBits()%8!=0;)n.putBit(!1);for(;!(n.getLengthInBits()>=8*s||(n.put(QRCode.PAD0,8),n.getLengthInBits()>=8*s));)n.put(QRCode.PAD1,8);return QRCode.createBytes(n,o)},QRCode.createBytes=function(t,e){for(var r=0,o=0,n=0,i=new Array(e.length),a=new Array(e.length),s=0;s<e.length;s++){var u=e[s].dataCount,l=e[s].totalCount-u;o=Math.max(o,u),n=Math.max(n,l),i[s]=new Array(u);for(var h=0;h<i[s].length;h++)i[s][h]=255&t.buffer[h+r];r+=u;var f=QRUtil.getErrorCorrectPolynomial(l),g=new QRPolynomial(i[s],f.getLength()-1).mod(f);a[s]=new Array(f.getLength()-1);for(h=0;h<a[s].length;h++){var c=h+g.getLength()-a[s].length;a[s][h]=c>=0?g.get(c):0}}var d=0;for(h=0;h<e.length;h++)d+=e[h].totalCount;var R=new Array(d),m=0;for(h=0;h<o;h++)for(s=0;s<e.length;s++)h<i[s].length&&(R[m++]=i[s][h]);for(h=0;h<n;h++)for(s=0;s<e.length;s++)h<a[s].length&&(R[m++]=a[s][h]);return R};for(var QRMode={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},QRErrorCorrectLevel={L:1,M:0,Q:3,H:2},QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},QRUtil={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(t){for(var e=t<<10;QRUtil.getBCHDigit(e)-QRUtil.getBCHDigit(QRUtil.G15)>=0;)e^=QRUtil.G15<<QRUtil.getBCHDigit(e)-QRUtil.getBCHDigit(QRUtil.G15);return(t<<10|e)^QRUtil.G15_MASK},getBCHTypeNumber:function(t){for(var e=t<<12;QRUtil.getBCHDigit(e)-QRUtil.getBCHDigit(QRUtil.G18)>=0;)e^=QRUtil.G18<<QRUtil.getBCHDigit(e)-QRUtil.getBCHDigit(QRUtil.G18);return t<<12|e},getBCHDigit:function(t){for(var e=0;0!=t;)e++,t>>>=1;return e},getPatternPosition:function(t){return QRUtil.PATTERN_POSITION_TABLE[t-1]},getMask:function(t,e,r){switch(t){case QRMaskPattern.PATTERN000:return(e+r)%2==0;case QRMaskPattern.PATTERN001:return e%2==0;case QRMaskPattern.PATTERN010:return r%3==0;case QRMaskPattern.PATTERN011:return(e+r)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(e/2)+Math.floor(r/3))%2==0;case QRMaskPattern.PATTERN101:return e*r%2+e*r%3==0;case QRMaskPattern.PATTERN110:return(e*r%2+e*r%3)%2==0;case QRMaskPattern.PATTERN111:return(e*r%3+(e+r)%2)%2==0;default:throw new Error("bad maskPattern:"+t)}},getErrorCorrectPolynomial:function(t){for(var e=new QRPolynomial([1],0),r=0;r<t;r++)e=e.multiply(new QRPolynomial([1,QRMath.gexp(r)],0));return e},getLengthInBits:function(t,e){if(1<=e&&e<10)switch(t){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:case QRMode.MODE_KANJI:return 8;default:throw new Error("mode:"+t)}else if(e<27)switch(t){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw new Error("mode:"+t)}else{if(!(e<41))throw new Error("type:"+e);switch(t){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw new Error("mode:"+t)}}},getLostPoint:function(t){for(var e=t.getModuleCount(),r=0,o=0;o<e;o++)for(var n=0;n<e;n++){for(var i=0,a=t.isDark(o,n),s=-1;s<=1;s++)if(!(o+s<0||e<=o+s))for(var u=-1;u<=1;u++)n+u<0||e<=n+u||0==s&&0==u||a==t.isDark(o+s,n+u)&&i++;i>5&&(r+=3+i-5)}for(o=0;o<e-1;o++)for(n=0;n<e-1;n++){var l=0;t.isDark(o,n)&&l++,t.isDark(o+1,n)&&l++,t.isDark(o,n+1)&&l++,t.isDark(o+1,n+1)&&l++,0!=l&&4!=l||(r+=3)}for(o=0;o<e;o++)for(n=0;n<e-6;n++)t.isDark(o,n)&&!t.isDark(o,n+1)&&t.isDark(o,n+2)&&t.isDark(o,n+3)&&t.isDark(o,n+4)&&!t.isDark(o,n+5)&&t.isDark(o,n+6)&&(r+=40);for(n=0;n<e;n++)for(o=0;o<e-6;o++)t.isDark(o,n)&&!t.isDark(o+1,n)&&t.isDark(o+2,n)&&t.isDark(o+3,n)&&t.isDark(o+4,n)&&!t.isDark(o+5,n)&&t.isDark(o+6,n)&&(r+=40);var h=0;for(n=0;n<e;n++)for(o=0;o<e;o++)t.isDark(o,n)&&h++;return r+=10*(Math.abs(100*h/e/e-50)/5)}},QRMath={glog:function(t){if(t<1)throw new Error("glog("+t+")");return QRMath.LOG_TABLE[t]},gexp:function(t){for(;t<0;)t+=255;for(;t>=256;)t-=255;return QRMath.EXP_TABLE[t]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},i=0;i<8;i++)QRMath.EXP_TABLE[i]=1<<i;for(i=8;i<256;i++)QRMath.EXP_TABLE[i]=QRMath.EXP_TABLE[i-4]^QRMath.EXP_TABLE[i-5]^QRMath.EXP_TABLE[i-6]^QRMath.EXP_TABLE[i-8];for(i=0;i<255;i++)QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]]=i;function QRPolynomial(t,e){if(void 0==t.length)throw new Error(t.length+"/"+e);for(var r=0;r<t.length&&0==t[r];)r++;this.num=new Array(t.length-r+e);for(var o=0;o<t.length-r;o++)this.num[o]=t[o+r]}function QRRSBlock(t,e){this.totalCount=t,this.dataCount=e}function QRBitBuffer(){this.buffer=new Array,this.length=0}function utf16to8(t){var e,r,o,n;for(e="",o=t.length,r=0;r<o;r++)(n=t.charCodeAt(r))>=1&&n<=127?e+=t.charAt(r):n>2047?(e+=String.fromCharCode(224|n>>12&15),e+=String.fromCharCode(128|n>>6&63),e+=String.fromCharCode(128|n>>0&63)):(e+=String.fromCharCode(192|n>>6&31),e+=String.fromCharCode(128|n>>0&63));return e}function drawQrcode(t,e){if(t=t||{},(t=extend(!0,{canvasId:"myQrcode",text:"爱一个人就要勇敢说出来",width:260,height:260,padding:20,typeNumber:-1,correctLevel:QRErrorCorrectLevel.H,background:"#ffffff",foreground:"#000000",image:{imageResource:"",width:80,height:80,round:!0}},t)).canvasId||t.canvas){if(t.paddingColor||(t.paddingColor=t.background),e){var r=new QRCode(t.typeNumber,t.correctLevel);return r.addData(utf16to8(t.text)),r.make(),new Promise(function(t,e){t(r)})}return new Promise(function(e,r){return e(function(){var e=new QRCode(t.typeNumber,t.correctLevel);e.addData(utf16to8(t.text)),e.make();const r=wx.getSystemInfoSync().pixelRatio;var o=t.canvas;const n=o.getContext("2d");o.width=t.width*r,o.height=t.width*r;const i=o.width;n.fillStyle=t.paddingColor,n.fillRect(0,0,i+2*t.padding,i+2*t.padding);for(var a=(i-2*t.padding)/e.getModuleCount(),s=(i-2*t.padding)/e.getModuleCount(),u=0;u<e.getModuleCount();u++)for(var l=0;l<e.getModuleCount();l++){n.fillStyle=e.isDark(u,l)?t.foreground:t.background;var h=Math.ceil((l+1)*a)-Math.floor(l*a),f=Math.ceil((u+1)*a)-Math.floor(u*a);n.fillRect(Math.round(l*a)+t.padding,Math.round(u*s)+t.padding,h,f)}if(t.image.imageResource){const e=t.image.width*r,o=t.image.height*r,a=(i-e)/2,s=(i-o)/2;if(t.image.round){const o=t.image.width*r+30,u=(i-o)/2,l=o/2,h=u+l;n.beginPath(),n.arc(h,h,l,0,2*Math.PI),n.fillStyle="#ffffff",n.fill(),n.restore();const f=e/2,g=a+f,c=s+f;n.beginPath(),n.arc(g,c,f,0,2*Math.PI),n.clip(),n.drawImage(t.image.imageResource,a,s,e,e),n.restore()}else n.drawImage(t.image.imageResource,a,s,e,o),n.restore()}return n}())})}console.warn("please set canvasId or canvas!")}QRPolynomial.prototype={get:function(t){return this.num[t]},getLength:function(){return this.num.length},multiply:function(t){for(var e=new Array(this.getLength()+t.getLength()-1),r=0;r<this.getLength();r++)for(var o=0;o<t.getLength();o++)e[r+o]^=QRMath.gexp(QRMath.glog(this.get(r))+QRMath.glog(t.get(o)));return new QRPolynomial(e,0)},mod:function(t){if(this.getLength()-t.getLength()<0)return this;for(var e=QRMath.glog(this.get(0))-QRMath.glog(t.get(0)),r=new Array(this.getLength()),o=0;o<this.getLength();o++)r[o]=this.get(o);for(o=0;o<t.getLength();o++)r[o]^=QRMath.gexp(QRMath.glog(t.get(o))+e);return new QRPolynomial(r,0).mod(t)}},QRRSBlock.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],QRRSBlock.getRSBlocks=function(t,e){var r=QRRSBlock.getRsBlockTable(t,e);if(void 0==r)throw new Error("bad rs block @ typeNumber:"+t+"/errorCorrectLevel:"+e);for(var o=r.length/3,n=new Array,i=0;i<o;i++)for(var a=r[3*i+0],s=r[3*i+1],u=r[3*i+2],l=0;l<a;l++)n.push(new QRRSBlock(s,u));return n},QRRSBlock.getRsBlockTable=function(t,e){switch(e){case QRErrorCorrectLevel.L:return QRRSBlock.RS_BLOCK_TABLE[4*(t-1)+0];case QRErrorCorrectLevel.M:return QRRSBlock.RS_BLOCK_TABLE[4*(t-1)+1];case QRErrorCorrectLevel.Q:return QRRSBlock.RS_BLOCK_TABLE[4*(t-1)+2];case QRErrorCorrectLevel.H:return QRRSBlock.RS_BLOCK_TABLE[4*(t-1)+3];default:return}},QRBitBuffer.prototype={get:function(t){var e=Math.floor(t/8);return 1==(this.buffer[e]>>>7-t%8&1)},put:function(t,e){for(var r=0;r<e;r++)this.putBit(1==(t>>>e-r-1&1))},getLengthInBits:function(){return this.length},putBit:function(t){var e=Math.floor(this.length/8);this.buffer.length<=e&&this.buffer.push(0),t&&(this.buffer[e]|=128>>>this.length%8),this.length++}};export default drawQrcode;