Merge branch 'master' of http://code.diaosaas.com/hxx/gangshi-un2

pages/group/groupInfo.vue

@@ -302,10 +302,11 @@
 			if (options.scene) {
 				that.packageId = decodeURIComponent(options.scene)
 				console.log('scene', that.packageId)
+			}else{
+				that.packageId = options.id
 			}
 			that.type = uni.getStorageSync('type')
-			that.packageId = options.id
-			// console.log(that.packageId)
+			console.log('that.packageId====',that.packageId)
 			if (that.type == 1) {
 				that.userType = user.userType
 				that.userId = user.enterpriseId