修改

assets/http/api.js

@@ -5,6 +5,11 @@ import {http} from './service.js'
 const uploadFile =(p)=> http.upload('blade-resource/oss/endpoint/put-file', {name:'file',filePath:p})
 
 
+//微信api
+const wxApp={
+	getOpenId:p => http.get('/wx-app/getOpenId', {params:p}),
+}
+
 //字典
 const dict={
 	getTagSelect:p => http.get("blade-system/dict-biz/list",{params:p}),
@@ -36,6 +41,12 @@ const shop={
 	memberInfo:p => http.get('shop/memberInfo',{params:p}),
 	shopBillsInfo:p => http.get('shop/shopBillsInfo',{params:p}),
 }
+
+
+const loginUser={
+	list:p => http.get('ldt_user/loginuser/list', {params:p}),
+}
+
 //审核状态
 const audit={
 	list:p => http.get('ldt_shop/audit/list',{params:p}),
@@ -116,13 +127,26 @@ const statistics={
 } 
 
 
+const withdraw={
+	submit:p => http.post('common/withdrawrec/withdraw',p),
+	payOrder:p => http.get('payment/payOrder/YEE_PAY/USER_WITHDRAW',{params:p}),
+	list:p => http.get("ldt_bills/withdrawrec/list", {params:p}),
+}
+
+const ocr={
+	bizilicense:(p)=> http.upload('ocr/bizilicense', {name:'image',filePath:p}),
+	idcard:(p)=> http.upload('ocr/idcard', {name:'image',filePath:p})
+}
+
 
 export const api={
 	uploadFile,
+	wxApp,
 	dict,
 	sms,
 	mall,
 	shop,
+	loginUser,
 	audit,
 	accout,
 	userBank,
@@ -132,5 +156,7 @@ export const api={
 	flow,
 	activity,
 	joinRecord,
-	statistics
+	statistics,
+	withdraw,
+	ocr
 }

assets/http/service.js

@@ -1,7 +1,7 @@
 import Request from 'luch-request'
 
 // let baseURL = 'https://ldt.guosen-fumao.cn/api/'
-let baseURL = 'http://192.168.1.168:2366/'
+let baseURL = 'http://192.168.1.48:2366/'
 
 
 let tokenUrl = baseURL +

components/ay-qrcode/ay-qrcode.vue

@@ -1,411 +0,0 @@
-<template>
-	<view :class="modal?'show-qrcode':'hide-qrcode'">
-		<view class="box-qrcode" :style="{'margin-left':  marginLeft + 'px'}" @longtap="longtapCode">
-			<!-- style="width: 550rpx;height: 550rpx;" -->
-			
-			<canvas class="canvas-qrcode" :style="style_w_h" :canvas-id="qrcode_id">
-				
-				<!-- #ifndef MP -->
-				<view v-if="modal&&is_themeImg" :style="style_w_h" class="box-img-qrcode">
-					<image :style="style_w_h_img" mode="scaleToFill" :src="themeImg"></image>
-				</view>
-				<!-- #endif -->
-				
-			</canvas>
-			
-			<!-- <image mode="scaleToFill" :src="imagePath"></image> -->
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	var qr_we = require("./qrcode_wx.js");
-	const qrCode = require('./weapp-qrcode.js')
-	export default {
-		data() {
-			return {
-				isAndroid : false ,
-				show: true,
-				imagePath: '',
-				// qrcode_id: 'qrcode_id',
-				marginLeft: 0,
-				//一般的安卓app只需加30就能显示全
-				//苹果app的不加就能显示全，加了就要弄margin-left
-				//有些安卓app显示不全
-				add_num : 30 ,
-				add_num_key : 'rectify_code_key',
-			}
-		},
-		props: {
-			modal: {
-				type: Boolean,
-				default: false
-			},
-			url: {
-				type: String,
-				default: ''
-			},
-			height: {
-				type: Number,
-				default: 260
-			},
-			width: {
-				type: Number,
-				default: 260
-			},
-			themeColor: {
-				type: String,
-				default: '#333333',
-			},
-			qrcode_id: {
-				type: String,
-				default: 'qrcode_id',
-			},
-			is_themeImg: {
-				type: Boolean,
-				default: false,
-			},
-			themeImg: {
-				type: String,
-				default: 'https://cdn.pixabay.com/photo/2016/11/29/13/24/balloons-1869816__340.jpg',
-			},
-			h_w_img: {
-				type: Number,
-				default: 30
-			},
-			
-			
-		},
-		watch:{
-			
-		},
-		computed: {
-			style_w_h() {
-				return this.set_style_w_h();
-			},
-			style_w_h_img() {
-				let that = this;
-				var height = parseInt(that.h_w_img);
-				var width = parseInt(that.h_w_img);
-				var style = '';
-				if (height > 0) {
-					style = `height:${height*2}rpx;`;
-				}
-				if (width > 0) {
-					style += `width:${width*2}rpx;z-index: 2;`;
-				}
-			
-				return style;
-			},
-		},
-		created: function() {
-			let that = this;
-			try {
-				//app苹果二维码不居中
-				//#ifndef MP
-				let isAndroid = false ;
-			    const res = uni.getSystemInfoSync();
-			    if(res.platform == 'android'){
-					isAndroid = true ;
-				}else{
-					isAndroid = false ;
-				}
-				
-				
-				if (!isAndroid) {
-					that.marginLeft = 46;
-				}
-				
-				that.isAndroid = isAndroid ;
-				try {
-					const add_num = uni.getStorageSync(that.add_num_key);
-					if (add_num) {
-						that.add_num = add_num;
-					}
-					
-				} catch (e) {
-					// error
-				
-				}
-				// #endif
-
-			} catch (e) {
-			    // error
-			}
-
-			//#ifdef MP
-			//that.marginLeft = 40;
-			// #endif
-
-		},
-		methods: {
-			set_style_w_h(){
-				
-				let that = this;
-				var height = parseInt(that.height);
-				var width = parseInt(that.width);
-				var style = '';
-				var height = height*2 ;
-				var width = width*2 ;
-				
-				//#ifndef MP
-				var add = that.add_num ;
-				
-				height +=  add;
-				width +=  add;
-				// #endif
-				
-				if (height > 0) {
-					style = `height:${height}rpx;`;
-				}
-				if (width > 0) {
-					style += `width:${width}rpx;`;
-				}
-				
-				return style;
-			},
-			hideQrcode() {
-				this.$emit("hideQrcode")
-			},
-			// 二维码生成工具
-			crtQrCode() {
-				let that = this;
-				//#ifndef MP
-				new qrCode(that.qrcode_id, {
-					text: this.url,
-					width: that.width,
-					height: that.height,
-					colorDark: that.themeColor,//#333333
-					colorLight: "#FFFFFF",
-					correctLevel: qrCode.CorrectLevel.H,
-				})
-				// #endif
-				//#ifdef MP
-				that.createQrCode(this.url, that.qrcode_id, that.width, that.height,that.themeColor,that.is_themeImg,that.themeImg,that.h_w_img);
-				// #endif
-
-				//that.createQrCode(this.url, that.qrcode_id, that.width, that.height);
-			},
-			//#ifdef MP
-
-			createQrCode: function(url, canvasId, cavW, cavH,cavColor,haveImg,imgurl,imgsize) {
-				//调用插件中的draw方法，绘制二维码图片
-				qr_we.api.draw(url, canvasId, cavW, cavH,cavColor,haveImg,imgurl,imgsize, this, this.canvasToTempImage);
-				// setTimeout(() => { this.canvasToTempImage();},100);
-
-			},
-			
-			// #endif
-			//获取临时缓存照片路径，存入data中
-			canvasToTempImage: function() {
-				var that = this;
-			},
-			saveImage: function() {
-				var that = this;
-				uni.canvasToTempFilePath({
-					canvasId: that.qrcode_id,
-					success: function(res) {
-						var tempFilePath = res.tempFilePath;
-						console.log(tempFilePath);
-						that.imagePath = tempFilePath;
-						
-						//保存到相册
-						// uni.saveFile({
-						//       tempFilePath: tempFilePath,
-						//       success: function (res2) {
-						//         var savedFilePath = res2.savedFilePath;
-								
-								
-						//       }
-						// });
-						uni.saveImageToPhotosAlbum({
-							filePath : tempFilePath ,
-							success: function (res3) {
-								uni.showModal({
-									title: '提示',
-									content: '保存成功',
-									confirmText: '确定',
-									showCancel: false,
-									confirmColor: '#33CCCC',
-									success(res4) {
-										
-									}
-								}) 
-							},
-						});
-					},
-					fail: function(res) {
-						console.log(res);
-					}
-				}, that);
-			},
-			//微信小程序支持：长按二维码，提示是否保存相册
-			//安卓APP长按校正二维码
-			longtapCode(){
-				var that = this;
-				
-				//#ifndef MP
-				uni.showModal({
-					title: '校正二维码',
-					content: '二维码是否异常',
-					confirmText: '确定',
-					confirmColor: '#33CCCC',
-					success(res) {
-						if (res.confirm) {
-							that.rectify_code();
-						}
-					}
-				})
-				// #endif
-				
-				//#ifdef MP-WEIXIN
-				uni.showModal({
-					title: '提示',
-					content: '是否保存到相册',
-					confirmText: '确定',
-					confirmColor: '#33CCCC',
-					success(res) {
-						if (res.confirm) {
-							that.saveImage();
-						}
-					}
-				})
-				// #endif
-			},
-			//安卓有些手机不正常，长按可选择矫正
-			rectify_code(){
-				var that = this;
-				let add_num = that.add_num ;
-				add_num += 30 ;
-				that.add_num = add_num;
-				that.crtQrCode();//重新生成才会立即覆盖
-				try {
-					//第一次长按校正设置了就不用在设置
-					uni.setStorage({
-						key: that.add_num_key,
-						data: add_num,
-						success: function() {
-							
-						}
-					});
-				} catch (e) {
-					// error
-				
-				}
-			},
-		},
-		mounted() {}
-	}
-</script>
-
-<style scoped lang="scss">
-	// .qrcode-box {
-	// 	position: fixed;
-	// 	left: 0;
-	// 	top: 0;
-	// 	right: 0;
-	// 	bottom: 0;
-	// 	height: 100vh;
-	// 	width: 100vw;
-	// 	background-color: rgba(59, 59, 59, 0.6);
-	// 	// opacity: 0.8;
-	// 	text-align: center;
-	// 	display: flex;
-	// 	align-items: center;
-	// 	display: none;
-
-	// 	.qrcode-item {
-	// 		flex: 1;
-	// 		position: relative;
-	// 		text-align: center;
-
-	// 		.item-box {
-	// 			width: 90%;
-	// 			margin: auto;
-	// 			display: inline-block;
-	// 			margin-top: 30%;
-	// 			padding-bottom: 30rpx;
-
-	// 			// animation: show 0.7s;
-	// 			.title {
-	// 				font-size: 46rpx;
-	// 				text-align: center;
-	// 				margin-bottom: 24rpx;
-	// 			}
-
-	// 			.canvas {
-	// 				margin: auto;
-	// 				display: inline-block;
-	// 				margin: auto;
-	// 			}
-
-	// 			background-color: #FFFFFF;
-	// 		}
-
-	// 	}
-	// }
-	.box-qrcode{
-		text-align: center;
-		position: relative;
-		.box-img-qrcode{
-			position: absolute;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			z-index: 2;
-		}
-	}
-	image{
-		width: 60upx;
-		height: 60upx;
-		border-radius: 50%;
-		
-	}
-	.canvas-qrcode {
-		
-		margin: auto;
-		display: inline-block;
-		float: left;
-	}
-	
-	
-	.opacity-qrcode {
-		opacity: 0;
-		display: block;
-	}
-
-	.show-qrcode {
-		display: block;
-		animation: fade 0.7s;
-
-		// -moz-animation: fade 0.5s; /* Firefox */
-		// -webkit-animation: fade 0.5s; /* Safari 和 Chrome */
-		// -o-animation: fade 0.5s;
-	}
-
-	.hide-qrcode {
-		animation: hide 0.7s;
-	}
-
-	@keyframes fade {
-		from {
-			opacity: 0.8;
-		}
-
-		to {
-			opacity: 1;
-		}
-	}
-
-	@keyframes hide {
-		from {
-			opacity: 1;
-		}
-
-		to {
-			opacity: 0;
-		}
-	}
-</style>

components/ay-qrcode/qrcode_wx.js

@@ -1,872 +0,0 @@
-!(function() {
-
-	// alignment pattern
-	var adelta = [
-		0, 11, 15, 19, 23, 27, 31,
-		16, 18, 20, 22, 24, 26, 28, 20, 22, 24, 24, 26, 28, 28, 22, 24, 24,
-		26, 26, 28, 28, 24, 24, 26, 26, 26, 28, 28, 24, 26, 26, 26, 28, 28
-	];
-
-	// version block
-	var vpat = [
-		0xc94, 0x5bc, 0xa99, 0x4d3, 0xbf6, 0x762, 0x847, 0x60d,
-		0x928, 0xb78, 0x45d, 0xa17, 0x532, 0x9a6, 0x683, 0x8c9,
-		0x7ec, 0xec4, 0x1e1, 0xfab, 0x08e, 0xc1a, 0x33f, 0xd75,
-		0x250, 0x9d5, 0x6f0, 0x8ba, 0x79f, 0xb0b, 0x42e, 0xa64,
-		0x541, 0xc69
-	];
-
-	// final format bits with mask: level << 3 | mask
-	var fmtword = [
-		0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976, //L
-		0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0, //M
-		0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed, //Q
-		0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b //H
-	];
-
-	// 4 per version: number of blocks 1,2; data width; ecc width
-	var eccblocks = [
-		1, 0, 19, 7, 1, 0, 16, 10, 1, 0, 13, 13, 1, 0, 9, 17,
-		1, 0, 34, 10, 1, 0, 28, 16, 1, 0, 22, 22, 1, 0, 16, 28,
-		1, 0, 55, 15, 1, 0, 44, 26, 2, 0, 17, 18, 2, 0, 13, 22,
-		1, 0, 80, 20, 2, 0, 32, 18, 2, 0, 24, 26, 4, 0, 9, 16,
-		1, 0, 108, 26, 2, 0, 43, 24, 2, 2, 15, 18, 2, 2, 11, 22,
-		2, 0, 68, 18, 4, 0, 27, 16, 4, 0, 19, 24, 4, 0, 15, 28,
-		2, 0, 78, 20, 4, 0, 31, 18, 2, 4, 14, 18, 4, 1, 13, 26,
-		2, 0, 97, 24, 2, 2, 38, 22, 4, 2, 18, 22, 4, 2, 14, 26,
-		2, 0, 116, 30, 3, 2, 36, 22, 4, 4, 16, 20, 4, 4, 12, 24,
-		2, 2, 68, 18, 4, 1, 43, 26, 6, 2, 19, 24, 6, 2, 15, 28,
-		4, 0, 81, 20, 1, 4, 50, 30, 4, 4, 22, 28, 3, 8, 12, 24,
-		2, 2, 92, 24, 6, 2, 36, 22, 4, 6, 20, 26, 7, 4, 14, 28,
-		4, 0, 107, 26, 8, 1, 37, 22, 8, 4, 20, 24, 12, 4, 11, 22,
-		3, 1, 115, 30, 4, 5, 40, 24, 11, 5, 16, 20, 11, 5, 12, 24,
-		5, 1, 87, 22, 5, 5, 41, 24, 5, 7, 24, 30, 11, 7, 12, 24,
-		5, 1, 98, 24, 7, 3, 45, 28, 15, 2, 19, 24, 3, 13, 15, 30,
-		1, 5, 107, 28, 10, 1, 46, 28, 1, 15, 22, 28, 2, 17, 14, 28,
-		5, 1, 120, 30, 9, 4, 43, 26, 17, 1, 22, 28, 2, 19, 14, 28,
-		3, 4, 113, 28, 3, 11, 44, 26, 17, 4, 21, 26, 9, 16, 13, 26,
-		3, 5, 107, 28, 3, 13, 41, 26, 15, 5, 24, 30, 15, 10, 15, 28,
-		4, 4, 116, 28, 17, 0, 42, 26, 17, 6, 22, 28, 19, 6, 16, 30,
-		2, 7, 111, 28, 17, 0, 46, 28, 7, 16, 24, 30, 34, 0, 13, 24,
-		4, 5, 121, 30, 4, 14, 47, 28, 11, 14, 24, 30, 16, 14, 15, 30,
-		6, 4, 117, 30, 6, 14, 45, 28, 11, 16, 24, 30, 30, 2, 16, 30,
-		8, 4, 106, 26, 8, 13, 47, 28, 7, 22, 24, 30, 22, 13, 15, 30,
-		10, 2, 114, 28, 19, 4, 46, 28, 28, 6, 22, 28, 33, 4, 16, 30,
-		8, 4, 122, 30, 22, 3, 45, 28, 8, 26, 23, 30, 12, 28, 15, 30,
-		3, 10, 117, 30, 3, 23, 45, 28, 4, 31, 24, 30, 11, 31, 15, 30,
-		7, 7, 116, 30, 21, 7, 45, 28, 1, 37, 23, 30, 19, 26, 15, 30,
-		5, 10, 115, 30, 19, 10, 47, 28, 15, 25, 24, 30, 23, 25, 15, 30,
-		13, 3, 115, 30, 2, 29, 46, 28, 42, 1, 24, 30, 23, 28, 15, 30,
-		17, 0, 115, 30, 10, 23, 46, 28, 10, 35, 24, 30, 19, 35, 15, 30,
-		17, 1, 115, 30, 14, 21, 46, 28, 29, 19, 24, 30, 11, 46, 15, 30,
-		13, 6, 115, 30, 14, 23, 46, 28, 44, 7, 24, 30, 59, 1, 16, 30,
-		12, 7, 121, 30, 12, 26, 47, 28, 39, 14, 24, 30, 22, 41, 15, 30,
-		6, 14, 121, 30, 6, 34, 47, 28, 46, 10, 24, 30, 2, 64, 15, 30,
-		17, 4, 122, 30, 29, 14, 46, 28, 49, 10, 24, 30, 24, 46, 15, 30,
-		4, 18, 122, 30, 13, 32, 46, 28, 48, 14, 24, 30, 42, 32, 15, 30,
-		20, 4, 117, 30, 40, 7, 47, 28, 43, 22, 24, 30, 10, 67, 15, 30,
-		19, 6, 118, 30, 18, 31, 47, 28, 34, 34, 24, 30, 20, 61, 15, 30
-	];
-
-	// Galois field log table
-	var glog = [
-		0xff, 0x00, 0x01, 0x19, 0x02, 0x32, 0x1a, 0xc6, 0x03, 0xdf, 0x33, 0xee, 0x1b, 0x68, 0xc7, 0x4b,
-		0x04, 0x64, 0xe0, 0x0e, 0x34, 0x8d, 0xef, 0x81, 0x1c, 0xc1, 0x69, 0xf8, 0xc8, 0x08, 0x4c, 0x71,
-		0x05, 0x8a, 0x65, 0x2f, 0xe1, 0x24, 0x0f, 0x21, 0x35, 0x93, 0x8e, 0xda, 0xf0, 0x12, 0x82, 0x45,
-		0x1d, 0xb5, 0xc2, 0x7d, 0x6a, 0x27, 0xf9, 0xb9, 0xc9, 0x9a, 0x09, 0x78, 0x4d, 0xe4, 0x72, 0xa6,
-		0x06, 0xbf, 0x8b, 0x62, 0x66, 0xdd, 0x30, 0xfd, 0xe2, 0x98, 0x25, 0xb3, 0x10, 0x91, 0x22, 0x88,
-		0x36, 0xd0, 0x94, 0xce, 0x8f, 0x96, 0xdb, 0xbd, 0xf1, 0xd2, 0x13, 0x5c, 0x83, 0x38, 0x46, 0x40,
-		0x1e, 0x42, 0xb6, 0xa3, 0xc3, 0x48, 0x7e, 0x6e, 0x6b, 0x3a, 0x28, 0x54, 0xfa, 0x85, 0xba, 0x3d,
-		0xca, 0x5e, 0x9b, 0x9f, 0x0a, 0x15, 0x79, 0x2b, 0x4e, 0xd4, 0xe5, 0xac, 0x73, 0xf3, 0xa7, 0x57,
-		0x07, 0x70, 0xc0, 0xf7, 0x8c, 0x80, 0x63, 0x0d, 0x67, 0x4a, 0xde, 0xed, 0x31, 0xc5, 0xfe, 0x18,
-		0xe3, 0xa5, 0x99, 0x77, 0x26, 0xb8, 0xb4, 0x7c, 0x11, 0x44, 0x92, 0xd9, 0x23, 0x20, 0x89, 0x2e,
-		0x37, 0x3f, 0xd1, 0x5b, 0x95, 0xbc, 0xcf, 0xcd, 0x90, 0x87, 0x97, 0xb2, 0xdc, 0xfc, 0xbe, 0x61,
-		0xf2, 0x56, 0xd3, 0xab, 0x14, 0x2a, 0x5d, 0x9e, 0x84, 0x3c, 0x39, 0x53, 0x47, 0x6d, 0x41, 0xa2,
-		0x1f, 0x2d, 0x43, 0xd8, 0xb7, 0x7b, 0xa4, 0x76, 0xc4, 0x17, 0x49, 0xec, 0x7f, 0x0c, 0x6f, 0xf6,
-		0x6c, 0xa1, 0x3b, 0x52, 0x29, 0x9d, 0x55, 0xaa, 0xfb, 0x60, 0x86, 0xb1, 0xbb, 0xcc, 0x3e, 0x5a,
-		0xcb, 0x59, 0x5f, 0xb0, 0x9c, 0xa9, 0xa0, 0x51, 0x0b, 0xf5, 0x16, 0xeb, 0x7a, 0x75, 0x2c, 0xd7,
-		0x4f, 0xae, 0xd5, 0xe9, 0xe6, 0xe7, 0xad, 0xe8, 0x74, 0xd6, 0xf4, 0xea, 0xa8, 0x50, 0x58, 0xaf
-	];
-
-	// Galios field exponent table
-	var gexp = [
-		0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1d, 0x3a, 0x74, 0xe8, 0xcd, 0x87, 0x13, 0x26,
-		0x4c, 0x98, 0x2d, 0x5a, 0xb4, 0x75, 0xea, 0xc9, 0x8f, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0,
-		0x9d, 0x27, 0x4e, 0x9c, 0x25, 0x4a, 0x94, 0x35, 0x6a, 0xd4, 0xb5, 0x77, 0xee, 0xc1, 0x9f, 0x23,
-		0x46, 0x8c, 0x05, 0x0a, 0x14, 0x28, 0x50, 0xa0, 0x5d, 0xba, 0x69, 0xd2, 0xb9, 0x6f, 0xde, 0xa1,
-		0x5f, 0xbe, 0x61, 0xc2, 0x99, 0x2f, 0x5e, 0xbc, 0x65, 0xca, 0x89, 0x0f, 0x1e, 0x3c, 0x78, 0xf0,
-		0xfd, 0xe7, 0xd3, 0xbb, 0x6b, 0xd6, 0xb1, 0x7f, 0xfe, 0xe1, 0xdf, 0xa3, 0x5b, 0xb6, 0x71, 0xe2,
-		0xd9, 0xaf, 0x43, 0x86, 0x11, 0x22, 0x44, 0x88, 0x0d, 0x1a, 0x34, 0x68, 0xd0, 0xbd, 0x67, 0xce,
-		0x81, 0x1f, 0x3e, 0x7c, 0xf8, 0xed, 0xc7, 0x93, 0x3b, 0x76, 0xec, 0xc5, 0x97, 0x33, 0x66, 0xcc,
-		0x85, 0x17, 0x2e, 0x5c, 0xb8, 0x6d, 0xda, 0xa9, 0x4f, 0x9e, 0x21, 0x42, 0x84, 0x15, 0x2a, 0x54,
-		0xa8, 0x4d, 0x9a, 0x29, 0x52, 0xa4, 0x55, 0xaa, 0x49, 0x92, 0x39, 0x72, 0xe4, 0xd5, 0xb7, 0x73,
-		0xe6, 0xd1, 0xbf, 0x63, 0xc6, 0x91, 0x3f, 0x7e, 0xfc, 0xe5, 0xd7, 0xb3, 0x7b, 0xf6, 0xf1, 0xff,
-		0xe3, 0xdb, 0xab, 0x4b, 0x96, 0x31, 0x62, 0xc4, 0x95, 0x37, 0x6e, 0xdc, 0xa5, 0x57, 0xae, 0x41,
-		0x82, 0x19, 0x32, 0x64, 0xc8, 0x8d, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0, 0xdd, 0xa7, 0x53, 0xa6,
-		0x51, 0xa2, 0x59, 0xb2, 0x79, 0xf2, 0xf9, 0xef, 0xc3, 0x9b, 0x2b, 0x56, 0xac, 0x45, 0x8a, 0x09,
-		0x12, 0x24, 0x48, 0x90, 0x3d, 0x7a, 0xf4, 0xf5, 0xf7, 0xf3, 0xfb, 0xeb, 0xcb, 0x8b, 0x0b, 0x16,
-		0x2c, 0x58, 0xb0, 0x7d, 0xfa, 0xe9, 0xcf, 0x83, 0x1b, 0x36, 0x6c, 0xd8, 0xad, 0x47, 0x8e, 0x00
-	];
-
-	// Working buffers:
-	// data input and ecc append, image working buffer, fixed part of image, run lengths for badness
-	var strinbuf = [],
-		eccbuf = [],
-		qrframe = [],
-		framask = [],
-		rlens = [];
-	// Control values - width is based on version, last 4 are from table.
-	var version, width, neccblk1, neccblk2, datablkw, eccblkwid;
-	var ecclevel = 2;
-	// set bit to indicate cell in qrframe is immutable.  symmetric around diagonal
-	function setmask(x, y) {
-		var bt;
-		if (x > y) {
-			bt = x;
-			x = y;
-			y = bt;
-		}
-		// y*y = 1+3+5...
-		bt = y;
-		bt *= y;
-		bt += y;
-		bt >>= 1;
-		bt += x;
-		framask[bt] = 1;
-	}
-
-	// enter alignment pattern - black to qrframe, white to mask (later black frame merged to mask)
-	function putalign(x, y) {
-		var j;
-
-		qrframe[x + width * y] = 1;
-		for (j = -2; j < 2; j++) {
-			qrframe[(x + j) + width * (y - 2)] = 1;
-			qrframe[(x - 2) + width * (y + j + 1)] = 1;
-			qrframe[(x + 2) + width * (y + j)] = 1;
-			qrframe[(x + j + 1) + width * (y + 2)] = 1;
-		}
-		for (j = 0; j < 2; j++) {
-			setmask(x - 1, y + j);
-			setmask(x + 1, y - j);
-			setmask(x - j, y - 1);
-			setmask(x + j, y + 1);
-		}
-	}
-
-	//========================================================================
-	// Reed Solomon error correction
-	// exponentiation mod N
-	function modnn(x) {
-		while (x >= 255) {
-			x -= 255;
-			x = (x >> 8) + (x & 255);
-		}
-		return x;
-	}
-
-	var genpoly = [];
-
-	// Calculate and append ECC data to data block.  Block is in strinbuf, indexes to buffers given.
-	function appendrs(data, dlen, ecbuf, eclen) {
-		var i, j, fb;
-
-		for (i = 0; i < eclen; i++)
-			strinbuf[ecbuf + i] = 0;
-		for (i = 0; i < dlen; i++) {
-			fb = glog[strinbuf[data + i] ^ strinbuf[ecbuf]];
-			if (fb != 255) /* fb term is non-zero */
-				for (j = 1; j < eclen; j++)
-					strinbuf[ecbuf + j - 1] = strinbuf[ecbuf + j] ^ gexp[modnn(fb + genpoly[eclen - j])];
-			else
-				for (j = ecbuf; j < ecbuf + eclen; j++)
-					strinbuf[j] = strinbuf[j + 1];
-			strinbuf[ecbuf + eclen - 1] = fb == 255 ? 0 : gexp[modnn(fb + genpoly[0])];
-		}
-	}
-
-	//========================================================================
-	// Frame data insert following the path rules
-
-	// check mask - since symmetrical use half.
-	function ismasked(x, y) {
-		var bt;
-		if (x > y) {
-			bt = x;
-			x = y;
-			y = bt;
-		}
-		bt = y;
-		bt += y * y;
-		bt >>= 1;
-		bt += x;
-		return framask[bt];
-	}
-
-	//========================================================================
-	//  Apply the selected mask out of the 8.
-	function applymask(m) {
-		var x, y, r3x, r3y;
-
-		switch (m) {
-			case 0:
-				for (y = 0; y < width; y++)
-					for (x = 0; x < width; x++)
-						if (!((x + y) & 1) && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-				break;
-			case 1:
-				for (y = 0; y < width; y++)
-					for (x = 0; x < width; x++)
-						if (!(y & 1) && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-				break;
-			case 2:
-				for (y = 0; y < width; y++)
-					for (r3x = 0, x = 0; x < width; x++, r3x++) {
-						if (r3x == 3)
-							r3x = 0;
-						if (!r3x && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-					}
-				break;
-			case 3:
-				for (r3y = 0, y = 0; y < width; y++, r3y++) {
-					if (r3y == 3)
-						r3y = 0;
-					for (r3x = r3y, x = 0; x < width; x++, r3x++) {
-						if (r3x == 3)
-							r3x = 0;
-						if (!r3x && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-					}
-				}
-				break;
-			case 4:
-				for (y = 0; y < width; y++)
-					for (r3x = 0, r3y = ((y >> 1) & 1), x = 0; x < width; x++, r3x++) {
-						if (r3x == 3) {
-							r3x = 0;
-							r3y = !r3y;
-						}
-						if (!r3y && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-					}
-				break;
-			case 5:
-				for (r3y = 0, y = 0; y < width; y++, r3y++) {
-					if (r3y == 3)
-						r3y = 0;
-					for (r3x = 0, x = 0; x < width; x++, r3x++) {
-						if (r3x == 3)
-							r3x = 0;
-						if (!((x & y & 1) + !(!r3x | !r3y)) && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-					}
-				}
-				break;
-			case 6:
-				for (r3y = 0, y = 0; y < width; y++, r3y++) {
-					if (r3y == 3)
-						r3y = 0;
-					for (r3x = 0, x = 0; x < width; x++, r3x++) {
-						if (r3x == 3)
-							r3x = 0;
-						if (!(((x & y & 1) + (r3x && (r3x == r3y))) & 1) && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-					}
-				}
-				break;
-			case 7:
-				for (r3y = 0, y = 0; y < width; y++, r3y++) {
-					if (r3y == 3)
-						r3y = 0;
-					for (r3x = 0, x = 0; x < width; x++, r3x++) {
-						if (r3x == 3)
-							r3x = 0;
-						if (!(((r3x && (r3x == r3y)) + ((x + y) & 1)) & 1) && !ismasked(x, y))
-							qrframe[x + y * width] ^= 1;
-					}
-				}
-				break;
-		}
-		return;
-	}
-
-	// Badness coefficients.
-	var N1 = 3,
-		N2 = 3,
-		N3 = 40,
-		N4 = 10;
-
-	// Using the table of the length of each run, calculate the amount of bad image 
-	// - long runs or those that look like finders; called twice, once each for X and Y
-	function badruns(length) {
-		var i;
-		var runsbad = 0;
-		for (i = 0; i <= length; i++)
-			if (rlens[i] >= 5)
-				runsbad += N1 + rlens[i] - 5;
-		// BwBBBwB as in finder
-		for (i = 3; i < length - 1; i += 2)
-			if (rlens[i - 2] == rlens[i + 2] &&
-				rlens[i + 2] == rlens[i - 1] &&
-				rlens[i - 1] == rlens[i + 1] &&
-				rlens[i - 1] * 3 == rlens[i]
-				// white around the black pattern? Not part of spec
-				&&
-				(rlens[i - 3] == 0 // beginning
-					||
-					i + 3 > length // end
-					||
-					rlens[i - 3] * 3 >= rlens[i] * 4 || rlens[i + 3] * 3 >= rlens[i] * 4)
-			)
-				runsbad += N3;
-		return runsbad;
-	}
-
-	// Calculate how bad the masked image is - blocks, imbalance, runs, or finders.
-	function badcheck() {
-		var x, y, h, b, b1;
-		var thisbad = 0;
-		var bw = 0;
-
-		// blocks of same color.
-		for (y = 0; y < width - 1; y++)
-			for (x = 0; x < width - 1; x++)
-				if ((qrframe[x + width * y] && qrframe[(x + 1) + width * y] &&
-						qrframe[x + width * (y + 1)] && qrframe[(x + 1) + width * (y + 1)]) // all black
-					||
-					!(qrframe[x + width * y] || qrframe[(x + 1) + width * y] ||
-						qrframe[x + width * (y + 1)] || qrframe[(x + 1) + width * (y + 1)])) // all white
-					thisbad += N2;
-
-		// X runs
-		for (y = 0; y < width; y++) {
-			rlens[0] = 0;
-			for (h = b = x = 0; x < width; x++) {
-				if ((b1 = qrframe[x + width * y]) == b)
-					rlens[h]++;
-				else
-					rlens[++h] = 1;
-				b = b1;
-				bw += b ? 1 : -1;
-			}
-			thisbad += badruns(h);
-		}
-
-		// black/white imbalance
-		if (bw < 0)
-			bw = -bw;
-
-		var big = bw;
-		var count = 0;
-		big += big << 2;
-		big <<= 1;
-		while (big > width * width)
-			big -= width * width, count++;
-		thisbad += count * N4;
-
-		// Y runs
-		for (x = 0; x < width; x++) {
-			rlens[0] = 0;
-			for (h = b = y = 0; y < width; y++) {
-				if ((b1 = qrframe[x + width * y]) == b)
-					rlens[h]++;
-				else
-					rlens[++h] = 1;
-				b = b1;
-			}
-			thisbad += badruns(h);
-		}
-		return thisbad;
-	}
-
-	function genframe(instring) {
-		var x, y, k, t, v, i, j, m;
-
-		// find the smallest version that fits the string
-		t = instring.length;
-		version = 0;
-		do {
-			version++;
-			k = (ecclevel - 1) * 4 + (version - 1) * 16;
-			neccblk1 = eccblocks[k++];
-			neccblk2 = eccblocks[k++];
-			datablkw = eccblocks[k++];
-			eccblkwid = eccblocks[k];
-			k = datablkw * (neccblk1 + neccblk2) + neccblk2 - 3 + (version <= 9);
-			if (t <= k)
-				break;
-		} while (version < 40);
-
-		// FIXME - insure that it fits insted of being truncated
-		width = 17 + 4 * version;
-
-		// allocate, clear and setup data structures
-		v = datablkw + (datablkw + eccblkwid) * (neccblk1 + neccblk2) + neccblk2;
-		for (t = 0; t < v; t++)
-			eccbuf[t] = 0;
-		strinbuf = instring.slice(0);
-
-		for (t = 0; t < width * width; t++)
-			qrframe[t] = 0;
-
-		for (t = 0; t < (width * (width + 1) + 1) / 2; t++)
-			framask[t] = 0;
-
-		// insert finders - black to frame, white to mask
-		for (t = 0; t < 3; t++) {
-			k = 0;
-			y = 0;
-			if (t == 1)
-				k = (width - 7);
-			if (t == 2)
-				y = (width - 7);
-			qrframe[(y + 3) + width * (k + 3)] = 1;
-			for (x = 0; x < 6; x++) {
-				qrframe[(y + x) + width * k] = 1;
-				qrframe[y + width * (k + x + 1)] = 1;
-				qrframe[(y + 6) + width * (k + x)] = 1;
-				qrframe[(y + x + 1) + width * (k + 6)] = 1;
-			}
-			for (x = 1; x < 5; x++) {
-				setmask(y + x, k + 1);
-				setmask(y + 1, k + x + 1);
-				setmask(y + 5, k + x);
-				setmask(y + x + 1, k + 5);
-			}
-			for (x = 2; x < 4; x++) {
-				qrframe[(y + x) + width * (k + 2)] = 1;
-				qrframe[(y + 2) + width * (k + x + 1)] = 1;
-				qrframe[(y + 4) + width * (k + x)] = 1;
-				qrframe[(y + x + 1) + width * (k + 4)] = 1;
-			}
-		}
-
-		// alignment blocks
-		if (version > 1) {
-			t = adelta[version];
-			y = width - 7;
-			for (;;) {
-				x = width - 7;
-				while (x > t - 3) {
-					putalign(x, y);
-					if (x < t)
-						break;
-					x -= t;
-				}
-				if (y <= t + 9)
-					break;
-				y -= t;
-				putalign(6, y);
-				putalign(y, 6);
-			}
-		}
-
-		// single black
-		qrframe[8 + width * (width - 8)] = 1;
-
-		// timing gap - mask only
-		for (y = 0; y < 7; y++) {
-			setmask(7, y);
-			setmask(width - 8, y);
-			setmask(7, y + width - 7);
-		}
-		for (x = 0; x < 8; x++) {
-			setmask(x, 7);
-			setmask(x + width - 8, 7);
-			setmask(x, width - 8);
-		}
-
-		// reserve mask-format area
-		for (x = 0; x < 9; x++)
-			setmask(x, 8);
-		for (x = 0; x < 8; x++) {
-			setmask(x + width - 8, 8);
-			setmask(8, x);
-		}
-		for (y = 0; y < 7; y++)
-			setmask(8, y + width - 7);
-
-		// timing row/col
-		for (x = 0; x < width - 14; x++)
-			if (x & 1) {
-				setmask(8 + x, 6);
-				setmask(6, 8 + x);
-			}
-		else {
-			qrframe[(8 + x) + width * 6] = 1;
-			qrframe[6 + width * (8 + x)] = 1;
-		}
-
-		// version block
-		if (version > 6) {
-			t = vpat[version - 7];
-			k = 17;
-			for (x = 0; x < 6; x++)
-				for (y = 0; y < 3; y++, k--)
-					if (1 & (k > 11 ? version >> (k - 12) : t >> k)) {
-						qrframe[(5 - x) + width * (2 - y + width - 11)] = 1;
-						qrframe[(2 - y + width - 11) + width * (5 - x)] = 1;
-					}
-			else {
-				setmask(5 - x, 2 - y + width - 11);
-				setmask(2 - y + width - 11, 5 - x);
-			}
-		}
-
-		// sync mask bits - only set above for white spaces, so add in black bits
-		for (y = 0; y < width; y++)
-			for (x = 0; x <= y; x++)
-				if (qrframe[x + width * y])
-					setmask(x, y);
-
-		// convert string to bitstream
-		// 8 bit data to QR-coded 8 bit data (numeric or alphanum, or kanji not supported)
-		v = strinbuf.length;
-
-		// string to array
-		for (i = 0; i < v; i++)
-			eccbuf[i] = strinbuf.charCodeAt(i);
-		strinbuf = eccbuf.slice(0);
-
-		// calculate max string length
-		x = datablkw * (neccblk1 + neccblk2) + neccblk2;
-		if (v >= x - 2) {
-			v = x - 2;
-			if (version > 9)
-				v--;
-		}
-
-		// shift and repack to insert length prefix
-		i = v;
-		if (version > 9) {
-			strinbuf[i + 2] = 0;
-			strinbuf[i + 3] = 0;
-			while (i--) {
-				t = strinbuf[i];
-				strinbuf[i + 3] |= 255 & (t << 4);
-				strinbuf[i + 2] = t >> 4;
-			}
-			strinbuf[2] |= 255 & (v << 4);
-			strinbuf[1] = v >> 4;
-			strinbuf[0] = 0x40 | (v >> 12);
-		} else {
-			strinbuf[i + 1] = 0;
-			strinbuf[i + 2] = 0;
-			while (i--) {
-				t = strinbuf[i];
-				strinbuf[i + 2] |= 255 & (t << 4);
-				strinbuf[i + 1] = t >> 4;
-			}
-			strinbuf[1] |= 255 & (v << 4);
-			strinbuf[0] = 0x40 | (v >> 4);
-		}
-		// fill to end with pad pattern
-		i = v + 3 - (version < 10);
-		while (i < x) {
-			strinbuf[i++] = 0xec;
-			// buffer has room    if (i == x)      break;
-			strinbuf[i++] = 0x11;
-		}
-
-		// calculate and append ECC
-
-		// calculate generator polynomial
-		genpoly[0] = 1;
-		for (i = 0; i < eccblkwid; i++) {
-			genpoly[i + 1] = 1;
-			for (j = i; j > 0; j--)
-				genpoly[j] = genpoly[j] ?
-				genpoly[j - 1] ^ gexp[modnn(glog[genpoly[j]] + i)] : genpoly[j - 1];
-			genpoly[0] = gexp[modnn(glog[genpoly[0]] + i)];
-		}
-		for (i = 0; i <= eccblkwid; i++)
-			genpoly[i] = glog[genpoly[i]]; // use logs for genpoly[] to save calc step
-
-		// append ecc to data buffer
-		k = x;
-		y = 0;
-		for (i = 0; i < neccblk1; i++) {
-			appendrs(y, datablkw, k, eccblkwid);
-			y += datablkw;
-			k += eccblkwid;
-		}
-		for (i = 0; i < neccblk2; i++) {
-			appendrs(y, datablkw + 1, k, eccblkwid);
-			y += datablkw + 1;
-			k += eccblkwid;
-		}
-		// interleave blocks
-		y = 0;
-		for (i = 0; i < datablkw; i++) {
-			for (j = 0; j < neccblk1; j++)
-				eccbuf[y++] = strinbuf[i + j * datablkw];
-			for (j = 0; j < neccblk2; j++)
-				eccbuf[y++] = strinbuf[(neccblk1 * datablkw) + i + (j * (datablkw + 1))];
-		}
-		for (j = 0; j < neccblk2; j++)
-			eccbuf[y++] = strinbuf[(neccblk1 * datablkw) + i + (j * (datablkw + 1))];
-		for (i = 0; i < eccblkwid; i++)
-			for (j = 0; j < neccblk1 + neccblk2; j++)
-				eccbuf[y++] = strinbuf[x + i + j * eccblkwid];
-		strinbuf = eccbuf;
-
-		// pack bits into frame avoiding masked area.
-		x = y = width - 1;
-		k = v = 1; // up, minus
-		/* inteleaved data and ecc codes */
-		m = (datablkw + eccblkwid) * (neccblk1 + neccblk2) + neccblk2;
-		for (i = 0; i < m; i++) {
-			t = strinbuf[i];
-			for (j = 0; j < 8; j++, t <<= 1) {
-				if (0x80 & t)
-					qrframe[x + width * y] = 1;
-				do { // find next fill position
-					if (v)
-						x--;
-					else {
-						x++;
-						if (k) {
-							if (y != 0)
-								y--;
-							else {
-								x -= 2;
-								k = !k;
-								if (x == 6) {
-									x--;
-									y = 9;
-								}
-							}
-						} else {
-							if (y != width - 1)
-								y++;
-							else {
-								x -= 2;
-								k = !k;
-								if (x == 6) {
-									x--;
-									y -= 8;
-								}
-							}
-						}
-					}
-					v = !v;
-				} while (ismasked(x, y));
-			}
-		}
-
-		// save pre-mask copy of frame
-		strinbuf = qrframe.slice(0);
-		t = 0; // best
-		y = 30000; // demerit
-		// for instead of while since in original arduino code
-		// if an early mask was "good enough" it wouldn't try for a better one
-		// since they get more complex and take longer.
-		for (k = 0; k < 8; k++) {
-			applymask(k); // returns black-white imbalance
-			x = badcheck();
-			if (x < y) { // current mask better than previous best?
-				y = x;
-				t = k;
-			}
-			if (t == 7)
-				break; // don't increment i to a void redoing mask
-			qrframe = strinbuf.slice(0); // reset for next pass
-		}
-		if (t != k) // redo best mask - none good enough, last wasn't t
-			applymask(t);
-
-		// add in final mask/ecclevel bytes
-		y = fmtword[t + ((ecclevel - 1) << 3)];
-		// low byte
-		for (k = 0; k < 8; k++, y >>= 1)
-			if (y & 1) {
-				qrframe[(width - 1 - k) + width * 8] = 1;
-				if (k < 6)
-					qrframe[8 + width * k] = 1;
-				else
-					qrframe[8 + width * (k + 1)] = 1;
-			}
-		// high byte
-		for (k = 0; k < 7; k++, y >>= 1)
-			if (y & 1) {
-				qrframe[8 + width * (width - 7 + k)] = 1;
-				if (k)
-					qrframe[(6 - k) + width * 8] = 1;
-				else
-					qrframe[7 + width * 8] = 1;
-			}
-		return qrframe;
-	}
-
-
-
-
-	var _canvas = null;
-
-	var api = {
-
-		get ecclevel() {
-			return ecclevel;
-		},
-
-		set ecclevel(val) {
-			ecclevel = val;
-		},
-
-		get size() {
-			return _size;
-		},
-
-		set size(val) {
-			_size = val
-		},
-
-		get canvas() {
-			return _canvas;
-		},
-
-		set canvas(el) {
-			_canvas = el;
-		},
-
-		getFrame: function(string) {
-			return genframe(string);
-		},
-		//这里的utf16to8(str)是对Text中的字符串进行转码，让其支持中文
-		utf16to8: function(str) {
-			var out, i, len, c;
-
-			out = "";
-			len = str.length;
-			for (i = 0; i < len; i++) {
-				c = str.charCodeAt(i);
-				if ((c >= 0x0001) && (c <= 0x007F)) {
-					out += str.charAt(i);
-				} else if (c > 0x07FF) {
-					out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F));
-					out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F));
-					out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-				} else {
-					out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F));
-					out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-				}
-			}
-			return out;
-		},
-		/**
-		 * 新增$this参数，传入组件的this,兼容在组件中生成
-		 */
-		draw: function(str, canvas, cavW, cavH, cavColor, haveImg, imageUrl, imageSize, $this, cb = function() {}, ecc) {
-			var that = this;
-			ecclevel = ecc || ecclevel;
-			canvas = canvas || _canvas;
-			if (!canvas) {
-				console.warn('No canvas provided to draw QR code in!')
-				return;
-			}
-			
-			
-			let pre_background = "#ffffff";
-			var size = Math.min(cavW, cavH);
-			str = that.utf16to8(str); //增加中文显示
-
-			var frame = that.getFrame(str);
-				// 组件中生成qrcode需要绑定this 
-			var ctx = uni.createCanvasContext(canvas, $this);
-			var px = Math.round(size / (width ));
-			
-			var roundedSize = px * (width);
-			// var px = 1 ;
-			// var roundedSize = px * (width + 8) ;
-			
-			//var roundedSize = 0 ;
-			//var offset = Math.floor((size - roundedSize) / 2);
-			var offset = 0 ;
-			size = roundedSize;
-			//ctx.clearRect(0, 0, cavW, cavW);
-			ctx.setFillStyle(pre_background)
-			ctx.fillRect(0, 0, cavW, cavW);
-			ctx.setFillStyle(cavColor);
-			for (var i = 0; i < width; i++) {
-				for (var j = 0; j < width; j++) {
-					if (frame[j * width + i]) {
-						ctx.fillRect(px * ( i) + offset, px * ( j) + offset, px, px);
-					}
-				}
-			}
-
-			//画图片
-			if (haveImg) {
-				try {
-					var x = Number(((cavW - imageSize - 14) / 2).toFixed(2));
-					var y = Number(((cavH - imageSize -14) / 2).toFixed(2));
-					drawRoundedRect(ctx, x, y, imageSize, imageSize, imageSize / 2, 6, true, true)
-
-					let isNetImg = false;
-
-					isNetImg = imageUrl.substr(0, 4) == 'http' ? true : false;
-
-					if (isNetImg) {
-						//网络图片下载到本地
-						uni.getImageInfo({
-							src: imageUrl,
-							success: function(res) {
-								ctx.drawImage(res.path, x, y, imageSize, imageSize);
-								//--增加绘制完成回调
-								ctx.draw(false, function() {
-									cb();
-								})
-							}
-						})
-					} else {
-						ctx.drawImage(imageUrl, x, y, imageSize, imageSize);
-						//--增加绘制完成回调
-						ctx.draw(false, function() {
-							cb();
-						})
-					}
-
-
-
-
-					// 画圆角矩形
-					function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
-						ctxi.setLineWidth(lineWidth);
-						ctxi.setFillStyle(pre_background);
-						ctxi.setStrokeStyle(pre_background);
-						ctxi.beginPath(); // draw top and top right corner 
-						ctxi.moveTo(x + r, y);
-						ctxi.arcTo(x + width, y, x + width, y + r, r); // draw right side and bottom right corner 
-						ctxi.arcTo(x + width, y + height, x + width - r, y + height, r); // draw bottom and bottom left corner 
-						ctxi.arcTo(x, y + height, x, y + height - r, r); // draw left and top left corner 
-						ctxi.arcTo(x, y, x + r, y, r);
-						ctxi.closePath();
-						if (fill) {
-							ctxi.fill();
-						}
-						if (stroke) {
-							ctxi.stroke();
-						}
-					}
-				} catch (e) {
-					//TODO handle the exception
-				}
-
-			} else {
-				//--增加绘制完成回调
-				ctx.draw(false, function() {
-					cb();
-				})
-			}
-
-
-
-		}
-	}
-	module.exports = {
-		api
-	}
-})();

components/mp-select/mp-select.vue

@@ -1,143 +0,0 @@
-<template>
-    <scroll-view class="" id="section_ul">
-        <!-- 一级分支 -->
-        <view class="lv1list" v-for="(item, index) in selectList" :key="index">
-            <view class="tree-one">
-                <!-- 单选框组件 -->
-                <checkbox-group v-if='showCheck'
-                    style="position: absolute;height: 80rpx;line-height: 80rpx; left:20rpx;z-index: 1;">
-                    <checkbox :checked="item.checked" @click="_chooseAll(item,index)" />
-                </checkbox-group>
-                <!-- 名字和iconfont -->
-                <label
-                    style='height:80rpx;display: flex;align-items: center;padding: 20rpx;position: relative;border-bottom: 1px solid #e4e4e4;background: #f3f3f3;'
-                    @click.capture='_showlv2(index)'>
-                    <view style="margin-left: 60rpx;">{{item.name}}</view>
-                    <i class="iconfont iconshang" v-if='item.show'
-                        style="position: absolute;top: 18%;right: 2%;font-size: 48rpx;"></i>
-                    <i class="iconfont iconxiala" v-else
-                        style="position: absolute;top: 18%;right: 2%;font-size: 48rpx;"></i>
-                </label>
-            </view>
-            <!-- 二级分支 -->
-            <view v-if='item.show&&item.childrenList'>
-                <view class="tree-two" v-for="(item2, index2) in item.childrenList" :key="index2"
-                    style="padding:20rpx 80rpx;background: white;border-bottom: 1px solid #e2e2e2;">
-                    <view class="aui-list-item-inner">
-                        <checkbox-group v-if='showCheck' style='display:inline;'>
-                            <checkbox :checked="item2.checked" @click="_chooseOne(index,index2)" />
-                        </checkbox-group>
-                        <label>{{item2.name}}</label>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </scroll-view>
-</template>
-
-<script>
-export default {
-    name: 'select-tree',
-    props: {
-        selectList: {
-            type: Array,
-            default: function () {
-                return [
-                    {
-                        name: '水果',
-                        checked: false,
-                        show: false,
-                        childrenList: [
-                            {
-                                checked: false,
-                                name: '西瓜',
-                            }, {
-                                checked: false,
-                                name: '桃子'
-                            }
-                        ]
-                    },
-                    {
-                        name: '工具',
-                        checked: false,
-                        show: false,
-                        childrenList: [
-                            {
-                                checked: false,
-                                name: '锄头'
-                            }, {
-                                checked: false,
-                                name: '铲子'
-                            }
-                        ]
-
-                    }
-                ]
-            }
-        },
-        showCheck: {//显示多选框
-            type: Boolean,
-            default: true
-        }
-    },
-    data() {
-        return {
-            finalList: []
-        }
-    },
-    methods: {
-        _showlv2(index) {//展开二级目录
-            if (this.selectList[index].show) {
-                this.$set(this.selectList[index], 'show', false)
-            } else {
-                this.$set(this.selectList[index], 'show', true)
-            }
-
-        },
-        _chooseAll(item, index) {//选中所有
-            if (this.selectList[index].checked) {//
-                this.$set(this.selectList[index], 'checked', false)
-                this.selectList[index].childrenList.forEach(item => {
-                    item.checked = false
-                })
-            } else {
-                this.$set(this.selectList[index], 'checked', true)
-                this.selectList[index].childrenList.forEach(item => {
-                    item.checked = true
-                })
-            }
-            this.$set(this.selectList[index], 'show', true)
-            this._computedFinalList()
-        },
-        _chooseOne(i1, i2) {
-            if (this.selectList[i1].childrenList[i2].checked) {//
-                this.$set(this.selectList[i1], 'checked', false)
-                this.$set(this.selectList[i1].childrenList[i2], 'checked', false)
-                this.$forceUpdate()
-                this._computedFinalList()
-            } else {
-                this.$set(this.selectList[i1], 'checked', false)
-                this.$set(this.selectList[i1].childrenList[i2], 'checked', true)
-                this.$forceUpdate()
-                this._computedFinalList()
-            }
-        },
-        _computedFinalList() {//计算最终的值
-            this.finalList = []
-            this.selectList.forEach(item => {
-                if (item.childrenList) {
-                    item.childrenList.forEach(item2 => {
-                        if (item2.checked) {
-                            this.finalList.push({ choosedValue: { ...item2 }, originValue: { ...item } })
-                        }
-                    })
-                }
-            })
-            this.$emit('choose',this.finalList)
-        }
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

components/mp-uploadImg/mp-uploadImg.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<view class="grid  grid-square flex-sub margin-top-50" :class="'col-'+count">
+		<view class="grid  grid-square flex-sub margin-top-50" :class="col?'col-'+col:'col-' + count">
 			<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="viewImage(index)">
 				<image :src="imgList[index]" mode="aspectFill"></image>
 				<view class="cu-tag bg-red" @tap.stop="delImg(index)">
@@ -20,7 +20,8 @@
 			count: {
 				type: Number,
 				default: 4
-			}
+			},
+			col:String
 		},
 		data() {
 			return {
@@ -63,6 +64,9 @@
 	.border {
 		border: 4rpx dashed #e1e1e1;
 		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
 	}
 
 	.icon {

main.js

@@ -117,6 +117,11 @@ Vue.prototype.$isNotEmpty=function(value){
 	return true;
 }
 
+Vue.prototype.$tmplIds=[
+	//设备告警通知
+	'yAtQ6AY8zBHDT1PxXHv7x7gS-qiN1DnSedN4MWLbHwk',
+]
+
 
 Vue.config.productionTip = false
 

package-lock.json

@@ -9,20 +9,6 @@
       "resolved": "https://registry.nlark.com/@dcloudio/types/download/@dcloudio/types-2.3.3.tgz?cache=0&sync_timestamp=1626160250541&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40dcloudio%2Ftypes%2Fdownload%2F%40dcloudio%2Ftypes-2.3.3.tgz",
       "integrity": "sha1-DkDCovGSXVbbKXw0xSjqjIz7tOc="
     },
-    "hotp-totp-generator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.nlark.com/hotp-totp-generator/download/hotp-totp-generator-1.1.3.tgz",
-      "integrity": "sha1-OrB48CnCqFhYjp9K8RS+ujwxOIM=",
-      "requires": {
-        "moment": "^2.19.3",
-        "pad-component": "0.0.1"
-      }
-    },
-    "jssha": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npm.taobao.org/jssha/download/jssha-3.2.0.tgz",
-      "integrity": "sha1-iOxQuGbdFBHerdvms+NpLkxxDxY="
-    },
     "luch-request": {
       "version": "3.0.6",
       "resolved": "https://registry.nlark.com/luch-request/download/luch-request-3.0.6.tgz",
@@ -37,29 +23,11 @@
       "integrity": "sha1-YlRgxL3kpMYBYswE3AVjbKtkh7Q=",
       "dev": true
     },
-    "moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.nlark.com/moment/download/moment-2.29.1.tgz",
-      "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M="
-    },
-    "pad-component": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npm.taobao.org/pad-component/download/pad-component-0.0.1.tgz",
-      "integrity": "sha1-rR8izhvw/cDW3dkIrxfzUaQEuKw="
-    },
     "tki-qrcode": {
       "version": "0.1.6",
       "resolved": "https://registry.nlark.com/tki-qrcode/download/tki-qrcode-0.1.6.tgz",
       "integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8="
     },
-    "totp-generator": {
-      "version": "0.0.9",
-      "resolved": "https://registry.nlark.com/totp-generator/download/totp-generator-0.0.9.tgz",
-      "integrity": "sha1-RDGMZ9CxY9PE8vbebY+iO8d986k=",
-      "requires": {
-        "jssha": "^3.1.2"
-      }
-    },
     "u-draw-poster": {
       "version": "1.1.6",
       "resolved": "https://registry.nlark.com/u-draw-poster/download/u-draw-poster-1.1.6.tgz",

pages.json

@@ -87,6 +87,7 @@
             "path" : "pages/member/member",
             "style" :                                                                                    
             {
+				"navigationStyle":"custom",
                 "navigationBarTitleText": "会员中心",
                 "enablePullDownRefresh": false
             }
@@ -218,7 +219,7 @@
             "path" : "pages/material-download/createPoster",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "物料下载",
+                "navigationBarTitleText": "生成付款码",
                 "enablePullDownRefresh": false
             }
             
@@ -307,6 +308,33 @@
             }
             
         }
+        ,{
+            "path" : "pages/card/feedback",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "用户反馈",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/withdraw/records",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "提现记录",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/material-download/createOrderPoster",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "生成点餐码",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/card/feedback.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/checkstand/pay-qrcode.vue

@@ -1,33 +1,9 @@
 <template>
 	<view class="code-container">
-		<view class="title center">{{isPayment? "向商家付款":"扫一扫，向我付款"}}</view>
+		<view class="title center">扫一扫，向我付款</view>
 		<view  class="main-content">
-			<view v-if="isPayment">
-				<!-- 占位 -->
-				<view style="height: 50rpx;"></view>
-				<!-- 条形码 -->
-				<view  class="bar-code center">
-					<tki-barcode
-				    ref="barcode"
-					:val="content"
-					onval=true
-					:opations="barOption"
-				  /></view>
-				  <!-- 付款码 -->
-				<view class="qr-code center">
-					 <tki-qrcode
-						cid="2"
-					    ref="qrcode"
-					    :val="content"
-						size="300"
-					    :onval="true"
-					    :loadMake="true"
-					    :usingComponents="true"
-					    />
-				</view>
-			</view>
 			<!-- 收款码 -->
-			<view v-else class="charge-code center">
+			<view class="charge-code center">
 				 <tki-qrcode
 					cid="1"
 				    ref="qrcode-charge"
@@ -41,9 +17,6 @@
 		</view>
 		<view class="footer center">
 			<text class="text-xl text-bold">{{shopDetail.name}}</text>
-			<!-- <view @click="isPayment=!isPayment"  class="cu-btn round cuIcon-qrcode" style="font-size: 50rpx;height: 100rpx;" :style="{color: isPayment? 'orange':'green' }">
-				<view class="text-black text-xl margin-left-30">{{ isPayment? " 切换收款码":"切换付款码"}}</view>
-			</view> -->
 		</view>
 		
 	</view>
@@ -51,10 +24,8 @@
 
 <script>
 	import tkiQrcode from "tki-qrcode"
-	import tkiBarcode from "@/components/tki-barcode/tki-barcode.vue"
-	import  totp   from "@/utils/totp.js"
 	export default {
-		components: { tkiBarcode,tkiQrcode},
+		components: {tkiQrcode},
 		computed:{
 			content(){
 				let  transformStr = (this.id*this.$global.TRANSFORM_PARAMS)*2
@@ -67,21 +38,10 @@
 				shopDetail:{},//商户详情
 				avatar: "",
 				secret: '000000',
-				isPayment: false,
 				timer: '',
-				barOption: {
-					width: 3,
-					height: 130,
-					displayValue:  false
-				}
 			}
 		},
 		methods: {
-			refreshCode(){
-				this.timer = setInterval(()=>{
-					this.secret =  totp.getSecret(this.id);
-				},1000)
-			},
 			async initAvatat(url){
 				return new Promise((reslove,reject)=>{
 					uni.downloadFile({

pages/index/index.vue

@@ -197,15 +197,8 @@
 				isOpenMemberShow:false,
 			}
 		},
-		onLoad() {
-			this.init()
-		},
-
 		onShow() {
-			if (this.canReset) {
-				this.getStatistic()
-			}
-			this.canReset = true
+			this.init()
 		},
 		methods: {
 			logout() {

pages/login/account-login.vue

@@ -8,31 +8,33 @@
 					<image src="@/static/icon/logo.png" mode=""></image>
 				</view>
 			</view>
-			
-			<view  style="width: 76%;margin-top: 30rpx;">
-				<u-form :model="form" :error-type="['message']"  ref="uForm">
-					<u-form-item  label-position="top" label="账号" prop="phone" label-width="150">
+
+			<view style="width: 76%;margin-top: 30rpx;">
+				<u-form :model="form" :error-type="['message']" ref="uForm">
+					<u-form-item label-position="top" label="账号" prop="phone" label-width="150">
 						<u-input :border="false" placeholder="请输入账号" v-model="form.phone" type="number"></u-input>
 					</u-form-item>
-					<u-form-item   label-position="top" label="密码" prop="password" label-width="150">
-						<u-input :border="false" placeholder="请输入登录密码" type="password" v-model="form.password"></u-input>
+					<u-form-item label-position="top" label="密码" prop="password" label-width="150">
+						<u-input :border="false" placeholder="请输入登录密码" type="password" v-model="form.password">
+						</u-input>
 					</u-form-item>
 				</u-form>
-				<view  class="text-right margin-top-10 text-sm">
-					<text @click="$jump('/pages/login/login')" style="margin-left: 20rpx;text-decoration: underline;">手机号快捷登录</text>
+				<view class="text-right margin-top-10 text-sm">
+					<text @click="$jump('/pages/login/login')"
+						style="margin-left: 20rpx;text-decoration: underline;">手机号快捷登录</text>
 				</view>
 			</view>
-			
-			<view  style="width: 86%;margin-top: 120rpx;">
+
+			<view style="width: 86%;margin-top: 120rpx;">
 				<view @click="login" class="btn cu-btn round" style="width:100%;height: 90rpx;font-size: 36rpx;">
 					立即登录
 				</view>
-				
+
 				<view class="flex justify-between  text-sm" style="margin: 30rpx 30rpx 0;">
-					<text @click="$jump('/pages/login/forget')" >忘记密码</text>
-					<text @click="$jump('/pages/login/register')" >注册账号</text>
+					<text @click="$jump('/pages/login/forget')">忘记密码</text>
+					<text @click="$jump('/pages/login/register')">注册账号</text>
 				</view>
-			
+
 			</view>
 		</view>
 	</view>
@@ -43,36 +45,32 @@
 	export default {
 		data() {
 			return {
-				customStyle:{
-					'backgroundColor':'#d18c42',
-					'color':'#ffffff'
+				customStyle: {
+					'backgroundColor': '#d18c42',
+					'color': '#ffffff'
 				},
-				form:{
-					type:2,
-					phone:'',
-					password:''
+				form: {
+					type: 'SHOP',
+					phone: '',
+					password: ''
 				},
 				rules: {
-					phone: [
-						{ 
-							required: true, 
-							message: '请输入账号', 
-							trigger: ['change','blur'],
-						},{
-							message: '手机号码不正确',
-							trigger: ['change', 'blur'],
-							validator: (rule, value, callback) => {
-								return this.$u.test.mobile(value);
-							},
-						}
-					],
-					password: [
-						{ 
-							required: true, 
-							message: '请输入密码', 
-							trigger: ['change','blur'],
-						}
-					],
+					phone: [{
+						required: true,
+						message: '请输入账号',
+						trigger: ['change', 'blur'],
+					}, {
+						message: '手机号码不正确',
+						trigger: ['change', 'blur'],
+						validator: (rule, value, callback) => {
+							return this.$u.test.mobile(value);
+						},
+					}],
+					password: [{
+						required: true,
+						message: '请输入密码',
+						trigger: ['change', 'blur'],
+					}],
 				}
 			}
 		},
@@ -80,11 +78,11 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad() {
-			 if (this.$cache.get('phone')) {
-			 	uni.reLaunch({
-			 		url:"/pages/index/index"
-			 	})
-			 }
+			if (this.$cache.get('phone')) {
+				uni.reLaunch({
+					url: "/pages/index/index"
+				})
+			}
 		},
 		methods: {
 			login() {
@@ -95,14 +93,14 @@
 					}
 				});
 			},
-			async loginIn(){
-				let p={
-					type:this.form.type,
-					phone:this.form.phone,
-					secret:md5Libs.md5(this.form.password),
+			async loginIn() {
+				let p = {
+					type: this.form.type,
+					phone: this.form.phone,
+					secret: md5Libs.md5(this.form.password),
 				}
-				let res=await this.$api.accout.login(p)
-				let shopList=res.data
+				let res = await this.$api.accout.login(p)
+				let shopList = res.data
 				uni.hideLoading()
 				if (!res.success) {
 					//登录失败
@@ -112,51 +110,65 @@
 				if (res.success && this.$isEmpty(shopList)) {
 					//未完善商户资料
 					uni.navigateTo({
-						url:"/pages/shop-info/shop-info?phone="+this.form.phone
+						url: "/pages/shop-info/shop-info?phone=" + this.form.phone
 					})
 					return
 				}
 				//审核通过
-				let passList= shopList.filter(item=>item.auditStatus==this.$global.SHOP_AUDIT.PASS)
+				let passList = shopList.filter(item => item.auditStatus == this.$global.SHOP_AUDIT.PASS)
 				if (this.$isNotEmpty(passList)) {
-					uni.setStorageSync("phone",this.form.phone)
+					uni.setStorageSync("phone", this.form.phone)
 					uni.navigateTo({
-						url:'/pages/index/index'
+						url: '/pages/index/index'
 					})
 					this.$u.toast('登录成功')
 					return
 				}
 				//没有审核通过的数据，有可能待审核中
-				let waitList= shopList.filter(item=>item.auditStatus==this.$global.SHOP_AUDIT.WAITING)
+				let waitList = shopList.filter(item => item.auditStatus == this.$global.SHOP_AUDIT.WAITING_MALL ||
+					item.auditStatus == this.$global.SHOP_AUDIT.WAITING_PLATFORM)
 				if (this.$isNotEmpty(waitList)) {
-					this.$dialog.showModal('商户资料审核中',false,"#FF9447")
+					this.$dialog.showModal('商户资料审核中', false, "#FF9447")
+				}
+				let failList= shopList.filter(item=>item.auditStatus ==this.$global.SHOP_AUDIT.FAIL)
+				if (this.$isNotEmpty(failList) && failList.length == 1) {
+					this.$dialog.showModal('商户资料审核失败,请重新申请', true, "#FF9447").then(res=>{
+						let params={
+							isFail:true,
+							shopId:failList[0].id
+						}
+						uni.navigateTo({
+							url: "/pages/shop-info/shop-info" + this.$u.queryParams(params)
+						})
+						return
+					})
 				}
-				
-			}, 
+
+			},
 
 		}
 	}
 </script>
 
 <style>
-	page{
+	page {
 		background-color: #FFFFFF;
 	}
 </style>
 
 <style lang="scss" scoped>
 	$color:#d18c42;
-	
-	page{
+
+	page {
 		background-color: #FFFFFF;
 	}
-	
-	.btn{
+
+	.btn {
 		background-color: $color;
-		color:#FFFFFF;
+		color: #FFFFFF;
 	}
-	
-	.bg{
+
+	.bg {
 		z-index: 99;
 		height: 400rpx;
 		width: 400rpx;
@@ -167,8 +179,8 @@
 		border-radius: 50%;
 		box-shadow: 0rpx 0rpx 50rpx #c5803b;
 	}
-	
-	.bg1{
+
+	.bg1 {
 		height: 460rpx;
 		width: 460rpx;
 		position: absolute;
@@ -178,17 +190,18 @@
 		border-radius: 50%;
 		box-shadow: #c6813b;
 	}
-	
-	.content{
+
+	.content {
 		height: 84vh;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		
-		.top{
+
+		.top {
 			display: flex;
-			.logo{
+
+			.logo {
 				background-color: $color;
 				width: 160rpx;
 				height: 160rpx;
@@ -196,32 +209,32 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				
-				image{
+
+				image {
 					width: 100rpx;
 					height: 100rpx;
 				}
 			}
-			
-			.title{
+
+			.title {
 				margin-right: 20rpx;
 				display: flex;
 				flex-direction: column;
 				text-align: left;
-				
-				text:first-child{
+
+				text:first-child {
 					font-size: 46rpx;
 					color: #000;
 					margin-bottom: 20rpx;
 				}
-				
-				text:last-child{
+
+				text:last-child {
 					font-size: 28rpx;
 					color: #7f7f7f;
 				}
 			}
-			
-			
+
+
 		}
 	}
 </style>

pages/login/register.vue

@@ -1,6 +1,7 @@
 <template>
 	<view style="position: relative;">
-		<view class="back" @click="$back">
+
+		<view class="back" @click="back">
 			<u-icon name="arrow-left" size="50" color="#919191"></u-icon>
 		</view>
 		<view class="content">
@@ -12,28 +13,32 @@
 					<text>请输入手机号进行注册</text>
 				</view>
 			</view>
-			
-			<view  style="width: 76%;margin-top: 80rpx;">
-				<u-form :model="form" ref="uForm" :rules="rules"  :error-type="['message']">
-					<u-form-item  label="手机号" prop="phone" label-width="150">
+
+			<view style="width: 76%;margin-top: 80rpx;">
+				<u-form :model="form" ref="uForm" :rules="rules" :error-type="['message']">
+					<u-form-item label="手机号" prop="phone" label-width="150">
 						<u-input :border="false" placeholder="请输入手机号" v-model="form.phone" type="number"></u-input>
 					</u-form-item>
-					<u-form-item   label="验证码" prop="code" label-width="150">
+					<u-form-item label="验证码" prop="code" label-width="150">
 						<view class="flex">
-							<u-input style="width: 100%;" :border="false" placeholder="请输入验证码" v-model="form.code" type="text"></u-input>
-							<u-button shape="circle" slot="right" :custom-style="customStyle" size="mini" @click="getCode">{{codeTips}}</u-button>
+							<u-input style="width: 100%;" :border="false" placeholder="请输入验证码" v-model="form.code"
+								type="text"></u-input>
+							<u-button shape="circle" slot="right" :custom-style="customStyle" size="mini"
+								@click="getCode">{{codeTips}}</u-button>
 						</view>
 					</u-form-item>
-					<u-form-item  label="密码" prop="password" label-width="150">
-						<u-input :border="false" placeholder="请设置登录密码" v-model="form.password" type="password"></u-input>
+					<u-form-item label="密码" prop="password" label-width="150">
+						<u-input :border="false" placeholder="请设置登录密码" v-model="form.password" type="password">
+						</u-input>
 					</u-form-item>
-					<u-form-item  label="确认密码" prop="newPassword" label-width="150">
-						<u-input :border="false" placeholder="请再次输入密码" v-model="form.newPassword" type="password"></u-input>
+					<u-form-item label="确认密码" prop="newPassword" label-width="150">
+						<u-input :border="false" placeholder="请再次输入密码" v-model="form.newPassword" type="password">
+						</u-input>
 					</u-form-item>
 				</u-form>
 			</view>
-			
-			<view  style="width: 86%;margin-top: 100rpx;">
+
+			<view style="width: 86%;margin-top: 100rpx;">
 				<view @click="next" class="btn cu-btn round" style="width:100%;height: 90rpx;font-size: 34rpx;">
 					确认
 				</view>
@@ -43,7 +48,7 @@
 				</view> -->
 			</view>
 		</view>
-		
+
 		<u-verification-code seconds="60" ref="uCode" @change="codeChange"></u-verification-code>
 	</view>
 </template>
@@ -53,24 +58,24 @@
 	export default {
 		data() {
 			return {
-				customStyle:{
-					'backgroundColor':'#d18c42',
-					'color':'#ffffff'
+				customStyle: {
+					'backgroundColor': '#d18c42',
+					'color': '#ffffff'
 				},
 				codeTips: '',
-				form:{
-					phone:'',
-					code:'',
-					password:'',
-					newPassword:''
+				form: {
+					phone: '',
+					code: '',
+					password: '',
+					newPassword: ''
 				},
 				rules: {
 					phone: [{
 						required: true,
 						message: '请输入手机号',
 						trigger: ['change', 'blur'],
-						
-					},{
+
+					}, {
 						message: '手机号码不正确',
 						trigger: ['change', 'blur'],
 						validator: (rule, value, callback) => {
@@ -91,7 +96,7 @@
 						required: true,
 						message: '请再次输入登录密码',
 						trigger: ['change', 'blur'],
-					},{
+					}, {
 						message: '密码不一致',
 						trigger: ['change', 'blur'],
 						validator: (rule, value, callback) => {
@@ -104,8 +109,28 @@
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
 		},
+		onLoad(options) {
+			if (options != null) {
+				if (this.$isNotEmpty(options.q)) {
+					//获取普通二维码的参数
+					let params= this.$util.getUrlParams(options.q)
+					this.$cache.put('promotionCode', params.promotionCode)
+					return
+				}
+				if (this.$isNotEmpty(options.promotionCode)) {
+					//获取小程序码的参数
+					this.$cache.put('promotionCode', options.promotionCode)
+				}
+			}
+			
+		},
 		methods: {
-			next(){
+			back() {
+				uni.navigateTo({
+					url: "account-login"
+				})
+			},
+			next() {
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						this.register()
@@ -115,21 +140,21 @@
 			codeChange(text) {
 				this.codeTips = text;
 			},
-			async register(){
-				let p={
-					phone:this.form.phone,
-					secret:md5Libs.md5(this.form.password),
-					smsId:this.$cache.get('smsId'),
-					value:this.form.code,
+			async register() {
+				let p = {
+					phone: this.form.phone,
+					secret: md5Libs.md5(this.form.password),
+					smsId: this.$cache.get('smsId'),
+					value: this.form.code,
 				}
-				this.$api.accout.register(p).then(res=>{
+				this.$api.accout.register(p).then(res => {
 					if (res.success) {
 						uni.navigateTo({
-							url:"/pages/shop-info/shop-info?phone="+this.form.phone
+							url: "/pages/shop-info/shop-info?phone=" + this.form.phone
 						})
 					}
 				})
-			}, 
+			},
 			// 获取验证码
 			getCode() {
 				if (this.$isEmpty(this.form.phone)) {
@@ -143,16 +168,16 @@
 						mask: true
 					})
 					setTimeout(() => {
-						let params={
-							phone:this.form.phone
+						let params = {
+							phone: this.form.phone
 						}
-						let p=this.$u.queryParams(params)
-						this.$api.sms.send(p).then(res=>{
+						let p = this.$u.queryParams(params)
+						this.$api.sms.send(p).then(res => {
 							if (res.data.success) {
-								this.$cache.put('smsId',res.data.id)
+								this.$cache.put('smsId', res.data.id)
 								this.$u.toast('验证码已发送');
 								// 通知验证码组件内部开始倒计时
-							}else{
+							} else {
 								this.$u.toast(res.data);
 							}
 							this.$refs.uCode.start();
@@ -168,28 +193,28 @@
 </script>
 
 <style>
-	page{
+	page {
 		background-color: #FFFFFF;
 	}
 </style>
 <style lang="scss" scoped>
 	$color:#d18c42;
-	
-	page{
+
+	page {
 		background-color: #FFFFFF;
 	}
-	
-	.btn{
+
+	.btn {
 		background-color: $color;
-		color:#FFFFFF;
+		color: #FFFFFF;
 	}
-	
-	.btn{
+
+	.btn {
 		background-color: $color;
-		color:#FFFFFF;
+		color: #FFFFFF;
 	}
-	
-	.bg{
+
+	.bg {
 		z-index: 99;
 		height: 400rpx;
 		width: 400rpx;
@@ -200,8 +225,8 @@
 		border-radius: 50%;
 		box-shadow: 0rpx 0rpx 50rpx #c5803b;
 	}
-	
-	.bg1{
+
+	.bg1 {
 		height: 460rpx;
 		width: 460rpx;
 		position: absolute;
@@ -211,46 +236,47 @@
 		border-radius: 50%;
 		box-shadow: #c6813b;
 	}
-	
-	.back{
+
+	.back {
 		position: absolute;
 		top: var(--status-bar-height);
 		left: 20rpx;
 		padding-top: var(--status-bar-height);
 	}
-	
-	.content{
+
+	.content {
 		height: 96vh;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		
-		.top{
+
+		.top {
 			width: 76%;
 			display: flex;
-			.title{
+
+			.title {
 				margin-right: 20rpx;
 				display: flex;
 				flex-direction: column;
 				justify-content: center;
 				align-items: flex-start;
 				text-align: left;
-				
-				text:first-child{
+
+				text:first-child {
 					font-weight: 800;
 					font-size: 50rpx;
 					color: #000;
 					margin-bottom: 20rpx;
 				}
-				
-				text:last-child{
+
+				text:last-child {
 					font-size: 28rpx;
 					color: #7f7f7f;
 				}
 			}
-			
-			
+
+
 		}
 	}
 </style>

pages/login/submit-success.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar  :is-back="false" title="提交成功"></u-navbar>
 		<view class="content">
-			<image src="@/static/icon/success2.png" mode=""></image>
+			<image src="@/static/icon/success.png" mode=""></image>
 			<text class="tips">{{params.title}}</text>
 			<view  class="cu-btn round btn" @click="$jump(params.path)">
 				确认
@@ -58,7 +58,7 @@
 		
 		.btn{
 			margin-top: 150rpx;
-			background-color: #FF9447;
+			background-color: #d18c42;
 			color: #FFFFFF;
 			width: 74%;
 			padding: 46rpx;

pages/material-download/comps/modal-checked.vue

@@ -0,0 +1,104 @@
+<template>
+	<view class="">
+		<u-modal @confirm="confirm"  v-model="show" title="请选择物料种类" confirm-color="#EF9944">
+			<view class="modal-content">
+				<view @click="activeIndex=0" class="item" :class="{'active':activeIndex==0}">
+					<view class="flex">
+						<image class="img1" src="/static/icon/paycode.png" mode=""></image>
+						<text class="center">付款码</text>
+					</view>
+					<view class="">
+						<image v-if="activeIndex==0" class="img2 center" src="/static/icon/checked.png" mode=""></image>
+					</view>
+				</view>
+				<view @click="activeIndex=1" class="item" :class="{'active':activeIndex==1}">
+					<view class="flex">
+						<image class="img3" src="/static/icon/order.png" mode=""></image>
+						<text class="center">点餐码</text>
+					</view>
+					<view class="">
+						<image v-if="activeIndex==1" class="img2 center" src="/static/icon/checked.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</u-modal>
+	</view>
+</template>
+
+<script>
+export default {
+	name: '',
+	data() {
+		return {
+			show:false,
+			activeIndex:0
+		};
+	},
+	onLoad() {
+		
+	},
+	methods:{
+		showModal(){
+			this.show=true
+		},
+		hideModal(){
+			this.show=false
+		},
+		confirm(){
+			this.$emit('confirm',this.activeIndex)
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.modal-content{
+		padding:70rpx 30rpx;
+		
+		.img1{
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 20rpx;
+			margin-left: 20rpx;
+		}
+		.img2{
+			width: 36rpx;
+			height: 36rpx;
+			margin-right: 20rpx;
+		}
+		.img3{
+			width: 42rpx;
+			height: 42rpx;
+			margin-right: 20rpx;
+			margin-left: 20rpx;
+		}
+		
+		 .item{
+			display: flex;
+			justify-content: space-between;
+			background-color: #f7f7f7;
+			border-radius: 50rpx;
+			padding: 20rpx;
+			margin-bottom: 50rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #696969;
+			
+		}
+		
+		.active {
+			color: #0b0100;
+			// background-color:rgba(255, 148, 71,.3);
+			background-color: #fef6e1;
+			
+			
+			image{
+				transform: scale(1.3);
+			}
+			
+			text{
+				transform: scale(1.1);
+			}
+		}
+	}
+</style>

pages/material-download/comps/mp-swiper.vue

@@ -7,28 +7,30 @@
 				<swiper-item class="swiper-container" v-for="(item,index) in list" :key="index" :item-id="index"
 					:data-year="index">
 					<view :animation="animationData[index]" class="swiper-item" >
-						<image :src="item.image" mode=""></image>
+						<image :src="name?item[name]:item" mode=""></image>
 					</view>
 				</swiper-item>
 			</swiper>
 		</view>
 		<view class="center flex-direction">
-			<text style="margin-bottom: 50rpx;font-size: 32rpx;">{{list[swiperCurrentIndex].name}}</text>
-			<view @click="createPoster" class="cu-btn  flex round text-lg"
+			<text  style="margin-bottom: 50rpx;font-size: 32rpx;">{{list[swiperCurrentIndex].name}}</text>
+			<view @click="operate" class="cu-btn  flex round text-lg"
 				style="padding: 46rpx 0;background-color: #EF9944;color: #FFFFFF;width: 76%;">
-				下一步
+				<u-icon margin-left="10" label-color="#fff" :label="operateText" :name="iconName"></u-icon>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
-	import tkiQrcode from "tki-qrcode"
 	export default {
 		props: {
-			list: Array
-		},
-		components: {
-			tkiQrcode
+			list: Array,
+			name: String,
+			iconName:String,
+			operateText:{
+				type:String,
+				default:'下一步'
+			}
 		},
 		data() {
 			return {
@@ -63,7 +65,7 @@
 			this.animationData[0] = this.animation.export();
 		},
 		methods: {
-			createPoster() {
+			operate() {
 				this.$emit('click', this.swiperCurrentIndex)
 			},
 			change(e) {

pages/material-download/createOrderPoster.vue

@@ -0,0 +1,149 @@
+<template>
+	<view class="index">
+		<mp-swiper operateText="批量保存图片" iconName="download" :list="imgList" @click="savePhoto"></mp-swiper>
+	
+		<view style="position: fixed; top: 999999999999999999999rpx">
+			<!-- #ifdef MP-WEIXIN -->
+			<canvas id="canvas" type="2d" style="width: 670rpx; height: 940rpx" />
+			<!-- #endif -->
+			<!-- #ifndef MP-WEIXIN -->
+			<canvas canvas-id="canvas" id="canvas" style="width: 670rpx; height: 940rpx" />
+			<!-- #endif -->
+		</view>
+		
+		<u-modal cancel-color="#c0c4cc" :show-cancel-button="true" cancel-text="暂不生成"  @cancel="$back" confirm-color="#FF9447" @confirm="modalConfirm" title="提示" 
+			v-model="modalShow">
+			<view class="slot-content" style="margin: 30rpx;">
+				<u-form label-width="150" ref="uForm">
+					<u-form-item :border-bottom="false" label="座位数:">
+						<u-input  placeholder="请输入生成的座位数" type="number" v-model="count" />
+					</u-form-item>
+				</u-form>
+			</view>
+		</u-modal>
+	</view>
+</template>
+<script>
+	import mpSwiper from "./comps/mp-swiper.vue"
+	import DrawPoster from "u-draw-poster";
+	import {
+		drawQrCode
+	} from "u-draw-poster";
+	DrawPoster.useCtx(drawQrCode);
+	export default {
+		components:{
+			mpSwiper
+		},
+		data: () => ({
+			modalShow:true,
+			
+			
+			imgUrl: '',
+			imgList:[],
+			//生成海报数量
+			count:'',
+			//模板下标
+			index:1
+		}),
+		onLoad(options) {
+			this.index=options.index
+		},
+		methods: {
+			modalConfirm(){
+				if (this.$isEmpty(this.count)) {
+					this.$dialog.showModal('请输入生成座位的数量',false)
+					this.modalShow=true
+					return
+				}
+				this.createPoster()
+			},
+			async createPoster(){
+				for (var i = 0; i < this.count; i++) {
+					await this.doCreatePoster(i + 1)
+				}
+			},
+			async doCreatePoster(number){
+				// 创建绘制工具
+				const dp = await DrawPoster.build({
+					selector: 'canvas',
+					loading: true,
+					debugging: true,
+				});
+				const w = (dp.canvas.width = 670);
+				const h = (dp.canvas.height = 940);
+				
+				//初始化参数
+				let bgImg = `/static/poster/wuliao${this.index}.png`
+				let shopDetail = this.$cache.get('selectedShop')
+				let text=`${shopDetail.name}【${number}号座】`
+				
+				let qrCodeText = this.$global.QR_PATH + this.vuex_shopId
+				let titleParams={
+					x:w / 2 - (text.length * 15 + 6),
+					y:h / 2 - 240,
+					color:"#000",
+					text:text			}
+				let qrParams = {
+					x: w / 2 - 175,
+					y: h / 2 - 200,
+					text: qrCodeText,
+					size: 350,
+					margin: 5,
+				}
+				
+				if (this.index==2) {
+					titleParams.y=h / 2 - 90
+					qrParams.y=h / 2 - 60
+				}
+				
+				if (this.index==3) {
+					titleParams.color='#fff'
+					titleParams.y=h / 2 - 150
+					qrParams.y=h / 2 - 120
+				}
+				
+				if (this.index==4) {
+					titleParams.y=h / 2 - 240
+					qrParams.y=h / 2 - 210
+				}
+				
+				// 绘制基本背景
+				dp.draw((ctx) => {
+					ctx.fillStyle = '#ffffff';
+					ctx.fillRoundRect(0, 0, w, h, 20);
+					ctx.clip();
+					ctx.fillRect(0, 0, w, h - 160);
+				});
+				// 绘制图片内容
+				dp.draw(async (ctx) => {
+					await Promise.all([
+						ctx.drawImage(bgImg, 0, 0, w, h),
+					]);
+					// 用户二维码
+					await ctx.drawQrCode(qrParams);
+				});
+				
+				// 绘制底部文字内容
+				dp.draw((ctx) => {
+					ctx.fillStyle = titleParams.color;
+					ctx.font = '34px PingFang SC';
+					ctx.fillText(titleParams.text, titleParams.x, titleParams.y);
+				});
+				this.imgUrl = await dp.createImagePath();
+				this.imgList.push(this.imgUrl)
+			},
+			async savePhoto() {
+				this.$dialog.showLoading('图片保存中')
+				for (var i = 0; i < this.imgList.length; i++) {
+					await this.$mpi.saveImageToPhotosAlbum(this.imgList[i])
+				}
+				uni.hideLoading()
+			}
+		}
+	};
+</script>
+
+
+<style lang="scss">
+
+</style>

pages/material-download/createPoster.vue

@@ -46,15 +46,16 @@
 			//初始化参数
 			let index = options.index
 			let bgImg = `/static/poster/wuliao${index}.png`
+			let borderImg='/static/icon/border.png'
 			let shopDetail = this.$cache.get('selectedShop')
+			let text=shopDetail.name
 			
 			let qrCodeText = this.$global.QR_PATH + this.vuex_shopId
 			let titleParams={
-				x:w / 2 - (shopDetail.name.length * 15 + 6),
+				x:w / 2 - (text.length * 15 + 6),
 				y:h / 2 - 240,
 				color:"#000",
-				text:shopDetail.name
-			}
+				text:text			}
 			let qrParams = {
 				x: w / 2 - 175,
 				y: h / 2 - 200,

pages/material-download/material-download.vue

@@ -1,13 +1,15 @@
 <template>
 	<view class="poster_page">
-		<mp-swiper :list="list" @click="createPoster"></mp-swiper>
+		<mp-swiper name="image" :list="list" @click="showModal"></mp-swiper>
+		<modal-checked ref="modalChecked" @confirm="createPoster"></modal-checked>
 	</view>
 </template>
 <script>
 	import mpSwiper from "./comps/mp-swiper.vue"
+	import modalChecked from "./comps/modal-checked.vue"
 	export default {
 		components: {
-			mpSwiper
+			mpSwiper,modalChecked
 		},
 		data() {
 			return {
@@ -28,13 +30,28 @@
 						image: 'https://guosen-bucket-ldt.obs.cn-south-1.myhuaweicloud.com:443/be1bf10664ed47998752a423abae5d7f-cQkZEj7ZXbZ1662466380785e447bc1b1c3155317a95.png'
 					}
 				],
+				templateIndex:1
 			};
 		},
 		methods: {
+			showModal(index){
+				this.templateIndex=index + 1
+				this.$refs.modalChecked.showModal()
+			},
 			createPoster(index) {
-				uni.navigateTo({
-					url:"createPoster?index="+(index+1)
-				})
+				if (index==0) {
+					//生成付款码
+					uni.navigateTo({
+						url:"createPoster?index="+this.templateIndex
+					})
+				}else if(index==1){
+					//生成点餐码
+					uni.navigateTo({
+						url:"createOrderPoster?index="+this.templateIndex
+					})
+				}
+				
+				
 			},
 
 		}

pages/member/add.vue

@@ -15,22 +15,18 @@
 		<view class="card margin-top-30">
 			<view class="margin-bottom-20">
 				<text class="title">积分价值</text>
-				<text class="sub_title">(例：1000积分=10元)</text>
+				<text class="sub_title">(例：1 元= 10 积分)</text>
 			</view>
 			<view class="flex">
-				<view class="center" style="width: 45%;">
-					<u-input height="50" :border="true" :clearable="false" v-model="form.point" placeholder="请输入积分数"/>
-					<view class="cu-tag bg-color radius">
-						积分
-					</view>
-				</view>
-				<view class="center" style="margin: 0 20rpx;">
-					<text>=</text>
+				<view class="center" style="width: 25%;">
+					<text class="text-bold  text-base" style="font-size: 40rpx;">1</text>
+					<text style="margin: 0 20rpx;">元</text>
+					<text style="margin: 0 20rpx;">=</text>
 				</view>
-				<view class="center" style="width: 45%;">
-					<u-input height="50" :border="true" :clearable="false" v-model="form.pointValue" placeholder="请输入积分价值" />
+				<view class="center" style="width: 45%;margin-left: 20rpx;">
+					<u-input type="digit" height="50" :border="true" :clearable="false" v-model="form.point" placeholder="请输入积分数"/>
 					<view class="cu-tag bg-color radius">
-						元
+						积分
 					</view>
 				</view>
 			</view>
@@ -41,11 +37,11 @@
 				<text class="title">积分规则</text>
 			</view>
 			<view class="flex">
-				<view class="center">
+				<view class="center" style="width: 25%;">
 					<text>消费1元赠送</text>
 				</view>
 				<view class="center" style="width: 45%;margin-left: 20rpx;">
-					<u-input height="50" :border="true" :clearable="false" v-model="form.consumeOnePoint" placeholder="请输入积分数"/>
+					<u-input type="digit" height="50" :border="true" :clearable="false" v-model="form.consumeOnePoint" placeholder="请输入积分数"/>
 					<view class="cu-tag bg-color radius">
 						积分
 					</view>
@@ -71,7 +67,6 @@
 			return {
 				form:{
 					point:'',
-					pointValue:'',
 					consumeOnePoint:''
 				}
 			}
@@ -82,26 +77,21 @@
 					this.$u.toast('请输入积分数')
 					return
 				}
-				if (this.$isEmpty(this.form.pointValue)) {
-					this.$u.toast('请输入积分值')
-					return
-				}
 				if (this.$isEmpty(this.form.consumeOnePoint)) {
 					this.$u.toast('请输入积分规则')
 					return
 				}
-				
 				let id=this.vuex_shopId
 				this.$api.shop.submit({
 					id,
 					sendPointUnit: this.form.consumeOnePoint,
-					pointRate: 0.01,
+					pointRate: this.$digital.keepTwoDecimalFull(1/this.form.point),
 					isOpenMember: 1
 				}).then(res=>{
 					if (res.success) {
 						this.$dialog.showModal('创建成功',false).then(res=>{
 							uni.redirectTo({
-								url:'/pages/member/member'
+								url:"/pages/member/member"
 							})
 						})
 					}else{

pages/member/detail.vue

@@ -34,7 +34,7 @@
 				<view class="item" v-for="(item,index) in list" :key="index">
 					<view class="area1">
 						<view class="item-padding">
-							<text>{{item.updateTime}}</text>
+							<text>{{item.createTime}}</text>
 						</view>
 					</view>
 					<view class="area2 text-area" style="width: 15%;">

pages/member/member.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :custom-back="back" title="会员中心"></u-navbar>
 		<view class="empty-page" v-if="!isOpenMember">
 			<image src="../../static/icon/vip.png" mode=""></image>
 			<text>没有会员中心信息</text>
@@ -12,7 +13,7 @@
 
 		<block v-else>
 			<view class="top-menu">
-				<view class="leftFixed">1积分等于{{detail.pointUnitValue}}元</view>
+				<view class="leftFixed"> 1 积分等于 {{detail.pointUnitValue}} 元</view>
 				<view class="u-flex u-row-between">
 					<view class="item">
 						<text>{{detail.memberNum}}</text>
@@ -25,7 +26,7 @@
 					</view>
 				</view>
 				<view class="u-m-t-50 u-flex u-col-center u-row-center">
-					<text class="u-font-24 u-m-r-20">规则:消费1元赠送{{detail.sendPointUnit}}积分</text>
+					<text class="u-font-24 u-m-r-20">规则:消费 1 元赠送 {{detail.sendPointUnit}} 积分</text>
 					<u-button size="mini" shape="circle" @click="showPopup=true">更改规则</u-button>
 				</view>
 			</view>
@@ -140,6 +141,11 @@
 			this.fetchMemberInfo()
 		},
 		methods: {
+			back(){
+				uni.reLaunch({
+					url:"/pages/index/index"
+				})
+			},
 			update(){
 				let params = {
 					id: this.vuex_shopId,

pages/test/test.vue

@@ -1,60 +1,96 @@
 <template>
-	<div>
-		<select-tree @choose='choose' :selectList='selectList' ref='selectTree'></select-tree>
-	</div>
+	<view class="">
+		<u-modal  v-model="show" title="请选择物料种类" confirm-color="#EF9944">
+			<view class="modal-content">
+				<view @click="activeIndex=0" class="item" :class="{'active':activeIndex==0}">
+					<view class="flex">
+						<image class="img1" src="/static/icon/paycode.png" mode=""></image>
+						<text class="center">付款码</text>
+					</view>
+					<view class="">
+						<image v-if="activeIndex==0" class="img2 center" src="/static/icon/checked.png" mode=""></image>
+					</view>
+				</view>
+				<view @click="activeIndex=1" class="item" :class="{'active':activeIndex==1}">
+					<view class="flex">
+						<image class="img3" src="/static/icon/order.png" mode=""></image>
+						<text class="center">点餐码</text>
+					</view>
+					<view class="">
+						<image v-if="activeIndex==1" class="img2 center" src="/static/icon/checked.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</u-modal>
+	</view>
 </template>
 
 <script>
-	import selectTree from '@/components/mp-select/mp-select.vue'
-	export default {
-		components: {
-			selectTree,
-		},
-		data() {
-			return {
-				selectList: [{
-						name: '水果',
-						checked: false,
-						show: true,
-						childrenList: [{
-							checked: false,
-							name: '西瓜',
-						}, {
-							checked: false,
-							name: '桃子'
-						}]
-					},
-					{
-						name: '工具',
-						checked: false,
-						show: false,
-						childrenList: [{
-							checked: false,
-							name: '锄头'
-						}, {
-							checked: false,
-							name: '铲子'
-						}]
-
-					}
-				]
-			}
-		},
-		methods: {
-			choose(e) {
-				console.log(e)
-				//返回参数说明
-			},
-			chooseAll() {
-				this.$refs.selectTree.chooseAll()
-			},
-			cancelAll() {
-				this.$refs.selectTree.cancelAll()
-			}
-		},
+export default {
+	name: '',
+	data() {
+		return {
+			show:true,
+			activeIndex:0
+		};
+	},
+	onLoad() {
+		
+	},
+	methods:{
+		
 	}
+};
 </script>
 
 <style lang="scss" scoped>
-
-</style>
+	.modal-content{
+		padding:70rpx 30rpx;
+		
+		.img1{
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 20rpx;
+			margin-left: 20rpx;
+		}
+		.img2{
+			width: 36rpx;
+			height: 36rpx;
+			margin-right: 20rpx;
+		}
+		.img3{
+			width: 42rpx;
+			height: 42rpx;
+			margin-right: 20rpx;
+			margin-left: 20rpx;
+		}
+		
+		 .item{
+			display: flex;
+			justify-content: space-between;
+			background-color: #f7f7f7;
+			border-radius: 50rpx;
+			padding: 20rpx;
+			margin-bottom: 50rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #696969;
+			
+		}
+		
+		.active {
+			color: #0b0100;
+			// background-color:rgba(255, 148, 71,.3);
+			background-color: #fef6e1;
+			
+			
+			image{
+				transform: scale(1.3);
+			}
+			
+			text{
+				transform: scale(1.1);
+			}
+		}
+	}
+</style>

pages/withdraw/records.vue

@@ -0,0 +1,84 @@
+<template>
+	<view>
+		<mescroll-body :height="height" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+			:up="upOption">
+			<view v-for="(item, index) in list" :key="index" class="flex align-center justify-between padding-sm bg-white margin-20 padding-20">
+				<view class="padding-lr">
+					<view class="title" style="display: flex;">
+						渠道代理提现
+						<text v-if="item.withdrawStatus=='WAITING'" style="font-size: 28rpx;color: #ff9900;padding-left: 20rpx;font-weight: 500;">处理中</text>
+						<text v-if="item.withdrawStatus=='DONE'" style="font-size: 28rpx;color: #19be6b;padding-left: 20rpx;font-weight: 500;">已处理</text>
+						<view v-if="item.withdrawStatus=='FAIL'" style="font-size: 28rpx;color: #F3484E;padding-left: 20rpx;font-weight: 500;">
+							<text style="margin-right: 6rpx;">提现失败</text>
+							<u-icon name="question-circle" @click="toast(item.failReason)"></u-icon>
+						</view>
+					</view>
+					<view class="padding-top-sm" style="font-size: 24upx;font-family: PingFang SC;font-weight: bold;color: #686868;">
+						{{item.createTime}}</view>
+				</view>
+				<view class="padding-right" v-if="item.withdrawStatus!=2">
+					<text style="font-size: 36upx;font-family: PingFang SC;font-weight: bold;color: #F3484E;">+{{ item.actualPrice}}</text>
+					<text class="text-bold padding-left-xs">元</text>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+<script>
+	import MescrollMixin from "@/components/mescroll-body/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin],
+		data() {
+			return {
+				list: [],
+				downOption:{
+					auto:false
+				},
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			downCallback() {
+				setTimeout(() => {
+					uni.showToast({
+						title: "刷新成功",
+						icon: "none"
+					})
+					this.mescroll.resetUpScroll();
+				}, 1000)
+			},
+			toast(msg){
+				this.$u.toast(msg)
+			},
+			upCallback(mescroll) {
+				let params = {
+					ownerId:this.vuex_shopId,
+					current:mescroll.num,
+					size:mescroll.size,
+				}
+				try {
+					this.$api.withdraw.list(params).then(res => {
+						let data = res.data.records
+						let total = res.data.total
+						mescroll.endBySize(data.length, total);
+						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(data); //追加新数据
+					})
+				} catch (e) {
+					this.mescroll.endErr()
+				}
+			},
+		}
+	}
+</script>
+<style lang="scss">
+ .title {
+ 	font-size: 28upx;
+ 	font-family: PingFang SC;
+ 	font-weight: 800;
+ 	color: #000000;
+	margin-bottom: 20rpx;
+ }
+</style>

pages/withdraw/withdraw.vue

@@ -56,6 +56,12 @@
 					<text class="">0.05%</text>
 				</view>
 			</view>
+			
+			<view @click="$jump('/pages/withdraw/records')" class="btn-withdraw">
+				<view class="cu-btn round sm btn" style="font-size: 26rpx;">
+					提现记录
+				</view>
+			</view>
 		</view>
 
 		<u-popup v-model="rateShow" :mask-close-able="false" mode="center" height="40%" width="76%" borderRadius="20"
@@ -219,8 +225,22 @@
 		align-items: center;
 		flex-direction: column;
 	}
+	
+	.btn-withdraw{
+		position: absolute;
+		right: -30rpx;
+		top: 26rpx;
+		
+		.btn{
+			padding: 16rpx 38rpx;
+			background-color: #FFE6CD;
+			color: #EF9944;
+		}
+	}
 
 	.card {
+		overflow: hidden;
+		position: relative;
 		border-radius: 20rpx;
 		margin-top: 30rpx;
 		padding: 40rpx;

utils/global.js

@@ -16,7 +16,10 @@ let global = {
 	},
 	
 	//商户收款码
-	QR_PATH:'https://ldt.guosen-fumao.cn/h5/#/pages/checkstand/index?id=',
+	QR_PATH:'https://ldt.guosen-fumao.cn/h5/#/pagesC/pages/checkstand/index?id=',
+	
+	//商家订餐码
+	ORDER_QR_PATH:'pagesD/pages/menu/menu',
 	
 	TRANSFORM_PARAMS:'95963',
 	
@@ -39,6 +42,10 @@ let global = {
 		WAIT:'待付款',
 		SUCCESS:'付款成功',
 		CANCEL:'取消付款'
+	},
+	
+	flow_prefix:{
+		shop:'appShop-'
 	}
 	
 	

utils/mpi.js

@@ -2,158 +2,181 @@ let mpi = {}
 
 // 微信登陆
 mpi.wxLogin = () => {
-  return new Promise((resolve, reject)=>{
-    uni.login({
-      success: function (res) {
-        resolve(res)
-      },
-      fail: function (err) {
-        console.warn(err)
-        reject(err)
-      }
-    })
-  })
+	return new Promise((resolve, reject) => {
+		uni.login({
+			success: function(res) {
+				resolve(res)
+			},
+			fail: function(err) {
+				console.warn(err)
+				reject(err)
+			}
+		})
+	})
 }
 
 //选择图片 res.tempFilePaths[0]
-mpi.chooseImage = (count=1) => {
-  return new Promise((resolve, reject)=>{
-    uni.chooseImage({
-    	count,
-    	//最多可以选择的图片张数，默认9
-    	sourceType: ['album'],
-    	sizeType: ['compressed'],
-    	//可选择原图或压缩后的图片
-    	success: res => {
-    		resolve(res.tempFilePaths)
-    	},
-		fail(err) {
-		  reject(err)
-		}
-    });
-    
-  })
+mpi.chooseImage = (count = 1, size = 2) => {
+	return new Promise((resolve, reject) => {
+		uni.chooseImage({
+			count,
+			//最多可以选择的图片张数，默认9
+			sourceType: ['album'],
+			sizeType: ['compressed'],
+			//可选择原图或压缩后的图片
+			success: res => {
+				if (res.tempFiles[0].size > size * 1024 * 1024) {
+					uni.showToast({
+						title: `上传的照片不能超过${size}m`,
+						icon: "none"
+					})
+					return
+				}
+				resolve(res.tempFilePaths)
+			},
+			fail(err) {
+				reject(err)
+			}
+		});
+
+	})
+}
+
+mpi.saveImageToPhotosAlbum = (filePath) => {
+	return new Promise((resolve,reject)=>{
+		uni.saveImageToPhotosAlbum({
+			filePath,
+			success: function(res) {
+				resolve(res)
+			},
+			fail: function(err) {
+				reject(err)
+			}
+		});
+	})
 }
 
 
 
+
+
 mpi.getLocation = () => {
-  return new Promise((resolve, reject)=>{
-	   uni.getLocation({
-	       type: 'gcj02',
-	       success: function (res) {
-	           resolve(res)
-	       },
-		   fail:function(err){
-			   reject(err)
-		   }
-	   });
-  })
+	return new Promise((resolve, reject) => {
+		uni.getLocation({
+			type: 'gcj02',
+			success: function(res) {
+				resolve(res)
+			},
+			fail: function(err) {
+				reject(err)
+			}
+		});
+	})
 }
 
 mpi.getConnectedWifi = () => {
-  return new Promise((resolve, reject)=>{
-	   uni.startWifi({
-	   	success: function(res) {
-	   		wx.getConnectedWifi({
-	   		  success: res => {
-	   			resolve(res)
-	   		  },
-	   		  fail: err => {
-	   			reject(err)
-	   		  }
-	   		})
-	   	},
-	   	fail: function(err){
-	   		reject(err)
-	   	}
-	   });
-  })
+	return new Promise((resolve, reject) => {
+		uni.startWifi({
+			success: function(res) {
+				wx.getConnectedWifi({
+					success: res => {
+						resolve(res)
+					},
+					fail: err => {
+						reject(err)
+					}
+				})
+			},
+			fail: function(err) {
+				reject(err)
+			}
+		});
+	})
 }
 /**
  * 订阅认证信息
  */
-mpi.subscribe=(tmplIds)=>{
-	return new Promise((resolve, reject)=>{
-	  uni.requestSubscribeMessage({
-		tmplIds,
-		success(res) {
-		  resolve(res)
-		},
-		fail(err) {
-		  reject(err)
-		}
-	  })
-	})
-},
-
-
-// 获取用户信息
-mpi.wxGetUserInfo = () => {
-  return new Promise((resolve, reject) => {
-    uni.getUserInfo({
-      withCredentials: true,
-      success: function(res) {
-        resolve(res)
-      },
-      fail: function(err) {
-        reject(err)
-      },
-    })
-  })
-}
+mpi.subscribe = (tmplIds) => {
+		return new Promise((resolve, reject) => {
+			uni.requestSubscribeMessage({
+				tmplIds,
+				success(res) {
+					resolve(res)
+				},
+				fail(err) {
+					reject(err)
+				}
+			})
+		})
+	},
+
+
+	// 获取用户信息
+	mpi.wxGetUserInfo = () => {
+		return new Promise((resolve, reject) => {
+			uni.getUserInfo({
+				withCredentials: true,
+				success: function(res) {
+					resolve(res)
+				},
+				fail: function(err) {
+					reject(err)
+				},
+			})
+		})
+	}
 
 //新版本的获取用户信息
 mpi.getUserProfile = () => {
-  return new Promise((resolve, reject) => {
-    uni.getUserProfile({
-    	desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-    	success: (res) => {
-    		resolve(res) 
-    	},
-		fail:(err)=>{
-			reject(err)
-		}
-    })
-  })
+	return new Promise((resolve, reject) => {
+		uni.getUserProfile({
+			desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+			success: (res) => {
+				resolve(res)
+			},
+			fail: (err) => {
+				reject(err)
+			}
+		})
+	})
 }
 
-let compareVersion=(v1, v2)=> {
-  v1 = v1.split('.')
-  v2 = v2.split('.')
-  const len = Math.max(v1.length, v2.length)
-
-  while (v1.length < len) {
-    v1.push('0')
-  }
-  while (v2.length < len) {
-    v2.push('0')
-  }
-
-  for (let i = 0; i < len; i++) {
-    const num1 = parseInt(v1[i])
-    const num2 = parseInt(v2[i])
-
-    if (num1 > num2) {
-      return 1
-    } else if (num1 < num2) {
-      return -1
-    }
-  }
-  return 0
+let compareVersion = (v1, v2) => {
+	v1 = v1.split('.')
+	v2 = v2.split('.')
+	const len = Math.max(v1.length, v2.length)
+
+	while (v1.length < len) {
+		v1.push('0')
+	}
+	while (v2.length < len) {
+		v2.push('0')
+	}
+
+	for (let i = 0; i < len; i++) {
+		const num1 = parseInt(v1[i])
+		const num2 = parseInt(v2[i])
+
+		if (num1 > num2) {
+			return 1
+		} else if (num1 < num2) {
+			return -1
+		}
+	}
+	return 0
 }
 
-mpi.versioning=(minVersion)=>{
+mpi.versioning = (minVersion) => {
 	const version = wx.getSystemInfoSync().SDKVersion
-	return new Promise((resolve, reject)=>{
-	  if (compareVersion(version, minVersion) >= 0) {
-		   resolve()
-	  }else{
-		  uni.showModal({
-		  	content:"当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。"
-		  })
-	  }
-    })
+	return new Promise((resolve, reject) => {
+		if (compareVersion(version, minVersion) >= 0) {
+			resolve()
+		} else {
+			uni.showModal({
+				content: "当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。"
+			})
+		}
+	})
 }
 
 

utils/totp.js

@@ -1,12 +0,0 @@
-const hotpOtpGenerator = require('hotp-totp-generator')
-
-//   生成动态密码
-export default {
- getSecret: (str)=>{
-  let secret = hotpOtpGenerator.totp({
-         key: str,
-          X: 60,
-       });
-  return  secret.substr(secret.length-6,secret.length-1);
- }
-}

utils/util.js

@@ -62,6 +62,22 @@ util.callPhone=(phone)=>{
 	});
 }
 
+/**
+ * 获取url参数
+ */
+util.getUrlParams=(p)=>{
+	let url = decodeURIComponent(p);
+	let param = {};
+	// 把参数按&拆分成数组
+	let index = url.indexOf("?");
+	let query = url.substring(index + 1, index.length);
+	var param_arr = query.split("&");
+	for (var i = 0; i < param_arr.length; i++) {
+		var pair = param_arr[i].split("=");
+		param[pair[0]] = pair[1];
+	}
+	return param
+}
 
 
 /**
@@ -74,6 +90,9 @@ util.uniqueArray = (arr)=>{
 	return [...new Set(arr)]
 }
 
+/**
+ * 对象键复制
+ */
 util.objectCoppy =(target,source)=>{
 	Object.keys(target).forEach(key=>{target[key]=source[key]})
 }