Merge branch 'dev' of http://git.2weisou.com/liumin/NewZkgj into dev

pages/mine/registerCode.vue

@@ -16,17 +16,19 @@
 			return {
 				qrCodeUrl: "",
 				projectId:"",
+				projectName:"",
 				appid:"",
 			};
 		},
 		onShow() {
 			this.projectId = uni.getStorageSync('buildingID').id;
+			this.projectName = uni.getStorageSync('buildingID').name;
 			this.appid = uni.getAccountInfoSync().miniProgram.appId;
 			this.qrCodeUrl = domain.baseUrl;
 		},
 		methods: {
 			down() {
-				let url = this.qrCodeUrl+'/customer/getQrCode?appid='+this.appid+'&page=pages/mine/registerForm&scene='+this.projectId
+				let url = this.qrCodeUrl+'/customer/getQrCode?appid='+this.appid+'&page=pages/mine/registerForm&scene='+this.projectId+'&projectName='+this.projectName
 				console.log(url)
 				uni.getImageInfo({
 					src:url,

pages/mine/registerForm.vue

@@ -78,7 +78,7 @@
 						<text class="t-time">{{$u.timeFormat(new Date(), 'hh:MM:ss')}}</text>
 						<text class="date">{{$u.timeFormat(new Date(), 'yyyy/mm/dd')}}</text>
 					</view>
-					<view class="address" style="font-size: 36rpx;">望京SOHO</view>
+					<view class="address" style="font-size: 36rpx;">{{pname}}</view>
 				</view>
 			</view>
 
@@ -132,7 +132,8 @@
 					projectName: 'xxx',
 					version:"",
 					checked: false,
-				},
+				},
+				pname:"",
 				daitiReceptionobj: {},
 				verifyPass: false,
 				qrCodeUrl: '',
@@ -145,7 +146,8 @@
 		onLoad(options) {
 			const sceneStr = decodeURIComponent(options.scene);
 			console.log(options)
-			this.parames.projectId = sceneStr
+			this.parames.projectId = sceneStr
+			this.pname = options.projectName
 			this.initFetch()
 		},
 		watch: {