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

components/tradeActivity/index.vue

+<style>
+	.trade-activity {
+		padding: 30rpx;
+		background-color: #F6F6F6;
+		max-height: 80vh;
+	}
+
+	.trade_List {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 30rpx;
+		margin-bottom: 20rpx;
+		padding: 30rpx;
+		display: flex;
+	}
+
+	.tradeImgDiv {
+		width: 80px;
+		height: 80px;
+		flex-shrink: 0;
+		border-radius: 20rpx;
+		overflow: hidden;
+		margin-right: 20rpx;
+	}
+
+	.tradeName {
+		width:100%;
+		display: flex;
+		justify-content: space-between;
+	}
+	.Activity_Name{
+		font-weight: bold;
+		font-size: 30rpx;
+		width:430rpx;
+		color: #1F1F1F;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+	}
+	.Activity_Time {
+		color: #999999;
+		font-size: 25rpx;
+	}
+	.trade_Btn{
+		position: fixed;
+		width:100%;
+		bottom:35rpx;
+		left:17%;
+	}
+</style>
 <template>
 	<view class="trade-activity">
- 
-		<view class="ad-chi" v-for="(item, index) in tradeData">
-			{{item.ActivityName}}
-			<img :src="item.CoverImg" style="margin-bottom:-4px" mode="widthFix" />
+		<view class="trade_List" v-for="(item, index) in tradeData">
+			<view class="tradeImgDiv">
+				<image :src="item.CoverImg" style="width:100%;height:100%" mode="aspectFill"></image>
+			</view>
+			<view>
+				<view class="tradeName">
+					<view class="Activity_Name">{{item.ActivityName}}</view>
+					<view>
+						<u-checkbox-group>
+							<u-checkbox v-model="item.IsCheck" :disabled="item.IsDefault"></u-checkbox>
+						</u-checkbox-group>
+					</view>
+				</view>
+				<view class="Activity_Time" style="margin-top:20rpx;">
+					报名时间：{{item.StartTime}}
+				</view>
+				<view class="Activity_Time" style="margin-top:10rpx;">
+					活动时间：{{item.EndTime}}
+				</view>
+			</view>
+		</view>
+		<view class="trade_Btn">
+			<u-button size="80" :ripple="true" :custom-style="{
+				  backgroundColor: mc,
+				  height: '80rpx',
+				  color: '#FFF',
+				  fontSize: '14px',
+				  margin: '0 3vw',
+				  width: '60vw',
+				}" @click="goSignUp()">立即报名</u-button>
 		</view>
-		<u-button size="80" :ripple="true" shape="circle" :custom-style="{
-		  backgroundColor: mc,
-		  height: '80rpx',
-		  color: '#FFF',
-		  fontSize: '14px',
-		  margin: '0 3vw',
-		  width: '40vw',
-		}" @click="goSignUp()">立即报名</u-button>
 	</view>
 </template>
 
@@ -21,22 +91,28 @@
 		props: ["dataObj"],
 		data() {
 			return {
-				mc:'',
-                tradeData:this.dataObj,
-				Ids:'7,8,9'
+				mc: '',
+				tradeData: this.dataObj,
+				Ids: ''
 			}
 		},
 		mounted() {
 			this.mc = this.$uiConfig.mainColor;
 		},
 		created() {
-			console.log("tradeData", this.tradeData);
 		},
 		methods: {
 			//跳转报名
-			goSignUp(){
+			goSignUp() {
+				let MyArray=[];
+				this.tradeData.forEach(x=>{
+					if(x.IsCheck){
+						MyArray.push(x.Id);	
+					}
+				})
+				this.Ids = MyArray.toString();				
 				uni.navigateTo({
-					url: "/pages/kotra/activeSignUp?Id="+this.Ids
+					url: "/pages/kotra/activeSignUp?Id=" + this.Ids
 				});
 			}
 		},

pages.json

@@ -770,6 +770,8 @@
 					"style": {
 						"navigationStyle": "custom"
 					}
+				},{
+					"path":"signSuccse"//报名成功页面
 				}
 				
 			]

pages/kotra/activeSignUp.vue

@@ -260,8 +260,9 @@
 			console.log(options, 'optionssss');
 			if (options && options.Id) {
 				this.signMsg.ActivityIds = options.Id;
+				
 			}
-			this.signMsg.ActivityIds =
+			// this.signMsg.ActivityIds =
 				uni.setNavigationBarTitle({
 					title: "活动报名",
 				});
@@ -378,6 +379,15 @@
 					(res) => {
 						if (res.resultCode == 1) {
 							console.log(res, '数据');
+							uni.showToast({
+								title:res.message,
+								icon:'none'
+							})
+							setTimeout(()=>{
+								uni.redirectTo({
+									url:"/pages/kotra/signSuccse"
+								})
+							},1000)
 						}
 					}
 				);

pages/kotra/signSuccse.vue

+<style>
+	.signSuccse{
+		width: 100%;
+		height: 100vh;
+		overflow-y: auto;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		
+	}
+	.signSuccse .text{
+		font-size: 15px;
+		font-family: PingFang SC;
+		
+		color: #111111;
+		line-height: 21px;
+	}
+	.signSuccse .btn{
+		width: 420rpx;
+		height: 44px;
+		border-radius: 10px;
+		background: #F70027;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 67px;
+		font-size: 16px;
+		color: #FFFFFF;
+		
+	}
+	.popup_box{
+		width: 100%;
+		background: #FFF;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		
+		border-radius: 10px;
+		background-image: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/signSuccsetc.png');
+		background-size:cover;
+		position: relative;
+		height: 622rpx;
+	}
+</style>
+<template>
+	<view class="signSuccse">
+		<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/signSuccsebg.png" mode="aspectFill" style="width: 73px;height: 73px;margin-top: 80px;"></image>
+		<view style="font-size: 20px;color: #111111;font-weight: bold;margin-top: 22px;">报名信息已提交</view>
+		<view class="text" style="margin-top: 23px;">审核通过后(大会开始前3日）</view>
+		<view class="text">参会入场短信将发送至您的手机</view>
+		<view class="text">请留意查收！</view>
+		<view class="btn" @click="golist">好的</view>
+		<u-popup v-model="rzshow" mode="center" length="80%" :closeable="true">
+			<view class="popup_box">
+				<view class="btn"  style="position: absolute;left: 50%;bottom: 78rpx;margin-left: -210rpx;" @click="queren">立即入驻</view> 
+				<u-icon name="cross" color="#909399"  size="42" style="position: absolute;right: 15px;top: 15px;"  @click="rzshow=false"></u-icon>
+			</view>
+			
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				companyStatus:0,
+				rzshow:false,
+			}
+		},
+		created() {
+			
+		},
+		mounted() {
+			setTimeout(()=>{
+				this.getComponyStatus()
+				
+			},2000)
+		},
+		methods:{
+			// 获取公司认证信息
+			getComponyStatus(){
+				let that = this
+				let parms = {
+					url: "/api/AppletTrade/GetCommpanyStatus",
+				}
+				this.request2(parms, (res) => {
+					if (res.resultCode == 1&&res.data!=null) {
+						// 获取公司名字和认证状态
+						that.companyStatus=res.data.CompanyStatus
+						if(that.companyStatus!=5){
+							this.rzshow=true
+						}						
+					}
+				})
+			},
+			queren(){//去认证
+				uni.reLaunch({
+				  url: "/pages/kotra/identification",
+				});
+			},
+			golist(){//报名列表
+				uni.reLaunch({
+				  url: "/pages/kotra/signList",
+				});
+				
+			}
+		}
+	}
+</script>
+