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

components/tradeActivity/index.vue

@@ -5,7 +5,14 @@
 			{{item.ActivityName}}
 			<img :src="item.CoverImg" style="margin-bottom:-4px" mode="widthFix" />
 		</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>
 
@@ -14,14 +21,24 @@
 		props: ["dataObj"],
 		data() {
 			return {
-                tradeData:this.dataObj
+				mc:'',
+                tradeData:this.dataObj,
+				Ids:'7,8,9'
 			}
 		},
+		mounted() {
+			this.mc = this.$uiConfig.mainColor;
+		},
 		created() {
 			console.log("tradeData", this.tradeData);
 		},
 		methods: {
-
+			//跳转报名
+			goSignUp(){
+				uni.navigateTo({
+					url: "/pages/kotra/activeSignUp?Id="+this.Ids
+				});
+			}
 		},
 	};
 </script>

pages/kotra/activeSignUp.vue

@@ -131,11 +131,16 @@
 				natureList: [], //性质数组
 				commonIndex:-1,
 				signMsg:{
-					ActivityIds:'',
-					CompanyName:'',
-					Nature:'',
+					ActivityIds:'7,8,9',
+					CompanyName:'成都微途科技',
+					Nature:'1',
 					Remark:'',
-					FirstShopLinkManList:[]
+					FirstShopLinkManList:[{
+						LinkMan:'张三',
+						LinkTel:'12345678',
+						Post:'总经理',
+						CountryInfo:'中国四川省成都市'
+					}]
 				}
 			}
 		},
@@ -145,6 +150,7 @@
 			this.getNatureList();
 		},
 		onLoad(options) {
+			console.log(options,'optionssss');
 			uni.setNavigationBarTitle({
 			  title: "活动报名",
 			});