Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0

pageNotification/index.vue

@@ -42,7 +42,6 @@ onShow(() => {
 
 const saveImage = () => {
 	// #ifdef  APP-PLUS
-	saveQrcodeImg()
 	uni.downloadFile({
 		url: vdata.QrcodeUrl,
 		success: (res) => {
@@ -92,16 +91,6 @@ function downloadQR() {
 }
 
 //#endif
-const saveQrcodeImg = () => {
-	saveHeadImgFile(vdata.QrcodeUrl, 80)
-		.then((success) => {
-		  infoBox.showSuccessToast('保存成功')
-		})
-		.catch((err) => {
-		  console.log(err)
-		  infoBox.showErrorToast('保存失败')
-		})
-}
 
 const saveWxQrcodeImg = (data) => {
 	const fileManager = wx.getFileSystemManager()

pages/index/index.vue

@@ -140,6 +140,11 @@
 		// 	icon: '/static/indexImg/icon-staff.svg',
 		// 	pageUrl: 'PAGES_USER'
 		// },
+		{
+			title: '订阅通知',
+			icon: '/static/indexImg/icon-notification.svg',
+			pageUrl: 'PAGES_NOTIFICATION_INDEX',
+		},
 		{
 			title: '设置中心',
 			icon: '/static/indexImg/icon-cashier.svg',