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

components/tradeActivity/index.vue

@@ -72,6 +72,7 @@
 				</view>
 			</view>
 		</view>
+		<view style="width:100%;height:100rpx;"></view>
 		<view class="trade_Btn">
 			<u-button size="80" :ripple="true" :custom-style="{
 				  backgroundColor: mc,

pages/kotra/activeSignUp.vue

@@ -221,12 +221,20 @@
 				<view class="ac_upBtn" style="width:90%;margin:25rpx auto" @click="goSignUp()">提交</view>
 			</view>
 		</view>
+		<auth
+		  v-if="showAuth"
+		  @changeuserinfo="reloadUserinfo"
+		  @gbAuth="gbAuth"
+		></auth>
 	</view>
 </template>
 
 <script>
+	import auth from "@/components/auth/index.vue";
 	export default {
-		components: {},
+		components: {
+			auth
+		},
 		data() {
 			return {
 				mc: "",
@@ -248,16 +256,26 @@
 				},
 				isShowAdd:true,
 				isEdit:false,
-				EditIndex:-1
+				EditIndex:-1,
+				showAuth:false,
+				u: {}
 			}
 		},
 		created() {},
 		mounted() {
 			this.mc = this.$uiConfig.mainColor;
+			this.u = uni.getStorageSync("mall_UserInfo");
+			if (!this.u) {
+			  this.u = {
+			    nickName: "未登录",
+			    avatarUrl: "",
+			  };
+			    this.showAuth = true;
+			} else {
 				this.getNatureList();
+			}
 		},
 		onLoad(options) {
-			console.log(options, 'optionssss');
 			if (options && options.Id) {
 				this.signMsg.ActivityIds = options.Id;
 			}
@@ -274,6 +292,14 @@
 			});
 		},
 		methods: {
+			reloadUserinfo() {
+			  this.u = uni.getStorageSync("mall_UserInfo");
+			  this.getNatureList();
+			},
+			//关闭登录窗口
+			gbAuth() {
+			  uni.navigateBack()
+			},
 			//获取性质
 			getNatureList() {
 				this.request2({
@@ -282,7 +308,6 @@
 					},
 					(res) => {
 						if (res.resultCode == 1) {
-							console.log(res, '数据');
 							this.natureList = res.data;
 						}
 					}
@@ -348,7 +373,6 @@
 			},
 			//立即报名
 			goSignUp() {
-				console.log(this.signMsg,'this.signMsg');
 				if(this.signMsg.CompanyName==''){
 					uni.showToast({
 					  title: '请输入单位/企业/机构名称',
@@ -376,7 +400,6 @@
 					},
 					(res) => {
 						if (res.resultCode == 1) {
-							console.log(res, '数据');
 							uni.showToast({
 								title:res.message,
 								icon:'none'