auto commit

common/css/common.css

@@ -1,6 +1,7 @@
 /* 全屏状态栏占位 */
 .hold-status-bar{ height: var(--status-bar-height);width: 100%;display: none;}
-.custom-nav{position: fixed;top: var(--status-bar-height);left: 0;right: 0;height: 65rpx;line-height: 65rpx;color: #fff;}
+.hold-status-bar.show{display: block;background-color: #fff;}
+.custom-nav{position: fixed;top: var(--status-bar-height);left: 0;right: 0;height: 65rpx;line-height: 65rpx;color: #fff;z-index: 999;}
 .custom-nav-left{position: absolute;left: 0;top: 0;padding-right: 40rpx;transform: rotate(180deg);}
 .custom-nav-left .iconfont{font-size: 35rpx;}
 .custom-nav-center{text-align: center;}
@@ -9,7 +10,7 @@
 .page-bg{width: 100%;max-height: 100%;}
 
 /* 头部图片 */
-.top-img{position: relative;height: 390rpx;overflow: hidden;z-index: -1;}
+.top-img{position: relative;height: 390rpx;overflow: hidden;}
 .top-img .img{width: 100%;height: 100%;position: absolute;left: 0;top: 0;z-index: -1;}
 
 .wrap{margin: 24rpx;}
@@ -54,48 +55,22 @@
 
 .full-search{padding-left: 16rpx;margin-bottom: 24rpx;}
 
-/* 侧边工具 */
-.aside-tool{position: fixed;top: 170rpx;right: 14rpx;}
-.aside-tool-item{margin-bottom: 35rpx;text-align: center;}
-.aside-tool-icon{width: 80rpx;height: 80rpx;margin: 0 auto;position: relative;overflow: hidden;top: 10rpx;display: flex;align-items: center;justify-content: center;border: 4rpx solid #fff;border-radius: 50%;}
-.aside-tool-icon.green{background-color: #26D18B;}
-.aside-tool-icon.yellow{background-color: #FFDA00;}
-.aside-tool-icon .img{width: 48rpx;height: 48rpx;}
-.aside-tool-text{position: relative;width: 144rpx;height: 40rpx;line-height: 40rpx;background-color: #fff;border-radius: 20rpx;font-size: 24rpx;color: #0A6F44;}
-
-.step-wrap{padding: 43rpx 86rpx 12rpx 74rpx;margin-bottom: 12rpx;display: flex;}
-.step-item{position: relative;flex: 1;height: 2rpx}
-.step-item::before{content: '';width: 16rpx;height: 16rpx;background-color: #E5E5E5;border-radius: 50%;position: absolute;left: 0;top: -8rpx;}
-.step-item.active::before{background-color: #26D18B;}
-.step-item::after{content: '';position: absolute;height: 1px;left: 22rpx;right: 6rpx;background-color: #E5E5E5;top: 0;}
-.step-wrap .step-item:last-of-type{flex: unset;width: 0;}
-.step-wrap .step-item:last-of-type::after{height: 0;}
-.step-text{margin:0 -30rpx 49rpx;display: flex;justify-content: space-between;}
-.step-text-item{flex: 1;text-align: center;}
-.step-text-item-cn{font-size: 28rpx;color: #333;line-height: 40rpx;}
-.step-text-item-en{font-size: 24rpx;color: #999;line-height: 33rpx;}
-
-.main-til{display: flex;margin-bottom: 24rpx;align-items: center;}
-.main-til-icon{width: 36rpx;height: 36rpx;margin-right: 20rpx;}
-.main-til-text{font-size: 32rpx;color: #333;font-weight: 500;}
-
-.timeline{margin-left: 56rpx;margin-bottom: 24rpx;}
-.timeline-item-content{transform: translateY(-30rpx);}
-.timeline-item{position: relative;padding: 0 0 118rpx 60rpx;font-weight: 400;border-left: 2rpx solid #E5E5E5;}
-.timeline .timeline-item:first-of-type{padding-top: 0;}
-.timeline .timeline-item:first-of-type .timeline-item-content{transform: translateY(0);}
-.timeline .timeline-item:last-of-type{padding-bottom: 0;border: 0;}
-.timeline-item-til{margin-bottom: 4rpx;font-size: 34rpx;color: #333;line-height: 48rpx;}
-.timeline-item.active {border-color: #26D18B;}
-.timeline-item.active .timeline-item-til{color: #26D18B;}
-.timeline-item-con{font-size: 30rpx;color: #999;line-height: 42rpx;}
-.timeline-item::before{content: '';width: 16rpx;height: 16rpx;border-radius: 50%;background: #E5E5E5;position: absolute;left: -8rpx;top: 0;}
-.timeline-item.active::before{width: 40rpx;height: 40rpx;left: -20rpx;background: url('http://fqn.hongweisoft.com/cqcarbon/wxapp/icon-zhonghe.png');background-size: 100%;}
-
-
-
-
-
-
-
-
+/* css点点点 动画 */
+.dotting {
+display: inline-block; width: 10px; min-height: 2px;
+padding-right: 2px;
+border-left: 2px solid currentColor; border-right: 2px solid currentColor;   
+background-color: currentColor; background-clip: content-box;
+box-sizing: border-box;
+animation: dot 4s infinite step-start both;
+/* *zoom: expression(this.innerHTML = '...'); */ /* IE7 */
+}
+.dotting:before { content: '...'; } /* IE8 */
+.dotting::before { content: ''; }
+:root .dotting { margin-left: 2px; padding-left: 2px; } /* IE9+ */
+
+@keyframes dot {
+25% { border-color: transparent; background-color: transparent; }          /* 0个点 */
+50% { border-right-color: transparent; background-color: transparent; }    /* 1个点 */
+75% { border-right-color: transparent; }                                   /* 2个点 */
+}

components/hans-tabbar/hans-tabbar.vue

@@ -0,0 +1,100 @@
+<template>
+	<view class="weui-tabbar" :class="extClass">
+		<!-- 选中的时候往weui-tabbar__item加class:weui-bar__item_on -->
+		<view  @click="tabChange(index)" v-for="(item, index) in list" :key="index" class="weui-tabbar__item" :class="{'weui-bar__item_on':index === current}">
+			<view style="position: relative;display:inline-block;"><image :src="current === index ? item.selectedIconPath : item.iconPath" class="weui-tabbar__icon"></image></view>
+			<view class="weui-tabbar__label">{{ item.text }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		list: {
+			type: Array,
+			default: function() {
+				return []
+			}
+		}
+	},
+	data() {
+		return {
+			extClass: '',
+			current: 1
+		};
+	},
+	methods: {
+		tabChange(index) {
+			if (index === this.current) {
+				return;
+			}
+			this.current = index;
+			this.$emit('tabChange',index)
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped >
+.weui-tabbar {
+	display: flex;
+	position: relative;
+	z-index: 500;
+	background-color: #ffffff;
+}
+.weui-tabbar:before {
+	content: ' ';
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	border-top: 1rpx solid rgba(0, 0, 0, 0.1);
+	color: rgba(0, 0, 0, 0.1);
+}
+.weui-tabbar__item {
+	display: block;
+	flex: 1;
+	padding: 8px 0 4px;
+	// padding-bottom: calc(8px + constant(safe-area-inset-bottom));
+	// padding-bottom: calc(8px + env(safe-area-inset-bottom));
+	font-size: 0;
+	color: rgba(0, 0, 0, 0.5);
+	text-align: center;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+.weui-tabbar__item:first-child {
+	padding-left: constant(safe-area-inset-left);
+	padding-left: env(safe-area-inset-left);
+}
+.weui-tabbar__item:last-child {
+	padding-right: constant(safe-area-inset-right);
+	padding-right: env(safe-area-inset-right);
+}
+.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,
+.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon > i,
+.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label {
+	color: #26D18B;
+}
+.weui-tabbar__icon {
+	display: inline-block;
+	width: 28px;
+	height: 28px;
+	margin-bottom: 2px;
+}
+i.weui-tabbar__icon,
+.weui-tabbar__icon > i {
+	font-size: 24px;
+	color: rgba(0, 0, 0, 0.5);
+}
+.weui-tabbar__icon image {
+	width: 100%;
+	height: 100%;
+}
+.weui-tabbar__label {
+	color: #bfbfbf;
+	font-size: 10px;
+	line-height: 1.4;
+}
+</style>

components/lime-painter/canvas.js

@@ -1,42 +1,5 @@
-import { CHAR_WIDTH_SCALE_MAP } from './utils'
-const _expand = ctx => {
-	// #ifndef APP-PLUS
-	ctx._measureText = ctx.measureText
-	// #endif
-	return {
-		setFont({fontFamily: ff = 'sans-serif', fontSize: fs = 14, fontWeight: fw = 'normal' , textStyle: ts = 'normal'}) {
-			// let ctx = this.ctx
-			// 设置属性
-			// #ifndef MP-TOUTIAO
-			// fw = fw == 'bold' ? 'bold' : 'normal'
-			// ts = ts == 'italic' ? 'italic' : 'normal'
-			// #endif
-			// #ifdef MP-TOUTIAO
-			fw = fw == 'bold' ? 'bold' : ''
-			ts =  ts == 'italic' ? 'italic' : ''
-			// #endif
-			// fs = toPx(fs)
-			ctx.font = `${ts} ${fw} ${fs}px ${ff}`;
-		},
-		// #ifndef APP-PLUS
-		measureText(text, fontSize) {
-			// app measureText为0需要累加计算0
-			return {
-				width: text.split("").reduce((widthScaleSum, char) => {
-				let code = char.charCodeAt(0);
-				let widthScale = CHAR_WIDTH_SCALE_MAP[code - 0x20] || 1;
-				return widthScaleSum + widthScale;
-			  }, 0) * fontSize
-			};
-		}
-		// #endif
-	}
-}
-export function expand(ctx) {
-	return Object.assign(ctx, _expand(ctx))
-}
 export function adaptor(ctx) {
-	return Object.assign(ctx, _expand(ctx), {
+	return Object.assign(ctx, {
 		setStrokeStyle(val) {
 			ctx.strokeStyle = val;
 		},
@@ -76,4 +39,4 @@ export function adaptor(ctx) {
 		createCircularGradient() {},
 		draw() {},
 	});
-}
+}

components/lime-painter/draw.js

@@ -1,14 +1,15 @@
-import { toPx, isNumber, getImageInfo  } from './utils'
+import { toPx, CHAR_WIDTH_SCALE_MAP, isNumber, getImageInfo  } from './utils'
 import { GD } from './gradient'
 import QR from './qrcode'
+let id = 0
 
 export class Draw {
-	constructor(context, canvas, use2dCanvas = false, isH5PathToBase64 = false, sleep) {
+	constructor(context, canvas, use2dCanvas = false, isH5PathToBase64 = false, boundary) {
 		this.ctx = context
 		this.canvas = canvas || null
+		this.root = boundary
 		this.use2dCanvas = use2dCanvas
 		this.isH5PathToBase64 = isH5PathToBase64
-		this.sleep = sleep
 	}
 	roundRect(x, y, w, h, r, fill = false, stroke = false, ) {
 		if (r < 0) return
@@ -25,6 +26,7 @@ export class Draw {
 				borderBottomRightRadius: br = r || 0,
 				borderBottomLeftRadius: bl = r || 0
 			} = r || {r,r,r,r}
+			ctx.beginPath()
 			// 右下角
 			ctx.arc(x + w - br, y + h - br, br, 0, Math.PI * 0.5)
 			ctx.lineTo(x + bl, y + h)
@@ -42,6 +44,34 @@ export class Draw {
 		if (stroke) ctx.stroke()
 		if (fill) ctx.fill()
 	}
+	measureText(text, fontSize) {
+		const { ctx } = this
+		// #ifndef APP-PLUS
+		return ctx.measureText(text).width
+		// #endif
+		// #ifdef APP-PLUS
+		// app measureText为0需要累加计算0
+		return text.split("").reduce((widthScaleSum, char) => {
+			let code = char.charCodeAt(0);
+			let widthScale = CHAR_WIDTH_SCALE_MAP[code - 0x20] || 1;
+			return widthScaleSum + widthScale;
+		  }, 0) * fontSize;
+		// #endif
+	}
+	setFont({fontFamily: ff = 'sans-serif', fontSize: fs = 14, fontWeight: fw = 'normal' , textStyle: ts = 'normal'}) {
+		let ctx = this.ctx
+		// 设置属性
+		// #ifndef MP-TOUTIAO
+		// fw = fw == 'bold' ? 'bold' : 'normal'
+		// ts = ts == 'italic' ? 'italic' : 'normal'
+		// #endif
+		// #ifdef MP-TOUTIAO
+		fw = fw == 'bold' ? 'bold' : ''
+		ts =  ts == 'italic' ? 'italic' : ''
+		// #endif
+		// fs = toPx(fs)
+		ctx.font = `${ts} ${fw} ${fs}px ${ff}`;
+	}
 	setTransform(box, {transform}) {
 		const {ctx} = this
 		const {
@@ -88,11 +118,13 @@ export class Draw {
 		}
 	}
 	setShadow({boxShadow: bs = []}) {
+		// #ifndef APP-NVUE
 		const {ctx} = this
 		if (bs.length) {
 			const [x, y, b, c] = bs
 			ctx.setShadow(x, y, b, c)
 		}
+		// #endif
 	}
 	setBorder(box, style) {
 		const {ctx} = this
@@ -231,10 +263,8 @@ export class Draw {
 			const {
 				borderRadius = 0,
 				mode,
-				padding = {},
 				backgroundColor: bg,
 			} = style
-			const {paddingTop: pt = 0, paddingLeft: pl= 0, paddingRight: pr= 0, paddingBottom: pb = 0} = padding
 			let {
 				left: x,
 				top: y,
@@ -253,10 +283,6 @@ export class Draw {
 			}
 			ctx.clip()
 			const _modeImage = (img) => {
-				x += pl
-				y += pt
-				w = w - pl - pr
-				h = h - pt - pb
 				// 获得图片原始大小
 				let rWidth = img.width
 				let rHeight = img.height
@@ -265,33 +291,17 @@ export class Draw {
 				// 绘画区域比例
 				const cp = w / h
 				// 原图比例
-				// 如果大于1 是宽度长
-				// 如果小于1 是高度长
 				const op = rWidth / rHeight
-				
+				if (cp >= op) {
+					rHeight = rWidth / cp;
+					// startY = Math.round((h - rHeight) / 2)
+				} else {
+					rWidth = rHeight * cp;
+					startX = Math.round(((img.width || w) - rWidth) / 2)
+				}
 				if (mode === 'scaleToFill' || !img.width) {
 					ctx.drawImage(img.src, x, y, w, h);
-				} else if(mode === 'aspectFit') {
-					if(cp >= op) {
-						rWidth = h * op;
-						rHeight = h
-						startX = x + Math.round(w - rWidth) / 2 
-						startY = y
-					} else {
-						rWidth = w
-						rHeight = w / op;
-						startX = x
-						startY = y + Math.round(h - rHeight) / 2 
-					}
-					ctx.drawImage(img.src, startX, startY, rWidth, rHeight);
 				} else {
-					if (cp >= op) {
-						rHeight = rWidth / cp;
-						// startY = Math.round((h - rHeight) / 2)
-					} else {
-						rWidth = rHeight * cp;
-						startX = Math.round(((img.width || w) - rWidth) / 2)
-					}
 					// 百度小程序 开发工具 顺序有问题 暂不知晓真机
 					// #ifdef MP-BAIDU
 					ctx.drawImage(img.src, x, y, w, h, startX, startY, rWidth, rHeight)
@@ -324,7 +334,7 @@ export class Draw {
 				this.setBorder(box, style)
 				setTimeout(() => {
 					resolve(true)
-				}, this.sleep)
+				}, this.root.sleep)
 			}
 			if(typeof img === 'string') {
 				const {path: src, width, height} = await getImageInfo(img, this.isH5PathToBase64)
@@ -354,31 +364,24 @@ export class Draw {
 			verticalAlign: va = 'top',
 			backgroundColor: bg,
 			maxLines,
-			display,
-			padding = {},
-			borderRadius = 0,
 			textDecoration: td
 		} = style
-		const {paddingTop: pt = 0, paddingLeft: pl = 0} = padding
 		lineHeight = toPx(lineHeight, fontSize)
 		
 		if (!text) return
 		ctx.save()
+		
 		this.setOpacity(style)
 		this.setTransform(box, style)
 		x = -w/2
 		y = -h/2
 		ctx.setTextBaseline(va)
-		ctx.setFont({fontFamily, fontSize, fontWeight, textStyle})
+		this.setFont({fontFamily, fontSize, fontWeight, textStyle})
 		ctx.setTextAlign(textAlign)
 		
 		if(bg) {
 			this.setBackground(bg, w, h)
-			this.roundRect(x, y, w, h, borderRadius, 1, 0)
-		 }
-		 if(display && display.includes('lock')) {
-			x += pl
-			y += pt 
+			this.roundRect(x, y, w, h, 1, bg)
 		 }
 		this.setShadow(style)
 		ctx.setFillStyle(color)
@@ -415,7 +418,7 @@ export class Draw {
 			default:
 				break
 		}
-		const textWidth = ctx.measureText(text, fontSize).width
+		const textWidth = this.measureText(text, fontSize)
 		const actualHeight = Math.ceil(textWidth / w) * lineHeight
 		let paddingTop = Math.ceil((h - actualHeight) / 2)
 		if (paddingTop < 0) paddingTop = 0
@@ -494,6 +497,7 @@ export class Draw {
 				ctx.stroke();
 			}
 		}
+		
 		const _reset = (text, x, y) => {
 			const rs = Object.keys(rulesObj)
 			for (let i = 0; i < rs.length; i++) {
@@ -509,9 +513,9 @@ export class Draw {
 		}
 		const _setText = (isReset, char) => {
 			if(isReset) {
-				const t1 = Math.round(ctx.measureText('\u0020', fontSize).width)
-				const t2 = Math.round(ctx.measureText('\u3000', fontSize).width)
-				const t3 = Math.round(ctx.measureText(char, fontSize).width)
+				const t1 = Math.round(this.measureText('\u0020', fontSize))
+				const t2 = Math.round(this.measureText('\u3000', fontSize))
+				const t3 = Math.round(this.measureText(char, fontSize))
 				let _char = ''
 				let _num = 1
 				if(t3 == t2){
@@ -543,7 +547,7 @@ export class Draw {
 					const t = _text[index]
 					let char = _setText(rulesObj[index], t) 
 					_text[index] = char
-					_setRulesObj(t, index, x + ctx.measureText(text.substring(0, index), fontSize).width, y + inlinePaddingTop)
+					_setRulesObj(t, index, x + this.measureText(text.substring(0, index), fontSize), y + inlinePaddingTop)
 				}
 				_reset()
 			}
@@ -561,6 +565,7 @@ export class Draw {
 		// 逐行绘制
 		let line = ''
 		let lineIndex = 0
+		
 		for(let index = 0 ; index <= chars.length; index++){
 			let ch = chars[index] || ''
 			const isLine = ch === '\n'
@@ -568,7 +573,9 @@ export class Draw {
 			ch = isLine ? '' : ch;
 			
 			let textline = line + _setText(rulesObj[index], ch)
-			let textWidth = ctx.measureText(textline, fontSize).width
+			let textWidth = this.measureText(textline, fontSize)
+			
+			
 			// 绘制行数大于最大行数，则直接跳出循环
 			if (lineIndex >= maxLines) {
 				break;
@@ -581,13 +588,13 @@ export class Draw {
 				_x = x
 			}
 			if(rulesObj[index]) {
-				_setRulesObj(ch, index, _x + ctx.measureText(line, fontSize).width, y + inlinePaddingTop)
+				_setRulesObj(ch, index, _x + this.measureText(line, fontSize), y + inlinePaddingTop)
 			}
 			if (textWidth > w || isLine || isRight) {
 				lineIndex++
 				line = isRight && textWidth <= w ? textline : line
 				if(lineIndex === maxLines && textWidth > w) {
-					while( ctx.measureText(`${line}...`, fontSize).width > w) {
+					while( this.measureText(`${line}...`, fontSize) > w) {
 						if (line.length <= 1) {
 							// 如果只有一个字符时，直接跳出循环
 							break;
@@ -615,6 +622,300 @@ export class Draw {
 		ctx.restore()
 		this.setBorder(box, style)
 	}
+	async findNode(element, parent = {}, index = 0, siblings = [], source) {
+		let computedStyle = Object.assign({}, this.getComputedStyle(element, parent, index));
+		let attributes = await this.getAttributes(element)
+		let node = {
+			id: id++,
+			parent,
+			computedStyle,
+			rules: element.rules,
+			attributes: Object.assign({}, attributes),
+			name: element?.type || 'view',
+		}
+		if(JSON.stringify(parent) === '{}' && !element.type) {
+			const {left = 0, top = 0, width = 0, height = 0 } = computedStyle
+			node.layoutBox = {left, top, width, height }
+		} else {
+			node.layoutBox = Object.assign({left: 0, top: 0}, this.getLayoutBox(node, parent, index, siblings, source))
+		}
+		
+		if (element?.views) {
+			let childrens = []
+			node.children = []
+			for (let i = 0; i < element.views.length; i++) {
+				let v = element.views[i]
+				childrens.push(await this.findNode(v, node, i, childrens, element))
+			}
+			 node.children = childrens
+		}
+		return node
+	}
+	getComputedStyle(element, parent = {}, index = 0) {
+		const style = {}
+		const name = element.name || element.type
+		let node = JSON.stringify(parent) == '{}' && !name ? element :  element.css;
+		const inheritProps = ['color', 'fontSize', 'lineHeight', 'verticalAlign', 'fontWeight', 'textAlign']
+		if(parent.computedStyle) {
+			inheritProps.forEach(prop => {
+			  node[prop] = node[prop] || parent.computedStyle[prop]
+			})
+		}
+		if(!node) return style
+		for (let value of Object.keys(node)) {
+			const item = node[value]
+			if(value == 'views') {
+				continue
+			}
+			if (['boxShadow', 'shadow'].includes(value)) {
+				let shadows = item.split(' ').map(v => /^\d/.test(v) ? toPx(v) : v)
+				style.boxShadow = shadows
+				continue
+			}
+			if (value.includes('border') && !value.includes('adius')) {
+				const prefix = value.match(/^border([BTRLa-z]+)?/)[0]
+				const type = value.match(/[W|S|C][a-z]+/)
+				let v = item.split(' ').map(v => /^\d/.test(v) ? toPx(v) : v)
+				
+				if(v.length > 1) {
+					style[prefix] = {
+						[prefix + 'Width'] : v[0] || 1,
+						[prefix + 'Style'] : v[1] || 'solid',
+						[prefix + 'Color'] : v[2] || 'black'
+					}
+				} else {
+					style[prefix] = {
+						[prefix + 'Width'] :  1,
+						[prefix + 'Style'] : 'solid',
+						[prefix + 'Color'] : 'black'
+					}
+					style[prefix][prefix + type[0]] = v[0]
+				}
+				continue
+			}
+			if (['background', 'backgroundColor'].includes(value)) {
+				style['backgroundColor'] = item
+				continue
+			}
+			if(value.includes('padding') || value.includes('margin') || value.includes('adius')) {
+				let isRadius = value.includes('adius')
+				let prefix = isRadius ? 'borderRadius' : value.match(/[a-z]+/)[0]
+				let pre = [0,0,0,0].map((item, i) => isRadius ? ['borderTopLeftRadius', 'borderTopRightRadius', 'borderBottomRightRadius', 'borderBottomLeftRadius'][i] : [prefix + 'Top', prefix + 'Right', prefix + 'Bottom', prefix + 'Left'][i] )
+				if(value === 'padding' || value === 'margin' || value === 'radius' || value === 'borderRadius') {
+					let v = item?.split(' ').map((item) => /^\d/.test(item) && toPx(item, node['width']), []) ||[0];
+					let type = isRadius ? 'borderRadius' : value;
+					if(v.length == 1) {
+						style[type] = v[0]
+					} else {
+						let [t, r, b, l] = v
+						style[type] = {
+							[pre[0]]: t,
+							[pre[1]]: isNumber(r) ? r : t,
+							[pre[2]]: isNumber(b) ? b : t,
+							[pre[3]]: isNumber(l) ? l : r
+						}
+					}
+				} else {
+					if(typeof style[prefix] === 'object') {
+						style[prefix][value] = toPx(item, node['width'])
+					} else {
+						style[prefix] = {
+							[pre[0]]: style[prefix] || 0,
+							[pre[1]]: style[prefix] || 0,
+							[pre[2]]: style[prefix] || 0,
+							[pre[3]]: style[prefix] || 0
+						}
+						style[prefix][value] = toPx(item, node['width'])
+					}
+				}
+				continue
+			}
+			if(value.includes('width') || value.includes('height')) {
+				if(/%$/.test(item)) {
+					style[value] = toPx(item, parent.layoutBox[value])
+				} else {
+					style[value] = /px|rpx$/.test(item) ? toPx(item) : item
+				}
+				continue
+			}
+			if(value.includes('transform')) {
+				style[value]= {}
+				item.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g, (g1, g2, g3) => {
+					const v = g3.split(',').map(k => k.replace(/(^\s*)|(\s*$)/g,''))
+					const transform = (v, r) => {
+						return v.includes('deg') ? v * 1 : toPx(v, r)
+					}
+					if(g2.includes('matrix')) {
+						style[value][g2] = v.map(v => v * 1)
+					} else if(g2.includes('rotate')) {
+						style[value][g2] = g3.match(/\d+/)[0] * 1
+					}else if(/[X, Y]/.test(g2)) {
+						style[value][g2] = /[X]/.test(g2) ? transform(v[0], node['width']) : transform(v[0], node['height'])
+					} else {
+						style[value][g2+'X'] = transform(v[0], node['width'])
+						style[value][g2+'Y'] = transform(v[1] || v[0], node['height'])
+					}
+				})
+				continue
+			}
+			style[value] = /%|px|rpx$/.test(item) ? toPx(item, node['width']) : /em$/.test(item) && name == 'text'? toPx(item, node['fontSize']) : item // (/em$/.test(item) && !value.includes('lineHeight') ? toPx(item, node['fontSize']) : item)
+		}
+		if((element.name == 'image' || element.type == 'image') && !style.mode) {
+			style.mode = 'aspectFill'
+			if((!node.width || node.width == 'auto') && (!node.height || node.width == 'auto') ) {
+				style.mode = ''
+			} 
+		}
+		return style
+	}
+	getLayoutBox(element, parent = {}, index = 0, siblings = [], source = {}) {
+		let box = {}
+		let {name, computedStyle: cstyle, layoutBox, attributes} = element || {}
+		if(!name) return box
+		const {ctx} = this
+		const pbox = parent.layoutBox || this.root
+		const pstyle = parent.computedStyle
+		let { 
+			verticalAlign: v = 'top', 
+			left: x, 
+			top: y,
+			width: w,
+			height: h,
+			fontSize = 14,
+			lineHeight = '1.4em',
+			maxLines,
+			fontWeight,
+			fontFamily,
+			textStyle,
+			position,
+			display
+			}  = cstyle;
+		const { paddingTop: pt = 0, paddingRight: pr = 0, paddingBottom: pb = 0, paddingLeft: pl = 0, } = cstyle.padding || {}
+		const { marginTop: mt = 0, marginRight: mr = 0, marginBottom: mb = 0, marginLeft: ml = 0, } = cstyle.margin || {}
+		
+		if(position == 'relative') {
+			x += pbox.left
+			y += pbox.top
+		}
+		if(name === 'text') {
+			const text = attributes.text ||''
+			lineHeight = toPx(lineHeight, fontSize)
+			ctx.save()
+			this.setFont({fontFamily, fontSize, fontWeight, textStyle})
+			const {layoutBox: lbox, computedStyle: ls} = siblings[index - 1] || {}
+			const {layoutBox: rbox, computedStyle: rs} = siblings[index + 1] || {}
+			const isLeft = index == 0
+			const isblock = display === 'block' || ls?.display === 'block'
+			const isOnly = isLeft && !rbox || !parent?.id
+			const lboxR = isLeft || isblock ? 0 : lbox.offsetRight || 0
+			let texts = text.split('\n')
+			let lineIndex = 1
+			let line = ''
+			const textIndent = cstyle.textIndent || 0
+			if(!isOnly) {
+				texts.map((t, i) => {
+					lineIndex += i
+					const chars = t.split('')
+					for (let j = 0; j < chars.length; j++) {
+						let ch = chars[j]
+						let textline = line + ch
+						let textWidth = this.measureText(textline, fontSize)
+						if(lineIndex == 1) {
+							textWidth = textWidth + (isblock ? 0 : lboxR) +  textIndent
+						}
+						if(textWidth > pbox.width) {
+							lineIndex++
+							line = ch
+						} else {
+							line = textline
+						}
+					}
+				})
+			} else {
+				line = text
+				lineIndex = Math.max(texts.length, Math.ceil(this.measureText(text, fontSize) / ((w || pbox.width) - this.measureText('0', fontSize))))
+			}
+			box.offsetLeft = (isNumber(x) || isblock || isOnly ? textIndent : lboxR) +  pl + ml;
+			// 剩下的字宽度
+			const remain = (this.measureText(line, fontSize))
+			let width =  lineIndex > 1 ? pbox.width : remain + box.offsetLeft;
+			box.offsetRight = box.offsetLeft + (w ? w : (isblock ? pbox.width : remain)) + pr + mr;
+			
+			
+			const _getLeft = () => {
+				return (x || pbox.left)
+			}
+			const _getWidth = () => {
+				return w || (isOnly ? pbox.width : (width > pbox.width - box.left || lineIndex > 1 ?  pbox.width - box.left : width))
+			}
+			const _getHeight = () => {
+				if(h) {
+					return h
+				} else if(lineIndex > 1 ) {
+					return (maxLines || lineIndex) * lineHeight + pt + pb + mt + mb
+				} else {
+					return lineHeight + pt + pb + mt + mb
+				}
+			}
+			const _getTop = () => {
+				let _y = y
+				if(_y) {
+					return _y + pt + mt
+				}
+				if(isLeft) {
+					 _y = pbox.top
+					
+				} else if(lbox.width < pbox.width) {
+					_y = lbox.top
+				} else {
+					_y = lbox.top + lbox.height - (ls?.lineHeight || 0)
+				}
+				if (v === 'bottom') {
+					_y = pbox.top + (pbox.height - box.height || 0)
+				}
+				if (v === 'middle') {
+					_y = pbox.top + (pbox.height - box.height || 0) / 2
+				}
+				return _y + pt + mt + (isblock && ls?.lineHeight || 0 )
+			}
+			box.left = _getLeft() 
+			box.width = _getWidth() 
+			box.height = _getHeight()
+			box.top = _getTop()
+			ctx.restore()
+		} else if(['view', 'qrcode'].includes(name)) {
+			box.left = x || pbox.left
+			box.width = (w || pbox?.width) - pl - pr
+			box.height = h || 0
+			box.top = y || pbox.top
+		} else if(name === 'image') {
+			box.left = x || pbox.left
+			box.width = (w || pbox?.width) - pl - pr
+			const {
+				width: rWidth,
+				height: rHeight
+			} = attributes
+			box.height = h || box.width * rHeight / rWidth 
+			box.top = y || pbox.top
+		}
+		return box
+	}
+	async getAttributes(element) {
+		let arr = { }
+		if(element?.url || element?.src) {
+			arr.src = element.url || element?.src;
+			const {width = 0, height = 0, path: src} = await getImageInfo(arr.src, this.isH5PathToBase64) || {}
+			arr = Object.assign({}, arr, {width, height, src})
+		}
+		if(element?.text) {
+			arr.text = element.text
+		}
+		return arr
+	}
+	async drawBoard(element) {
+		const node = await this.findNode(element)
+		return this.drawNode(node)
+	}
 	async drawNode(element) {
 		const {
 			layoutBox,

components/lime-painter/index.vue

@@ -1,35 +1,12 @@
 <template>
-	<canvas 
-		v-if="use2dCanvas" 
-		:id="canvasId" 
-		type="2d" 
-		:style="style"
-		@touchstart="onTouchStart"
-		@touchmove="onTouchMove"
-		@touchend="onTouchEnd"
-		@touchcancel="onTouchCancel" 
-		>
-	</canvas>
-	<canvas
-		v-else 
-		:canvas-id="canvasId" 
-		:style="style" 
-		:id="canvasId" 
-		:width="boardWidth * dpr" 
-		:height="boardHeight * dpr"
-		@touchstart="onTouchStart"
-		@touchmove="onTouchMove"
-		@touchend="onTouchEnd"
-		@touchcancel="onTouchCancel" 
-		>
-	</canvas>
+	<canvas v-if="use2dCanvas" :id="canvasId" type="2d" :style="style"></canvas>
+	<canvas v-else :canvas-id="canvasId" :style="style" :id="canvasId" :width="boardWidth * dpr" :height="boardHeight * dpr"></canvas>
 </template>
 
 <script>
 import { toPx, base64ToPath, compareVersion} from './utils';
 import { Draw } from './draw';
-import { Layout } from './layout';
-import { adaptor, expand } from './canvas';
+import { adaptor } from './canvas';
 export default {
 	// version: '1.5.9.3',
 	name: 'l-painter',
@@ -70,8 +47,7 @@ export default {
 			use2dCanvas: false,
 			// #endif
 			draw: null,
-			ctx: null,
-			layout: null
+			ctx: null
 		};
 	},
 	computed: {
@@ -112,15 +88,6 @@ export default {
 			})
 	},
 	methods: {
-		onTouchStart(e) {
-			 const {x,y} = e.touches[0]
-			console.log('e', {x,y})
-			console.log(this.node)
-			// this.ctx.isPointInPath(x, y)
-		},
-		onTouchMove(e) {},
-		onTouchEnd(e) {},
-		onTouchCancel(e) {},
 		async render(args = {}, single = false) {
 			const ctx = await this.getContext()
 			const { use2dCanvas, boardWidth, boardHeight, board, canvas, isBase64ToPath, isH5PathToBase64, sleep } = this;
@@ -133,22 +100,17 @@ export default {
 				  left: 0,
 				  width: boardWidth,
 				  height: boardHeight,
+				  sleep
 				}
 			}
 			if(!single) {
 				ctx.clearRect(0, 0, boardWidth, boardHeight);
 			}
 			if(!this.draw) {
-				this.draw = new Draw(ctx, canvas, use2dCanvas, isH5PathToBase64, sleep);
+				this.draw = new Draw(ctx, canvas, use2dCanvas, isH5PathToBase64, this.boundary);
 			} 
-			if(!this.layout) {
-				this.layout = new Layout(ctx, {}, this.boundary, this.isH5PathToBase64)
-			}
 			if(JSON.stringify(args) != '{}' || board && JSON.stringify(board) != '{}') {
-				this.node = await this.layout.calcNode(JSON.stringify(args) != '{}' ? args : board)
-			}
-			if(this.node) {
-				await this.draw.drawNode(this.node);
+				await this.draw.drawBoard(JSON.stringify(args) != '{}' ? args : board);
 			}
 			await new Promise(resolve => this.$nextTick(resolve)) 
 			if (!use2dCanvas && !single) {
@@ -214,8 +176,8 @@ export default {
 							// #ifdef MP-ALIPAY
 							ctx.scale(dpr, dpr);
 							// #endif
-							this.ctx = expand(ctx)
-							resolve(this.ctx);
+							this.ctx = ctx
+							resolve(ctx);
 						}
 					})
 				})
@@ -248,7 +210,7 @@ export default {
 							ctx.scale(dpr, dpr);
 						}
 						this.ctx = adaptor(ctx)
-						resolve(this.ctx);
+						resolve(adaptor(ctx));
 					});
 				
 			});

components/lime-painter/qrcode.js

@@ -1 +1,791 @@
-// 请去下载覆盖：https://gitee.com/liangei/lime-painter/blob/master/qrcode.js
+/* eslint-disable */
+!(function () {
+
+  // alignment pattern
+  let 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
+  let 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
+  let 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
+  let 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
+  let 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
+  let 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
+  let strinbuf = [], eccbuf = [], qrframe = [], framask = [], rlens = [];
+  // Control values - width is based on version, last 4 are from table.
+  let version, width, neccblk1, neccblk2, datablkw, eccblkwid;
+  let ecclevel = 2;
+  // set bit to indicate cell in qrframe is immutable.  symmetric around diagonal
+  function setmask(x, y) {
+    let 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) {
+    let 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;
+  }
+
+  let genpoly = [];
+
+  // Calculate and append ECC data to data block.  Block is in strinbuf, indexes to buffers given.
+  function appendrs(data, dlen, ecbuf, eclen) {
+    let 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) {
+    let 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) {
+    let 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.
+  let 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) {
+    let i;
+    let 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() {
+    let x, y, h, b, b1;
+    let thisbad = 0;
+    let 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;
+
+    let big = bw;
+    let 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) {
+    let 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;
+  }
+  let _canvas = null;
+  let 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(string) {
+      return genframe(string);
+    },
+    //这里的utf16to8(str)是对Text中的字符串进行转码，让其支持中文
+    utf16to8(str) {
+      let 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;
+    },
+	draw(str, $this, box, style, ecc) {
+		const {ctx} = $this
+		let {
+			left: startX, 
+			top: startY, 
+			width: cavW, 
+			height: cavH
+		} = box
+		const {
+			borderRadius = 0,
+			backgroundColor: bg,
+			color = '#000000',
+			border
+		} = style
+		const { borderWidth: bw } = border || {}
+      let that = this;
+      ecclevel = ecc || ecclevel;
+      if (!ctx) {
+        console.warn('No canvas provided to draw QR code in!')
+        return;
+      }
+	  ctx.save()
+	  if(bw) {
+		 cavW = cavW - bw
+		 cavH = cavH - bw
+	  }
+      let size = Math.min(cavW, cavH);
+	  //增加中文显示
+      str = that.utf16to8(str);
+
+      let frame = that.getFrame(str);
+      let px = size / width;
+	  $this.setOpacity(style)
+	  $this.setTransform(box, style)
+	  startX = -cavW/2,
+	  startY = -cavH/2
+      if (bg) {
+		  $this.setBackground(bg, cavW, cavH)
+		  $this.roundRect(startX, startY, cavW, cavH, borderRadius, true, false)
+      }
+	  ctx.setFillStyle(color)
+      for (let i = 0; i < width; i++) {
+        for (let j = 0; j < width; j++) {
+          if (frame[j * width + i]) {
+            ctx.fillRect(startX + px * i, startY + px * j, px, px);
+          }
+        }
+      }
+	  ctx.restore()
+	  $this.setBorder(box, style)
+    }
+  }
+  module.exports = { api }
+})();

components/lime-painter/utils.js

@@ -15,12 +15,12 @@ export function toPx(value, baseSize) {
 	}
 	// 如果有单位
 	if (typeof value === 'string') {
-		const reg = /^-?[0-9]+([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g
 		const results = reg.exec(value);
 		if (!value || !results) {
 			return 0;
 		}
-		const unit = results[2];
+		const unit = results[3];
 		value = parseFloat(value);
 		let res = 0;
 		if (unit === 'rpx') {
@@ -366,71 +366,44 @@ const getLocalFilePath = (path)=> {
 // #endif
 
 export function getImageInfo(img, isH5PathToBase64) {
-	return new Promise(async (resolve, reject) => {
-		const base64Reg = /^data:image\/(\w+);base64/
-		const localReg = /^\.|^\/(?=[^\/])/;
-		const networkReg = /^(http|\/\/)/
-		// #ifdef H5
-		if(networkReg.test(img) && isH5PathToBase64) {
-			img = await pathToBase64(img)
-		}
-		// #endif
-		// #ifndef MP-ALIPAY 
-		if(base64Reg.test(img)) {
-			if(!cache[img]) {
-				const imgName = img
-				img = await base64ToPath(img)
-				cache[imgName] = img
-			} else {
-				img = cache[img]
+		return new Promise(async (resolve, reject) => {
+			const base64Reg = /^data:image\/(\w+);base64/
+			const localReg = /^\.|^\/(?=[^\/])/;
+			const networkReg = /^(http|\/\/)/
+			// #ifdef H5
+			if(networkReg.test(img) && isH5PathToBase64) {
+				img = await pathToBase64(img)
 			}
-		}
-		// #endif
-		if(cache[img] && cache[img].errMsg) {
-			resolve(cache[img])
-		} else {
-			uni.getImageInfo({
-				src: img,
-				success: (image) => {
-					// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
-					image.path = localReg.test(img) ?  `/${image.path}` : image.path;
-					// #endif
-					// image.path = /^(http|\/\/|\/|wxfile|data:image\/(\w+);base64|file|bdfile|ttfile|blob)/.test(image.path) ? image.path : `/${image.path}`;
-					cache[img] = image
-					resolve(cache[img])
-				},
-				fail(err) {
-					resolve({path: img})
-					console.error(`getImageInfo:fail ${img} failed ${JSON.stringify(err)}`);
+			// #endif
+			// #ifndef MP-ALIPAY 
+			if(base64Reg.test(img)) {
+				if(!cache[img]) {
+					const imgName = img
+					img = await base64ToPath(img)
+					cache[imgName] = img
+				} else {
+					img = cache[img]
 				}
-			})
-		}
-	})
-}
-	
-	
-	
-export class DataUtil {
-  /**
-   * 设置差异数据
-   * @param component
-   * @param data
-   */
-  setDiffData(component, data) {
-	const diffData = {};
-
-	// 遍历获取到有差异的数据
-	Object.keys(data).forEach(key => {
-	  if (component[key] !== data[key]) {
-		diffData[key] = data[key];
-	  }
-	});
-
-	// 设置数据
-	if (Object.keys(diffData).length) {
-	  // component.setData(diffData);
-	}
-  }
-}
-// const dataUtil = new DataUtil;
-// export dataUtil;
+			}
+			// #endif
+			if(cache[img] && cache[img].errMsg) {
+				resolve(cache[img])
+			} else {
+				uni.getImageInfo({
+					src: img,
+					success: (image) => {
+						// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
+						image.path = localReg.test(img) ?  `/${image.path}` : image.path;
+						// #endif
+						// image.path = /^(http|\/\/|\/|wxfile|data:image\/(\w+);base64|file|bdfile|ttfile|blob)/.test(image.path) ? image.path : `/${image.path}`;
+						cache[img] = image
+						resolve(cache[img])
+					},
+					fail(err) {
+						resolve({path: img})
+						console.error(`getImageInfo:fail ${img} failed ${JSON.stringify(err)}`);
+					}
+				})
+			}
+		})
+	}

config/config.js

@@ -2,7 +2,9 @@ const config = {
 	//dev
 	// apiBaseurl:'http://172.16.90.8:21998',//东东
 	// apiBaseurl:'http://wx.hw.hongweisoft.com/cqthminapp',//东东
-	apiBaseurl:'http://47.108.214.98:21998',//服务器
+	// apiBaseurl:'http://172.16.90.102:21998',//邱波
+	// apiBaseurl:'http://47.108.214.98:21998',//服务器
+	apiBaseurl:'https://cqthht.hongweisoft.com/qbcert',//正式地址 需要在manifest中修改appid
 	
 	// 图片占位
 	placeImg:'http://placekitten.com',
@@ -19,19 +21,20 @@ const config = {
 	
 	
 	//online 线上配置
-
 	
+	// 证书地址
+	certificateUrl:'https://cqthht.hongweisoft.com/cert?',
 	
 	//本地图片
 	// imgUrl:"../../static/img/",
 	imgUrl:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
 	//二级页面图片
 	// innerImgUrl:"../../../static/img/",
-	innerImgUrl:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
+	// innerImgUrl:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
 	// 云图片(产品)
 	onlineImg:"http://fqn.hongweisoft.com/",
 	// 七牛云
-	qnyImg:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
+	// qnyImg:"http://fqn.hongweisoft.com/cqcarbon/wxapp/",
 }
 export {
 	config

main.js

@@ -82,11 +82,14 @@ const href = (data,type = 1) =>{
 Vue.config.productionTip = false;
 
 const goback = () =>{
+	// let menuButtonInfo = uni.getMenuButtonBoundingClientRect();//胶囊按钮信息
 	let pages = getCurrentPages();
-	console.log('pages',pages);
-	console.log('pages[0].route',pages[0].route);
-	// if(pages[0].route == 'pages/use/useRouter'){
-	if(pages.length == '2'){
+	let prevPage = pages[pages.length - 2]; //上一个页面
+	// console.log('pages',pages);
+	// console.log('prevPage',prevPage.route);
+	// console.log('pages[0].route',pages[0].route);
+	if(prevPage.route == 'pages/use/useRouter'){
+	// if(pages.length == '2'){
 		uni.switchTab({
 			url:'/pages/index/index',
 			fail: (err) => {
@@ -100,10 +103,10 @@ const goback = () =>{
 
 Vue.prototype.$api = {msg,http,href,goback};
 Vue.prototype.$getimg = config.imgUrl;
-Vue.prototype.$getInnerImg = config.innerImgUrl;
+// Vue.prototype.$getInnerImg = config.innerImgUrl;
 Vue.prototype.$onlineImg = config.onlineImg;
 Vue.prototype.$placeImg = config.placeImg;
-Vue.prototype.$qnyImg = config.qnyImg;
+// Vue.prototype.$qnyImg = config.qnyImg;
 Vue.prototype.$store = store;
 Vue.prototype.config = config;
 

manifest.json

@@ -57,11 +57,12 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxc950eea640108c5e",
+        "appid" : "wx042c1edaadc86fbb",
+        // "appid" : "wxc950eea640108c5e",//测试
         "setting" : {
             "urlCheck" : false,
             "postcss" : false,
-            "minified" : false,
+            "minified" : true,
             "es6" : true
         },
         "usingComponents" : true,

pages.json

@@ -40,13 +40,14 @@
 		{
 			"path": "pages/product/product",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationStyle":"custom"
 			}
 		},
 		{
 			"path": "pages/product/productList/productList",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "更多产品"
 			}
 		},
 		{
@@ -55,6 +56,19 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/buySuccess/buySuccess",
+			"style": {
+				"navigationBarTitleText": "结果页"
+			}
+		},
+		{
+			"path": "pages/building/building",
+			"style": {
+				"navigationBarTitleText": "正在建设中"
+				,"navigationStyle":"custom"
+			}
+		},
 		{
 			"path": "pages/use/useRouter",
 			"style": {

pages/building/building.vue

@@ -0,0 +1,104 @@
+<!-- https://www.kancloud.cn/dishaxueyuan/uni-app/1358897 onBackPress在小程序不生效 -->
+<template>
+	<view class="pages">
+		<view class="hold-status-bar show">
+			<!-- 占据了状态栏位置 -->
+		</view>
+		<view class="custom-nav">
+			<view class="custom-nav-left" @click="$api.goback"><text class="iconfont icon-jiantou"></text></view>
+			<view class="custom-nav-center"></view>
+		</view>
+		<image :src="$getimg + 'building.png'" class="building-img" mode="heightFix"></image>
+		<view class="building-text">正在建设中<text class="dotting"></text></view>
+		
+		<hans-tabber :list="list" style="position:fixed;bottom:0;width:100%;left:0;right:0;" @tabChange="tabChange"></hans-tabber>
+	</view>
+</template>
+
+<script>
+	import hansTabber from '../../components/hans-tabbar/hans-tabbar.vue';
+	export default {
+		components:{
+			hansTabber
+		},
+		data() {
+			return {
+				list: [{
+				 "text": "首页",
+				 "iconPath": '/static/img/icon_home.png' ,
+				 "selectedIconPath": '/static/img/icon_home_active.png'
+			   },
+			   {
+				 "text": "价值实现",
+				 "iconPath": '/static/img/icon_use.png',
+				 "selectedIconPath":'/static/img/icon_use_active.png'
+				 },
+				 {
+				   "text": "我的信息",
+				   "iconPath": '/static/img/icon_usercenter.png',
+				   "selectedIconPath": '/static/img/icon_usercenter_active.png'
+				 }],
+				$getimg:this.$getimg,
+				token:'',
+				params:{
+					
+				}
+				
+			}
+		},
+		onShow() {
+			let self = this;
+			uni.getStorage({
+				key : 'userInfo',
+				success:function(res){
+					if(res.data.customerType =='1'){
+						// console.log('个人用户');
+						self.list[1].text='普惠商城';
+						self.list[1].iconPath='/static/img/icon_mall.png';
+						self.list[1].selectedIconPath='/static/img/icon_mall_active.png';
+					}else{
+						
+					};
+				}
+			});
+		},
+		onLoad() {
+			// var pages = getCurrentPages();
+			// console.log('pages',pages);
+			// let menuButtonInfo = uni.getMenuButtonBoundingClientRect();//胶囊按钮信息
+			// console.log('menuButtonInfo',menuButtonInfo);
+
+		},
+		methods: {
+			tabChange(index) {
+				console.log(index)
+				switch(index) {
+				     case 0:
+				        uni.switchTab({
+				        	url:'../index/index'
+				        });
+				        break;
+				     case 1:
+				        return
+				        break;
+					case 2:
+					   uni.switchTab({
+					   	url:'../usercenter/usercenter'
+					   });
+					   break;
+				     default:
+				        return
+				} 
+			}
+
+		}
+	}
+</script>
+
+<style>
+	/* @import url("./building.css"); */
+	page{background-color: #F5F5F5;text-align: center;}
+	.custom-nav{background-color: #fff;color: #333;padding-bottom: 20rpx;}
+	.building-img{margin-top: 408rpx;width: 240rpx;height: 240rpx;margin-bottom: 36rpx;}
+	.building-text{font-size: 30rpx;color: #999;line-height: 45rpx;font-weight: 400;}
+</style>

pages/buySuccess/buySuccess.css

@@ -0,0 +1,32 @@
+page{background-color: #F5F5F5;}
+.content{background-color: #fff;padding: 113rpx 24rpx 64rpx;text-align: center;}
+.content-icon{width: 108rpx;height: 108rpx;margin-bottom: 48rpx;}
+.content-til{font-size: 36rpx;color: #333;line-height: 50rpx;font-weight: 400;margin-bottom: 16rpx;}
+.content-subtil{font-size: 26rpx;color: #999;line-height: 37rpx;font-weight: 400;min-height: 74rpx;}
+.full-btn{margin: 40rpx 24rpx;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pages/buySuccess/buySuccess.vue

@@ -0,0 +1,48 @@
+<template>
+	<view class="pages">
+		<view class="content">
+			<image :src="$getimg + 'icon-chenggong.png'" class="content-icon" mode="heightFix"></image>
+			<view class="content-til">购买成功</view>
+			<view class="content-subtil">您将获得由重庆生态环境局发给您的碳汇购碳证书，您还可以将您的证书分享到您的朋友圈，号召更多的人购买碳汇践行环保</view>
+		</view>
+		<view class="full-btn" @click="goCertDetails">查看证书</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				$getimg:this.$getimg,
+				token:'',
+				orderid:'',
+				params:{
+					
+				}
+				
+			}
+		},
+		onShow() {
+			let serf = this;
+			this.token = this.$store.state.token;
+		},
+		onLoad(option) {
+			console.log('option',option);
+			this.orderid = option.orderid;
+
+		},
+		methods: {
+			goCertDetails(id){
+				// console.log(id)
+				uni.navigateTo({
+					url: '/pages/usercenter/certificateList/certificate/certificate?orderid=' + this.orderid,
+				});
+			},
+
+		}
+	}
+</script>
+
+<style>
+	@import url("./buySuccess.css");
+</style>

pages/confirmOrder/confirmOrder.css

@@ -2,15 +2,15 @@ page{background: #F5F5F8;padding-bottom: 160rpx;}
 .order-list{background: #fff;margin-bottom: 30rpx;}
 .order-list-item{padding: 20rpx 50rpx;border-bottom: 1px solid #eee;display: flex;}
 .order-list .order-list-item:last-of-type{border-bottom: 0;}
-.order-list-item .image-content{width: 202rpx;height: 202rpx;padding-right: 60rpx;}
+.order-list-item .image-content{width: 202rpx;height: 202rpx;padding-right: 24rpx;}
 .order-list-item image{width:100%;height: 100%;background:#DDDDDD;}
 .order-list-item .text-content{flex: 1;position: relative;}
-.order-list-item .title{width:350rpx;font-size:30rpx;margin-bottom:20rpx;overflow: hidden;text-overflow: ellipsis;display: -webkit-box; -webkit-line-clamp:3;-webkit-box-orient: vertical;font-weight:bold;}
+.order-list-item .title{width:350rpx;height: 80rpx;font-size:30rpx;margin-bottom:20rpx;overflow: hidden;text-overflow: ellipsis;display: -webkit-box; -webkit-line-clamp:3;-webkit-box-orient: vertical;font-weight:bold;}
 .order-list-item .totalcarbon,
 .order-list-item .oId{font-size: 28rpx;color: #999;font-weight: 300;}
-/* .order-list-item .text-content .price{position:absolute;top:0;right:-20rpx;font-weight: 500;font-size:30rpx;color:#999;} */
-/* .order-list-item .total{position:absolute;left: 0;bottom: 0;width: 100%;font-size:40rpx;} */
-.order-list-item .total uni-text{font-size:24rpx;}
+.order-list-item .text-content .price{display: flex;justify-content: space-between;align-items: center;margin-bottom: 24rpx;}
+.order-list-item .price .price-total{color: #26D18B;font-weight: 600;}
+.order-list-item .price .price-unit{font-size: 28rpx;color: #999;}
 .order-list-item .nums{position:absolute;right:-20rpx;bottom:0;}
 .order-list-item .nums .countNum{display:flex;width:152rpx;height:50rpx;border:1px solid #E5E5E5;margin-left:134rpx;}
 .order-list-item .nums .countNum .countNum-action{width:230rpx;height:100%;line-height:44rpx;color:#26D18B;text-align:center;}

pages/confirmOrder/confirmOrder.vue

@@ -9,9 +9,12 @@
 				<view class="text-content">
 					<view class="title">{{item.goodsName}} </view>
 					<!-- <view class="oId">产品编号: {{ item.oId }}</view> -->
-					<view class="price">{{item.price}}元 / KG</view>
+					<view class="price">
+						<view class="price-total"><text>￥</text>{{item.totalPrice | keepTwoNum}}</view>
+						<view class="price-unit">{{item.price}}元 / KG</view>						
+					</view>
 					<view class="totalcarbon">累计碳汇量{{item.carbonVal}}kg</view>
-					<view class="total"><text>￥</text>{{item.totalPrice | keepTwoNum}}</view>
+					<!-- <view class="total"><text>￥</text>{{item.totalPrice | keepTwoNum}}</view> -->
 					<view class="nums">
 						 <view class="countNum">
 							 <view class="countNum-action reduce" @click="calcValue('reduce',item)">-</view>
@@ -200,7 +203,8 @@
 					    paySign: res.data.retBody.paySign,
 					    success: function (res) {
 							// self.$api.href('/pages/usercenter/orderList/orderList')
-							self.$api.href('/pages/usercenter/certificateList/certificate/certificate?orderid=' + self.orderid)
+							// self.$api.href('/pages/usercenter/certificateList/certificate/certificate?orderid=' + self.orderid);
+							self.$api.href('/pages/buySuccess/buySuccess?orderid=' + self.orderid)
 					        console.log('success:' + JSON.stringify(res));
 					    },
 					    fail: function (err) {

pages/index/guide.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="pages">
-		<view class="hold-status-bar">
+		<view class="hold-status-bar show">
 			<!-- 占据了状态栏位置 -->
 		</view>
-		<view class="guide-img">
+		<view class="guide-img" :class="{isheight:isheight}">
 			<swiper class="swiper" 
 			:indicator-dots="swiper.indicatorDots" 
 			:indicator-color="swiper.indicatorColor"  
@@ -11,17 +11,17 @@
 			:autoplay="swiper.autoplay" 			
 			:interval="swiper.interval" :duration="swiper.duration">
 				<swiper-item>
-					<view class="adv-item"><image :src="$getimg +'guide01.png'" class="pic" mode="scaleToFill"></image></view>
+					<view class="adv-item"><image :src="$getimg +'guide01-s1.png'" class="pic" mode="widthFix"></image></view>
 				</swiper-item>
 				<swiper-item>
-					<view class="adv-item"><image :src="$getimg +'guide02.png'" class="pic" mode="scaleToFill"></image></view>
+					<view class="adv-item" style="background-color: #26C896;"><image :src="$getimg +'guide02.png'" class="pic" mode="widthFix"></image></view>
 				</swiper-item>
 				<swiper-item>
-					<view class="adv-item"><image :src="$getimg +'guide03.png'" class="pic" mode="scaleToFill"></image></view>
+					<view class="adv-item" style="background-color: #26C896;"><image :src="$getimg +'guide03.png'" class="pic" mode="widthFix"></image></view>
 				</swiper-item>
 				<swiper-item>
-					<view class="adv-item" @click="goIndex">
-						<image :src="$getimg +'guide04.png'" class="pic" mode="scaleToFill"></image>
+					<view class="adv-item" style="background-color: #26C896;" @click="goIndex">
+						<image :src="$getimg +'guide04.png'" class="pic" mode="widthFix"></image>
 						<view class="tip-btn-wrap">
 							<text class="tip-btn">立即体验</text>
 						</view>
@@ -43,6 +43,7 @@
 			return {
 				preloaderTime:5,
 				$getimg:this.$getimg,
+				isheight:false,
 				swiper: {
 					indicatorDots: true,
 					autoplay: false,
@@ -58,7 +59,19 @@
 		},
 		onLoad() {
 			// console.log(this.config.version);
-			 
+			let self = this;
+			uni.getSystemInfo({
+			    success: function (res) {
+					console.log('getSystemInfo',res);
+					let windowscale = res.windowHeight/res.screenWidth;//屏幕高宽比 
+					console.log('res.windowHeight',res.windowHeight);
+					console.log('res.screenWidth',res.screenWidth);
+					console.log('windowscale',windowscale);
+					if(res.windowHeight>800){
+						self.isheight = true;						
+					}
+			    }
+			}); 
 		},
 		onReady() {
 			// 从本地缓存中同步获取指定 key 对应的内容，用于判断是否是第一次打开应用
@@ -117,7 +130,8 @@
 </script>
 
 <style scoped>
-.guide-img{position: fixed;left: 0;right: 0;top: 0;bottom: 0;display: block;}
+.guide-img{position: fixed;left: 0;right: 0;top:40rpx;bottom: 0;display: block;}
+.guide-img.isheight{top: 115rpx;}
 .swiper{height: 100%;}
 .adv-item{height: 100%;position: relative;}
 .guide-img .pic{width: 100%;height: 100%;/* max-height: 100%; */}

pages/index/index.vue

@@ -39,7 +39,7 @@
 					<image :src="$getimg+'home-buy-now-img.png'" class="buy-now-img" mode="aspectFit"></image>
 				</view>
 				<view class="buy-now-text">
-					<view class="buy-now-text-big">立即购碳</view>
+					<view class="buy-now-text-big">{{buyNowText}}</view>
 					<view class="buy-now-text-small">点击去购碳哟</view>
 				</view>
 				<view class="buy-now-icon">
@@ -140,12 +140,13 @@
 					</view>
 				</view>
 				<!-- rank-top end -->
-				<view class="rank-list-header" v-if="rankList.length>0">
+				<view class="rank-list-header" v-if="rankTop.length > 0">
 					<view class="rank-list-header-rank">排名</view>
 					<view class="rank-list-header-user">用户</view>
 					<view class="rank-list-header-carbon">购买碳汇</view>
-				</view>
-				<view class="rank-list" v-if="rankList">
+				</view>				
+				<view class="rank-list">
+					<custom-nodata notice='暂无更多数据' v-if="rankTop.length > 0&&rankList.length<=0"></custom-nodata>
 					<view class="rank-list-item" v-for="(item, index) in rankList" :key="index">
 						<view class="rank-list-rank">{{item.rank}}</view>
 						<view class="rank-list-user">
@@ -201,7 +202,8 @@
 				rankTop:[],
 				myRank:{},
 				rankList:[],
-				rankResult:{}
+				rankResult:{},
+				buyNowText:'立即认购'
 				
 			}
 		},
@@ -219,7 +221,10 @@
 						  iconPath: '/static/img/icon_mall.png',
 						  selectedIconPath: '/static/img/icon_mall_active.png',
 						  pagePath: '/pages/mall/mall'
-						})
+						});
+						self.buyNowText = '立即购碳'
+					}else{
+						self.rankTab(2);
 					};
 				}
 			});

pages/index/modal/quickBuy.css

@@ -12,15 +12,15 @@
 .remark{border: 2rpx solid #DFDFDF;padding: 30rpx 24rpx 24rpx;}
 .remark-textarea{font-size: 24rpx;color: #ccc;line-height: 33rpx;height: 100rpx;}
 
-.amount-wrap{display: flex;padding: 32rpx 40rpx;margin-bottom: 12rpx;align-items: center;justify-content: space-between;}
+.amount-wrap{display: flex;padding: 32rpx 40rpx 0;margin-bottom: 12rpx;align-items: center;justify-content: space-between;}
 .amount-flex-wrap{display: flex;align-items: center;}
 .amount-til{font-size: 30rpx;color: #666;font-weight: 600;}
 .amount{color: #FFDA00;font-weight: 600;}
 .amount .rmb{font-size: 54rpx;}
 .amount .num{font-size: 70rpx;}
-.amount-btn{margin-right: 0;height: 98rpx;line-height: 98rpx;padding: 0 22rpx;background-color: #26D18B;border-radius: 6rpx;text-align: center;color: #fff;}
+.amount-btn{margin-right: 0;height: 98rpx;line-height: 98rpx;width: 240rpx;background-color: #26D18B;border-radius: 6rpx;text-align: center;color: #fff;}
 
-.tip{padding: 0 40rpx 50rpx;font-size: 28rpx;color: #999;}
+.tip{padding: 0 40rpx 68rpx;font-size: 28rpx;color: #999;}
 
 
 

pages/index/modal/quickBuy.vue

@@ -28,7 +28,7 @@
 							<text class="num">{{totalMoney}}</text>
 						</view>						
 					</view>					
-					<view class="amount-btn"  @click="goCart">提交认购申请</view>
+					<view class="amount-btn"  @click="goCart">{{amountBtnText}}</view>
 				</view>
 				<view class="tip">
 					购买{{shoppingNum}}kg，预估金额{{totalMoney}}元，认购期3年
@@ -52,8 +52,21 @@
 			uniPopup,
 		},
 		created() {
-			this.thetoken = 'Bearer' + ' ' + this.$store.state.token;			
 			let self = this;
+			uni.getStorage({
+				key : 'userInfo',
+				success:function(res){
+					// console.log('userInfo customerType',res.data.customerType);
+					if(res.data.customerType =='1'){
+						// console.log('个人用户');
+						self.amountBtnText = '立即购买'
+					}else{
+						
+					};
+					
+				}
+			});
+			this.thetoken = 'Bearer' + ' ' + this.$store.state.token;
 			this.shoppingNum = 1;
 			uni.getStorage({
 				key:'userInfo',
@@ -92,6 +105,7 @@
 				totalMoney:0,
 				price:3,
 				helpPeople:[],
+				amountBtnText:'提交认购申请'
 				// goodsId:'',
 				// carbonVal:''
 			}
@@ -161,7 +175,9 @@
 					Authorization: this.thetoken, //注意Bearer后面有一空格
 				},
 				}).then(res=>{
-					self.$api.href('/pages/usercenter/subscribe/subscribe')
+					console.log('res.data.retBody',res.data.retBody);
+					self.$api.href('/pages/offlineBuy/offlineBuy?guid=' + res.data.retBody);
+					// self.$api.href('/pages/usercenter/subscribe/subscribe');
 				}).catch( err =>{
 					console.log('err',err)
 				})

pages/login/companyLogin.vue

@@ -33,8 +33,8 @@
 				$getimg:this.$getimg,
 				params:{
 					// loginStr:'66432356',
-					loginStr:'64676376',
-					pwd:'123456',
+					loginStr:'',
+					pwd:'',
 					
 				},
 				rules: {

pages/mall/mall.css

@@ -1,5 +1,4 @@
-.tip{margin-top: 500rpx;font-size: 50rpx;color: #999;text-align: center;}
-.tip .back-index{margin: 50rpx 200rpx;background-color: #26D18B;color: #fff;}
+.custom-nav {color: #333;}
 
 .top-img{height: 340rpx;overflow: visible;padding-top: 200rpx;box-sizing: border-box;}
 .top-img::after{content: '';}

pages/mall/mall.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="pages">
-		<view class="tip">
-			正在建设中
-			<button type="default" @click="goIndex" class="back-index">返回首页</button>
+		<view class="custom-nav">
+			<view class="custom-nav-left" @click="$api.goback"><text class="iconfont icon-jiantou"></text></view>
+			<view class="custom-nav-center"></view>
 		</view>
 		<view class="hold-status-bar">
 			<!-- 占据了状态栏位置 -->

pages/product/product.css

@@ -1,5 +1,5 @@
 page{background-color: #F5F5F5;}
-.swiper-wrap{margin-bottom: 24rpx;}
+.swiper-wrap{margin-bottom: 24rpx;height: 400rpx;}
 .goods-name{display: flex;align-items: center;justify-content: space-between;padding: 24rpx;background-color: #fff;border-bottom: 1px solid #ddd;}
 .goods-name .name{flex: 1;font-size: 30rpx;font-weight: 600;line-height: 40rpx;}
 .goods-name .type{font-size: 24rpx;color: #999;width: 200rpx;text-align: right;}
@@ -11,6 +11,7 @@ page{background-color: #F5F5F5;}
 
 .main-body{margin-bottom: 24rpx;background-color: #fff;}
 .main-body-til{display: flex;justify-content: space-between;align-items: center;padding: 24rpx;border-bottom: 1px solid #ddd;}
+.main-body-til.noborder{border-bottom: 0;}
 .main-body-til .til{font-size: 30rpx;font-weight: 600;color: #333;}
 .main-body-til .con{display: flex;align-items: center;font-size: 24rpx;color: #666;}
 .main-body-info{display: flex;padding: 24rpx;align-items: center;}

pages/product/product.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="pages">
+		<view class="custom-nav">
+			<view class="custom-nav-left" @click="$api.goback"><text class="iconfont icon-jiantou"></text></view>
+			<view class="custom-nav-center"></view>
+		</view>
 		<view class="swiper-wrap">
 			<swiper class="swiper"
 			:indicator-dots="swiper.indicatorDots" 
@@ -8,13 +12,13 @@
 			:autoplay="swiper.autoplay"
 			:interval="swiper.interval" :duration="swiper.duration">
 				<swiper-item v-for="(item, index) in bannerList" :key="index">
-					<view class="adv-item" ><image :src="$onlineImg +item" class="pic" mode="heightFix"></image></view>
+					<view class="adv-item" ><image :src="$onlineImg +item" class="pic" mode="aspectFill"></image></view>
 				</swiper-item>
 			</swiper>
 		</view>
 		<view class="goods-name">
 			<view class="name">{{product.goodsName}}</view>
-			<view class="type">类别:{{product.goodsType || "T001"}}</view>
+			<view class="type">类别:{{product.productInfos[0].productType.typeName || ""}}</view>
 		</view>
 		<view class="goods-base-info padding24">
 			<view class="goods-base-info-item">产品编号:{{product.goodsCode}}</view>
@@ -26,23 +30,23 @@
 			</view>			
 		</view>
 		<view class="main-body">
-			<view class="main-body-til">
+			<view class="main-body-til noborder">
 				<view class="til">碳汇研发主体</view>
 				<view class="con">
-					<text>青龙村</text>
+					<!-- <text>青龙村</text> -->
 					<text class="iconfont icon-jiantou"></text>
 				</view>
 			</view>
-			<view class="main-body-info">
+			<!-- <view class="main-body-info">
 				<image :src="$getimg+'home-buy-now-img.png'" class="main-body-info-img" mode="scaleToFill"></image>
 				<view class="main-body-info-text">
 					<view class="text-item">
 						<text class="text">家庭成员:5人</text>
 						<text class="text">涉及产品数:3</text>
 					</view>
-					<view class="main-body-info-text">地址:重庆市渝中区解放碑街道民生路</view>
+					<view class="main-body-info-text">地址:{{product.productInfos[0].povertyArea.areaAddress || ""}}</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="main-body product-info">
 			<view class="main-body-til">
@@ -63,6 +67,16 @@
 				</view>
 			</view>
 		</view>
+		<view class="main-body">
+			<view class="main-body-til">
+				<view class="til">产品介绍</view>
+			</view>
+			<view class="main-body-info">
+				<view class="main-body-info-text">
+					<view class="main-body-info-text">{{product.productInfos[0].povertyArea.areaDesc || ""}}</view>
+				</view>
+			</view>
+		</view>
 		<view class="bottom-btn-wrap">
 			<view class="bottom-btn-wrap-bg">
 				<view class="bottom-btn btn" @click="randomPop">

pages/use/use.vue

@@ -32,16 +32,38 @@
 				<view class="use-item-til">大型活动碳中和</view>
 			</view>
 		</view>
+		
+		<hans-tabber :list="list" style="position:fixed;bottom:0;width:100%;left:0;right:0;" @tabChange="tabChange"></hans-tabber>
 	</view>
 </template>
 
 <script>
+	import hansTabber from '../../components/hans-tabbar/hans-tabbar.vue';
 	export default {
+		components:{
+			hansTabber
+		},
 		data() {
 			return {
+				list: [{
+					 "text": "首页",
+					 "iconPath": '/static/img/icon_home.png' ,
+					 "selectedIconPath": '/static/img/icon_home_active.png'
+				},
+				{
+				 "text": "价值实现",
+				 "iconPath": '/static/img/icon_use.png',
+				 "selectedIconPath":'/static/img/icon_use_active.png'
+				 },
+				 {
+				   "text": "我的信息",
+				   "iconPath": '/static/img/icon_usercenter.png',
+				   "selectedIconPath": '/static/img/icon_usercenter_active.png'
+				 }],
 				$getimg:this.$getimg,
+				token:'',
 				params:{
-					token:'',
+					
 				}
 				
 			}
@@ -75,7 +97,8 @@
 				this.$api.msg('暂未开放')
 			},
 			useClick(){
-				this.$api.msg('稍后展示')
+				this.$api.href('/pages/usercenter/question/question')
+				// this.$api.msg('稍后展示')
 			}
 
 		}

pages/use/useRouter.vue

@@ -22,14 +22,16 @@
 					console.log('userInfo customerType',res.data.customerType);
 					if(res.data.customerType =='1'){
 						console.log('个人用户');
-						self.$api.href('/pages/mall/mall')
+						self.$api.href('/pages/building/building')
+						// self.$api.href('/pages/mall/mall');
 					}else{
 						self.$api.href('/pages/use/use')
 					};
 				}
 			});
 		},
-		onLoad() {
+		onLoad(option) {
+			console.log('this',this)
 
 		},
 		methods: {

pages/usercenter/certificateList/certificate/certificate - 副本.vue

@@ -0,0 +1,233 @@
+<template>
+	<view class="pages">
+		<web-view :src="certificateUrl
+		+'credentialNo='+item.credentialNo
+		+'&customerName='+item.customerName
+		+'&year='+item.year
+		+'&carbonAmount='+item.carbonAmount
+		+'&orderAmount='+item.orderAmount
+		+'&buyDate='+item.buyDate
+		"></web-view>
+<!-- 		<view class="save-tip">
+			长按保存
+		</view> -->
+		<!-- 画板 -->		
+		<!-- <l-painter ref="painter" :board="base"/>
+		<view class="bottom-btn-wrap">
+			<view class="bottom-btn-wrap-bg">
+				<view class="bottom-btn btn" @click="download">
+					下载图片
+				</view>
+			</view>
+		</view> -->
+		<!-- <button class="generate-btn" id="mycanvas" @click="download()"></button> -->
+		<!-- <view class="container" id="wrapper">
+			<view class="image-wrapper draw">
+			  <image :src="$getimg+'cqtanhui-cert.jpg'" class="draw page-bg" mode="scaleToFill"></image>
+			</view>
+			<view class="draw cart-no">证书编号:{{item.credentialNo}}</view>
+			<view class="cart-text cart-name">
+				尊敬的 {{item.customerName}}:
+			</view>
+			<view class="cart-text">
+				感谢您对“碳汇+”生态产品价值实现的支持，您购买了{{item.year}}年度碳汇量{{item.carbonAmount}}kg，您购碳资金{{item.orderAmount}}元，已全额转入{{item.farmerName}}的银行账户。
+			</view>
+			<view class="cart-text">
+				该笔碳汇可用于抵消您的碳排放
+			</view>
+			<view class="cart-text">
+				感谢您为生态文明建设和全球应对气候变化所做出的贡献
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	import lPainter from '@/components/lime-painter/index.vue';	
+	export default {
+		components:{
+			lPainter
+		},
+		data() {
+			return {
+				$getimg:this.$getimg,
+				certificateUrl:this.config.certificateUrl,
+				thetoken:'',
+				orderid:'',
+				item:[],
+				path:'',
+				params:{
+				},
+				base: {
+					width: '750rpx',
+					height: '1130rpx',
+					views: [
+						{
+							type: 'image',
+							src: 'http://fqn.hongweisoft.com/cqcarbon/wxapp/cqtanhui-cert.jpg',
+							css: {
+								left: '0rpx',
+								top: '0rpx',
+								width: '100%',
+								height: '1130rpx'
+							}
+						},
+						{
+							type: 'text',
+							text: '',
+							css: {
+								left: '100rpx',
+								top: '350rpx',
+								width: '550rpx',
+								color:'#26D18B',
+								textAlign: 'center',
+								display:'block',
+							}
+						},
+						{
+							type: 'text',
+							text: '',
+							css: {
+								left: '100rpx',
+								top: '398rpx',
+								width: '550rpx',
+								fontSize: '28rpx',
+								lineHeight: '36rpx',
+								color:'#333',
+								textAlign: 'left',
+							}
+						},
+						{
+							type: 'text',
+							text: '',
+							css: {
+								width: '550rpx',
+								left: '100rpx',
+								top: '446rpx',
+								fontSize: '28rpx',
+								lineHeight: '36rpx',
+								color:'#333',
+								textAlign: 'left',
+								textIndent: '2em'
+							}
+						},
+						{
+							type: 'text',
+							text: '该笔碳汇可用于抵消您的碳排放',
+							css: {
+								width: '550rpx',
+								left: '100rpx',
+								top: '566rpx',
+								fontSize: '28rpx',
+								lineHeight: '36rpx',
+								color:'#333',
+								textAlign: 'left',
+								textIndent: '2em'
+							}
+						},
+						{
+							type: 'text',
+							text: '感谢您为生态文明建设和全球应对气候变化所做出的贡献',
+							css: {
+								width: '550rpx',
+								left: '100rpx',
+								top: '614rpx',
+								fontSize: '28rpx',
+								lineHeight: '36rpx',
+								color:'#333',
+								textAlign: 'left',
+								textIndent: '2em'
+							}
+						},
+					]
+				}
+				
+			}
+		},
+		onShow() {
+		
+		},
+		onLoad(e) {
+			console.log('config',this.config);
+			this.thetoken = 'Bearer' + ' ' + this.$store.state.token;
+			this.orderid = e.orderid;
+			uni.showLoading({
+				title: '正在获取证书信息'
+			});
+			this.$api.http.get(this.config.apiBaseurl + '/carbon-h5/wap/order/getCredentialByOrderId?orderId='+this.orderid,{
+				header: {
+				Accept:'application/json',
+				Authorization: this.thetoken, 
+			},
+			}).then(res => {
+				uni.hideLoading();
+				// this.info = Object.assign(this.info, data);
+				// this.info.url = '/static/html2canvas/index.html?key=' + this.orderid;
+				this.item = res.data.retBody;
+				console.log('this.base.views',this.base.views);
+				this.base.views[1].text = `证书编号:${res.data.retBody.credentialNo}`;
+				this.base.views[2].text = `尊敬的 ${res.data.retBody.customerName}:`;
+				this.base.views[3].text = `感谢您对“碳汇+”生态产品价值实现的支持，您购买了 ${res.data.retBody.year}年度碳汇量${res.data.retBody.carbonAmount}kg，您购碳资金${res.data.retBody.orderAmount}元，已全额转入${res.data.retBody.farmerName}的银行账户。`;
+				console.log('res',JSON.parse(JSON.stringify(res.data.retBody)));
+			}).catch(err =>{
+				console.log('err',err)
+			});
+
+		},
+		methods: {
+			onRender() {
+				// 支持通过调用render传入参数
+				const painter = this.$refs.painter
+				painter.render(this.base)
+			},
+			// canvasToTempFilePath() {
+			// 	const painter = this.$refs.painter
+			// 	// 支持通过调用canvasToTempFilePath方法传入参数 调取生成图片
+			// 	painter.canvasToTempFilePath().then(res => this.path = res.tempFilePath)
+			// },
+			// // 支持通过调用canvasToTempFilePath方法传入参数 调取生成图片
+			// onCanvasToTempFilePath() {
+			// 	const painter = this.$refs.custom
+			// 	painter.canvasToTempFilePath({dpr:2}).then(res => this.path = res.tempFilePath)
+				
+			// },
+			download(){
+				let self = this;
+				const painter = this.$refs.painter;
+				painter.canvasToTempFilePath().then(res => this.path = res.tempFilePath);
+				console.log('this.path',this.path);
+				uni.showLoading({
+					title: '生成中'
+				});
+				setTimeout(this.saveImg,500);
+			},
+			saveImg(){
+				let self = this;
+				uni.saveImageToPhotosAlbum({
+					filePath:this.path,
+					success:function(res){
+						uni.hideLoading();
+						self.$api.msg('生成成功');
+					},
+					fail:function(err){						
+						uni.hideLoading();
+						if(err.errMsg =="saveImageToPhotosAlbum:fail cancel"){
+							return true;
+						}
+						self.$api.msg('生成失败请重试!');
+						// self.$api.msg(err.errMsg);
+						// if(err.errMsg == 'saveImageToPhotosAlbum:fail The "path" argument must be of type string. Received type object'){
+						// 	self.$api.msg('生成失败请重试!')
+						// }
+						console.log('err',err)
+					}
+				});				
+			}
+
+		}
+	}
+</script>
+
+<style>
+	@import url("./certificate.css");
+</style>

pages/usercenter/certificateList/certificate/certificate-bak.vue

@@ -1,136 +0,0 @@
-<template>
-	<view class="content">
-		<web-view v-if="info.url" class="web-view" :src="info.url"></web-view>
-		<view class="btns">
-			<!-- <button class="my-btn" @click="$api.goto('/pages/home/home', '', true)">首页</button> -->
-			<!-- <button class="my-btn" type="gradient" @tap="$api.goto('/pages/usercenter/certificateList/certificateList')">我的证书</button> -->
-			<!--#ifdef H5-->
-			<!-- <button class="my-btn" type="gradient" @tap="share" v-show="$api.clientType.isWeiXin">分享证书</button> -->
-			<!--#endif-->
-		</view>
-		<!--#ifdef H5-->
-		<!-- <view v-show="showShare" class="share-bg" @tap="showShareFun"></view> -->
-		<!--#endif-->
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			thetoken:'',
-			orderid:'',
-			info: {
-				url: ''
-			},
-			//#ifdef H5
-			showShare:false,
-			//#endif
-		};
-	},
-	onLoad(e) {
-		console.log('e',e);
-		this.thetoken = 'Bearer' + ' ' + this.$store.state.token;
-		this.orderid = e.orderid;
-		// const data = this.$api.getE();
-		// this.info = Object.assign(this.info, data);
-		//自定义证书ID字段  orderId
-		//通过订单id获取证书信息
-		uni.showLoading({
-			title: '正在获取证书信息'
-		});
-		this.$api.http.get(this.config.apiBaseurl + '/carbon-h5/wap/order/getCredentialByOrderId?orderId='+this.orderid,{
-			header: {
-			Accept:'application/json',
-			Authorization: this.thetoken, 
-		},
-		}).then(res => {
-			uni.hideLoading();
-			// this.info = Object.assign(this.info, data);
-			this.info.url = '/static/html2canvas/index.html?key=' + this.orderid;
-			console.log('res',JSON.parse(JSON.stringify(res.data.retBody)));
-		}).catch(err =>{
-			console.log('err',err)
-		});
-		// this.$api
-		// 	.$http({
-		// 		url: '/wap/order/getCredentialByOrderId',
-		// 		data: {
-		// 			orderId: data.orderId
-		// 		}
-		// 	})
-		// 	.then(res => {
-		// 		const info = res.data instanceof Object ? res.data : {};
-		// 		this.info = Object.assign(this.info, res.data);
-		// 		if (res.code == 0) {
-		// 			//更新缓存信息
-		// 			uni.setStorageSync(data.orderId, info);
-		// 			//调用生成
-		// 			this.info.url = '/static/html2canvas/index.html?key=' + data.orderId;
-		// 		} else {
-		// 			uni.hideLoading();
-		// 		}
-		// 	});
-	},
-	//标题栏按钮监听
-	onNavigationBarButtonTap(e) {
-		this.$api.gohome(e);
-	},
-	methods: {
-		//#ifdef H5
-		showShareFun(){
-			this.showShare = !this.showShare;
-		},
-		share() {
-			//显示菜单
-			this.$wxApi.showMenu();
-			this.showShareFun();
-			//注册分享数据
-			this.$wxApi.share({
-				orderId: this.info.orderId
-			});
-		}
-		//#endif
-	}
-};
-</script>
-
-<style lang="scss">
-.content {
-	.btns {
-		position: absolute;
-		top: 88%;
-		width: 100%;
-		display: flex;
-		z-index: 1;
-		button {
-			flex: 1;
-			margin: 0 10% 10% 10%;
-		}
-	}
-}
-.web-view {
-	box-sizing: border-box;
-}
-.share-bg{
-	position: fixed;
-	z-index: 998;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	overflow: hidden;
-	background: rgba(0,0,0,.7);
-	box-sizing: border-box;
-	&::after{
-		content: "";
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background: url(http://fqn.hongweisoft.com/cqcarbon/wxapp/guide01.png) no-repeat top right;
-		background-size: 80% auto;
-	}
-}
-</style>

pages/usercenter/certificateList/certificate/certificate.css

@@ -3,6 +3,7 @@
 .cart-no{margin-top: 333rpx;text-align: center;font-size: 24rpx;color: #26D18B;}
 .cart-text{margin: 10rpx 100rpx;line-height: 40rpx;font-size: 28rpx;color: #666;text-indent: 2em;}
 
+/* .save-tip{text-align: center;margin-top: 24rpx;color: #666;font-size: 30rpx;position: fixed;bottom: 24rpx;left: 0;right: 0;} */
 
 
 

pages/usercenter/certificateList/certificate/certificate.vue

@@ -1,142 +1,41 @@
 <template>
 	<view class="pages">
-		<!-- <web-view src="http://172.16.90.6:8080"></web-view> -->
-		<!-- 画板 -->		
-		<l-painter ref="painter" :board="base" pixel-ratio="2"/>
-		<view class="bottom-btn-wrap">
-			<view class="bottom-btn-wrap-bg">
-				<view class="bottom-btn btn" @click="download">
-					下载图片
-				</view>
-			</view>
-		</view>
-		<!-- <button class="generate-btn" id="mycanvas" @click="download()"></button> -->
-		<!-- <view class="container" id="wrapper">
-			<view class="image-wrapper draw">
-			  <image :src="$getimg+'cqtanhui-cert.jpg'" class="draw page-bg" mode="scaleToFill"></image>
-			</view>
-			<view class="draw cart-no">证书编号:{{item.credentialNo}}</view>
-			<view class="cart-text cart-name">
-				尊敬的 {{item.customerName}}:
-			</view>
-			<view class="cart-text">
-				感谢您对“碳汇+”生态产品价值实现的支持，您购买了{{item.year}}年度碳汇量{{item.carbonAmount}}kg，您购碳资金{{item.orderAmount}}元，已全额转入{{item.farmerName}}的银行账户。
-			</view>
-			<view class="cart-text">
-				该笔碳汇可用于抵消您的碳排放
-			</view>
-			<view class="cart-text">
-				感谢您为生态文明建设和全球应对气候变化所做出的贡献
-			</view>
-		</view> -->
+		<web-view :src="certificateUrl
+		+'credentialNo='+item.credentialNo
+		+'&customerName='+item.customerName
+		+'&year='+item.year
+		+'&carbonAmount='+item.carbonAmount
+		+'&orderAmount='+item.orderAmount
+		+'&buyDate='+item.buyDate
+		+'&nickName='+item.nickName
+		+'&companyName='+item.companyName
+		+'&isH5=1'
+		">
+		</web-view>
 	</view>
 </template>
 
 <script>
-	import lPainter from '@/components/lime-painter/index.vue';	
 	export default {
 		components:{
-			lPainter
+			
 		},
 		data() {
 			return {
 				$getimg:this.$getimg,
+				certificateUrl:this.config.certificateUrl,
 				thetoken:'',
 				orderid:'',
 				item:[],
 				path:'',
-				params:{
-				},
-				base: {
-					width: '750rpx',
-					height: '1130rpx',
-					views: [
-						{
-							type: 'image',
-							src: 'http://fqn.hongweisoft.com/cqcarbon/wxapp/cqtanhui-cert.jpg',
-							css: {
-								left: '0rpx',
-								top: '0rpx',
-								width: '100%',
-								height: '1130rpx'
-							}
-						},
-						{
-							type: 'text',
-							text: '',
-							css: {
-								left: '100rpx',
-								top: '350rpx',
-								width: '550rpx',
-								color:'#26D18B',
-								textAlign: 'center',
-								display:'block',
-							}
-						},
-						{
-							type: 'text',
-							text: '',
-							css: {
-								left: '100rpx',
-								top: '398rpx',
-								width: '550rpx',
-								fontSize: '28rpx',
-								lineHeight: '36rpx',
-								color:'#333',
-								textAlign: 'left',
-							}
-						},
-						{
-							type: 'text',
-							text: '',
-							css: {
-								width: '550rpx',
-								left: '100rpx',
-								top: '446rpx',
-								fontSize: '28rpx',
-								lineHeight: '36rpx',
-								color:'#333',
-								textAlign: 'left',
-								textIndent: '2em'
-							}
-						},
-						{
-							type: 'text',
-							text: '该笔碳汇可用于抵消您的碳排放',
-							css: {
-								width: '550rpx',
-								left: '100rpx',
-								top: '566rpx',
-								fontSize: '28rpx',
-								lineHeight: '36rpx',
-								color:'#333',
-								textAlign: 'left',
-								textIndent: '2em'
-							}
-						},
-						{
-							type: 'text',
-							text: '感谢您为生态文明建设和全球应对气候变化所做出的贡献',
-							css: {
-								width: '550rpx',
-								left: '100rpx',
-								top: '614rpx',
-								fontSize: '28rpx',
-								lineHeight: '36rpx',
-								color:'#333',
-								textAlign: 'left',
-								textIndent: '2em'
-							}
-						},
-					]
-				}
-				
+				params:{},
 			}
 		},
 		onShow() {
 		
 		},
 		onLoad(e) {
+			console.log('config',this.config);
 			this.thetoken = 'Bearer' + ' ' + this.$store.state.token;
 			this.orderid = e.orderid;
 			uni.showLoading({
@@ -163,54 +62,6 @@
 
 		},
 		methods: {
-			onRender() {
-				// 支持通过调用render传入参数
-				const painter = this.$refs.painter
-				painter.render(this.base)
-			},
-			// canvasToTempFilePath() {
-			// 	const painter = this.$refs.painter
-			// 	// 支持通过调用canvasToTempFilePath方法传入参数 调取生成图片
-			// 	painter.canvasToTempFilePath().then(res => this.path = res.tempFilePath)
-			// },
-			// // 支持通过调用canvasToTempFilePath方法传入参数 调取生成图片
-			// onCanvasToTempFilePath() {
-			// 	const painter = this.$refs.custom
-			// 	painter.canvasToTempFilePath({dpr:2}).then(res => this.path = res.tempFilePath)
-				
-			// },
-			download(){
-				let self = this;
-				const painter = this.$refs.painter;
-				painter.canvasToTempFilePath().then(res => this.path = res.tempFilePath);
-				console.log('this.path',this.path);
-				uni.showLoading({
-					title: '生成中'
-				});
-				setTimeout(this.saveImg,500);
-			},
-			saveImg(){
-				let self = this;
-				uni.saveImageToPhotosAlbum({
-					filePath:this.path,
-					success:function(res){
-						uni.hideLoading();
-						self.$api.msg('生成成功');
-					},
-					fail:function(err){						
-						uni.hideLoading();
-						if(err.errMsg =="saveImageToPhotosAlbum:fail cancel"){
-							return true;
-						}
-						self.$api.msg('生成失败请重试!');
-						// self.$api.msg(err.errMsg);
-						// if(err.errMsg == 'saveImageToPhotosAlbum:fail The "path" argument must be of type string. Received type object'){
-						// 	self.$api.msg('生成失败请重试!')
-						// }
-						console.log('err',err)
-					}
-				});				
-			}
 
 		}
 	}
@@ -218,4 +69,4 @@
 
 <style>
 	@import url("./certificate.css");
-</style>
+</style>

pages/usercenter/certificateList/certificateList.vue

@@ -3,7 +3,7 @@
 		<mescroll-body class="certificateList-wrap" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
 			<view class="certificate">
 				<view v-for="(item,index) in certificateList" :key="index" class="certificate-item" @click="goCertDetails(item.fkOrderId)">
-					<image :src="$getInnerImg + 'certificate.png'" class="certificate-item-img" mode="scaleToFill"></image>
+					<image :src="$getimg + 'certificate.png'" class="certificate-item-img" mode="scaleToFill"></image>
 					<view class="certificate-item-text">
 						<view class="num">证书编号：{{item.credentialNo}}</view>
 						<view class="time">颁发日期：{{item.createTime}}</view>
@@ -27,7 +27,7 @@
 		},
 		data() {
 			return {
-				$getInnerImg:this.$getInnerImg,
+				$getimg:this.$getimg,
 				mescroll: null, // mescroll实例对象 (此行可删,mixins已默认)
 				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
 				downOption: { 

pages/usercenter/orderList/orderList.vue

@@ -285,8 +285,9 @@
 					    signType: 'MD5',
 					    paySign: res.data.retBody.paySign,
 					    success: function (res) {
-							self.downCallback();
+							// self.downCallback();
 					        console.log('success:' + JSON.stringify(res));
+							self.$api.href('/pages/buySuccess/buySuccess?orderid=' + params.orderId)
 					    },
 					    fail: function (err) {
 					        console.log('fail:' + JSON.stringify(err));

pages/usercenter/orderList/orderdetails/orderdetails.vue

@@ -6,22 +6,22 @@
 			<view class="order-info">
 				支付方式：
 				<text v-if="item.payChannel == '1'">微信支付</text>
-				<text v-if="item.payChannel == '2'">支付宝</text>
+				<text v-if="item.payChannel == '2'">支付宝</text><strong></strong>
 				<text v-if="item.payChannel == '3'">银联</text>
 				<text v-if="item.payChannel == '4'">线下支付</text>
 			</view>
 			<view class="order-info" v-if="item.payNo">支付流水号：{{item.payNo}}</view>
 			<view class="order-status">
 				<view class="status" v-if="item.orderStatus == 1 && item.state ==1">
-					<image :src="$getInnerImg+'icon-vipcard.png'" class="status-img" mode="scaleToFill"></image>
+					<image :src="$getimg+'icon-vipcard.png'" class="status-img" mode="scaleToFill"></image>
 					<text class="status-text">待付款</text>
 				</view>
 				<view class="status" v-if="item.state == 0">
-					<image :src="$getInnerImg+'icon-vipcard.png'" class="status-img" mode="scaleToFill"></image>
+					<image :src="$getimg+'icon-vipcard.png'" class="status-img" mode="scaleToFill"></image>
 					<text class="status-text">已失效</text>
 				</view>
 				<view class="status"  v-if="item.orderStatus == 2">
-					<image :src="$getInnerImg+'icon-vipcard-green.png'" class="status-img" mode="scaleToFill"></image>
+					<image :src="$getimg+'icon-vipcard-green.png'" class="status-img" mode="scaleToFill"></image>
 					<text class="status-text">已支付</text>
 				</view>
 				<view class="order-btn topay" v-if="item.orderStatus == 1&&item.state==1&&item.orderType==0" @click.stop="pay(item)">去支付</view>
@@ -45,7 +45,7 @@
 		},
 		data() {
 			return {
-				$getInnerImg:this.$getInnerImg,
+				$getimg:this.$getimg,
 				token:'',
 				tokenhead:'Bearer',
 				params: {

pages/usercenter/question/question.css

@@ -3,7 +3,7 @@ page{background-color: #F5F5F5;}
 .questions-item-til{display: flex;margin-bottom: 12rpx;align-items: center;}
 .questions-item-img{width: 44rpx;height: 48rpx;margin-right: 24rpx;}
 .questions-item-text{font-size: 28rpx;color: #333;line-height: 40rpx;font-weight: 500;letter-spacing: 1rpx;}
-.questions-item-con{padding-left: 68rpx;font-size: 24rpx;color: #666;line-height: 33rpx;letter-spacing: 1rpx;}
+.questions-item-con{padding-left: 68rpx;font-size: 24rpx;color: #666;line-height: 33rpx;letter-spacing: 1rpx;text-indent: 2em;}
 
 
 

pages/usercenter/question/question.vue

@@ -4,10 +4,10 @@
 			<view class="questions wrap40">
 				<view class="questions-item" v-for="(item,index) in questionlist" :key="index">
 					<view class="questions-item-til">
-						<image :src="$getInnerImg + 'icon-questions.png'" class="questions-item-img" mode="scaleToFill"></image>
-						<view class="questions-item-text">{{item.title}}</view>
+						<image :src="$getimg + 'icon-questions.png'" class="questions-item-img" mode="scaleToFill"></image>
+						<view class="questions-item-text">{{index+1}}.{{item.problemName}}</view>
 					</view>
-					<view class="questions-item-con">{{item.content}}</view>
+					<view class="questions-item-con">{{item.problemAnswer}}</view>
 				</view>
 			</view>
 		</mescroll-body>
@@ -27,7 +27,7 @@
 		},
 		data() {
 			return {
-				$getInnerImg:this.$getInnerImg,
+				$getimg:this.$getimg,
 				params:{},
 				mescroll: null, // mescroll实例对象 (此行可删,mixins已默认)
 				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
@@ -44,10 +44,7 @@
 						tip: '暂无相关数据'
 					}
 				},
-				questionlist:[
-					{title:'1.如何获得碳积分',content:'如何获得碳积分'},
-					{title:'2.如何获得碳积分',content:'如何获得碳积分'},
-				],
+				questionlist:[],
 				
 			}
 		},
@@ -89,7 +86,7 @@
 				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});				
 				let thetoken = 'Bearer ' + this.token;
 				// console.log('thetoken',thetoken);
-				this.$api.http.post(this.config.apiBaseurl + '/carbon-h5/wap/order/searchByPage',this.params,{
+				this.$api.http.post(this.config.apiBaseurl + '/carbon-h5/carbon/problem/list',this.params,{
 					header: {
 					Accept:'application/json',
 					Authorization: 'Bearer '+ this.token, //注意Bearer后面有一空格