Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

pages.json

@@ -363,6 +363,13 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/my/ad",
+			"style": {
+				"navigationBarTitleText": "营销",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/my/ruleCenter",
 			"style": {

pages/my/index.vue

@@ -142,7 +142,7 @@
 								<text class="banner-subtitle">带上你的超级项目,这里有无限的可能</text>
 							</view>
 							<view class="banner-button">
-								<text class="button-text" @click="goBusinessLicense">立即参与</text>
+								<text class="button-text" @click="goBusinessLicense(0)">立即参与</text>
 							</view>
 						</view>
 					</view>
@@ -517,7 +517,7 @@
 								<text class="banner-subtitle">亿职赞，为您提供前程似锦的优质项目</text>
 							</view>
 							<view class="banner-button">
-								<text class="button-text" @click="goBusinessLicense">立即参与</text>
+								<text class="button-text" @click="goBusinessLicense(1)">立即参与</text>
 							</view>
 						</view>
 					</view>
@@ -915,9 +915,9 @@
 		},
 		methods: {
 			// 入职公司
-			goBusinessLicense() {
+			goBusinessLicense(pageType) {
 				uni.navigateTo({
-					url: "/pages/my/switchRoles",
+					url: "/pages/my/ad?pageType="+pageType,
 				});
 			},