diff --git a/package1/AI/addAiList.vue b/package1/AI/addAiList.vue
index 9e13c6d..9d701f8 100644
--- a/package1/AI/addAiList.vue
+++ b/package1/AI/addAiList.vue
@@ -1,410 +1,150 @@
 <!-- 管理员登录页 -->
 <template>
 	<view class="page1" style="overflow: scroll;">
-		<view @tap="addList"
-			style="width: 90%;height:80rpx;margin:20rpx auto;background: #088FEB;color: #fff;border-radius: 20rpx;text-align: center;line-height: 80rpx;font-size: 32rpx;">
-			新增
-		</view>
-		<button @tap="getQRCode">生成</button>
-		<uqrcode ref="uqrcode" canvas-id="qrcode" hide="true" start="false" auto="true" queue="true" :value="QrUrl">
-		</uqrcode>
-		<img v-for="(item,index) in newQRList" :src="item" alt="" />
-		<view v-for="(item,index) in QrList1" :key="index"
-			style="background: #fff;height: 100rpx;display: flex;line-height: 100rpx;">
-			<input type="text" :value="item.name" maxlength="6" @blur="addItemName($event,index)" placeholder="输入名称"
-				style="width: 30%;display: block;height: 100rpx;text-align: center;font-size: 32rpx;" />
-			<input type="text" disabled @tap="scanCodeAdd(index)" :value="item.path" placeholder="点击扫描二维码"
-				style="width: 58%;display: block;height: 80rpx;border: 1px solid #eee;padding-left: 20rpx;margin-top: 10rpx;" />
-			<view @tap="delItem(index)" style="width:12%;margin-left: 20rpx;">
-				<uni-icons color="red" type="minus" size="26"></uni-icons>
-			</view>
-		</view>
-		<view style="display: flex;">
-			<view v-for="(item,index) in QrList1" :key="index" style="width: 150rpx;height: 210rpx;margin: 20rpx;">
-				<image :src="item.imgUrl" style="width: 150rpx;height: 150rpx;background-size: 100%;"></image>
-				<view v-if="item.imgUrl != ''">{{item.name}}</view>
-			</view>
-		</view>
-
-		<view @tap="updateShopIcon()"
-			style="width: 90%;height:80rpx;position: fixed;bottom: 40rpx;left:5%;background: #088FEB;color: #fff;border-radius: 20rpx;text-align: center;line-height: 80rpx;font-size: 32rpx;">
-			提交
-		</view>
-		<canvas canvas-id="qrcode" style="width: 200px;height: 200px;top: -1000px;"></canvas>
+		<official-account :bindload="successRes" :binderror="errorRes">
+			<view style="width: 100%;height: 100rpx;background: #000;">关注</view>
+		</official-account>
 	</view>
 </template>
 
 <script>
-	import {
-		generateUUID
-	} from '@/utils/global.js'
 	export default {
 		data() {
 			return {
-				//旧的二维码路径
-				QRList: [
-					'wxp://f2f0egWTC-6-dnZPjtxrXAnLQemXglhjQB92wtNu01tRoeE',
-					'https://u.wechat.com/MINRIYDQnbErEZEUAAhuOL0',
-					'https://u.wechat.com/ELXU0g00OAM8huehO8nDQMQ',
-					'https://qr.alipay.com/fkx11051559cgeldh61dyf6'
-				],
-				QrUrl: '', //二维码临时存放
-				newQRList: [], // 生成的二维码临时路径的数组
-				QrList1: [], // 点击新增按钮，新增一条数据
-				aaa: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/67fd6f17a7634400afac9b6694ed9234.png'
+
 			}
 		},
 		onShow() {
-			this.dingyuexiaoxi()
+
 		},
 		onLoad(option) {
-			let that = this
-			that.tui.request("/app/shop/getShopInfoById", "post", {
-				id: uni.getStorageSync('shopId'),
-			}, false, true).then((res) => {
-				if (res.code == 200) {
-					let qrCode = res.result.shopIcon
-					if (qrCode != '') {
-						let data = qrCode.split(',')
-						for (let i = 0; i < data.length; i++) {
-							if (qrCode.indexOf('@_@') != -1) {
-								let obj = {
-									name: data[i].split('@_@')[0],
-									path: data[i].split('@_@')[1],
-									imgUrl: data[i].split('@_@')[2],
-									level: "M"
-								}
-								this.QrList1.push(obj)
-							} else {
-								var weixin = data[i].indexOf("微信");
-								var dianpu = data[i].indexOf("店铺");
-								var zifubao = data[i].indexOf("支付");
-								var yinlian = data[i].indexOf("收款");
-								var duizhang = data[i].indexOf("对账");
-								if (duizhang != -1) {
-									var result = data[i].substring(duizhang + 2);
-									let obj = {
-										name: '查看对账单',
-										path: result,
-										level: "M"
-									}
-									this.QrList1.push(obj)
-								}
-								if (dianpu != -1) {
-									var result = data[i].substring(dianpu + 2);
-									let obj = {
-										name: '店铺微信',
-										path: result,
-										level: "M"
-									}
-									this.QrList1.push(obj)
-								}
-								if (weixin != -1) {
-									var result = data[i].substring(weixin + 2);
-									let obj = {
-										name: '微信收款码',
-										path: result,
-										level: "M"
-									}
-									this.QrList1.push(obj)
-								}
-								if (zifubao != -1) {
-									var result = data[i].substring(zifubao + 2);
-									let obj = {
-										name: '支付宝收款码',
-										path: result,
-										level: "Q"
-									}
-									this.QrList1.push(obj)
-								}
-								if (yinlian != -1) {
-									var result = data[i].substring(yinlian + 2);
-									let obj = {
-										name: '银行收款码',
-										path: result,
-										level: "M"
-									}
-									this.QrList1.push(obj)
-								}
-							}
-						}
-						setTimeout(res => {
-							if (this.qrArr.length > 0) {
-								that.getQRCode();
-							}
-						}, 1000)
-					}
-				}
-			}).catch((res) => {})
-
-			setTimeout(res => {
-				// 返回canvas的位图数据
-				uni.canvasGetImageData({
-					canvasId: 'aaaa',
-					x: 0,
-					y: 0,
-					width: 100,
-					height: 100,
-					success(res) {
-						let data = {
-							width: res.width,
-							height: res.height,
-							imageData: res.data,
-							threshold: 180
-						}
-					}
-				})
-			}, 2000)
+			this.getToken()
 		},
 		methods: {
-			dingyuexiaoxi() {
-				uni.getUserInfo({
-					provider: 'weixin',
-					success: function(infoRes) {
+			successRes() {
 
-						uni.request({
-							url: 'https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=86_qLwHUm1Q-w4qQX2AlLcCC5FnR8cMki59Ba6cyw2mdkjLtezVMdZpCjAcRai1WlI3sOf7w1_8uoD0xikGSkBGUaYcG22w8--jYa6kBsnwxxaZ0h1HeQ6VKERnFtkANTeADAREK',
-							header: {
-								'content-type': 'application/json'
-							},
-							method: 'POST', //'GET','POST'
-							dataType: 'json',
-							data: {
-								touser: infoRes.userInfo.openId,
-
-								template_id: "XhSZTsF05lKg5RF9lRzM7cSAk7-6riAGvTpPRJRJMWo",
-								page: "/pages/index/index",
-								data: {
-									keyword1: {
-										value: "339208499"
-									},
-									keyword2: {
-										value: "2015年01月05日 12:30"
-									}
-								},
-
-							},
-							success: (res) => {
-								console.log(res.data);
-							}
-						});
+			},
+			//获取code
+			getToken() {
+				uni.login({
+					provider: 'weixin',
+					success(res) {
+						console.log(res.code);
+						// this.getOpenId(res.code)
 					}
 				});
-
 			},
-			grayPixle(pix) {
-				return pix[0] * 0.299 + pix[1] * 0.587 + pix[2] * 0.114;
-			},
-			updateShopIcon() {
-				let shopIcon = ''
-				if (this.QrList1.length > 0) {
-					for (let i = 0; i < this.QrList1.length; i++) {
-						if (i == this.QrList1.length - 1) {
-							shopIcon += this.QrList1[i].name + '@_@' + this.QrList1[i].path + '@_@' + this.QrList1[i]
-								.imgUrl
-						} else {
-							shopIcon += this.QrList1[i].name + '@_@' + this.QrList1[i].path + '@_@' + this.QrList1[i]
-								.imgUrl + ','
-						}
-					}
-					this.tui.request("/app/shop/editShopIconById", "post", {
-						shopId: uni.getStorageSync('shopId'),
-						shopIcon: shopIcon
-					}, false, true).then((res) => {
-						if (res.code == 200) {
-							uni.showToast({
-								title: "更新成功",
-								icon: 'none'
-							})
-							setTimeout(res => {
-								uni.navigateBack({
-									delta: 1
-								})
-							}, 1000)
-						}
-					})
+			//获取小程序openid
+			getOpenId(code) {
+				this.tui.request("", "post", {
+					appid: 'wx6d7d4fb58d1502db',
+					secret: '3a2c8cd00926764bbd12fd7361e01f1d',
+					js_code: code,
+					grant_type: "authorization_code",
+					customId: ''
+				}, false, false).then((res) => {
+					this.status = 'nomore';
+					if (res.code == 200) {
 
-				}
-			},
-			overwriteImageData(data) {
-				let sendWidth = data.width,
-					sendHeight = data.height;
-				const threshold = data.threshold || 180;
-				let sendImageData = new ArrayBuffer((sendWidth * sendHeight) / 8);
-				sendImageData = new Uint8Array(sendImageData);
-				let pix = data.imageData;
-				const part = [];
-				let index = 0;
-				for (let i = 0; i < pix.length; i += 32) {
-					//横向每8个像素点组成一个字节（8位二进制数）。
-					for (let k = 0; k < 8; k++) {
-						const grayPixle1 = this.grayPixle(pix.slice(i + k * 4, i + k * 4 + (4 - 1)));
-						//阈值调整
-						if (grayPixle1 > threshold) {
-							//灰度值大于threshold位   白色 为第k位0不打印
-							part[k] = 0;
-						} else {
-							part[k] = 1;
-						}
+					} else {
+						this.tui.toast(res.message)
 					}
-					let temp = 0;
-					for (let a = 0; a < part.length; a++) {
-						temp += part[a] * Math.pow(2, part.length - 1 - a);
-					}
-					sendImageData[index++] = temp;
-				}
-				return {
-					array: Array.from(sendImageData),
-					width: sendWidth / 8,
-					height: sendHeight,
-				};
-
-			},
-			addList() {
-				if (this.QrList1.length >= 4) {
-					uni.showToast({
-						title: '最多只能添加4个二维码',
-						icon: 'none'
-					})
-					return
-				}
-				let data = {
-					name: '',
-					path: ''
-				}
-				this.QrList1.push(data)
+				}).catch((res) => {})
 			},
-			getQRCode(index) {
-				let that = this
-				// for (let i = 0; i <= this.QRList.length; i++) {
+			//根据openid查询用户信息
+			getUserInfo(openId) {
+				this.tui.request("", "post", {
+					openId: openId
+				}, false, false).then((res) => {
+					this.status = 'nomore';
+					if (res.code == 200) {
 
-				setTimeout(res => {
-					this.$refs.uqrcode.toTempFilePath({
-						success: res => {
-							let ctx = uni.createCanvasContext('qrcode', that)
-							ctx.drawImage(res.tempFilePath, 0, 0, 200, 200);
-							ctx.draw(true);
-							setTimeout(ress => {
-								uni.canvasToTempFilePath({
-									x: 0,
-									y: 0,
-									width: 200,
-									height: 200,
-									destWidth: 200,
-									destHeight: 200,
-									canvasId: 'qrcode',
-									success: (res3) => {
-										uni.uploadFile({
-											url: that.tui.interfaceUrl() +
-												'/upload/file',
-											filePath: res3.tempFilePath,
-											name: 'file',
-											header: {
-												"content-type": "multipart/form-data",
-												'accessToken': that.tui
-													.getToken()
-											},
-											formData: {},
-											success: (uploadFileRes) => {
-												let path = JSON.parse(
-													uploadFileRes
-													.data)
-												//后端返回的地址，存入图片地址
-												that.QrList1[index]
-													.imgUrl = path
-													.result
-												that.$forceUpdate()
-											}
-										});
-									}
-								});
-							}, 500)
-						}
-					});
-				}, 1000)
-				// }
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
 			},
-			async base64ToTempFilePath(base64Data) {
-				const fs = uni.getFileSystemManager()
-				const fileName = 'LotteryActivity_' + Date.now() + '.png' // 自定义文件名，可根据需要修改
-				const filePath = uni.env.USER_DATA_PATH + '/' + fileName
-				const base64 = base64Data.split(',')[1] //移除固定头部
-				const buffer = uni.base64ToArrayBuffer(base64)
-				let promise = await new Promise((resolve, reject) => {
-					fs.writeFile({
-						filePath,
-						data: buffer,
-						encoding: 'binary',
-						success(res) {
-							resolve(filePath) // fulfilled
+			/*	
+				发送模板消息
+				
+				⦁对账单模板template_id：xAoOMfWdnT8pwfj_OOskJGKQHVU-8_AYwx1A5I5wBTM
+				参数： 
+				订单金额：{{amount1.DATA}}
+				交易时间{{time3.DATA}}
+				商户名称{{thing4.DATA}}
+				客户姓名{{thing5.DATA}}
+				
+				⦁充值成功模板template_id：WKCcMlr0UoXvulrhX-cBUeEELAd_ar_NnAnw30DjnQE
+				参数： 
+				充值金额{{amount1.DATA}}
+				充值时间{{time2.DATA}}
+				账户总额{{amount3.DATA}}
+				顾客姓名{{thing4.DATA}}
+				门店名称{{thing11.DATA}}
+				
+				⦁店铺上新template_id：M45X8AmPi58c16M9YVTMEOhwEVEa9s5md-6i3TwjpRQ
+				参数： 
+				公司名称{{thing3.DATA}}
+				提交时间{{time2.DATA}}
+			*/
+			sendMessage() {
+				this.tui.request("", "post", {
+					touser: "", //openid
+					template_id: "",
+					miniprogram: {
+						appid: "wx6d7d4fb58d1502db",
+						pagepath: ""
+					},
+					data: {
+						keyword1: {
+							value: "巧克力"
 						},
-						fail(err) {
-							reject(err) // rejected
+						keyword2: {
+							value: "39.8元"
+						},
+						keyword3: {
+							value: "2014年9月22日"
 						}
-					})
-				})
-				return promise
-			},
-			addItemName(e, index) {
-				this.QrList1[index].name = e.detail.value
-			},
-			scanCodeAdd(index) {
-				let that = this;
-				uni.scanCode({
-					success: (res) => {
-						if (res.result != '') {
-							if (res.result.indexOf('u.wechat.com') == -1 && res.result.indexOf(
-									'qr.alipay.com') == -1 && res.result.indexOf('wxp://') == -1 && res.result
-								.length > 80) {
-								let uid = uni.getStorageSync('shopId').substring('10', '12') + generateUUID()
-									.substring('0', '7');
-								let urlMapping = []
-								urlMapping.push({
-									id: uid,
-									longUrl: res.result
-								})
-								this.tui.request("/app/urlMapping/saveOrUpdateUrlMapping", "post", urlMapping,
-									false, false).then((res) => {
-									if (res.code == 200) {
-										this.QrList1[index].path = that.tui.interfaceUrl() +
-											'/app/urlMapping/redirect?id=' + uid
-									}
-								})
-							} else {
-								this.QrList1[index].path = res.result
-							}
-							setTimeout(res => {
-								that.QrUrl = this.QrList1[index].path
-								that.getQRCode(index)
-							}, 500)
+					}
+				}, false, false).then((res) => {
+					this.status = 'nomore';
+					if (res.code == 200) {
 
-						} else {
-							uni.showToast({
-								title: '扫描失败',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						uni.showToast({
-							title: '扫描失败',
-							icon: 'none'
-						})
+					} else {
+						this.tui.toast(res.message)
 					}
-				})
+				}).catch((res) => {})
 			},
-			delItem(index) {
-				let that = this;
-				uni.showModal({
-					title: "提示",
-					content: "确定要删除吗？",
-					success: function(res) {
-						if (res.confirm) {
-							that.QrList1.splice(index, 1)
+			//店铺上新
+			sendMessageUpNew() {
+				this.tui.request("", "post", {
+					wxList: {
+						template_id:'',
+						miniprogram: {
+							appid: "wx6d7d4fb58d1502db",
+							pagepath: ""
+						},
+						data: {
+							keyword1: {
+								value: "巧克力"
+							},
+							keyword2: {
+								value: "39.8元"
+							},
+							keyword3: {
+								value: "2014年9月22日"
+							}
 						}
-					}
-				})
+					},
+					categoryId: ""
+				}, false, false).then((res) => {
+					this.status = 'nomore';
+					if (res.code == 200) {
 
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
 			}
 		}
 	}
diff --git a/package1/index/orderDetail.vue b/package1/index/orderDetail.vue
index 2b09d23..1570b93 100644
--- a/package1/index/orderDetail.vue
+++ b/package1/index/orderDetail.vue
@@ -2561,7 +2561,7 @@
 						}
 					}
 
-				} else if (this.shopId == '1810179818189361152' || this.shopId == '1843114735801864192' || this.shopId == '1818888277105709056') {
+				} else if (this.printingMethod == '2' || this.shopId == '1810179818189361152' || this.shopId == '1843114735801864192' || this.shopId == '1818888277105709056') {
 					//华秀
 					if(this.printingMethod == '2'){
 						if (that.yNum + 64 >= 1990 * pageNum) {
diff --git a/package1/staff/performance.vue b/package1/staff/performance.vue
index 5a2269b..21fd9d4 100644
--- a/package1/staff/performance.vue
+++ b/package1/staff/performance.vue
@@ -12,10 +12,15 @@
 								<text class="staff-name">{{ item.createByName?item.createByName:'暂无' }}</text>
 							</view>
 						</template>
-						<template #footer>
-							<view style="font-size: 24rpx;display: flex;flex-direction: column;width: 250rpx;">
-								<text style="display: inline-block;width: auto;">单数：{{item.totalCount?item.totalCount:'暂无'}}单</text>
-								<text style="display: inline-block;width: auto;">总金额：{{item.totalPrice?item.totalPrice:'暂无'}}元</text>
+						<template #footer>
+							<view style="display: flex;" @tap="goDetail(item)">
+								<view style="font-size: 24rpx;display: flex;flex-direction: column;width: 250rpx;">
+									<text style="display: inline-block;width: auto;">单数：{{item.totalCount?item.totalCount:'暂无'}}单</text>
+									<text style="display: inline-block;width: auto;">总金额：{{item.totalPrice?item.totalPrice:'暂无'}}元</text>
+								</view>
+								<view style="height: 88rpx;line-height: 88rpx;">
+									<uni-icons type="right" size="24"></uni-icons>
+								</view>
 							</view>
 						</template>
 					</uni-list-item>
@@ -65,8 +70,12 @@
 				let end = year + '-' + month + '-' + da 
 				let beg = year + '-' + month + '-01' 
 				this.range = [beg,end]
+			},
+			goDetail(item){
+				uni.navigateTo({
+					url: '/package1/staff/staffSaleDetail?createBy=' + item.createBy+'&range='+JSON.stringify(this.range)
+				})
 			}
-			
 		}
 	}
 </script>