From 0931daa2206745c30c922f2d594e4702b7e8ae9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Fri, 10 Jun 2022 11:47:53 +0800
Subject: [PATCH] up

---
 packageA/pages/generalList/generalList.vue    |  379 ++++-
 .../pages/generalPatrol/generalPatrol.vue     |  144 +-
 packageA/pages/generalPatrol/viewPatrol.vue   |    8 +
 pages.json                                    |    8 +
 pages/index/index.vue                         |   21 +-
 pages/login/login.vue                         |   29 +-
 pages/mine/mine.vue                           |  146 +-
 utils/BasePage.js                             |   11 -
 utils/WeChat.js                               |   10 -
 utils/qrcode.js                               | 1441 +++++++++++++++++
 utils/util.js                                 |  321 ++--
 utils/util.wxs                                |  120 --
 utils/weapp-qrcode.js                         | 1004 ------------
 13 files changed, 2148 insertions(+), 1494 deletions(-)
 create mode 100644 packageA/pages/generalPatrol/viewPatrol.vue
 delete mode 100755 utils/BasePage.js
 delete mode 100755 utils/WeChat.js
 create mode 100644 utils/qrcode.js
 delete mode 100755 utils/util.wxs
 delete mode 100755 utils/weapp-qrcode.js

diff --git a/packageA/pages/generalList/generalList.vue b/packageA/pages/generalList/generalList.vue
index a17f51e..6901162 100644
--- a/packageA/pages/generalList/generalList.vue
+++ b/packageA/pages/generalList/generalList.vue
@@ -1,97 +1,338 @@
 <template>
-	<view class="content">
-		<map id="map" class="map" style="width: 100%;height: 100vh;"  :show-location="true" :latitude="latitude" :longitude="longitude"></map>
+	<view class="boxContent">
+
+		<view class="box-header">
+			<view class="search-wrap">
+				<!-- 如果使用u-search组件，必须要给v-model绑定一个变量 -->
+				<u-search v-model="keyword" placeholder="地址/河道等" @change="tosearch()" @search="tosearch()" height="56"
+					:action-style="{color: '#fff'}">
+				</u-search>
+			</view>
+			<u-dropdown ref="uDropdown" :close-on-click-mask="mask">
+				<u-dropdown-item title="问题类型">
+					<view class="slot-content">
+						<view class="item-box">
+							<view class="item" :class="[item.active ? 'active' : '']" @tap="tagClick(index)"
+								v-for="(item, index) in options1" :key="index">
+								{{item.label}}
+							</view>
+						</view>
+						<u-button type="primary" @click="tosearch">确定</u-button>
+					</view>
+				</u-dropdown-item>
+				<u-dropdown-item v-model="value3" :title="value3==''?'工单状态':value3" @change="toChangeStatus()"
+					:options="options3">
+				</u-dropdown-item>
+			</u-dropdown>
+		</view>
+		<view class="list" style="padding-top: 188rpx;">
+			<block v-for="(item, index) in dataList">
+				<u-card :title="item.created_at" @click="todetail(item.id)" padding="20" margin="20rpx" :border="true"
+					:sub-title="item.created_at" :thumb="thumb" thumb-width="36">
+					<view class="" slot="body">
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">问题类别：</view>
+							</u-col>
+							<u-col span="3">
+								<view class="demo-layout bg-purple-light">{{item.feedback_department.name}}</view>
+							</u-col>
+							<u-col span="3">
+								<view class="demo-layout bg-purple">问题内容：</view>
+							</u-col>
+							<u-col span="3">
+								<view class="demo-layout bg-purple-light">{{item.created_at}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">反馈科室：</view>
+							</u-col>
+							<u-col span="3">
+								<view class="demo-layout bg-purple-light">{{item.feedback_department.name}}</view>
+							</u-col>
+							<u-col span="3">
+								<view class="demo-layout bg-purple">提交日期：</view>
+							</u-col>
+							<u-col span="3">
+								<view class="demo-layout bg-purple-light">{{item.created_at}}</view>
+							</u-col>
+						</u-row>
+						<u-row gutter="16">
+							<u-col span="3">
+								<view class="demo-layout bg-purple">描述：</view>
+							</u-col>
+							<u-col span="9">
+								<view class="demo-layout bg-purple-light">{{item.content}}</view>
+							</u-col>
+						</u-row>
+					</view>
+					<view class="footer" slot="foot">
+						<block >
+							<u-button type="primary"  size="mini"
+								@click="toOperate(item.id)" :ripple="true">工单处理
+							</u-button>
+						</block>
+						<block >
+							<u-button type="primary"  size="mini" @click="toAssin(item.id)"
+								:custom-style="customStyle" :ripple="true">工单分配
+							</u-button>
+						</block>
+					</view>
+				</u-card>
+
+			</block>
+
+			<u-empty text="暂无数据" margin-top="200" v-if="dataList.length==0" mode="list"></u-empty>
+		</view>
 	</view>
+
+
 </template>
 
 <script>
-	const img = '../../../static/img/logo.png';
-
 	export default {
 		data() {
 			return {
-				latitude: 23.099994,
-				longitude: 113.324520,
+				background: {
+					backgroundColor: '#007AFF'
+				},
+				mask: true,
+				dataList: [],
+				thumb: "/static/img/location.png",
+				currentPage: 0,
+				customStyle: {
+					marginLeft: '20px'
+				},
+				currentRole: "inspector", //前端用户角色：inspector巡查员，manager管理员，operator现场处置人员
+				value1Arr: [],
+				value1: "",
+				value2: '',
+				value3: '',
+				value3v: '',
+				keyword: "",
+				title: "",
+				stat: [],
+				options1: [],
+				options2: [],
+				options3: [{
+					label: "所有",
+					value: "所有",
+					v: ""
+				}, {
+					label: "待处理",
+					value: "待处理",
+					v: "save"
+				}, {
+					label: "处理中",
+					value: "处理中",
+					v: "ongong"
+				}, {
+					label: "已处理",
+					value: "已处理",
+					v: "finashed"
+				}]
 			}
 		},
-		onReady() {
-			this._mapContext = uni.createMapContext("map", this);
-
-			// 仅调用初始化，才会触发 on.("markerClusterCreate", (e) => {})
-			this._mapContext.initMarkerCluster({
-				enableDefaultStyle: false,
-				zoomOnClick: true,
-				gridSize: 60,
-				complete(res) {
-					console.log('initMarkerCluster', res)
+		onReachBottom: function(e) {
+			this.loadPage(this.currentPage + 1);
+		},
+		onPullDownRefresh: function(e) {
+			this.loadPage(1);
+		},
+		onShow: function() {
+			var that = this;
+		},
+		onLoad(options) {
+			this.loadPage(1);
+		},
+		methods: {
+			toChangeStatus: function(value) {
+				var jsonSearch = this.options3.filter(function(e) {
+					return e.value == value;
+				});
+				this.value3v = jsonSearch[0].v;
+				console.log(jsonSearch)
+				this.loadPage(1)
+				this.$refs.uDropdown.close();
+			},
+			tosearch() {
+				this.value1Arr = [];
+				for (var m of this.options1) {
+					if (m.active) {
+						this.value1Arr.push(m.value);
+					}
 				}
-			});
+				this.loadPage(1)
+				this.$refs.uDropdown.close();
+			},
+			tagClick(index) {
+				this.options1[index].active = !this.options1[index].active;
+			},
+			loadAreaList: function() {
+				var that = this;
+				that.options1 = [];
+				this.util.request({
+					api: 'worker/get-zones',
+					utilSuccess: function(res) {
+						for (var m of res) {
+							that.options1.push({
+								label: m.name,
+								value: m.id,
+								active: false
+							});
+						}
+					},
+					utilFail: function(res) {
+						console.log(res)
+					}
+				});
+			},
 
-			this._mapContext.on("markerClusterCreate", (e) => {
-				console.log("markerClusterCreate", e);
-			});
+			toAssin: function(id) {
+				uni.navigateTo({
+					url: "../assign/assign?id=" + id
+				})
+			},
+			toOperate: function(id) {
+				uni.navigateTo({
+					url: "../operate/operate?id=" + id
+				})
+			},
+			add: function() {
+				uni.navigateTo({
+					url: "../addPatrol/addPatrol"
+				})
+			},
+			todetail: function(id) {
+				uni.navigateTo({
+					url: "../patrolInfo/info?id=" + id
+				})
+			},
+			loadPage: function(page) {
+				uni.hideKeyboard()
+				var that = this;
+				this.util.request({
+					bindThis: that,
+					api: '/api/mobile/common-inspection/index',
+					customLoading: false,
+					data: {
+						page: page,
+						page_size: 5,
+						keyword: that.keyword
+					},
+					utilSuccess: function(r) {
+						var res = r.data;
+						uni.stopPullDownRefresh(); // 服务器总条数 < 每页条数, 会将第一页的条数重新返回
 
-			this.addMarkers();
-		},
-		methods: {
+						var hasNoMore = that.dataList.length < 5 && page > 1;
+						if (hasNoMore || res.length == 0 && page > 1) {
+							// 已加载到最后一页
+							uni.showToast({
+								title: '已加载到最后一页',
+								icon: 'none'
+							});
+							return;
+						}
+						var dataList = that.dataList;
 
-			addMarkers() {
-				const marker = {
-					id: 1,
-					iconPath: img,
-					width: 50,
-					height: 50,
-					joinCluster: true, // 指定了该参数才会参与聚合
-					label: {
-						width: 50,
-						height: 30,
-						borderWidth: 1,
-						borderRadius: 10,
-						bgColor: '#ffffff'
-					}
-				};
 
-				const positions = [{
-					latitude: 23.099994,
-					longitude: 113.324520,
-				}, {
-					latitude: 23.099994,
-					longitude: 113.322520,
-				}, {
-					latitude: 23.099994,
-					longitude: 113.326520,
-				}, {
-					latitude: 23.096994,
-					longitude: 113.329520,
-				}]
+						if (page == 1) {
+							dataList = res;
+						} else {
+							dataList.push(...res);
+						}
+						for (var m of dataList) {
+							m.created_at = m.created_at.split("T")[0]
+						}
+						console.log(dataList)
 
-				const markers = []
+						that.currentPage = page;
+						that.dataList = dataList;
+					},
+					utilFail: function(res) {
+						uni.stopPullDownRefresh();
 
-				positions.forEach((p, i) => {
-					const newMarker = Object.assign(marker, p)
-					newMarker.id = i + 1
-					newMarker.label.content = `label ${i + 1}`
-					markers.push(newMarker)
+						if (page == 1) {
 
-					this._mapContext.addMarkers({
-						markers,
-						clear: false,
-						complete(res) {
-							console.log('addMarkers', res)
+							that.currentPage = page;
 						}
-					})
-				})
+
+						this.util.alert(res);
+					}
+				});
 			}
+
 		}
+
 	}
 </script>
-
 <style>
-	.content {
-		flex: 1;
+	.boxContent {
+		background: #f3f4f6;
+		min-height: 100vh;
 	}
 
-	.map {
-		flex: 1;
+	.footer {
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.box-header {
+
+		position: fixed;
+		top: 0;
+		width: 100%;
+		z-index: 99;
+	}
+
+
+	.u-row {
+		margin: 10rpx 0;
+		font-size: 28rpx;
+	}
+	.u-card{
+		z-index: 1;
+	}
+</style>
+
+
+<style scoped lang="scss">
+	.search-wrap {
+		background: #007AFF;
+		padding: 20rpx;
+	}
+
+	.u-config-wrap {
+		padding: 30rpx;
+	}
+
+	.bg-purple {
+		font-weight: bold;
+	}
+
+	.slot-content {
+		background-color: #FFFFFF;
+		padding: 24rpx;
+
+		.item-box {
+			margin-bottom: 50rpx;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.item {
+				border: 1px solid $u-type-primary;
+				color: $u-type-primary;
+				padding: 8rpx 40rpx;
+				border-radius: 100rpx;
+				margin-top: 30rpx;
+			}
+
+			.active {
+				color: #FFFFFF;
+				background-color: $u-type-primary;
+			}
+		}
 	}
 </style>
diff --git a/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue
index 6f80ea1..88bd2db 100644
--- a/packageA/pages/generalPatrol/generalPatrol.vue
+++ b/packageA/pages/generalPatrol/generalPatrol.vue
@@ -1,24 +1,35 @@
 <template>
 	<view class="content">
 		<u-form :model="form" ref="uForm">
-			<u-form-item label="问题类型" label-position="top">
+			<u-form-item label="问题类型" label-position="top" prop="typeName" required>
 				<u-input v-model="form.typeName" type="select" :border="true" @click="typeshow = true" />
 				<u-select v-model="typeshow" mode="single-column" value-name="id" label-name="value" :list="plist"
 					@confirm="confirmType"></u-select>
 			</u-form-item>
-			<u-form-item label="问题内容" label-position="top">
+			<u-form-item label="问题内容" label-position="top" prop="contentName" required>
 				<u-input v-model="form.contentName" type="select" :border="true" @click="contentshow = true" />
-				<u-select v-model="contentshow" mode="single-column" value-name="id" label-name="value" :list="list" @confirm="confirmContent"></u-select>
+				<u-select v-model="contentshow" mode="single-column" value-name="id" label-name="value" :list="list"
+					@confirm="confirmContent"></u-select>
 			</u-form-item>
-			<u-form-item label="位置" label-position="top">
+			<u-form-item label="位置" label-position="top" required>
 				<text>江苏省苏州市通园路66号</text>
 				<u-button shape="square" slot='right' size="mini" @click="toshowMap" type="info">重新获取</u-button>
 			</u-form-item>
-			<u-form-item label-position="top" label="描述" prop="intro">
-				<u-input v-model="form.intro" type='textarea' height='100' :border="true" />
+			<u-form-item label-position="top" label="描述" prop="content">
+				<u-input v-model="form.content" type='textarea' height='100' :border="true" />
 			</u-form-item>
-			<u-form-item label-position="top" label="附件上传" prop="intro">
-				<u-upload ref="uUpload" :action="action" upload-text="选择附件" :show-tips="false"></u-upload>
+			<u-form-item label-position="top" label="附件上传">
+				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
+					:previewFullImage="true" :form-data="otherData" :show-tips="false" @on-uploaded="toupload"
+					@on-remove="toremove">
+				</u-upload>
+			</u-form-item>
+
+			<u-form-item label="反馈科室" label-position="top" required>
+				<u-input v-model="form.unitName" placeholder="请选择反馈科室" type="select" :border="true"
+					@click="unitshow = true" />
+				<u-select v-model="unitshow" mode="single-column" value-name="id" label-name="name" :list="listUnit"
+					@confirm="confirmUnit"></u-select>
 			</u-form-item>
 		</u-form>
 		<u-button type="primary" @click="submit">提交</u-button>
@@ -40,6 +51,10 @@
 	export default {
 		data() {
 			return {
+				otherData: {
+					token: ""
+				},
+				unitshow: false,
 				showMap: false,
 				typeshow: false,
 				contentshow: false,
@@ -47,14 +62,37 @@
 				location: {},
 				plist: [],
 				list: [],
+				listUnit: [],
 				form: {
-					type: "",
-					content: "",
+					unitName: "",
+					ask_type_id: "",
+					ask_content_id: "",
 					typeName: "",
-					contentName: ""
+					contentName: "",
+					content: "",
+					feedback_department_id: "",
+					longitude: "",
+					latitude: "",
+					files_list: [],
+					address: ""
 				},
 				width: 300,
-				height: 300
+				height: 300,
+				action: "",
+				rules: {
+					typeName: [{
+						required: true,
+						message: '请选择类型',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['change', 'blur'],
+					}],
+					contentName: [{
+						required: true,
+						message: '请选择内容',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['change', 'blur'],
+					}]
+				}
 			}
 		},
 		onLoad() {
@@ -64,14 +102,20 @@
 			}, function(res) {
 				that.plist = res;
 			});
+			this.action = this.util.HOST + "/api/mobile/upload-file";
+			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
+			this.loadUnit();
 		},
 		onReady() {
+			this.$refs.uForm.setRules(this.rules);
 			this._mapContext = uni.createMapContext("map", this);
 			let that = this;
 			uni.getLocation({
 				type: "gcj02",
 				success(res) {
 					that.location = res;
+					that.form.latitude = res.latitude;
+					that.form.longitude = res.longitude;
 				}
 			})
 			uni.getSystemInfo({
@@ -83,6 +127,31 @@
 
 		},
 		methods: {
+			toremove(index, lists, nam) {
+				console.log(lists);
+				let list = [];
+				for (var m of lists) {
+					list.push({
+						upload_id: m.response.id
+					})
+				}
+				this.form.files_list = list;
+			},
+			toupload(lists, name) {
+				console.log(lists)
+				let list = [];
+				for (var m of lists) {
+					list.push({
+						upload_id: m.response.id
+					})
+				}
+				this.form.files_list = list;
+			},
+			confirmUnit(e) {
+				var that = this;
+				this.form.feedback_department_id = e[0].value
+				this.form.unitName = e[0].label
+			},
 			loadType(data, call) {
 				let that = this;
 				this.util.request({
@@ -96,14 +165,59 @@
 					}
 				});
 			},
+			loadUnit() {
+				let that = this;
+				this.util.request({
+					api: '/api/mobile/other/department-list',
+					utilSuccess: function(res) {
+						that.listUnit = res;
+					},
+					utilFail: function(res) {
+						this.util.alert(res);
+					}
+				});
+
+			},
 			toshowMap() {
 				this.showMap = true;
 				this.addMaker();
 			},
-			submit() {},
+			submit() {
+				let that = this;
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						console.log('验证通过');
+						that.util.request({
+							api: '/api/mobile/common-inspection/store',
+							method: "POST",
+							data: that.form,
+							utilSuccess: function(res) {
+								uni.showToast({
+									icon: "none",
+									title: "提交成功",
+									complete() {
+										that.afterSubmit(res);
+									},
+									duration: 2000
+								})
+							},
+							utilFail: function(res) {
+								this.util.alert(res);
+							}
+						});
+					} else {
+						console.log('验证失败');
+					}
+				});
+			},
+			afterSubmit(res) {
+				uni.redirectTo({
+					url: "../generalList/generalList"
+				})
+			},
 			confirmType(e) {
 				var that = this;
-				this.form.type = e[0].value
+				this.form.ask_type_id = e[0].value
 				this.form.typeName = e[0].label
 				this.loadType({
 					pid: e[0].value
@@ -112,7 +226,7 @@
 				})
 			},
 			confirmContent(e) {
-				this.form.content = e[0].value
+				this.form.ask_content_id = e[0].value
 				this.form.contentName = e[0].label
 			},
 			addMaker() {
diff --git a/packageA/pages/generalPatrol/viewPatrol.vue b/packageA/pages/generalPatrol/viewPatrol.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/packageA/pages/generalPatrol/viewPatrol.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d1c0f11..c568d23 100644
--- a/pages.json
+++ b/pages.json
@@ -47,6 +47,14 @@
 				"navigationStyle": "custom"
 			}
 
+		}, {
+			"path": "generalPatrol/viewPatrol",
+			"style": {
+				"navigationBarTitleText": "通用巡查",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
 		}]
 	}, {
 		"root": "packageB/pages",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 261f1d1..8706ab1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,8 @@
 	<view class="wrap">
 		<u-row gutter="16" justify="space-between">
 			<u-col span="12">
-				<view class="demo-layout bg-blue" style="text-align: left;padding-left: 20rpx;">当前登录人：张三</view>
+				<view class="demo-layout bg-blue" style="text-align: left;padding-left: 20rpx;">当前登录人：{{userInfo.name}}
+				</view>
 			</u-col>
 		</u-row>
 		<u-row gutter="16">
@@ -50,13 +51,27 @@
 	export default {
 		data() {
 			return {
-				title: ''
+				title: '',
+				userInfo: {}
 			}
 		},
 		onLoad() {
-
+			this.loadInfo();
 		},
 		methods: {
+			loadInfo() {
+				let that = this;
+				this.util.request({
+					api: '/api/mobile/auth/me',
+					method: 'POST',
+					utilSuccess: function(res) {
+						that.userInfo = res;
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
 			toview(type) {
 				let url = "/packageA/pages/generalPatrol/generalPatrol";
 				if (type == 2) {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4f55e70..bd71c56 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -7,7 +7,7 @@
 		<view class="loginBox">
 			<u-field v-model="username" label-width=0 icon="account" placeholder="请填写登陆名">
 			</u-field>
-			<u-field v-model="password" label-width=0 icon="lock" password=true placeholder="请填写密码">
+			<u-field v-model="password" label-width=0 icon="lock" :password="true" placeholder="请填写密码">
 			</u-field>
 		</view>
 
@@ -22,29 +22,12 @@
 	export default {
 		data() {
 			return {
-				username: '',
-				password: ''
+				username: 'test',
+				password: 'Admin2022'
 			}
 		},
 		onLoad: function() {
-			var user = uni.getStorageSync('userInfo');
-			if (!util.isNull(user.access_token)) {
-				util.request({
-					api: 'worker/check-token',
-					utilSuccess: function(res) {
-						if (res.token_available) {
 
-							uni.redirectTo({
-								url: '/pages/index/index'
-							});
-						}
-					},
-					utilFail: function(res) {
-						console.log(res)
-					}
-				});
-
-			}
 
 		},
 		methods: {
@@ -62,15 +45,15 @@
 				}
 
 				util.request({
-					api: 'worker/login-by-username',
+					api: '/api/mobile/auth/login',
 					method: 'POST',
 					data: {
-						'mobile': that.username,
+						'username': that.username,
 						'password': that.password
 					},
 					utilSuccess: function(res) {
 						console.log(res)
-						uni.setStorageSync('userInfo', res);
+						uni.setStorageSync('userInfo_token', res);
 						uni.redirectTo({
 							url: '/pages/index/index'
 						});
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 8183fd0..c79238d 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,22 +1,126 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
+<template>
+	<view class="wrap">
+		<u-row gutter="16" justify="space-between">
+			<u-col span="12">
+				<view class="demo-layout bg-blue" style="text-align: left;padding-left: 20rpx;">当前登录人：{{userInfo.name}}
+				</view>
+			</u-col>
+		</u-row>
+		<u-row gutter="16">
+
+			<u-col span="6">
+				<view class="demo-layout bg-purple-light">
+					<text class="iconfont icon-guanxianxuncha"></text>
+					<text class="navtxt">我的巡查</text>
+				</view>
+			</u-col>
+			<u-col span="6">
+				<view class="demo-layout bg-purple">
+					<text class="iconfont icon-guanxianyanghu"></text>
+					<text class="navtxt">我的养护</text>
+				</view>
+			</u-col>
+		</u-row>
+		<u-row gutter="16">
+
+
+			<u-col span="12">
+				<view class="demo-layout bg-purple-light">
+					<text class="iconfont icon-zaixianjiance"></text>
+					<text class="navtxt">我的日常监督巡查</text>
+				</view>
+			</u-col>
+		</u-row>
+		<u-row gutter="16" justify="space-between">
+			<u-col span="8">
+				<view class="demo-layout bg-purple" @click="toview(1)">
+					<text class="iconfont icon-caidanguanli"></text>
+					<text class="navtxt">我的通用巡查</text>
+				</view>
+			</u-col>
+		</u-row>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				title: '',
+				userInfo: {}
+			}
+		},
+		onLoad() {
+			this.loadInfo();
+		},
+		methods: {
+			loadInfo() {
+				let that = this;
+				this.util.request({
+					api: '/api/mobile/auth/me',
+					method: 'POST',
+					utilSuccess: function(res) {
+						that.userInfo = res;
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			toview(type) {
+				let url = "/packageA/pages/generalList/generalList";
+				if (type == 2) {
+					url = "/pages/mine/mine"
+				}
+				uni.navigateTo({
+					url: url
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.wrap {
+		padding: 24rpx;
+	}
+
+	.u-row {
+		margin: 40rpx 0;
+	}
+
+	.demo-layout {
+		border-radius: 8rpx;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		padding: 20rpx 0rpx;
+	}
+
+	.navtxt {
+		margin-top: 20rpx;
+		color: #000000;
+	}
+
+	.iconfont {
+		color: #338de3;
+		font-size: 64rpx;
+
+	}
+
+	.bg-purple {
+		background: #d3dce6;
+	}
+
+	.bg-blue {
+		background: #338de3;
+		color: #fff;
+	}
+
+	.bg-purple-light {
+		background: #e5e9f2;
+	}
+
+	.bg-purple-dark {
+		background: #99a9bf;
+	}
 </style>
diff --git a/utils/BasePage.js b/utils/BasePage.js
deleted file mode 100755
index 1d46ebd..0000000
--- a/utils/BasePage.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import WeChat from "./WeChat";
-export default class BasePage {
-  constructor() {
-    this.data = {};
-  }
-
-  onLoad(o) {
-    console.log('BasePage loaded');
-  }
-
-}
\ No newline at end of file
diff --git a/utils/WeChat.js b/utils/WeChat.js
deleted file mode 100755
index 2ae5a36..0000000
--- a/utils/WeChat.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// 小程序全局对象
-const WeChat = {};
-WeChat.Page = Page; // 注册页面
-
-WeChat.register = function (PageClass) {
-  let page = new PageClass();
-  WeChat.Page(page);
-};
-
-export default WeChat;
\ No newline at end of file
diff --git a/utils/qrcode.js b/utils/qrcode.js
new file mode 100644
index 0000000..1b1ba3f
--- /dev/null
+++ b/utils/qrcode.js
@@ -0,0 +1,1441 @@
+// uqrcode.js
+//---------------------------------------------------------------------
+// github https://github.com/Sansnn/uQRCode
+//---------------------------------------------------------------------
+
+let uQRCode = {};
+
+(function() {
+	//---------------------------------------------------------------------
+	// QRCode for JavaScript
+	//
+	// Copyright (c) 2009 Kazuhiko Arase
+	//
+	// URL: http://www.d-project.com/
+	//
+	// Licensed under the MIT license:
+	//   http://www.opensource.org/licenses/mit-license.php
+	//
+	// The word "QR Code" is registered trademark of 
+	// DENSO WAVE INCORPORATED
+	//   http://www.denso-wave.com/qrcode/faqpatent-e.html
+	//
+	//---------------------------------------------------------------------
+
+	//---------------------------------------------------------------------
+	// QR8bitByte
+	//---------------------------------------------------------------------
+
+	function QR8bitByte(data) {
+		this.mode = QRMode.MODE_8BIT_BYTE;
+		this.data = data;
+	}
+
+	QR8bitByte.prototype = {
+
+		getLength: function(buffer) {
+			return this.data.length;
+		},
+
+		write: function(buffer) {
+			for (var i = 0; i < this.data.length; i++) {
+				// not JIS ...
+				buffer.put(this.data.charCodeAt(i), 8);
+			}
+		}
+	};
+
+	//---------------------------------------------------------------------
+	// QRCode
+	//---------------------------------------------------------------------
+
+	function QRCode(typeNumber, errorCorrectLevel) {
+		this.typeNumber = typeNumber;
+		this.errorCorrectLevel = errorCorrectLevel;
+		this.modules = null;
+		this.moduleCount = 0;
+		this.dataCache = null;
+		this.dataList = new Array();
+	}
+
+	QRCode.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() {
+			// Calculate automatically typeNumber if provided is < 1
+			if (this.typeNumber < 1) {
+				var typeNumber = 1;
+				for (typeNumber = 1; typeNumber < 40; typeNumber++) {
+					var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, this.errorCorrectLevel);
+
+					var buffer = new QRBitBuffer();
+					var totalDataCount = 0;
+					for (var i = 0; i < rsBlocks.length; i++) {
+						totalDataCount += rsBlocks[i].dataCount;
+					}
+
+					for (var i = 0; i < this.dataList.length; i++) {
+						var data = this.dataList[i];
+						buffer.put(data.mode, 4);
+						buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber));
+						data.write(buffer);
+					}
+					if (buffer.getLengthInBits() <= totalDataCount * 8)
+						break;
+				}
+				this.typeNumber = typeNumber;
+			}
+			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; //(col + row) % 3;
+				}
+			}
+
+			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 = QRCode.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);
+
+			// vertical		
+			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;
+				}
+			}
+
+			// horizontal
+			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;
+				}
+			}
+
+			// fixed module
+			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;
+					}
+				}
+			}
+
+		}
+
+	};
+
+	QRCode.PAD0 = 0xEC;
+	QRCode.PAD1 = 0x11;
+
+	QRCode.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);
+		}
+
+		// calc num max data.
+		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 +
+				")");
+		}
+
+		// end code
+		if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
+			buffer.put(0, 4);
+		}
+
+		// padding
+		while (buffer.getLengthInBits() % 8 != 0) {
+			buffer.putBit(false);
+		}
+
+		// padding
+		while (true) {
+
+			if (buffer.getLengthInBits() >= totalDataCount * 8) {
+				break;
+			}
+			buffer.put(QRCode.PAD0, 8);
+
+			if (buffer.getLengthInBits() >= totalDataCount * 8) {
+				break;
+			}
+			buffer.put(QRCode.PAD1, 8);
+		}
+
+		return QRCode.createBytes(buffer, rsBlocks);
+	}
+
+	QRCode.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;
+
+	}
+
+	//---------------------------------------------------------------------
+	// QRMode
+	//---------------------------------------------------------------------
+
+	var QRMode = {
+		MODE_NUMBER: 1 << 0,
+		MODE_ALPHA_NUM: 1 << 1,
+		MODE_8BIT_BYTE: 1 << 2,
+		MODE_KANJI: 1 << 3
+	};
+
+	//---------------------------------------------------------------------
+	// QRErrorCorrectLevel
+	//---------------------------------------------------------------------
+
+	var QRErrorCorrectLevel = {
+		L: 1,
+		M: 0,
+		Q: 3,
+		H: 2
+	};
+
+	//---------------------------------------------------------------------
+	// QRMaskPattern
+	//---------------------------------------------------------------------
+
+	var QRMaskPattern = {
+		PATTERN000: 0,
+		PATTERN001: 1,
+		PATTERN010: 2,
+		PATTERN011: 3,
+		PATTERN100: 4,
+		PATTERN101: 5,
+		PATTERN110: 6,
+		PATTERN111: 7
+	};
+
+	//---------------------------------------------------------------------
+	// QRUtil
+	//---------------------------------------------------------------------
+
+	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) {
+
+				// 1 - 9
+
+				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) {
+
+				// 10 - 26
+
+				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) {
+
+				// 27 - 40
+
+				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;
+
+			// LEVEL1
+
+			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);
+					}
+				}
+			}
+
+			// LEVEL2
+
+			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;
+					}
+				}
+			}
+
+			// LEVEL3
+
+			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;
+					}
+				}
+			}
+
+			// LEVEL4
+
+			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;
+		}
+
+	};
+
+
+	//---------------------------------------------------------------------
+	// QRMath
+	//---------------------------------------------------------------------
+
+	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;
+	}
+
+	//---------------------------------------------------------------------
+	// QRPolynomial
+	//---------------------------------------------------------------------
+
+	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);
+			}
+
+			// recursive call
+			return new QRPolynomial(num, 0).mod(e);
+		}
+	};
+
+	//---------------------------------------------------------------------
+	// QRRSBlock
+	//---------------------------------------------------------------------
+
+	function QRRSBlock(totalCount, dataCount) {
+		this.totalCount = totalCount;
+		this.dataCount = dataCount;
+	}
+
+	QRRSBlock.RS_BLOCK_TABLE = [
+
+		// L
+		// M
+		// Q
+		// H
+
+		// 1
+		[1, 26, 19],
+		[1, 26, 16],
+		[1, 26, 13],
+		[1, 26, 9],
+
+		// 2
+		[1, 44, 34],
+		[1, 44, 28],
+		[1, 44, 22],
+		[1, 44, 16],
+
+		// 3
+		[1, 70, 55],
+		[1, 70, 44],
+		[2, 35, 17],
+		[2, 35, 13],
+
+		// 4		
+		[1, 100, 80],
+		[2, 50, 32],
+		[2, 50, 24],
+		[4, 25, 9],
+
+		// 5
+		[1, 134, 108],
+		[2, 67, 43],
+		[2, 33, 15, 2, 34, 16],
+		[2, 33, 11, 2, 34, 12],
+
+		// 6
+		[2, 86, 68],
+		[4, 43, 27],
+		[4, 43, 19],
+		[4, 43, 15],
+
+		// 7		
+		[2, 98, 78],
+		[4, 49, 31],
+		[2, 32, 14, 4, 33, 15],
+		[4, 39, 13, 1, 40, 14],
+
+		// 8
+		[2, 121, 97],
+		[2, 60, 38, 2, 61, 39],
+		[4, 40, 18, 2, 41, 19],
+		[4, 40, 14, 2, 41, 15],
+
+		// 9
+		[2, 146, 116],
+		[3, 58, 36, 2, 59, 37],
+		[4, 36, 16, 4, 37, 17],
+		[4, 36, 12, 4, 37, 13],
+
+		// 10		
+		[2, 86, 68, 2, 87, 69],
+		[4, 69, 43, 1, 70, 44],
+		[6, 43, 19, 2, 44, 20],
+		[6, 43, 15, 2, 44, 16],
+
+		// 11
+		[4, 101, 81],
+		[1, 80, 50, 4, 81, 51],
+		[4, 50, 22, 4, 51, 23],
+		[3, 36, 12, 8, 37, 13],
+
+		// 12
+		[2, 116, 92, 2, 117, 93],
+		[6, 58, 36, 2, 59, 37],
+		[4, 46, 20, 6, 47, 21],
+		[7, 42, 14, 4, 43, 15],
+
+		// 13
+		[4, 133, 107],
+		[8, 59, 37, 1, 60, 38],
+		[8, 44, 20, 4, 45, 21],
+		[12, 33, 11, 4, 34, 12],
+
+		// 14
+		[3, 145, 115, 1, 146, 116],
+		[4, 64, 40, 5, 65, 41],
+		[11, 36, 16, 5, 37, 17],
+		[11, 36, 12, 5, 37, 13],
+
+		// 15
+		[5, 109, 87, 1, 110, 88],
+		[5, 65, 41, 5, 66, 42],
+		[5, 54, 24, 7, 55, 25],
+		[11, 36, 12],
+
+		// 16
+		[5, 122, 98, 1, 123, 99],
+		[7, 73, 45, 3, 74, 46],
+		[15, 43, 19, 2, 44, 20],
+		[3, 45, 15, 13, 46, 16],
+
+		// 17
+		[1, 135, 107, 5, 136, 108],
+		[10, 74, 46, 1, 75, 47],
+		[1, 50, 22, 15, 51, 23],
+		[2, 42, 14, 17, 43, 15],
+
+		// 18
+		[5, 150, 120, 1, 151, 121],
+		[9, 69, 43, 4, 70, 44],
+		[17, 50, 22, 1, 51, 23],
+		[2, 42, 14, 19, 43, 15],
+
+		// 19
+		[3, 141, 113, 4, 142, 114],
+		[3, 70, 44, 11, 71, 45],
+		[17, 47, 21, 4, 48, 22],
+		[9, 39, 13, 16, 40, 14],
+
+		// 20
+		[3, 135, 107, 5, 136, 108],
+		[3, 67, 41, 13, 68, 42],
+		[15, 54, 24, 5, 55, 25],
+		[15, 43, 15, 10, 44, 16],
+
+		// 21
+		[4, 144, 116, 4, 145, 117],
+		[17, 68, 42],
+		[17, 50, 22, 6, 51, 23],
+		[19, 46, 16, 6, 47, 17],
+
+		// 22
+		[2, 139, 111, 7, 140, 112],
+		[17, 74, 46],
+		[7, 54, 24, 16, 55, 25],
+		[34, 37, 13],
+
+		// 23
+		[4, 151, 121, 5, 152, 122],
+		[4, 75, 47, 14, 76, 48],
+		[11, 54, 24, 14, 55, 25],
+		[16, 45, 15, 14, 46, 16],
+
+		// 24
+		[6, 147, 117, 4, 148, 118],
+		[6, 73, 45, 14, 74, 46],
+		[11, 54, 24, 16, 55, 25],
+		[30, 46, 16, 2, 47, 17],
+
+		// 25
+		[8, 132, 106, 4, 133, 107],
+		[8, 75, 47, 13, 76, 48],
+		[7, 54, 24, 22, 55, 25],
+		[22, 45, 15, 13, 46, 16],
+
+		// 26
+		[10, 142, 114, 2, 143, 115],
+		[19, 74, 46, 4, 75, 47],
+		[28, 50, 22, 6, 51, 23],
+		[33, 46, 16, 4, 47, 17],
+
+		// 27
+		[8, 152, 122, 4, 153, 123],
+		[22, 73, 45, 3, 74, 46],
+		[8, 53, 23, 26, 54, 24],
+		[12, 45, 15, 28, 46, 16],
+
+		// 28
+		[3, 147, 117, 10, 148, 118],
+		[3, 73, 45, 23, 74, 46],
+		[4, 54, 24, 31, 55, 25],
+		[11, 45, 15, 31, 46, 16],
+
+		// 29
+		[7, 146, 116, 7, 147, 117],
+		[21, 73, 45, 7, 74, 46],
+		[1, 53, 23, 37, 54, 24],
+		[19, 45, 15, 26, 46, 16],
+
+		// 30
+		[5, 145, 115, 10, 146, 116],
+		[19, 75, 47, 10, 76, 48],
+		[15, 54, 24, 25, 55, 25],
+		[23, 45, 15, 25, 46, 16],
+
+		// 31
+		[13, 145, 115, 3, 146, 116],
+		[2, 74, 46, 29, 75, 47],
+		[42, 54, 24, 1, 55, 25],
+		[23, 45, 15, 28, 46, 16],
+
+		// 32
+		[17, 145, 115],
+		[10, 74, 46, 23, 75, 47],
+		[10, 54, 24, 35, 55, 25],
+		[19, 45, 15, 35, 46, 16],
+
+		// 33
+		[17, 145, 115, 1, 146, 116],
+		[14, 74, 46, 21, 75, 47],
+		[29, 54, 24, 19, 55, 25],
+		[11, 45, 15, 46, 46, 16],
+
+		// 34
+		[13, 145, 115, 6, 146, 116],
+		[14, 74, 46, 23, 75, 47],
+		[44, 54, 24, 7, 55, 25],
+		[59, 46, 16, 1, 47, 17],
+
+		// 35
+		[12, 151, 121, 7, 152, 122],
+		[12, 75, 47, 26, 76, 48],
+		[39, 54, 24, 14, 55, 25],
+		[22, 45, 15, 41, 46, 16],
+
+		// 36
+		[6, 151, 121, 14, 152, 122],
+		[6, 75, 47, 34, 76, 48],
+		[46, 54, 24, 10, 55, 25],
+		[2, 45, 15, 64, 46, 16],
+
+		// 37
+		[17, 152, 122, 4, 153, 123],
+		[29, 74, 46, 14, 75, 47],
+		[49, 54, 24, 10, 55, 25],
+		[24, 45, 15, 46, 46, 16],
+
+		// 38
+		[4, 152, 122, 18, 153, 123],
+		[13, 74, 46, 32, 75, 47],
+		[48, 54, 24, 14, 55, 25],
+		[42, 45, 15, 32, 46, 16],
+
+		// 39
+		[20, 147, 117, 4, 148, 118],
+		[40, 75, 47, 7, 76, 48],
+		[43, 54, 24, 22, 55, 25],
+		[10, 45, 15, 67, 46, 16],
+
+		// 40
+		[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 = new Array();
+
+		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;
+		}
+	}
+
+	//---------------------------------------------------------------------
+	// QRBitBuffer
+	//---------------------------------------------------------------------
+
+	function QRBitBuffer() {
+		this.buffer = new Array();
+		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++;
+		}
+	};
+
+	//---------------------------------------------------------------------
+	// Support Chinese
+	//---------------------------------------------------------------------
+	function utf16To8(text) {
+		var result = '';
+		var c;
+		for (var i = 0; i < text.length; i++) {
+			c = text.charCodeAt(i);
+			if (c >= 0x0001 && c <= 0x007F) {
+				result += text.charAt(i);
+			} else if (c > 0x07FF) {
+				result += String.fromCharCode(0xE0 | c >> 12 & 0x0F);
+				result += String.fromCharCode(0x80 | c >> 6 & 0x3F);
+				result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+			} else {
+				result += String.fromCharCode(0xC0 | c >> 6 & 0x1F);
+				result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+			}
+		}
+		return result;
+	}
+
+	uQRCode = {
+
+		errorCorrectLevel: QRErrorCorrectLevel,
+
+		defaults: {
+			size: 354,
+			margin: 0,
+			backgroundColor: '#ffffff',
+			foregroundColor: '#000000',
+			fileType: 'png', // 'jpg', 'png'
+			errorCorrectLevel: QRErrorCorrectLevel.H,
+			typeNumber: -1
+		},
+
+		make: function(options) {
+			return new Promise((reslove, reject) => {
+				var defaultOptions = {
+					canvasId: options.canvasId,
+					componentInstance: options.componentInstance,
+					text: options.text,
+					size: this.defaults.size,
+					margin: this.defaults.margin,
+					backgroundColor: this.defaults.backgroundColor,
+					foregroundColor: this.defaults.foregroundColor,
+					fileType: this.defaults.fileType,
+					errorCorrectLevel: this.defaults.errorCorrectLevel,
+					typeNumber: this.defaults.typeNumber
+				};
+				if (options) {
+					for (var i in options) {
+						defaultOptions[i] = options[i];
+					}
+				}
+				options = defaultOptions;
+				if (!options.canvasId) {
+					console.error('uQRCode: Please set canvasId!');
+					return;
+				}
+
+				function createCanvas() {
+					var qrcode = new QRCode(options.typeNumber, options.errorCorrectLevel);
+					qrcode.addData(utf16To8(options.text));
+					qrcode.make();
+
+					var ctx = uni.createCanvasContext(options.canvasId, options.componentInstance);
+					ctx.setFillStyle(options.backgroundColor);
+					ctx.fillRect(0, 0, options.size, options.size);
+
+					var tileW = (options.size - options.margin * 2) / qrcode.getModuleCount();
+					var tileH = tileW;
+
+					for (var row = 0; row < qrcode.getModuleCount(); row++) {
+						for (var col = 0; col < qrcode.getModuleCount(); col++) {
+							var style = qrcode.isDark(row, col) ? options.foregroundColor : options.backgroundColor;
+							ctx.setFillStyle(style);
+							var x = Math.round(col * tileW) + options.margin;
+							var y = Math.round(row * tileH) + options.margin;
+							var w = Math.ceil((col + 1) * tileW) - Math.floor(col * tileW);
+							var h = Math.ceil((row + 1) * tileW) - Math.floor(row * tileW);
+							ctx.fillRect(x, y, w, h);
+						}
+					}
+
+					setTimeout(function() {
+						ctx.draw(false, (function() {
+							setTimeout(function() {
+								uni.canvasToTempFilePath({
+									canvasId: options.canvasId,
+									fileType: options.fileType,
+									width: options.size,
+									height: options.size,
+									destWidth: options.size,
+									destHeight: options.size,
+									success: function(res) {
+										let resData; // 将统一为base64格式
+										let tempFilePath = res.tempFilePath; // H5为base64，其他为相对路径
+
+										// #ifdef H5
+										resData = tempFilePath;
+										options.success && options.success(resData);
+										reslove(resData);
+										// #endif
+
+										// #ifdef APP-PLUS
+										const path = plus.io.convertLocalFileSystemURL(tempFilePath) // 绝对路径
+										let fileReader = new plus.io.FileReader();
+										fileReader.readAsDataURL(path);
+										fileReader.onloadend = res => {
+											resData = res.target.result;
+											options.success && options.success(resData);
+											reslove(resData);
+										};
+										// #endif
+
+										// #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+										uni.getFileSystemManager().readFile({
+											filePath: tempFilePath,
+											encoding: 'base64',
+											success: res => {
+												resData = 'data:image/png;base64,' + res.data;
+												options.success && options.success(resData);
+												reslove(resData);
+											}
+										})
+										// #endif
+
+										// #ifndef H5 || APP-PLUS || MP-WEIXIN || MP-QQ || MP-TOUTIAO
+										if (plus) {
+											const path = plus.io.convertLocalFileSystemURL(tempFilePath) // 绝对路径
+											let fileReader = new plus.io.FileReader();
+											fileReader.readAsDataURL(path);
+											fileReader.onloadend = res => {
+												resData = res.target.result;
+												options.success && options.success(resData);
+												reslove(resData);
+											};
+										} else {
+											uni.request({
+												url: tempFilePath,
+												method: 'GET',
+												responseType: 'arraybuffer',
+												success: res => {
+													resData = `data:image/png;base64,${uni.arrayBufferToBase64(res.data)}`; // 把arraybuffer转成base64
+													options.success && options.success(resData);
+													reslove(resData);
+												}
+											})
+										}
+										// #endif
+									},
+									fail: function(error) {
+										options.fail && options.fail(error);
+										reject(error);
+									},
+									complete: function(res) {
+										options.complete && options.complete(res);
+									}
+								}, options.componentInstance);
+							}, options.text.length + 100);
+						})());
+					}, 150);
+				}
+
+				createCanvas();
+			});
+		}
+	}
+
+})()
+
+export default uQRCode
+
+
diff --git a/utils/util.js b/utils/util.js
index f5db390..96a5d47 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -4,7 +4,8 @@ const HOSTARR = {
 	'production': 'http://118.31.104.155:9003'
 }; // 审核状态
 
-const HOST = HOSTARR[process.env.NODE_ENV]; //"https://tiantianxinye.365care.langye.net/";//HOSTARR[process.env.NODE_ENV];//
+const HOST = HOSTARR[process.env
+	.NODE_ENV]; //"https://tiantianxinye.365care.langye.net/";//HOSTARR[process.env.NODE_ENV];//
 
 
 const formatTime = date => {
@@ -14,13 +15,77 @@ const formatTime = date => {
 	return [year, month, day].map(formatNumber).join('-');
 };
 
+const user_info_key = "userInfo_token";
+const user_key = "userInfo";
+
+const getUserInfo = (cb, refresh) => {
+	cb = cb || function() {}
+	refresh = refresh || false
+	if (!refresh) {
+		let user_info = uni.getStorageSync(user_key)
+		if (!isNull(user_info)) {
+			cb(user_info)
+			return
+		}
+	}
+	request({
+		api: '/api/mobile/user/show',
+		utilSuccess: function(res) {
+			uni.setStorageSync(user_key, res)
+			cb(res)
+		},
+		utilFail: function(res) {}
+	})
+}
+
+const getOpenidInfo = (cb, refresh) => {
+	cb = cb || function() {}
+	refresh = refresh || false
+	if (!refresh) {
+		let user_info = uni.getStorageSync(user_info_key)
+		if (!isNull(user_info)) {
+			cb(user_info)
+			return
+		}
+	}
+
+	uni.login({
+		provider: 'weixin',
+		success: (res) => {
+			console.log(res.code);
+			let url = HOST + '/api/mobile/user/login?code=' + res.code;
+			uni.request({
+				url: url,
+				method: 'GET',
+				success: result => {
+					let user_info = result.data
+					uni.setStorageSync(user_info_key, user_info)
+					cb(user_info)
+				}
+			});
+		}
+	});
+}
 
 
-const stateArr = {
-	"save": "待处理",
-	"ongoing": "处理中",
-	"finished": "已处理"
+
+const getUserProfile = (cb) => {
+	cb = cb || function() {}
+
+	wx.getUserProfile({
+		desc: '用于完善会员资料',
+		success: (res) => {
+			uni.setStorageSync('user_profile', res.userInfo)
+			cb(res.userInfo)
+		}
+	})
 }
+
+
+
+
+
+
 const formatTimeAll = date => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;
@@ -46,6 +111,23 @@ const alert = msg => {
 	});
 }; // 订单状态
 
+const toast = msg => {
+	// setTimeout(function() {
+	// 	uni.showToast({
+	// 		icon: "none",
+	// 		title: msg,
+	// 		duration: 2000
+	// 	})
+	// }, 2000)
+
+	uni.showModal({
+		title: '',
+		content: msg,
+		showCancel: false
+	});
+
+}; // 订单状态
+
 
 const orderStatusDic = {
 	'0': '待确认',
@@ -82,7 +164,7 @@ const request = options => {
 		//'content-type': 'application/json'
 	}; // 如果已登录,请求中拼openId
 
-	var access_token = uni.getStorageSync('userInfo').access_token;
+	var access_token = uni.getStorageSync(user_info_key).access_token;
 
 	if (isLogin()) {
 		options.data = {
@@ -100,6 +182,7 @@ const request = options => {
 	uni.request({
 		...options,
 		success: function(res) {
+			uni.hideLoading();
 			if (res.statusCode != 200) {
 				if (options.utilFail != undefined) {
 					if (res.statusCode == 401) {
@@ -112,11 +195,12 @@ const request = options => {
 					}
 				}
 			} else {
-				if (!isNull(res.data.errorcode) || res.data.errorcode == 0) {
+
+				if (res.data.hasOwnProperty("errcode")) {
 					if (options.utilFail != undefined) {
-						options.utilFail(res.data.errormsg || '接口发生未知错误');
+						options.utilFail(res.data.errmsg || '接口发生未知错误');
 					} else {
-						options.utilFail(res.data.errormsg);
+						options.utilFail(res.data.errmsg);
 					}
 				} else {
 					if (options.utilSuccess != undefined) {
@@ -129,7 +213,7 @@ const request = options => {
 		complete: function(res) {
 			if (!options.customLoading) {
 				uni.hideNavigationBarLoading();
-				uni.hideLoading();
+
 			} else {
 				// 当前页面请求数量-1
 				if (options.bindThis) {
@@ -143,27 +227,11 @@ const request = options => {
 }; // 提交formID封装
 
 
-const uploadFormID = formID => {
-	var timestamp = Math.floor(new Date().getTime() / 1000);
-	request({
-		api: 'WeChat/SaveFormID',
-		method: 'POST',
-		data: {
-			FormIDs: formID
-		},
-		utilSuccess: function(res) {
-			console.log('上传formID成功');
-		},
-		utilFail: function(err) {
-			console.log('上传formID失败');
-		}
-	});
-}; // 支付
-
 
 const payOrder = (orderID, orderType, success, fail) => {
 	uni.request({
-		url: HOST + 'WxPay/ToPay?openId=' + uni.getStorageSync('userInfo').WeChatOpenID + '&orderId=' +
+		url: HOST + 'WxPay/ToPay?openId=' + uni.getStorageSync(user_info_key).WeChatOpenID +
+			'&orderId=' +
 			orderID + '&OrderType=' + orderType,
 		method: 'GET',
 		header: {
@@ -226,128 +294,16 @@ const payOrder = (orderID, orderType, success, fail) => {
 	});
 }; // 判断是否已登录（同时有open-id和PhoneNum, 则认为已登录）
 
-const scanPay = (orderID, amt, scan, type, success, fail) => {
-	var access_token = uni.getStorageSync('userInfo').access_token;
-	console.log("1.支付进入")
-	var data = {
-		token: access_token,
-		order_id: orderID,
-		money: amt,
-		auth_code: scan,
-		type: type
-	};
-	console.log("2.参数")
-	console.log(data)
-	uni.showLoading({
-		title: '正在加载',
-
-	});
-	uni.request({
-		url: HOST + 'manager/scan-pay/' + orderID,
-		method: 'POST',
-		data: {
-			token: access_token,
-			order_id: orderID,
-			money: amt,
-			auth_code: scan,
-			type: type
-		},
-		header: {
-			'content-type': 'application/json'
-		},
-		success: function(res) {
-			uni.hideLoading();
-			if (isNull(res.data.errorcode)) {
-				success(res);
-				console.log("3.支付成功")
-				console.log(res)
-			} else {
-				alert("支付失败:" + res.data.errormsg);
-				console.log("4.支付失败")
-				console.log(res)
-			}
-
-		},
-		fail: function(err) {
-			fail('当前网络状况不好');
-			console.log("4.支付失败")
-			console.log(res)
-		}
-	});
-}; // 判断是否已登录（同时有open-id和PhoneNum, 则认为已登录）
-
 const isLogin = () => {
-	var userInfo = uni.getStorageSync('userInfo');
+	var userInfo = uni.getStorageSync(user_info_key);
 	return !isNull(userInfo.access_token);
 }; // 判断是否为空
 
 
-const getfile = (id, success, fail) => {
-	var access_token = uni.getStorageSync('userInfo').access_token;
-	var url = HOST + 'manager/get-attachment/' + id + '?token=' + access_token;
-	success(url);
-	// 	uni.request({
-	// 		url: HOST + 'manager/get-attachment/' + id + '?token=' + access_token,
-	// 		method: 'GET',
-	// 		header: {
-	// 			'content-type': 'application/json'
-	// 		},
-	// 		success: function(res) {
-	// 			success(res); // 发送成功通知
-	// 		},
-	// 		fail: function(res) {
-	// 			fail(res);
-	// 		}
-	// 	});
-};
-
-
-//获取订单详情
-const getOrderInfo = (id, success, fail) => {
-	var access_token = uni.getStorageSync('userInfo').access_token;
-	var url = HOST + 'manager/get-order/' + id + '?token=' + access_token;
-	uni.request({
-		url: url,
-		method: 'GET',
-		header: {
-			'content-type': 'application/json'
-		},
-		success: function(res) {
-			res.data.factorjson = JSON.parse(res.data.factors);
-			success(res); // 发送成功通知
-		},
-		fail: function(res) {
-			fail(res);
-		}
-	});
-};
-
-
-//获取订单详情
-const getOrderItemInfo = (id, success, fail) => {
-	var access_token = uni.getStorageSync('userInfo').access_token;
-	var url = HOST + 'manager/get-order-item/' + id + '?token=' + access_token;
-	uni.request({
-		url: url,
-		method: 'GET',
-		header: {
-			'content-type': 'application/json'
-		},
-		success: function(res) {
-			res.data.factorjson = JSON.parse(res.data.factors);
-			success(res.data); // 发送成功通知
-		},
-		fail: function(res) {
-			fail(res);
-		}
-	});
-};
-
 const isNull = p => {
 	return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
 }; // 正则
 
-
 const phoneRegex = /^1\d{10}$/;
 const idCardRegex = /^\d{17}([0-9]|X)$/; // 去掉特殊字符
 
@@ -374,74 +330,6 @@ const randomStr = length => {
 	return ret;
 }; // proType对应的中文描述
 
-
-const proTypeDic = {}; // 排序字段
-
-const orderByArr = [{
-		id: '1',
-		name: '近期销量最高'
-	}, // { id: '2', name: '产品评价最高' },
-	{
-		id: '3',
-		name: '价格由高到低'
-	}, {
-		id: '4',
-		name: '价格由低到高'
-	}
-]; // 日期天数
-
-const travelDaysArr = [{
-	id: '1',
-	name: '2日',
-	minDay: 2,
-	maxDay: 2
-}, {
-	id: '2',
-	name: '3日',
-	minDay: 3,
-	maxDay: 3
-}, {
-	id: '3',
-	name: '4日',
-	minDay: 4,
-	maxDay: 4
-}, {
-	id: '4',
-	name: '5日',
-	minDay: 5,
-	maxDay: 5
-}, {
-	id: '5',
-	name: '6日',
-	minDay: 6,
-	maxDay: 6
-}, {
-	id: '6',
-	name: '7日',
-	minDay: 7,
-	maxDay: 7
-}, {
-	id: '7',
-	name: '8日',
-	minDay: 8,
-	maxDay: 8
-}, {
-	id: '8',
-	name: '9日',
-	minDay: 9,
-	maxDay: 9
-}, {
-	id: '9',
-	name: '10日',
-	minDay: 10,
-	maxDay: 10
-}, {
-	id: '10',
-	name: '10日以上',
-	minDay: 11,
-	maxDay: 0
-}]; // 中文星期
-
 const weekdayArr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; // 是否合法的身份证
 
 const isValidCardID = cardID => {
@@ -648,25 +536,22 @@ module.exports = {
 	formatTimeAll: formatTimeAll,
 	formatNumber: formatNumber,
 	alert: alert,
-	getfile: getfile,
+	getOpenidInfo: getOpenidInfo,
 	request: request,
-	uploadFormID: uploadFormID,
 	payOrder: payOrder,
-	scanPay: scanPay,
 	isLogin: isLogin,
 	isNull: isNull,
 	phoneRegex: phoneRegex,
 	idCardRegex: idCardRegex,
 	filterSpecialChars: filterSpecialChars,
 	randomStr: randomStr,
-	proTypeDic: proTypeDic,
-	orderByArr: orderByArr,
-	travelDaysArr: travelDaysArr,
 	weekdayArr: weekdayArr,
 	Base64: Base64,
 	orderStatusDic: orderStatusDic,
 	auditStatusDic: auditStatusDic,
-	getOrderInfo: getOrderInfo,
-	getOrderItemInfo: getOrderItemInfo,
-	stateArr: stateArr
+	getUserProfile: getUserProfile,
+	getUserInfo: getUserInfo,
+	toast: toast,
+	isValidCardID:isValidCardID
+	
 };
diff --git a/utils/util.wxs b/utils/util.wxs
deleted file mode 100755
index d1f35de..0000000
--- a/utils/util.wxs
+++ /dev/null
@@ -1,120 +0,0 @@
-// 从2018-09-01 15:30:27 中提取出 15:30
-var hmTimeFrom = function (dateStr) {
-  return dateStr.substring(11, 16);
-}; // 算出2个dateStr间的时间间隔，例如 2018-09-01 15:30:27 到 2018-09-02 03:28:09,中间相差'd天h小时m分钟'
-
-
-var intervalBetween = function (startDateStr, endDateStr) {
-  var startDate = dateFromDateStr(startDateStr);
-  var endDate = dateFromDateStr(endDateStr);
-  var startTimestamp = startDate.getTime();
-  var endTimestamp = endDate.getTime();
-  var deltaTimestamp = Math.floor((endTimestamp - startTimestamp) / 1000);
-  var days = Math.floor(deltaTimestamp / (24 * 3600));
-  var hours = Math.floor((deltaTimestamp - days * 24 * 3600) / 3600);
-  var minutes = Math.floor((deltaTimestamp - days * 24 * 3600 - hours * 3600) / 60);
-  var ret = '';
-  if (days > 0) ret += days + 'd';
-  if (hours > 0) ret += hours + 'h';
-  if (minutes > 0) ret += minutes + 'm';
-  return ret;
-}; // 算出24小时内的2个时间间隔，例如 12:00 到 15:30,中间相差'h小时m分钟'
-
-
-var intervalBetween24h = function (startDateStr, endDateStr, isCN) {
-  var startComponents = startDateStr.split(':');
-  var endComponents = endDateStr.split(':');
-  var startH = startComponents[0];
-  var startM = startComponents[1];
-  var endH = endComponents[0];
-  var endM = endComponents[1];
-  var deltaTimestamp = 0;
-
-  if (endH > startH || endH == startH && endM > startM) {
-    // 不跨天
-    // Start
-    var startDate = getDate(2018, 1, 1, startH, startM, 0);
-    var startTimestamp = startDate.getTime(); // End
-
-    var endDate = getDate(2018, 1, 1, endH, endM, 0);
-    var endTimestamp = endDate.getTime(); // delta
-
-    deltaTimestamp = Math.floor((endTimestamp - startTimestamp) / 1000);
-  } else {
-    // 跨天
-    // Start
-    var startDate = getDate(2018, 1, 1, startH, startM, 0);
-    var startTimestamp = startDate.getTime(); // End
-
-    var endDate = getDate(2018, 1, 2, endH, endM, 0);
-    var endTimestamp = endDate.getTime(); // delta
-
-    deltaTimestamp = Math.floor((endTimestamp - startTimestamp) / 1000);
-  } // 拼接返回值
-
-
-  var days = Math.floor(deltaTimestamp / (24 * 3600));
-  var hours = Math.floor((deltaTimestamp - days * 24 * 3600) / 3600);
-  var minutes = Math.floor((deltaTimestamp - days * 24 * 3600 - hours * 3600) / 60);
-  var ret = '';
-
-  if (isCN) {
-    if (days > 0) ret += days + '天';
-    if (hours > 0) ret += hours + '小时';
-    if (minutes > 0) ret += minutes + '分钟';
-  } else {
-    if (days > 0) ret += days + 'd';
-    if (hours > 0) ret += hours + 'h';
-    if (minutes > 0) ret += minutes + 'm';
-  }
-
-  return ret;
-}; // dateStr转Date类型
-
-
-var dateFromDateStr = function (dateStr) {
-  var components = dateStr.split(' ');
-  var dateComponents = components[0].split('-');
-  var timeComponents = components[1].split(':');
-  var totalComponents = dateComponents.concat(timeComponents);
-  return getDate(parseInt(totalComponents[0]), parseInt(totalComponents[1]) - 1, parseInt(totalComponents[2]), parseInt(totalComponents[3]), parseInt(totalComponents[4]), parseInt(totalComponents[5]), 0);
-}; // 判断是否跨天, 例如 12:00 到 11:30 为跨天
-
-
-var isCrossDay = function (startDateStr, endDateStr) {
-  var startComponents = startDateStr.split(':');
-  var endComponents = endDateStr.split(':');
-  var startH = startComponents[0];
-  var startM = startComponents[1];
-  var endH = endComponents[0];
-  var endM = endComponents[1];
-  return endH < startH || endH == startH && endM < startM;
-};
-
-var numberUtil = {
-  numberFormat: function (value) {
-    var v = parseFloat(value); //强转Int，毕竟有可能返回是String类型的数字
-
-    return v.toFixed(2);
-  }
-};
-
-var rorderStatusDic = function (status) {
-  var orderStatusDic = {
-    '0': '待确认',
-    '10': '待派单',
-    '20': '进行中',
-    '100': '已完成'
-  };
-  return orderStatusDic[status];
-};
-
-module.exports = {
-  hmTimeFrom: hmTimeFrom,
-  intervalBetween: intervalBetween,
-  intervalBetween24h: intervalBetween24h,
-  isCrossDay: isCrossDay,
-  numberFormat: numberUtil.numberFormat,
-  //暴露接口调用
-  rorderStatusDic: rorderStatusDic
-};
\ No newline at end of file
diff --git a/utils/weapp-qrcode.js b/utils/weapp-qrcode.js
deleted file mode 100755
index 986493c..0000000
--- a/utils/weapp-qrcode.js
+++ /dev/null
@@ -1,1004 +0,0 @@
-//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) {
-    this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
-
-    this._oQRCode.addData(sText);
-
-    this._oQRCode.make();
-
-    this.makeImage();
-  };
-
-  QRCode.prototype.makeImage = function () {
-    var _oContext;
-
-    if (this._htOption.usingIn) {
-      _oContext = uni.createCanvasContext(this.canvasId, this._htOption.usingIn);
-    } else {
-      _oContext = uni.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();
-  };
-
-  QRCode.prototype.exportImage = function (callback) {
-    if (!callback) {
-      return;
-    }
-
-    uni.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) {
-        console.log(res.tempFilePath);
-        callback(res.tempFilePath);
-      },
-      fail: function (err) {
-        console.log(err);
-      }
-    });
-  };
-
-  QRCode.CorrectLevel = QRErrorCorrectLevel;
-})();
-
-module.exports = QRCode;
\ No newline at end of file