Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

package-lock.json

@@ -8850,7 +8850,7 @@
     },
     "qrcodejs2": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/qrcodejs2/download/qrcodejs2-0.0.2.tgz",
       "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
     },
     "qs": {

src/init.vue

@@ -79,21 +79,17 @@ export default {
 						var is = false;
 						if (res.data.code == 1) {
 							var { token, user } = res.data.data;
-							if(user.is_offical == 1){
+							// user.employee_detail.role_list.forEach(item => {
+							// 	if (user.is_official == 1) {
+							// 		if (item.name == 'admin' || item.name == 'creator' || item.name == 'point_manager') {is = true;}
+							// 	}
+							// });
+							if (user.is_official==1) {
 								that.$setUserData(user);
 								that.$router.replace({ path: '/index' });
 							}else{
 								that.$router.replace({ path: '/noAccess' });
 							}
-							// user.employee_detail.role_list.forEach(item => {
-							// 	// if (user.is_official == 1) {
-							// 		if (item.name == 'admin' || item.name == 'creator' || item.name == 'point_manager') {is = true;}
-							// 	// }
-							// });
-							// if (is) {
-							// } else {
-							// 	that.$router.replace({ path: '/noAccess' });
-							// }
 						}else if(res.data.code==2001){
 							this.dialogFormVisible=true;
 						}

src/views/set/rule.vue

@@ -406,7 +406,7 @@ export default {
 			let appid = '?appId='+this.$appId
 			let corpId = '&corpId='+localStorage.getItem('corpId')
 			// let corpId = '&corpId=ding011f57ab048cf202ffe93478753d9884'
-			let page = '&page='+encodeURIComponent(`pages/workbench/apply/apply?id=${encodeURIComponent(row)}`)//encodeURIComponent('小米')
+			let page = '&page='+encodeURIComponent(`pages/workbench/apply/apply?item=${encodeURIComponent(row)}`)//encodeURIComponent('小米')
 			let urls = url+appid+corpId+page
 			var qrcode = new QRCode('qrcode', {
 				text: urls, // 二维码内容
@@ -425,7 +425,7 @@ export default {
 			this.innerVisible = true
 			// 使用$nextTick确保数据渲染
 			this.$nextTick(() => {
-				this.payOrder(row.id)
+				this.payOrder(row)
 			})
 		},
 		// 关闭弹框,清除已经生成的二维码