Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

pages/kotra/activeSignUp.vue

@@ -209,7 +209,7 @@
 				<template v-if="signMsg.FirstShopLinkManList.length>0">
 					<view style="display: flex;justify-content: space-between;" v-if="isShowAdd">
 						<view class="ac_upBtn" @click="addPerson()">提交联系人信息</view>
-						<view class="ac_CancelBtn">取消</view>
+						<view class="ac_CancelBtn" @click="isShowAdd=false">取消</view>
 					</view>
 					<view v-if="!isShowAdd">
 						<view class="ac_CancelBtn" style="width:300rpx;margin:auto;color:#F70027;border-color:#F70027" 
@@ -260,9 +260,7 @@
 			console.log(options, 'optionssss');
 			if (options && options.Id) {
 				this.signMsg.ActivityIds = options.Id;
-				
 			}
-			// this.signMsg.ActivityIds =
 			uni.setNavigationBarTitle({
 				title: "活动报名",
 			});