From e73f995d539a99c02c9912853c5c39bb7384559a Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Mon, 31 Mar 2025 14:31:41 +0800
Subject: [PATCH] 1

---
 api/business/notice.js                        |   27 +
 components/hj-placard/shareImages.vue         |  196 +++
 components/qr_code/qrcode.js                  | 1362 +++++++++++++++++
 components/qr_code/qrcode.vue                 |   27 +
 components/tabbar/tabBar.vue                  |    9 +-
 package.json                                  |    1 +
 pages/components/notice-item.vue              |    3 +-
 pages/index.vue                               |   25 +-
 pages/mine/index.vue                          |  582 ++++---
 static/bg.jpg                                 |  Bin 0 -> 6946 bytes
 static/detail/approval.png                    |  Bin 0 -> 4422 bytes
 static/detail/card.png                        |  Bin 0 -> 2004 bytes
 static/detail/home.png                        |  Bin 0 -> 1883 bytes
 static/detail/share.png                       |  Bin 0 -> 2362 bytes
 .../tabbar/{my_motice_.png => my_notice_.png} |  Bin
 store/modules/user.js                         |    2 +
 .../uni-popup-dialog/uni-popup-dialog.vue     |   60 +-
 .../uni-popup-share/uni-popup-share.vue       |   62 +-
 utils/auth.js                                 |   30 +-
 utils/common.js                               |   42 +-
 utils/constant.js                             |    2 +
 21 files changed, 2175 insertions(+), 255 deletions(-)
 create mode 100644 components/hj-placard/shareImages.vue
 create mode 100644 components/qr_code/qrcode.js
 create mode 100644 components/qr_code/qrcode.vue
 create mode 100644 static/bg.jpg
 create mode 100644 static/detail/approval.png
 create mode 100644 static/detail/card.png
 create mode 100644 static/detail/home.png
 create mode 100644 static/detail/share.png
 rename static/images/tabbar/{my_motice_.png => my_notice_.png} (100%)

diff --git a/api/business/notice.js b/api/business/notice.js
index b39a993..5c33a36 100644
--- a/api/business/notice.js
+++ b/api/business/notice.js
@@ -8,4 +8,31 @@ export function getNoticeList(params) {
 		method: 'get',
 		params: params
 	})
+}
+
+// 查通告详情
+export function getNoticeDetail(params) {
+	return request({
+		url: '/busi/notice/appGetDetail',
+		method: 'get',
+		params: params
+	})
+}
+
+// 浏览通告
+export function addView(params) {
+	return request({
+		url: '/busi/view/addView',
+		method: 'post',
+		params: params
+	})
+}
+
+// 关闭通告
+export function closeNotice(params) {
+	return request({
+		url: '/busi/notice/publishTakeDown',
+		method: 'post',
+		params: params
+	})
 }
\ No newline at end of file
diff --git a/components/hj-placard/shareImages.vue b/components/hj-placard/shareImages.vue
new file mode 100644
index 0000000..56ad082
--- /dev/null
+++ b/components/hj-placard/shareImages.vue
@@ -0,0 +1,196 @@
+<template>
+	<view style="position: fixed;z-index: -9999;">
+		<canvas :canvas-id="canvasID" :style="{width:canvasWidth+'px',height:canvasHeight+'px'}"></canvas>
+		<view v-if="qrCode == ''">
+			<QRCode ref="qrcode" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import QRCode from "@/components/qr_code/qrcode.vue"
+	var _this;
+	export default {
+		name: 'canvas-images',
+		props: {
+			// canvasID 等同于 canvas-id
+			canvasID: {
+				Type: String,
+				default: 'shareCanvas'
+			},
+			canvasWidth: { // 画布宽度
+				Type: 'int',
+				default: 375
+			},
+			canvasHeight: { // 画布高度
+				Type: 'int',
+				default: 500
+			},
+			shareTitle: { // 分享标题
+				Type: 'String',
+				default: '我是这张图片的标题'
+			},
+			goodsTitle: { // 商品宣传标题
+				Type: 'String',
+				default: '我是这张图片的标题我是这张图片的标题我是这张图片的标'
+			},
+			shareImage: { // 分享图片
+				Type: 'String',
+				default: '/static/bg.jpg'
+			},
+			qrSize: { // 二维码大小
+				Type: 'int',
+				default: 100
+			},
+			qrUrl: { // 生成二维码的链接
+				Type: 'String',
+				default: 'https://ext.dcloud.net.cn/plugin?id=5747'
+			}
+		},
+		components: {
+			QRCode
+		},
+		data() {
+			return {
+				qrCode: '', // 二维码
+			}
+		},
+		mounted() {
+			_this = this;
+		},
+		methods: {
+			// 创建二维码
+			canvasCreate() {
+				_this.$refs.qrcode.make({
+						size: _this.qrSize,
+						text: _this.qrUrl
+					})
+					.then(res => {
+						// 返回的res与uni.canvasToTempFilePath返回一致
+						// console.log(res)
+						_this.qrCode = res.tempFilePath;
+						_this.onCanvas();
+					});
+			},
+			// 画图
+			async onCanvas() {
+				uni.showLoading({
+					title: "分享图片生成中..."
+				});
+				const ctx = uni.createCanvasContext(_this.canvasID, _this);
+				// 设置 canvas 背景色
+				ctx.setFillStyle('#FFFFFF');
+				ctx.fillRect(0, 0, _this.canvasWidth, _this.canvasHeight);
+				ctx.setFillStyle('#000000');
+				// 背景图片
+				ctx.drawImage(_this.shareImage, 50, 50);
+				ctx.setFontSize(18);
+				ctx.setTextAlign('center');
+				ctx.fillText(_this.shareTitle, _this.canvasWidth / 2, 30);
+				// 左边标题
+				ctx.setTextAlign('left')
+				ctx.setFontSize(16)
+				_this.writeTextOnCanvas(ctx, 30, 21, _this.goodsTitle, 50, 350);
+				// 设置虚线
+				ctx.setStrokeStyle('#333333');
+				ctx.setLineDash([5, 10], 2);
+				ctx.beginPath();
+				ctx.moveTo(220, 340);
+				ctx.lineTo(220, 420);
+				ctx.stroke();
+				// 二维码
+				ctx.drawImage(_this.qrCode, 225, 330, 100, 100);
+				// ctx.draw();
+
+				// 延迟后渲染至canvas上
+				let pic = await _this.setTime(ctx)
+				_this.$emit('success', pic);
+			},
+			/**
+			 * @param {Object} ctx_2d	getContext("2d") 对象
+			 * @param {int} lineheight	段落文本行高
+			 * @param {int} bytelength	设置单字节文字一行内的数量
+			 * @param {string} text		写入画面的段落文本
+			 * @param {int} startleft	开始绘制文本的 x 坐标位置（相对于画布）
+			 * @param {int} starttop	开始绘制文本的 y 坐标位置（相对于画布）
+			 */
+			writeTextOnCanvas(ctx_2d, lineheight, bytelength, text, startleft, starttop) {
+				// 获取字符串的真实长度（字节长度）
+				function getTrueLength(str) {
+					var len = str.length,
+						truelen = 0;
+					for (var x = 0; x < len; x++) {
+						if (str.charCodeAt(x) > 128) {
+							truelen += 2;
+						} else {
+							truelen += 1;
+						}
+					}
+					return truelen;
+				}
+				// 按字节长度截取字符串，返回substr截取位置
+				function cutString(str, leng) {
+					var len = str.length,
+						tlen = len,
+						nlen = 0;
+					for (var x = 0; x < len; x++) {
+						if (str.charCodeAt(x) > 128) {
+							if (nlen + 2 < leng) {
+								nlen += 2;
+							} else {
+								tlen = x;
+								break;
+							}
+						} else {
+							if (nlen + 1 < leng) {
+								nlen += 1;
+							} else {
+								tlen = x;
+								break;
+							}
+						}
+					}
+					return tlen;
+				}
+				for (var i = 1; getTrueLength(text) > 0; i++) {
+					var tl = cutString(text, bytelength);
+					ctx_2d.fillText(text.substr(0, tl).replace(/^\s+|\s+$/, ""), startleft, (i - 1) * lineheight +
+						starttop);
+					text = text.substr(tl);
+				}
+			},
+			// 彻底改成同步 防止拿到的图片地址为空
+			setTime(ctx) {
+				return new Promise((resole, err) => {
+					setTimeout(() => {
+						ctx.draw(false, async () => {
+							let pic = await _this.getNewPic();
+							resole(pic)
+						});
+					}, 600)
+				})
+			},
+			// 获取新的图片地址
+			getNewPic() {
+				return new Promise((resolve, errs) => {
+					setTimeout(() => {
+						uni.canvasToTempFilePath({
+							canvasId: _this.canvasID,
+							quality: 1,
+							complete: (res) => {
+								// 在H5平台下，tempFilePath 为 base64
+								// 关闭showLoading
+								uni.hideLoading();
+								//  储存海报地址  也是分享的地址
+								resolve(res.tempFilePath)
+							}
+						}, _this);
+					}, 200)
+				})
+			},
+		},
+		mounted() {
+			_this = this;
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/components/qr_code/qrcode.js b/components/qr_code/qrcode.js
new file mode 100644
index 0000000..44e5715
--- /dev/null
+++ b/components/qr_code/qrcode.js
@@ -0,0 +1,1362 @@
+//---------------------------------------------------------------------
+// github https://github.com/Sansnn/uQRCode
+// version 2.0.2
+//---------------------------------------------------------------------
+
+let uQRCode = {};
+
+(function() {
+	//---------------------------------------------------------------------
+	// QRCode for JavaScript
+	//
+	// Copyright (c) 2009 Kazuhiko Arase
+	//
+	// URL: http://www.d-project.com/
+	//
+	// Licensed under the MIT license:
+	//   http://www.opensource.org/licenses/mit-license.php
+	//
+	// The word "QR Code" is registered trademark of 
+	// DENSO WAVE INCORPORATED
+	//   http://www.denso-wave.com/qrcode/faqpatent-e.html
+	//
+	//---------------------------------------------------------------------
+
+	//---------------------------------------------------------------------
+	// QR8bitByte
+	//---------------------------------------------------------------------
+
+	function QR8bitByte(data) {
+		this.mode = QRMode.MODE_8BIT_BYTE;
+		this.data = data;
+	}
+
+	QR8bitByte.prototype = {
+
+		getLength: function(buffer) {
+			return this.data.length;
+		},
+
+		write: function(buffer) {
+			for (var i = 0; i < this.data.length; i++) {
+				// not JIS ...
+				buffer.put(this.data.charCodeAt(i), 8);
+			}
+		}
+	};
+
+	//---------------------------------------------------------------------
+	// QRCode
+	//---------------------------------------------------------------------
+
+	function QRCode(typeNumber, errorCorrectLevel) {
+		this.typeNumber = typeNumber;
+		this.errorCorrectLevel = errorCorrectLevel;
+		this.modules = null;
+		this.moduleCount = 0;
+		this.dataCache = null;
+		this.dataList = new Array();
+	}
+
+	QRCode.prototype = {
+
+		addData: function(data) {
+			var newData = new QR8bitByte(data);
+			this.dataList.push(newData);
+			this.dataCache = null;
+		},
+
+		isDark: function(row, col) {
+			if (row < 0 || this.moduleCount <= row || col < 0 || this.moduleCount <= col) {
+				throw new Error(row + "," + col);
+			}
+			return this.modules[row][col];
+		},
+
+		getModuleCount: function() {
+			return this.moduleCount;
+		},
+
+		make: function() {
+			// Calculate automatically typeNumber if provided is < 1
+			if (this.typeNumber < 1) {
+				var typeNumber = 1;
+				for (typeNumber = 1; typeNumber < 40; typeNumber++) {
+					var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, this.errorCorrectLevel);
+
+					var buffer = new QRBitBuffer();
+					var totalDataCount = 0;
+					for (var i = 0; i < rsBlocks.length; i++) {
+						totalDataCount += rsBlocks[i].dataCount;
+					}
+
+					for (var i = 0; i < this.dataList.length; i++) {
+						var data = this.dataList[i];
+						buffer.put(data.mode, 4);
+						buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber));
+						data.write(buffer);
+					}
+					if (buffer.getLengthInBits() <= totalDataCount * 8)
+						break;
+				}
+				this.typeNumber = typeNumber;
+			}
+			this.makeImpl(false, this.getBestMaskPattern());
+		},
+
+		makeImpl: function(test, maskPattern) {
+
+			this.moduleCount = this.typeNumber * 4 + 17;
+			this.modules = new Array(this.moduleCount);
+
+			for (var row = 0; row < this.moduleCount; row++) {
+
+				this.modules[row] = new Array(this.moduleCount);
+
+				for (var col = 0; col < this.moduleCount; col++) {
+					this.modules[row][col] = null; //(col + row) % 3;
+				}
+			}
+
+			this.setupPositionProbePattern(0, 0);
+			this.setupPositionProbePattern(this.moduleCount - 7, 0);
+			this.setupPositionProbePattern(0, this.moduleCount - 7);
+			this.setupPositionAdjustPattern();
+			this.setupTimingPattern();
+			this.setupTypeInfo(test, maskPattern);
+
+			if (this.typeNumber >= 7) {
+				this.setupTypeNumber(test);
+			}
+
+			if (this.dataCache == null) {
+				this.dataCache = QRCode.createData(this.typeNumber, this.errorCorrectLevel, this.dataList);
+			}
+
+			this.mapData(this.dataCache, maskPattern);
+		},
+
+		setupPositionProbePattern: function(row, col) {
+
+			for (var r = -1; r <= 7; r++) {
+
+				if (row + r <= -1 || this.moduleCount <= row + r) continue;
+
+				for (var c = -1; c <= 7; c++) {
+
+					if (col + c <= -1 || this.moduleCount <= col + c) continue;
+
+					if ((0 <= r && r <= 6 && (c == 0 || c == 6)) ||
+						(0 <= c && c <= 6 && (r == 0 || r == 6)) ||
+						(2 <= r && r <= 4 && 2 <= c && c <= 4)) {
+						this.modules[row + r][col + c] = true;
+					} else {
+						this.modules[row + r][col + c] = false;
+					}
+				}
+			}
+		},
+
+		getBestMaskPattern: function() {
+
+			var minLostPoint = 0;
+			var pattern = 0;
+
+			for (var i = 0; i < 8; i++) {
+
+				this.makeImpl(true, i);
+
+				var lostPoint = QRUtil.getLostPoint(this);
+
+				if (i == 0 || minLostPoint > lostPoint) {
+					minLostPoint = lostPoint;
+					pattern = i;
+				}
+			}
+
+			return pattern;
+		},
+
+		createMovieClip: function(target_mc, instance_name, depth) {
+
+			var qr_mc = target_mc.createEmptyMovieClip(instance_name, depth);
+			var cs = 1;
+
+			this.make();
+
+			for (var row = 0; row < this.modules.length; row++) {
+
+				var y = row * cs;
+
+				for (var col = 0; col < this.modules[row].length; col++) {
+
+					var x = col * cs;
+					var dark = this.modules[row][col];
+
+					if (dark) {
+						qr_mc.beginFill(0, 100);
+						qr_mc.moveTo(x, y);
+						qr_mc.lineTo(x + cs, y);
+						qr_mc.lineTo(x + cs, y + cs);
+						qr_mc.lineTo(x, y + cs);
+						qr_mc.endFill();
+					}
+				}
+			}
+			return qr_mc;
+		},
+
+		setupTimingPattern: function() {
+
+			for (var r = 8; r < this.moduleCount - 8; r++) {
+				if (this.modules[r][6] != null) {
+					continue;
+				}
+				this.modules[r][6] = (r % 2 == 0);
+			}
+
+			for (var c = 8; c < this.moduleCount - 8; c++) {
+				if (this.modules[6][c] != null) {
+					continue;
+				}
+				this.modules[6][c] = (c % 2 == 0);
+			}
+		},
+
+		setupPositionAdjustPattern: function() {
+
+			var pos = QRUtil.getPatternPosition(this.typeNumber);
+
+			for (var i = 0; i < pos.length; i++) {
+
+				for (var j = 0; j < pos.length; j++) {
+
+					var row = pos[i];
+					var col = pos[j];
+
+					if (this.modules[row][col] != null) {
+						continue;
+					}
+
+					for (var r = -2; r <= 2; r++) {
+
+						for (var c = -2; c <= 2; c++) {
+
+							if (r == -2 || r == 2 || c == -2 || c == 2 ||
+								(r == 0 && c == 0)) {
+								this.modules[row + r][col + c] = true;
+							} else {
+								this.modules[row + r][col + c] = false;
+							}
+						}
+					}
+				}
+			}
+		},
+
+		setupTypeNumber: function(test) {
+
+			var bits = QRUtil.getBCHTypeNumber(this.typeNumber);
+
+			for (var i = 0; i < 18; i++) {
+				var mod = (!test && ((bits >> i) & 1) == 1);
+				this.modules[Math.floor(i / 3)][i % 3 + this.moduleCount - 8 - 3] = mod;
+			}
+
+			for (var i = 0; i < 18; i++) {
+				var mod = (!test && ((bits >> i) & 1) == 1);
+				this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+			}
+		},
+
+		setupTypeInfo: function(test, maskPattern) {
+
+			var data = (this.errorCorrectLevel << 3) | maskPattern;
+			var bits = QRUtil.getBCHTypeInfo(data);
+
+			// vertical		
+			for (var i = 0; i < 15; i++) {
+
+				var mod = (!test && ((bits >> i) & 1) == 1);
+
+				if (i < 6) {
+					this.modules[i][8] = mod;
+				} else if (i < 8) {
+					this.modules[i + 1][8] = mod;
+				} else {
+					this.modules[this.moduleCount - 15 + i][8] = mod;
+				}
+			}
+
+			// horizontal
+			for (var i = 0; i < 15; i++) {
+
+				var mod = (!test && ((bits >> i) & 1) == 1);
+
+				if (i < 8) {
+					this.modules[8][this.moduleCount - i - 1] = mod;
+				} else if (i < 9) {
+					this.modules[8][15 - i - 1 + 1] = mod;
+				} else {
+					this.modules[8][15 - i - 1] = mod;
+				}
+			}
+
+			// fixed module
+			this.modules[this.moduleCount - 8][8] = (!test);
+
+		},
+
+		mapData: function(data, maskPattern) {
+
+			var inc = -1;
+			var row = this.moduleCount - 1;
+			var bitIndex = 7;
+			var byteIndex = 0;
+
+			for (var col = this.moduleCount - 1; col > 0; col -= 2) {
+
+				if (col == 6) col--;
+
+				while (true) {
+
+					for (var c = 0; c < 2; c++) {
+
+						if (this.modules[row][col - c] == null) {
+
+							var dark = false;
+
+							if (byteIndex < data.length) {
+								dark = (((data[byteIndex] >>> bitIndex) & 1) == 1);
+							}
+
+							var mask = QRUtil.getMask(maskPattern, row, col - c);
+
+							if (mask) {
+								dark = !dark;
+							}
+
+							this.modules[row][col - c] = dark;
+							bitIndex--;
+
+							if (bitIndex == -1) {
+								byteIndex++;
+								bitIndex = 7;
+							}
+						}
+					}
+
+					row += inc;
+
+					if (row < 0 || this.moduleCount <= row) {
+						row -= inc;
+						inc = -inc;
+						break;
+					}
+				}
+			}
+		}
+	};
+
+	QRCode.PAD0 = 0xEC;
+	QRCode.PAD1 = 0x11;
+
+	QRCode.createData = function(typeNumber, errorCorrectLevel, dataList) {
+
+		var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
+
+		var buffer = new QRBitBuffer();
+
+		for (var i = 0; i < dataList.length; i++) {
+			var data = dataList[i];
+			buffer.put(data.mode, 4);
+			buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber));
+			data.write(buffer);
+		}
+
+		// calc num max data.
+		var totalDataCount = 0;
+		for (var i = 0; i < rsBlocks.length; i++) {
+			totalDataCount += rsBlocks[i].dataCount;
+		}
+
+		if (buffer.getLengthInBits() > totalDataCount * 8) {
+			throw new Error("code length overflow. (" +
+				buffer.getLengthInBits() +
+				">" +
+				totalDataCount * 8 +
+				")");
+		}
+
+		// end code
+		if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
+			buffer.put(0, 4);
+		}
+
+		// padding
+		while (buffer.getLengthInBits() % 8 != 0) {
+			buffer.putBit(false);
+		}
+
+		// padding
+		while (true) {
+
+			if (buffer.getLengthInBits() >= totalDataCount * 8) {
+				break;
+			}
+			buffer.put(QRCode.PAD0, 8);
+
+			if (buffer.getLengthInBits() >= totalDataCount * 8) {
+				break;
+			}
+			buffer.put(QRCode.PAD1, 8);
+		}
+
+		return QRCode.createBytes(buffer, rsBlocks);
+	}
+
+	QRCode.createBytes = function(buffer, rsBlocks) {
+		var offset = 0;
+		var maxDcCount = 0;
+		var maxEcCount = 0;
+
+		var dcdata = new Array(rsBlocks.length);
+		var ecdata = new Array(rsBlocks.length);
+
+		for (var r = 0; r < rsBlocks.length; r++) {
+
+			var dcCount = rsBlocks[r].dataCount;
+			var ecCount = rsBlocks[r].totalCount - dcCount;
+
+			maxDcCount = Math.max(maxDcCount, dcCount);
+			maxEcCount = Math.max(maxEcCount, ecCount);
+
+			dcdata[r] = new Array(dcCount);
+
+			for (var i = 0; i < dcdata[r].length; i++) {
+				dcdata[r][i] = 0xff & buffer.buffer[i + offset];
+			}
+			offset += dcCount;
+
+			var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
+			var rawPoly = new QRPolynomial(dcdata[r], rsPoly.getLength() - 1);
+
+			var modPoly = rawPoly.mod(rsPoly);
+			ecdata[r] = new Array(rsPoly.getLength() - 1);
+			for (var i = 0; i < ecdata[r].length; i++) {
+				var modIndex = i + modPoly.getLength() - ecdata[r].length;
+				ecdata[r][i] = (modIndex >= 0) ? modPoly.get(modIndex) : 0;
+			}
+
+		}
+
+		var totalCodeCount = 0;
+		for (var i = 0; i < rsBlocks.length; i++) {
+			totalCodeCount += rsBlocks[i].totalCount;
+		}
+
+		var data = new Array(totalCodeCount);
+		var index = 0;
+
+		for (var i = 0; i < maxDcCount; i++) {
+			for (var r = 0; r < rsBlocks.length; r++) {
+				if (i < dcdata[r].length) {
+					data[index++] = dcdata[r][i];
+				}
+			}
+		}
+
+		for (var i = 0; i < maxEcCount; i++) {
+			for (var r = 0; r < rsBlocks.length; r++) {
+				if (i < ecdata[r].length) {
+					data[index++] = ecdata[r][i];
+				}
+			}
+		}
+		return data;
+	}
+
+	//---------------------------------------------------------------------
+	// QRMode
+	//---------------------------------------------------------------------
+
+	var QRMode = {
+		MODE_NUMBER: 1 << 0,
+		MODE_ALPHA_NUM: 1 << 1,
+		MODE_8BIT_BYTE: 1 << 2,
+		MODE_KANJI: 1 << 3
+	};
+
+	//---------------------------------------------------------------------
+	// QRErrorCorrectLevel
+	//---------------------------------------------------------------------
+
+	var QRErrorCorrectLevel = {
+		L: 1,
+		M: 0,
+		Q: 3,
+		H: 2
+	};
+
+	//---------------------------------------------------------------------
+	// QRMaskPattern
+	//---------------------------------------------------------------------
+
+	var QRMaskPattern = {
+		PATTERN000: 0,
+		PATTERN001: 1,
+		PATTERN010: 2,
+		PATTERN011: 3,
+		PATTERN100: 4,
+		PATTERN101: 5,
+		PATTERN110: 6,
+		PATTERN111: 7
+	};
+
+	//---------------------------------------------------------------------
+	// QRUtil
+	//---------------------------------------------------------------------
+
+	var QRUtil = {
+
+		PATTERN_POSITION_TABLE: [
+			[],
+			[6, 18],
+			[6, 22],
+			[6, 26],
+			[6, 30],
+			[6, 34],
+			[6, 22, 38],
+			[6, 24, 42],
+			[6, 26, 46],
+			[6, 28, 50],
+			[6, 30, 54],
+			[6, 32, 58],
+			[6, 34, 62],
+			[6, 26, 46, 66],
+			[6, 26, 48, 70],
+			[6, 26, 50, 74],
+			[6, 30, 54, 78],
+			[6, 30, 56, 82],
+			[6, 30, 58, 86],
+			[6, 34, 62, 90],
+			[6, 28, 50, 72, 94],
+			[6, 26, 50, 74, 98],
+			[6, 30, 54, 78, 102],
+			[6, 28, 54, 80, 106],
+			[6, 32, 58, 84, 110],
+			[6, 30, 58, 86, 114],
+			[6, 34, 62, 90, 118],
+			[6, 26, 50, 74, 98, 122],
+			[6, 30, 54, 78, 102, 126],
+			[6, 26, 52, 78, 104, 130],
+			[6, 30, 56, 82, 108, 134],
+			[6, 34, 60, 86, 112, 138],
+			[6, 30, 58, 86, 114, 142],
+			[6, 34, 62, 90, 118, 146],
+			[6, 30, 54, 78, 102, 126, 150],
+			[6, 24, 50, 76, 102, 128, 154],
+			[6, 28, 54, 80, 106, 132, 158],
+			[6, 32, 58, 84, 110, 136, 162],
+			[6, 26, 54, 82, 110, 138, 166],
+			[6, 30, 58, 86, 114, 142, 170]
+		],
+
+		G15: (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0),
+		G18: (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0),
+		G15_MASK: (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1),
+
+		getBCHTypeInfo: function(data) {
+			var d = data << 10;
+			while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0) {
+				d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15)));
+			}
+			return ((data << 10) | d) ^ QRUtil.G15_MASK;
+		},
+
+		getBCHTypeNumber: function(data) {
+			var d = data << 12;
+			while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0) {
+				d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18)));
+			}
+			return (data << 12) | d;
+		},
+
+		getBCHDigit: function(data) {
+
+			var digit = 0;
+
+			while (data != 0) {
+				digit++;
+				data >>>= 1;
+			}
+
+			return digit;
+		},
+
+		getPatternPosition: function(typeNumber) {
+			return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1];
+		},
+
+		getMask: function(maskPattern, i, j) {
+
+			switch (maskPattern) {
+
+				case QRMaskPattern.PATTERN000:
+					return (i + j) % 2 == 0;
+				case QRMaskPattern.PATTERN001:
+					return i % 2 == 0;
+				case QRMaskPattern.PATTERN010:
+					return j % 3 == 0;
+				case QRMaskPattern.PATTERN011:
+					return (i + j) % 3 == 0;
+				case QRMaskPattern.PATTERN100:
+					return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0;
+				case QRMaskPattern.PATTERN101:
+					return (i * j) % 2 + (i * j) % 3 == 0;
+				case QRMaskPattern.PATTERN110:
+					return ((i * j) % 2 + (i * j) % 3) % 2 == 0;
+				case QRMaskPattern.PATTERN111:
+					return ((i * j) % 3 + (i + j) % 2) % 2 == 0;
+
+				default:
+					throw new Error("bad maskPattern:" + maskPattern);
+			}
+		},
+
+		getErrorCorrectPolynomial: function(errorCorrectLength) {
+
+			var a = new QRPolynomial([1], 0);
+
+			for (var i = 0; i < errorCorrectLength; i++) {
+				a = a.multiply(new QRPolynomial([1, QRMath.gexp(i)], 0));
+			}
+
+			return a;
+		},
+
+		getLengthInBits: function(mode, type) {
+
+			if (1 <= type && type < 10) {
+
+				// 1 - 9
+
+				switch (mode) {
+					case QRMode.MODE_NUMBER:
+						return 10;
+					case QRMode.MODE_ALPHA_NUM:
+						return 9;
+					case QRMode.MODE_8BIT_BYTE:
+						return 8;
+					case QRMode.MODE_KANJI:
+						return 8;
+					default:
+						throw new Error("mode:" + mode);
+				}
+
+			} else if (type < 27) {
+
+				// 10 - 26
+
+				switch (mode) {
+					case QRMode.MODE_NUMBER:
+						return 12;
+					case QRMode.MODE_ALPHA_NUM:
+						return 11;
+					case QRMode.MODE_8BIT_BYTE:
+						return 16;
+					case QRMode.MODE_KANJI:
+						return 10;
+					default:
+						throw new Error("mode:" + mode);
+				}
+
+			} else if (type < 41) {
+
+				// 27 - 40
+
+				switch (mode) {
+					case QRMode.MODE_NUMBER:
+						return 14;
+					case QRMode.MODE_ALPHA_NUM:
+						return 13;
+					case QRMode.MODE_8BIT_BYTE:
+						return 16;
+					case QRMode.MODE_KANJI:
+						return 12;
+					default:
+						throw new Error("mode:" + mode);
+				}
+
+			} else {
+				throw new Error("type:" + type);
+			}
+		},
+
+		getLostPoint: function(qrCode) {
+
+			var moduleCount = qrCode.getModuleCount();
+
+			var lostPoint = 0;
+
+			// LEVEL1
+
+			for (var row = 0; row < moduleCount; row++) {
+
+				for (var col = 0; col < moduleCount; col++) {
+
+					var sameCount = 0;
+					var dark = qrCode.isDark(row, col);
+
+					for (var r = -1; r <= 1; r++) {
+
+						if (row + r < 0 || moduleCount <= row + r) {
+							continue;
+						}
+
+						for (var c = -1; c <= 1; c++) {
+
+							if (col + c < 0 || moduleCount <= col + c) {
+								continue;
+							}
+
+							if (r == 0 && c == 0) {
+								continue;
+							}
+
+							if (dark == qrCode.isDark(row + r, col + c)) {
+								sameCount++;
+							}
+						}
+					}
+
+					if (sameCount > 5) {
+						lostPoint += (3 + sameCount - 5);
+					}
+				}
+			}
+
+			// LEVEL2
+
+			for (var row = 0; row < moduleCount - 1; row++) {
+				for (var col = 0; col < moduleCount - 1; col++) {
+					var count = 0;
+					if (qrCode.isDark(row, col)) count++;
+					if (qrCode.isDark(row + 1, col)) count++;
+					if (qrCode.isDark(row, col + 1)) count++;
+					if (qrCode.isDark(row + 1, col + 1)) count++;
+					if (count == 0 || count == 4) {
+						lostPoint += 3;
+					}
+				}
+			}
+
+			// LEVEL3
+
+			for (var row = 0; row < moduleCount; row++) {
+				for (var col = 0; col < moduleCount - 6; col++) {
+					if (qrCode.isDark(row, col) &&
+						!qrCode.isDark(row, col + 1) &&
+						qrCode.isDark(row, col + 2) &&
+						qrCode.isDark(row, col + 3) &&
+						qrCode.isDark(row, col + 4) &&
+						!qrCode.isDark(row, col + 5) &&
+						qrCode.isDark(row, col + 6)) {
+						lostPoint += 40;
+					}
+				}
+			}
+
+			for (var col = 0; col < moduleCount; col++) {
+				for (var row = 0; row < moduleCount - 6; row++) {
+					if (qrCode.isDark(row, col) &&
+						!qrCode.isDark(row + 1, col) &&
+						qrCode.isDark(row + 2, col) &&
+						qrCode.isDark(row + 3, col) &&
+						qrCode.isDark(row + 4, col) &&
+						!qrCode.isDark(row + 5, col) &&
+						qrCode.isDark(row + 6, col)) {
+						lostPoint += 40;
+					}
+				}
+			}
+
+			// LEVEL4
+
+			var darkCount = 0;
+
+			for (var col = 0; col < moduleCount; col++) {
+				for (var row = 0; row < moduleCount; row++) {
+					if (qrCode.isDark(row, col)) {
+						darkCount++;
+					}
+				}
+			}
+
+			var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
+			lostPoint += ratio * 10;
+
+			return lostPoint;
+		}
+
+	};
+
+
+	//---------------------------------------------------------------------
+	// QRMath
+	//---------------------------------------------------------------------
+
+	var QRMath = {
+
+		glog: function(n) {
+
+			if (n < 1) {
+				throw new Error("glog(" + n + ")");
+			}
+
+			return QRMath.LOG_TABLE[n];
+		},
+
+		gexp: function(n) {
+
+			while (n < 0) {
+				n += 255;
+			}
+
+			while (n >= 256) {
+				n -= 255;
+			}
+
+			return QRMath.EXP_TABLE[n];
+		},
+
+		EXP_TABLE: new Array(256),
+
+		LOG_TABLE: new Array(256)
+
+	};
+
+	for (var i = 0; i < 8; i++) {
+		QRMath.EXP_TABLE[i] = 1 << i;
+	}
+	for (var i = 8; i < 256; i++) {
+		QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4] ^
+			QRMath.EXP_TABLE[i - 5] ^
+			QRMath.EXP_TABLE[i - 6] ^
+			QRMath.EXP_TABLE[i - 8];
+	}
+	for (var i = 0; i < 255; i++) {
+		QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]] = i;
+	}
+
+	//---------------------------------------------------------------------
+	// QRPolynomial
+	//---------------------------------------------------------------------
+
+	function QRPolynomial(num, shift) {
+
+		if (num.length == undefined) {
+			throw new Error(num.length + "/" + shift);
+		}
+
+		var offset = 0;
+
+		while (offset < num.length && num[offset] == 0) {
+			offset++;
+		}
+
+		this.num = new Array(num.length - offset + shift);
+		for (var i = 0; i < num.length - offset; i++) {
+			this.num[i] = num[i + offset];
+		}
+	}
+
+	QRPolynomial.prototype = {
+
+		get: function(index) {
+			return this.num[index];
+		},
+
+		getLength: function() {
+			return this.num.length;
+		},
+
+		multiply: function(e) {
+
+			var num = new Array(this.getLength() + e.getLength() - 1);
+
+			for (var i = 0; i < this.getLength(); i++) {
+				for (var j = 0; j < e.getLength(); j++) {
+					num[i + j] ^= QRMath.gexp(QRMath.glog(this.get(i)) + QRMath.glog(e.get(j)));
+				}
+			}
+
+			return new QRPolynomial(num, 0);
+		},
+
+		mod: function(e) {
+
+			if (this.getLength() - e.getLength() < 0) {
+				return this;
+			}
+
+			var ratio = QRMath.glog(this.get(0)) - QRMath.glog(e.get(0));
+
+			var num = new Array(this.getLength());
+
+			for (var i = 0; i < this.getLength(); i++) {
+				num[i] = this.get(i);
+			}
+
+			for (var i = 0; i < e.getLength(); i++) {
+				num[i] ^= QRMath.gexp(QRMath.glog(e.get(i)) + ratio);
+			}
+
+			// recursive call
+			return new QRPolynomial(num, 0).mod(e);
+		}
+	};
+
+	//---------------------------------------------------------------------
+	// QRRSBlock
+	//---------------------------------------------------------------------
+
+	function QRRSBlock(totalCount, dataCount) {
+		this.totalCount = totalCount;
+		this.dataCount = dataCount;
+	}
+
+	QRRSBlock.RS_BLOCK_TABLE = [
+
+		// L
+		// M
+		// Q
+		// H
+
+		// 1
+		[1, 26, 19],
+		[1, 26, 16],
+		[1, 26, 13],
+		[1, 26, 9],
+
+		// 2
+		[1, 44, 34],
+		[1, 44, 28],
+		[1, 44, 22],
+		[1, 44, 16],
+
+		// 3
+		[1, 70, 55],
+		[1, 70, 44],
+		[2, 35, 17],
+		[2, 35, 13],
+
+		// 4		
+		[1, 100, 80],
+		[2, 50, 32],
+		[2, 50, 24],
+		[4, 25, 9],
+
+		// 5
+		[1, 134, 108],
+		[2, 67, 43],
+		[2, 33, 15, 2, 34, 16],
+		[2, 33, 11, 2, 34, 12],
+
+		// 6
+		[2, 86, 68],
+		[4, 43, 27],
+		[4, 43, 19],
+		[4, 43, 15],
+
+		// 7		
+		[2, 98, 78],
+		[4, 49, 31],
+		[2, 32, 14, 4, 33, 15],
+		[4, 39, 13, 1, 40, 14],
+
+		// 8
+		[2, 121, 97],
+		[2, 60, 38, 2, 61, 39],
+		[4, 40, 18, 2, 41, 19],
+		[4, 40, 14, 2, 41, 15],
+
+		// 9
+		[2, 146, 116],
+		[3, 58, 36, 2, 59, 37],
+		[4, 36, 16, 4, 37, 17],
+		[4, 36, 12, 4, 37, 13],
+
+		// 10		
+		[2, 86, 68, 2, 87, 69],
+		[4, 69, 43, 1, 70, 44],
+		[6, 43, 19, 2, 44, 20],
+		[6, 43, 15, 2, 44, 16],
+
+		// 11
+		[4, 101, 81],
+		[1, 80, 50, 4, 81, 51],
+		[4, 50, 22, 4, 51, 23],
+		[3, 36, 12, 8, 37, 13],
+
+		// 12
+		[2, 116, 92, 2, 117, 93],
+		[6, 58, 36, 2, 59, 37],
+		[4, 46, 20, 6, 47, 21],
+		[7, 42, 14, 4, 43, 15],
+
+		// 13
+		[4, 133, 107],
+		[8, 59, 37, 1, 60, 38],
+		[8, 44, 20, 4, 45, 21],
+		[12, 33, 11, 4, 34, 12],
+
+		// 14
+		[3, 145, 115, 1, 146, 116],
+		[4, 64, 40, 5, 65, 41],
+		[11, 36, 16, 5, 37, 17],
+		[11, 36, 12, 5, 37, 13],
+
+		// 15
+		[5, 109, 87, 1, 110, 88],
+		[5, 65, 41, 5, 66, 42],
+		[5, 54, 24, 7, 55, 25],
+		[11, 36, 12],
+
+		// 16
+		[5, 122, 98, 1, 123, 99],
+		[7, 73, 45, 3, 74, 46],
+		[15, 43, 19, 2, 44, 20],
+		[3, 45, 15, 13, 46, 16],
+
+		// 17
+		[1, 135, 107, 5, 136, 108],
+		[10, 74, 46, 1, 75, 47],
+		[1, 50, 22, 15, 51, 23],
+		[2, 42, 14, 17, 43, 15],
+
+		// 18
+		[5, 150, 120, 1, 151, 121],
+		[9, 69, 43, 4, 70, 44],
+		[17, 50, 22, 1, 51, 23],
+		[2, 42, 14, 19, 43, 15],
+
+		// 19
+		[3, 141, 113, 4, 142, 114],
+		[3, 70, 44, 11, 71, 45],
+		[17, 47, 21, 4, 48, 22],
+		[9, 39, 13, 16, 40, 14],
+
+		// 20
+		[3, 135, 107, 5, 136, 108],
+		[3, 67, 41, 13, 68, 42],
+		[15, 54, 24, 5, 55, 25],
+		[15, 43, 15, 10, 44, 16],
+
+		// 21
+		[4, 144, 116, 4, 145, 117],
+		[17, 68, 42],
+		[17, 50, 22, 6, 51, 23],
+		[19, 46, 16, 6, 47, 17],
+
+		// 22
+		[2, 139, 111, 7, 140, 112],
+		[17, 74, 46],
+		[7, 54, 24, 16, 55, 25],
+		[34, 37, 13],
+
+		// 23
+		[4, 151, 121, 5, 152, 122],
+		[4, 75, 47, 14, 76, 48],
+		[11, 54, 24, 14, 55, 25],
+		[16, 45, 15, 14, 46, 16],
+
+		// 24
+		[6, 147, 117, 4, 148, 118],
+		[6, 73, 45, 14, 74, 46],
+		[11, 54, 24, 16, 55, 25],
+		[30, 46, 16, 2, 47, 17],
+
+		// 25
+		[8, 132, 106, 4, 133, 107],
+		[8, 75, 47, 13, 76, 48],
+		[7, 54, 24, 22, 55, 25],
+		[22, 45, 15, 13, 46, 16],
+
+		// 26
+		[10, 142, 114, 2, 143, 115],
+		[19, 74, 46, 4, 75, 47],
+		[28, 50, 22, 6, 51, 23],
+		[33, 46, 16, 4, 47, 17],
+
+		// 27
+		[8, 152, 122, 4, 153, 123],
+		[22, 73, 45, 3, 74, 46],
+		[8, 53, 23, 26, 54, 24],
+		[12, 45, 15, 28, 46, 16],
+
+		// 28
+		[3, 147, 117, 10, 148, 118],
+		[3, 73, 45, 23, 74, 46],
+		[4, 54, 24, 31, 55, 25],
+		[11, 45, 15, 31, 46, 16],
+
+		// 29
+		[7, 146, 116, 7, 147, 117],
+		[21, 73, 45, 7, 74, 46],
+		[1, 53, 23, 37, 54, 24],
+		[19, 45, 15, 26, 46, 16],
+
+		// 30
+		[5, 145, 115, 10, 146, 116],
+		[19, 75, 47, 10, 76, 48],
+		[15, 54, 24, 25, 55, 25],
+		[23, 45, 15, 25, 46, 16],
+
+		// 31
+		[13, 145, 115, 3, 146, 116],
+		[2, 74, 46, 29, 75, 47],
+		[42, 54, 24, 1, 55, 25],
+		[23, 45, 15, 28, 46, 16],
+
+		// 32
+		[17, 145, 115],
+		[10, 74, 46, 23, 75, 47],
+		[10, 54, 24, 35, 55, 25],
+		[19, 45, 15, 35, 46, 16],
+
+		// 33
+		[17, 145, 115, 1, 146, 116],
+		[14, 74, 46, 21, 75, 47],
+		[29, 54, 24, 19, 55, 25],
+		[11, 45, 15, 46, 46, 16],
+
+		// 34
+		[13, 145, 115, 6, 146, 116],
+		[14, 74, 46, 23, 75, 47],
+		[44, 54, 24, 7, 55, 25],
+		[59, 46, 16, 1, 47, 17],
+
+		// 35
+		[12, 151, 121, 7, 152, 122],
+		[12, 75, 47, 26, 76, 48],
+		[39, 54, 24, 14, 55, 25],
+		[22, 45, 15, 41, 46, 16],
+
+		// 36
+		[6, 151, 121, 14, 152, 122],
+		[6, 75, 47, 34, 76, 48],
+		[46, 54, 24, 10, 55, 25],
+		[2, 45, 15, 64, 46, 16],
+
+		// 37
+		[17, 152, 122, 4, 153, 123],
+		[29, 74, 46, 14, 75, 47],
+		[49, 54, 24, 10, 55, 25],
+		[24, 45, 15, 46, 46, 16],
+
+		// 38
+		[4, 152, 122, 18, 153, 123],
+		[13, 74, 46, 32, 75, 47],
+		[48, 54, 24, 14, 55, 25],
+		[42, 45, 15, 32, 46, 16],
+
+		// 39
+		[20, 147, 117, 4, 148, 118],
+		[40, 75, 47, 7, 76, 48],
+		[43, 54, 24, 22, 55, 25],
+		[10, 45, 15, 67, 46, 16],
+
+		// 40
+		[19, 148, 118, 6, 149, 119],
+		[18, 75, 47, 31, 76, 48],
+		[34, 54, 24, 34, 55, 25],
+		[20, 45, 15, 61, 46, 16]
+	];
+
+	QRRSBlock.getRSBlocks = function(typeNumber, errorCorrectLevel) {
+
+		var rsBlock = QRRSBlock.getRsBlockTable(typeNumber, errorCorrectLevel);
+
+		if (rsBlock == undefined) {
+			throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" +
+				errorCorrectLevel);
+		}
+
+		var length = rsBlock.length / 3;
+
+		var list = new Array();
+
+		for (var i = 0; i < length; i++) {
+
+			var count = rsBlock[i * 3 + 0];
+			var totalCount = rsBlock[i * 3 + 1];
+			var dataCount = rsBlock[i * 3 + 2];
+
+			for (var j = 0; j < count; j++) {
+				list.push(new QRRSBlock(totalCount, dataCount));
+			}
+		}
+
+		return list;
+	}
+
+	QRRSBlock.getRsBlockTable = function(typeNumber, errorCorrectLevel) {
+
+		switch (errorCorrectLevel) {
+			case QRErrorCorrectLevel.L:
+				return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
+			case QRErrorCorrectLevel.M:
+				return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
+			case QRErrorCorrectLevel.Q:
+				return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
+			case QRErrorCorrectLevel.H:
+				return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
+			default:
+				return undefined;
+		}
+	}
+
+	//---------------------------------------------------------------------
+	// QRBitBuffer
+	//---------------------------------------------------------------------
+
+	function QRBitBuffer() {
+		this.buffer = new Array();
+		this.length = 0;
+	}
+
+	QRBitBuffer.prototype = {
+
+		get: function(index) {
+			var bufIndex = Math.floor(index / 8);
+			return ((this.buffer[bufIndex] >>> (7 - index % 8)) & 1) == 1;
+		},
+
+		put: function(num, length) {
+			for (var i = 0; i < length; i++) {
+				this.putBit(((num >>> (length - i - 1)) & 1) == 1);
+			}
+		},
+
+		getLengthInBits: function() {
+			return this.length;
+		},
+
+		putBit: function(bit) {
+
+			var bufIndex = Math.floor(this.length / 8);
+			if (this.buffer.length <= bufIndex) {
+				this.buffer.push(0);
+			}
+
+			if (bit) {
+				this.buffer[bufIndex] |= (0x80 >>> (this.length % 8));
+			}
+
+			this.length++;
+		}
+	};
+
+	//---------------------------------------------------------------------
+	// Support Chinese
+	//---------------------------------------------------------------------
+	function utf16To8(text) {
+		var result = '';
+		var c;
+		for (var i = 0; i < text.length; i++) {
+			c = text.charCodeAt(i);
+			if (c >= 0x0001 && c <= 0x007F) {
+				result += text.charAt(i);
+			} else if (c > 0x07FF) {
+				result += String.fromCharCode(0xE0 | c >> 12 & 0x0F);
+				result += String.fromCharCode(0x80 | c >> 6 & 0x3F);
+				result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+			} else {
+				result += String.fromCharCode(0xC0 | c >> 6 & 0x1F);
+				result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+			}
+		}
+		return result;
+	}
+
+	uQRCode = {
+		errorCorrectLevel: QRErrorCorrectLevel,
+
+		defaults: {
+			size: 354,
+			margin: 0,
+			backgroundColor: '#ffffff',
+			foregroundColor: '#000000',
+			fileType: 'png', // 'jpg', 'png'
+			errorCorrectLevel: QRErrorCorrectLevel.H,
+			typeNumber: -1,
+			enableDelay: false // 启用延迟绘制
+		},
+
+		getModules: function(options) {
+			options = Object.assign(this.defaults, options);
+			var qrcode = new QRCode(options.typeNumber, options.errorCorrectLevel);
+			qrcode.addData(utf16To8(options.text));
+			qrcode.make();
+			return qrcode.modules;
+		},
+
+		make: function(options, componentInstance) {
+			return new Promise((reslove, reject) => {
+				options = Object.assign(this.defaults, options);
+				if (!options.canvasId) {
+					throw new Error('uQRCode: Please set canvasId!');
+				}
+				var modules = this.getModules(options);
+				var tileW = (options.size - options.margin * 2) / modules.length;
+				var tileH = tileW;
+				var delay = 0;
+				var ctx = uni.createCanvasContext(options.canvasId, componentInstance);
+				ctx.setFillStyle(options.backgroundColor);
+				ctx.fillRect(0, 0, options.size, options.size);
+				for (var row = 0; row < modules.length; row++) {
+					for (var col = 0; col < modules.length; col++) {
+						delay = options.enableDelay ? row * modules.length + col + 1 : 0;
+						setTimeout(function(row, col) {
+							// 计算每一个小块的位置
+							var x = Math.round(col * tileW) + options.margin;
+							var y = Math.round(row * tileH) + options.margin;
+							var w = Math.ceil((col + 1) * tileW) - Math.floor(col * tileW);
+							var h = Math.ceil((row + 1) * tileW) - Math.floor(row * tileW);
+							var style = modules[row][col] ? options.foregroundColor :
+								options.backgroundColor;
+							ctx.setFillStyle(style);
+							ctx.fillRect(x, y, w, h);
+						}, delay, row, col);
+					}
+				}
+				
+				// 耗时
+				var time = options.enableDelay ? delay + options.size * 2 + options.margin * 2 + options.text.length : 0;
+				setTimeout(function() {
+					ctx.draw(false, function() {
+						uni.canvasToTempFilePath({
+							canvasId: options.canvasId,
+							fileType: options.fileType,
+							width: options.size,
+							height: options.size,
+							destWidth: options.size,
+							destHeight: options.size,
+							success: function(res) {
+								reslove(Object.assign(res, {
+									time
+								}));
+							},
+							fail: function(err) {
+								reject(err);
+							}
+						}, componentInstance);
+					});
+				}, time);
+			});
+		}
+	}
+})();
+
+export default uQRCode;
diff --git a/components/qr_code/qrcode.vue b/components/qr_code/qrcode.vue
new file mode 100644
index 0000000..621582c
--- /dev/null
+++ b/components/qr_code/qrcode.vue
@@ -0,0 +1,27 @@
+<template>
+	<view class="qrcode">
+		<canvas id="qrcode" canvas-id="qrcode" :style="{'width': `${options.size}px`, 'height': `${options.size}px`}" />
+	</view>
+</template>
+
+<script>
+	import qrcode from './qrcode'
+	export default {
+		name: 'qrcode',
+		data() {
+			return {
+				options: {
+					canvasId: 'qrcode',
+					size: 354,
+					margin: 10,
+					text: ''
+				}
+			}
+		},
+		methods: {
+			make(options) {
+				return qrcode.make(Object.assign(this.options, options), this)
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/components/tabbar/tabBar.vue b/components/tabbar/tabBar.vue
index 8b25043..10a851f 100644
--- a/components/tabbar/tabBar.vue
+++ b/components/tabbar/tabBar.vue
@@ -16,9 +16,14 @@
 
 <script>
 	export default {
+		props: {
+			currPage: {
+				Type: 'int',
+				default: 0
+			}
+		},
 		data() {
 			return {
-				currPage: 0,
 				tabbar: [{
 						id: 0,
 						code: "home",
@@ -66,7 +71,7 @@
 			 * @param {Object} item
 			 */
 			goPage(item) {
-				this.currPage=item.id
+				this.currPage = item.id
 				this.$emit("changeMenu", item.code)
 			}
 		}
diff --git a/package.json b/package.json
index f87b47d..2ba9127 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "html2canvas": "^1.4.1",
     "rich-text-parser": "^1.0.2"
   },
   "devDependencies": {
diff --git a/pages/components/notice-item.vue b/pages/components/notice-item.vue
index 0497fa5..7959f6c 100644
--- a/pages/components/notice-item.vue
+++ b/pages/components/notice-item.vue
@@ -9,7 +9,7 @@
 				<view class="left-text">
 					<view class="text-item">
 						<image class="dl-icon" src="@/static/index/money.png" mode="aspectFit"></image>
-						<view v-if="0==item.feeUp" class="dl-content">奖励：无稿费</view>
+						<view v-if="null==item.feeUp" class="dl-content">奖励：无稿费</view>
 						<view v-else class="dl-content">奖励：¥{{item.feeDown}}-{{item.feeUp}}</view>
 					</view>
 					<view class="text-item">
@@ -168,6 +168,7 @@
 								flex: none;
 								width: 30rpx;
 								height: 29rpx;
+								margin-left: 6rpx;
 							}
 
 							.dl-item-right {
diff --git a/pages/index.vue b/pages/index.vue
index 60c2c5a..632df9d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="content">
 		<!-- 主体区域 -->
-		<view style="width: 100%;">
+		<view class="content-body">
 			<!-- 通告列表页 -->
 			<notice-index v-show="'home'==menuCode"></notice-index>
 			<mine-index v-show="'my'==menuCode"></mine-index>
 		</view>
-		<tabBarVue  :currPage="0" ref="tarBar" @changeMenu="changeMenu"></tabBarVue>
+		<tabBarVue :currPage="3" ref="tarBar" @changeMenu="changeMenu"></tabBarVue>
 	</view>
 </template>
 
@@ -15,16 +15,16 @@
 	import noticeIndex from '@/pages/components/index.vue'
 	import mineIndex from '@/pages/mine/index.vue'
 	export default {
-		components:{
+		components: {
 			tabBarVue,
 			noticeIndex,
 			mineIndex
 		},
 		data() {
 			return {
-				menus: ['全部', '最新', '高奖励', '急招',  '品牌置换'],
+				menus: ['全部', '最新', '高奖励', '急招', '品牌置换'],
 				menuIndex: 0,
-				dataList:['1','2','2','2'],
+				dataList: ['1', '2', '2', '2'],
 				queryParams: {
 					pageNo: 1,
 					pageSize: 10,
@@ -32,7 +32,7 @@
 				total: 0,
 				//下来刷新状态
 				isTriggered: false,
-				menuCode:"home",
+				menuCode: "my",
 			}
 		},
 		onLoad: function() {
@@ -46,8 +46,8 @@
 			 * 菜单切换
 			 * @param {Object} code
 			 */
-			changeMenu(code){
-				this.menuCode=code
+			changeMenu(code) {
+				this.menuCode = code
 			},
 			/**
 			 * 上滑加载数据
@@ -77,10 +77,15 @@
 	.content {
 		width: 100%;
 		color: #363636;
-		background-color: white;
+		background-color: #F6F6F6;
 		font-size: 38rpx;
 		height: 100vh;
+	}
+
+	.content-body {
+		width: 100%;
+		background-color: white;
 		padding-top: var(--status-bar-height);
 		padding-bottom: var(--window-bottom);
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 916e9b1..5e61cc8 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -1,203 +1,419 @@
 <template>
-  <view class="mine-container" :style="{height: `${windowHeight}px`}">
-    <!--顶部个人信息栏-->
-    <view class="header-section">
-      <view class="flex padding justify-between">
-        <view class="flex align-center">
-          <view v-if="!avatar" class="cu-avatar xl round bg-white">
-            <view class="iconfont icon-people text-gray icon"></view>
-          </view>
-          <image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
-          </image>
-          <view v-if="!name" @click="handleToLogin" class="login-tip">
-            点击登录
-          </view>
-          <view v-if="name" @click="handleToInfo" class="user-info">
-            <view class="u_title">
-              用户名：{{ name }}
-            </view>
-          </view>
-        </view>
-        <view @click="handleToInfo" class="flex align-center">
-          <text>个人信息</text>
-          <view class="iconfont icon-right"></view>
-        </view>
-      </view>
-    </view>
-
-    <view class="content-section">
-      <view class="mine-actions grid col-4 text-center">
-        <view class="action-item" @click="handleJiaoLiuQun">
-          <view class="iconfont icon-friendfill text-pink icon"></view>
-          <text class="text">交流群</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-service text-blue icon"></view>
-          <text class="text">在线客服</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-community text-mauve icon"></view>
-          <text class="text">反馈社区</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-dianzan text-green icon"></view>
-          <text class="text">点赞我们</text>
-        </view>
-      </view>
-
-      <view class="menu-list">
-        <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
-          <view class="menu-item-box">
-            <view class="iconfont icon-user menu-icon"></view>
-            <view>编辑资料</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleHelp">
-          <view class="menu-item-box">
-            <view class="iconfont icon-help menu-icon"></view>
-            <view>常见问题</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleAbout">
-          <view class="menu-item-box">
-            <view class="iconfont icon-aixin menu-icon"></view>
-            <view>关于我们</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow" @click="handleToSetting">
-          <view class="menu-item-box">
-            <view class="iconfont icon-setting menu-icon"></view>
-            <view>应用设置</view>
-          </view>
-        </view>
-      </view>
-
-    </view>
-	<tabBarVue  :currPage="3" ref="tarBar" ></tabBarVue>
-  </view>
+	<view class="mine-container">
+		<!-- 切换身份 -->
+		<view class="dl-title">
+			<view class="left-search" @click="changeUserType('bz'==nowUserType?'tgz':'bz')">
+				<image class="dl-image" src="@/static/mine/change_role.png" mode="aspectFit"></image>
+				<text class="dl-text">切换至{{'bz'==nowUserType?'通告主':'博主'}}</text>
+			</view>
+		</view>
+		<!-- 头像信息 -->
+		<view class="dl-person-box">
+			<view class="user-image-box">
+				<view class="dl-image-box">
+					<image class="touxiang" src="@/static/images/profile.jpg" mode="aspectFit"></image>
+					<image class="sex" src="@/static/mine/sex_girl.png" mode="aspectFit"></image>
+				</view>
+				<view class="name-box">
+					<text style="margin-bottom: 10rpx;">李林</text>
+					<view class="fans-box">
+						<image src="@/static/mine/fans.png" mode="aspectFit"></image>
+						<view class="fans-num">1000</view>
+					</view>
+				</view>
+				<view class="edit-box">
+					编辑 <uni-icons type="right" color="#929292" size="12">{{item.unicode}}</uni-icons>
+				</view>
+			</view>
+			<!-- 会员开通 -->
+			<view class="dl-member-box">
+				<view class="dl-left">
+					<image class="dl-icon" src="@/static/index/zuanshi.png" mode="aspectFit"></image>
+					<text>开通会员 解锁更多权益</text>
+				</view>
+				<view class="dl-right">
+					<view class="dl-go-view">立即开通</view>
+				</view>
+			</view>
+			<!-- 积分 -->
+			<view class="points-box">
+				<view class="item-box">
+					<view class="item-text-box">
+						<view>积分<text class="red-text">140</text></view>
+						<view class="dl-little">赚积分<uni-icons type="right" size="10">{{item.unicode}}</uni-icons></view>
+					</view>
+					<image src="@/static/index/zuanshi.png" mode="aspectFit"></image>
+				</view>
+				<view class="item-box">
+					<view class="item-text-box">
+						<view>报名<text class="red-text">140</text>次</view>
+						<view class="dl-little">去提额<uni-icons type="right" size="10">{{item.unicode}}</uni-icons></view>
+					</view>
+					<image src="@/static/index/zuanshi.png" mode="aspectFit"></image>
+				</view>
+			</view>
+		</view>
+		<!-- 个人信息和其他信息 -->
+		<view class="other-box">
+			<view class="box-room">
+				<view class="detail-title">个人信息</view>
+				<view class="menu-box">
+					<view class="menu-item">
+						<image src="@/static/mine/zuji.png" mode="aspectFit"></image>
+						<view>足迹</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/shezhi.png" mode="aspectFit"></image>
+						<view>设置</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/dizhi.png" mode="aspectFit"></image>
+						<view>地址</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/mingpian.png" mode="aspectFit"></image>
+						<view>名片</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/tongyong.png" mode="aspectFit"></image>
+						<view>通用</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="other-box">
+			<view class="box-room">
+				<view class="detail-title">其他信息</view>
+				<view class="menu-box">
+					<view class="menu-item">
+						<image src="@/static/mine/xinrenshouce.png" mode="aspectFit"></image>
+						<view>新人手册</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/kefu.png" mode="aspectFit"></image>
+						<view>联系客服</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/gognzhonghao.png" mode="aspectFit"></image>
+						<view>公众号</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/jairushequ.png" mode="aspectFit"></image>
+						<view>加入社区</view>
+					</view>
+					<view class="menu-item">
+						<image src="@/static/mine/yijianfankui.png" mode="aspectFit"></image>
+						<view>意见反馈</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
 	import tabBarVue from '@/components/tabbar/tabBar.vue'
-  import storage from '@/utils/storage'
-  
-  export default {
-	  components:{
-	  	tabBarVue,
-	  },
-    data() {
-      return {
-        name: this.$store.state.user.name,
-        version: getApp().globalData.config.appInfo.version
-      }
-    },
-    computed: {
-      avatar() {
-        return this.$store.state.user.avatar
-      },
-      windowHeight() {
-        return uni.getSystemInfoSync().windowHeight - 50
-      }
-    },
-    methods: {
-      handleToInfo() {
-        this.$tab.navigateTo('/pages/mine/info/index')
-      },
-      handleToEditInfo() {
-        this.$tab.navigateTo('/pages/mine/info/edit')
-      },
-      handleToSetting() {
-        this.$tab.navigateTo('/pages/mine/setting/index')
-      },
-      handleToLogin() {
-        this.$tab.reLaunch('/pages/login')
-      },
-      handleToAvatar() {
-        this.$tab.navigateTo('/pages/mine/avatar/index')
-      },
-      handleLogout() {
-        this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
-            this.$tab.reLaunch('/pages/index')
-          })
-        })
-      },
-      handleHelp() {
-        this.$tab.navigateTo('/pages/mine/help/index')
-      },
-      handleAbout() {
-        this.$tab.navigateTo('/pages/mine/about/index')
-      },
-      handleJiaoLiuQun() {
-        this.$modal.showToast('QQ群：①133713780(满)、②146013835(满)、③189091635')
-      },
-      handleBuilding() {
-        this.$modal.showToast('模块建设中~')
-      }
-    }
-  }
+	import storage from '@/utils/storage'
+	import constant from '@/utils/constant';
+	import {
+		changeUserType,
+		getUserType,
+		formatNumberWithUnits,
+		calculateTimeDifference
+	} from '@/utils/common.js'
+
+	export default {
+		components: {
+			tabBarVue,
+		},
+		data() {
+			return {
+				//当前用户类型
+				nowUserType: null,
+			}
+		},
+		onLoad() {
+			nowUserType = getUserType()
+		},
+		computed: {
+			windowHeight() {
+				return uni.getSystemInfoSync().windowHeight - 50
+			}
+		},
+		methods: {
+			/**
+			 * 切换用户身份
+			 */
+			changeUserType(type) {
+				changeUserType(type)
+				this.nowUserType = type
+			},
+			handleToInfo() {
+				this.$tab.navigateTo('/pages/mine/info/index')
+			},
+		}
+	}
 </script>
 
 <style lang="scss">
-  page {
-    background-color: #f5f6f7;
-  }
+	.mine-container {
+		width: 100%;
+		color: #363636;
+		font-size: 38rpx;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		position: relative;
 
-  .mine-container {
-    width: 100%;
-    height: 100%;
+		.dl-title {
+			width: 100%;
+			background-color: white;
+			display: flex;
+			position: relative;
+			z-index: 10;
+			font-size: 26rpx;
+			padding: 55rpx 10rpx 13rpx 15rpx;
+			border-bottom: 1px solid #F4F4F4;
 
 
-    .header-section {
-      padding: 15px 15px 45px 15px;
-      background-color: #3c96f3;
-      color: white;
+			.left-search {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: left;
+				position: relative;
 
-      .login-tip {
-        font-size: 18px;
-        margin-left: 10px;
-      }
+				.dl-image {
+					width: 30rpx;
+					height: 30rpx;
+				}
 
-      .cu-avatar {
-        border: 2px solid #eaeaea;
+				.dl-text {
+					padding-left: 10rpx;
+				}
+			}
+		}
 
-        .icon {
-          font-size: 40px;
-        }
-      }
+		.dl-person-box {
+			width: 100%;
+			background-color: white;
+			padding: 20rpx 25rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			position: relative;
 
-      .user-info {
-        margin-left: 15px;
+			.user-image-box {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 
-        .u_title {
-          font-size: 18px;
-          line-height: 30px;
-        }
-      }
-    }
+				.dl-image-box {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 100rpx;
+					position: relative;
 
-    .content-section {
-      position: relative;
-      top: -50px;
+					.touxiang {
+						border-radius: 50%;
+						width: 80rpx;
+						height: 80rpx;
+					}
 
-      .mine-actions {
-        margin: 15px 15px;
-        padding: 20px 0px;
-        border-radius: 8px;
-        background-color: white;
+					.sex {
+						width: 40rpx;
+						height: 40rpx;
+						position: absolute;
+						bottom: -5rpx;
+						right: 0rpx;
+					}
+				}
 
-        .action-item {
-          .icon {
-            font-size: 28px;
-          }
+				.name-box {
+					display: flex;
+					padding-left: 20rpx;
+					flex: 1;
+					flex-direction: column;
+					align-items: self-start;
+					justify-content: center;
 
-          .text {
-            display: block;
-            font-size: 13px;
-            margin: 8px 0px;
-          }
-        }
-      }
-    }
-  }
-</style>
+					.fans-box {
+						font-size: 18rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						background-color: #FEF4EF;
+						padding: 5rpx 10rpx;
+						color: #FE9860;
+						border-radius: 20rpx;
+
+						image {
+							height: 20rpx;
+							width: 20rpx;
+						}
+					}
+
+
+					.fans-num {}
+				}
+
+				.edit-box {
+					color: #929292;
+					text-align: right;
+					padding-right: 20rpx;
+					font-size: 22rpx;
+					width: 200rpx;
+
+				}
+			}
+
+			.dl-member-box {
+				display: flex;
+				align-items: center;
+				margin-top: 10rpx;
+				border-radius: 35rpx;
+				justify-content: center;
+				height: 120rpx;
+				width: 100%;
+				background: url('/static/index/member-bg.png');
+				background-size: contain;
+				background-position: center;
+				/* 图片居中显示 */
+				background-repeat: no-repeat;
+				/* 不重复背景图片 */
+
+				.dl-left {
+					display: flex;
+					flex: 1;
+					padding-left: 30rpx;
+					align-items: center;
+					font-size: 30rpx;
+					color: #623109;
+					justify-content: left;
+
+					.dl-icon {
+						width: 60rpx;
+						height: 56rpx;
+
+					}
+				}
+
+				.dl-right {
+					.dl-go-view {
+						font-size: 28rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						background-color: #F5D8A5;
+						color: #623109;
+						padding: 10rpx 25rpx;
+						float: right;
+						border-radius: 30rpx;
+					}
+				}
+			}
+		}
+
+		.points-box {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.item-box {
+				flex: 1;
+				border-radius: 20rpx;
+				background-color: #FEF4EF;
+				margin: 8rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				padding: 20rpx;
+
+				.item-text-box {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+
+					.dl-little {
+						font-size: 22rpx;
+						background-color: white;
+						border-radius: 20rpx;
+						padding: 5rpx 20rpx;
+						margin-top: 15rpx;
+					}
+				}
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+				}
+
+				.red-text {
+					color: #FC1F3E;
+				}
+			}
+		}
+
+		.other-box {
+			background-color: #F6F6F6;
+			width: 100%;
+			flex-direction: column;
+			padding: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.box-room {
+				display: flex;
+				background-color: white;
+				border-radius: 20rpx;
+				width: 100%;
+				flex-direction: column;
+				padding: 25rpx 30rpx;
+				align-items: self-start;
+				justify-content: center;
+
+				.detail-title {
+					border-left: 8rpx solid #FC1F3E;
+					font-weight: bold;
+					font-size: 29rpx;
+					padding-left: 20rpx;
+					margin-bottom: 30rpx;
+
+				}
+
+				.menu-box {
+					border-top: 1rpx solid #F7F7F7;
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.menu-item {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						justify-content: center;
+						font-size: 24rpx;
+						margin: 10rpx;
+
+						image {
+							width: 60rpx;
+							height: 60rpx;
+							margin-bottom: 10rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/bg.jpg b/static/bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..03a698a094d6e8c7846d0404aa797dc5f79b5dcb
GIT binary patch
literal 6946
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
WeTqR7?Qb1Lk%*F~f*Q25#s39Ky=`&;

literal 0
HcmV?d00001

diff --git a/static/detail/approval.png b/static/detail/approval.png
new file mode 100644
index 0000000000000000000000000000000000000000..52eac00a7a2670f39656a88deea103f9d56d9ef5
GIT binary patch
literal 4422
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
M07*qoM6N<$f`UY9mjD0&

literal 0
HcmV?d00001

diff --git a/static/detail/card.png b/static/detail/card.png
new file mode 100644
index 0000000000000000000000000000000000000000..f68ac986ab1fe7fed88061a05e0c06a215c1a658
GIT binary patch
literal 2004
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

literal 0
HcmV?d00001

diff --git a/static/detail/home.png b/static/detail/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..49c748596922ec7b95ad3c49371a56dad2ef4311
GIT binary patch
literal 1883
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
VFo~GKoU{M{002ovPDHLkV1nm*dguTE

literal 0
HcmV?d00001

diff --git a/static/detail/share.png b/static/detail/share.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecaccc3112bbb67a1982a7eb234770439803746a
GIT binary patch
literal 2362
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
YTE*lf$m|6hxfueS9o#W2`;hd10O_!OTL1t6

literal 0
HcmV?d00001

diff --git a/static/images/tabbar/my_motice_.png b/static/images/tabbar/my_notice_.png
similarity index 100%
rename from static/images/tabbar/my_motice_.png
rename to static/images/tabbar/my_notice_.png
diff --git a/store/modules/user.js b/store/modules/user.js
index 4e16d3c..364093c 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -108,6 +108,8 @@ const user = {
 					}
 					//会员权益
 					setJSONData(constant.userRightsKey, res.rights)
+					//用户基本信息
+					setJSONData(constant.userInfo, res.user)
 					if (!getStrData(constant.userTypeKey)) {
 						//没有默认身份，默认博主
 						changeUserType(constant.bz)
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index b5eee79..d818043 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -1,23 +1,25 @@
 <template>
 	<view class="uni-popup-dialog">
-		<view class="uni-dialog-title">
+		<!-- <view class="uni-dialog-title">
 			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
-		</view>
+		</view> -->
 		<view v-if="mode === 'base'" class="uni-dialog-content">
 			<slot>
+				<image v-if="iconPath" :src="iconPath" mode="aspectFit"></image>
 				<text class="uni-dialog-content-text">{{content}}</text>
 			</slot>
 		</view>
 		<view v-else class="uni-dialog-content">
 			<slot>
-				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText" :focus="focus" >
+				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText"
+					:focus="focus">
 			</slot>
 		</view>
 		<view class="uni-dialog-button-group">
 			<view class="uni-dialog-button" @click="closeDialog">
 				<text class="uni-dialog-button-text">{{closeText}}</text>
 			</view>
-			<view class="uni-dialog-button uni-border-left" @click="onOk">
+			<view class="uni-dialog-button uni-border-left dl-button-ok" @click="onOk">
 				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
 			</view>
 		</view>
@@ -28,10 +30,12 @@
 <script>
 	import popup from '../uni-popup/popup.js'
 	import {
-	initVueI18n
+		initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup/i18n/index.js'
-	const {	t } = initVueI18n(messages)
+	const {
+		t
+	} = initVueI18n(messages)
 	/**
 	 * PopUp 弹出层-对话框样式
 	 * @description 弹出层-对话框样式
@@ -55,9 +59,9 @@
 	export default {
 		name: "uniPopupDialog",
 		mixins: [popup],
-		emits:['confirm','close'],
+		emits: ['confirm', 'close'],
 		props: {
-			inputType:{
+			inputType: {
 				type: String,
 				default: 'text'
 			},
@@ -89,11 +93,15 @@
 				type: Boolean,
 				default: false
 			},
-			cancelText:{
+			cancelText: {
 				type: String,
 				default: ''
 			},
-			confirmText:{
+			confirmText: {
+				type: String,
+				default: ''
+			},
+			iconPath: {
 				type: String,
 				default: ''
 			}
@@ -151,12 +159,12 @@
 			 * 点击确认按钮
 			 */
 			onOk() {
-				if (this.mode === 'input'){
+				if (this.mode === 'input') {
 					this.$emit('confirm', this.val)
-				}else{
+				} else {
 					this.$emit('confirm')
 				}
-				if(this.beforeClose) return
+				if (this.beforeClose) return
 				this.popup.close()
 			},
 			/**
@@ -164,17 +172,17 @@
 			 */
 			closeDialog() {
 				this.$emit('close')
-				if(this.beforeClose) return
+				if (this.beforeClose) return
 				this.popup.close()
 			},
-			close(){
+			close() {
 				this.popup.close()
 			}
 		}
 	}
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 	.uni-popup-dialog {
 		width: 300px;
 		border-radius: 11px;
@@ -199,15 +207,22 @@
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		flex-direction: row;
+		display: flex;
+		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 		padding: 20px;
+
+		image {
+			margin: 30rpx 0 15rpx 0;
+			width: 100rpx;
+			height: 100rpx;
+		}
 	}
 
 	.uni-dialog-content-text {
 		font-size: 14px;
-		color: #6C6C6C;
+		color: #363636;
 	}
 
 	.uni-dialog-button-group {
@@ -232,6 +247,11 @@
 		height: 45px;
 	}
 
+	.dl-button-ok {
+		background-color: #FC1F3E;
+		border-radius: 0 0 11px 0;
+	}
+
 	.uni-border-left {
 		border-left-color: #f0f0f0;
 		border-left-style: solid;
@@ -244,7 +264,7 @@
 	}
 
 	.uni-button-color {
-		color: #007aff;
+		color: white;
 	}
 
 	.uni-dialog-input {
@@ -272,4 +292,4 @@
 	.uni-popup__info {
 		color: #909399;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index 5be7624..c11a119 100644
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -3,7 +3,9 @@
 		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
 		<view class="uni-share-content">
 			<view class="uni-share-content-box">
-				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index"
+					@click.stop="select(item,index)">
+					<button v-if="'wx'==item.name" class="share-button" open-type="share" plain="true"></button>
 					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
 					<text class="uni-share-text">{{item.text}}</text>
 				</view>
@@ -19,14 +21,16 @@
 <script>
 	import popup from '../uni-popup/popup.js'
 	import {
-	initVueI18n
+		initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup/i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	const {
+		t
+	} = initVueI18n(messages)
 	export default {
 		name: 'UniPopupShare',
-		mixins:[popup],
-		emits:['select'],
+		mixins: [popup],
+		emits: ['select'],
 		props: {
 			title: {
 				type: String,
@@ -45,21 +49,21 @@
 						name: 'wx'
 					},
 					{
-						text: '支付宝',
+						text: '海报',
 						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
-						name: 'wx'
+						name: 'hb'
 					},
 					{
-						text: 'QQ',
+						text: '举报',
 						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
-						name: 'qq'
-					},
-					{
-						text: '新浪',
-						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
-						name: 'sina'
+						name: 'jb'
 					},
 					// {
+					// 	text: '新浪',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+					// 	name: 'sina'
+					// },
+					// {
 					// 	text: '百度',
 					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
 					// 	name: 'copy'
@@ -77,7 +81,7 @@
 			cancelText() {
 				return t("uni-popup.cancel")
 			},
-		shareTitleText() {
+			shareTitleText() {
 				return this.title || t("uni-popup.shareTitle")
 			}
 		},
@@ -91,24 +95,34 @@
 					index
 				})
 				this.close()
-
 			},
 			/**
 			 * 关闭窗口
 			 */
 			close() {
-				if(this.beforeClose) return
+				if (this.beforeClose) return
 				this.popup.close()
 			}
 		}
 	}
 </script>
-<style lang="scss" >
+<style lang="scss">
+	button[plain] {
+		border: 0
+	}
+
+	.share-button {
+		position: absolute;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
 	.uni-popup-share {
 		background-color: #fff;
 		border-top-left-radius: 11px;
 		border-top-right-radius: 11px;
 	}
+
 	.uni-share-title {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -118,10 +132,12 @@
 		justify-content: center;
 		height: 40px;
 	}
+
 	.uni-share-title-text {
 		font-size: 14px;
 		color: #666;
 	}
+
 	.uni-share-content {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -137,11 +153,12 @@
 		/* #endif */
 		flex-direction: row;
 		flex-wrap: wrap;
-		width: 360px;
+		width: 100%;
 	}
 
 	.uni-share-content-item {
-		width: 90px;
+		position: relative;
+		flex: 1;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -152,7 +169,9 @@
 	}
 
 	.uni-share-content-item:active {
+		pointer-events: none;
 		background-color: #f5f5f5;
+		position: relative;
 	}
 
 	.uni-share-image {
@@ -161,6 +180,7 @@
 	}
 
 	.uni-share-text {
+		z-index: 999;
 		margin-top: 10px;
 		font-size: 14px;
 		color: #3B4144;
@@ -184,4 +204,4 @@
 	.uni-share-button::after {
 		border-radius: 50px;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/utils/auth.js b/utils/auth.js
index 973d047..8cf97c0 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -1,41 +1,41 @@
 const TokenKey = 'App-Token'
 
 export function getToken() {
-  return uni.getStorageSync(TokenKey)
+	return uni.getStorageSync(TokenKey)
 }
 
 export function setToken(token) {
-  return uni.setStorageSync(TokenKey, token)
+	return uni.setStorageSync(TokenKey, token)
 }
 
 export function removeToken() {
-  return uni.removeStorageSync(TokenKey)
+	return uni.removeStorageSync(TokenKey)
 }
 
 export function getJSONData(keyStr) {
-  if(uni.getStorageSync(keyStr)){
-    return JSON.parse(uni.getStorageSync(keyStr))
-  }else{
-    return "";
-  }
+	if (uni.getStorageSync(keyStr)) {
+		return JSON.parse(uni.getStorageSync(keyStr))
+	} else {
+		return null;
+	}
 }
 
-export function setJSONData(keyStr,dataObj) {
-  return uni.setStorageSync(keyStr, JSON.stringify(dataObj))
+export function setJSONData(keyStr, dataObj) {
+	return uni.setStorageSync(keyStr, JSON.stringify(dataObj))
 }
 
 export function removeJSONData(keyStr) {
-  return uni.removeStorageSync(keyStr)
+	return uni.removeStorageSync(keyStr)
 }
 
 export function getStrData(keyStr) {
-  return uni.getStorageSync(keyStr)
+	return uni.getStorageSync(keyStr)
 }
 
-export function setStrData(keyStr,dataStr) {
-  return uni.setStorageSync(keyStr, dataStr)
+export function setStrData(keyStr, dataStr) {
+	return uni.setStorageSync(keyStr, dataStr)
 }
 
 export function removeStrData(keyStr) {
-  return uni.removeStorageSync(keyStr)
+	return uni.removeStorageSync(keyStr)
 }
\ No newline at end of file
diff --git a/utils/common.js b/utils/common.js
index b2e1948..a00f9c7 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -28,7 +28,8 @@ export function hasRights(code) {
 		rtnData = userRights[code]
 	}
 	return rtnData
-}/**
+}
+/**
  * 切换用户当前身份
  * @param {Object} value 身份值
  */
@@ -36,6 +37,14 @@ export function changeUserType(value) {
 	setStrData(constant.userTypeKey, value)
 }
 
+/**
+ * 获取用户当前身份
+ * @param {Object} value 身份值
+ */
+export function getUserType() {
+	return getStrData(constant.userTypeKey)
+}
+
 /**
  * 显示消息提示框
  * @param content 提示的标题
@@ -97,10 +106,11 @@ export function tansParams(params) {
  */
 export function formatNumberWithUnits(num) {
 	const units = ['', 'k', 'w', 'kw'];
-	const absNum = Math.abs(num); // 获取绝对值以处理负数
+	// 获取绝对值以处理负数
+	let absNum = Math.abs(num);
 	// 处理小于1000的情况，直接返回原数字的字符串形式
 	if (absNum < 1000) {
-		return absNum.toString();
+		return num;
 	}
 
 	// 寻找合适的单位
@@ -119,3 +129,29 @@ export function formatNumberWithUnits(num) {
 	const formattedNum = absNum.toFixed(2).replace(/\.?0+$/, ''); // 保留两位小数并去除末尾的零
 	return formattedNum + units[unitIndex];
 }
+
+/**
+ * 计算某个时间是几天、几小时之前
+ * @param {Object} time
+ */
+export function calculateTimeDifference(time) {
+	// 将时间字符串转换为Date对象
+	const nowDate = new Date();
+	const lastDate = new Date(time);
+
+	// 计算时间差（毫秒）
+	const diffMs = Math.abs(nowDate.getTime() - lastDate.getTime());
+
+	// 将毫秒转换为小时
+	const diffHours = diffMs / (1000 * 60 * 60);
+
+	// 计算完整的整天天数和剩余的小时数
+	const diffDays = Math.floor(diffHours / 24);
+	const remainingHours = diffHours % 24;
+
+	if (diffDays > 0) {
+		return parseInt(diffDays) + "天前"
+	} else {
+		return parseInt(remainingHours) + "小时前"
+	}
+}
\ No newline at end of file
diff --git a/utils/constant.js b/utils/constant.js
index d4e6c79..b7beb1a 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -7,6 +7,8 @@ const constant = {
 	userRightsKey: 'User-Rights',
 	// 用户当前身份code
 	userTypeKey: 'User-Type',
+	//当前用户信息
+	userInfo: 'User-Info',
 	//博主
 	bz: '02',
 	//通告主