1

components/navpage/index.vue

@@ -24,6 +24,7 @@
 						<view v-html='subItem.data.content.replace(new RegExp("max-width: 100%", "gm"), "max-width:100%;display:block")'></view>
 					</view>
 					<rubik v-if="subItem.Id == 'rubik'" :ad="subItem.data"></rubik>
+					<matchmaking v-if="subItem.Id == 'miaiuser'" :navs="subItem.data"></matchmaking>
 				</template>
 			</template>
 		</template>
@@ -61,11 +62,13 @@
 	import cats from "@/components/navpage/category";
 	import activity from "@/components/navpage/activity";
 	import rubik from "@/components/rubik/index";
+	import matchmaking from "@/components/matchmaking/index"
 	export default {
 		components: {
 			cats,
 			activity,
-			rubik
+			rubik,
+			matchmaking
 		},
 		props: ["navs"],
 		data() {

pages/blindDate/personal/buyvip.vue

@@ -72,7 +72,7 @@
 	.buyvip .xaingq{
 		width: 100%;
 		background:linear-gradient( #EFB252, #FCD7A3);
-		padding-bottom:30px ;
+		padding-bottom:60px ;
 	}
 	.buyvip .buybtn{
 		width: calc(100vw - 30px);
@@ -88,7 +88,7 @@
 		border-radius: 22.5px;
 	}
 	.buybtn-box{
-		width: 100%;height: 115px;position: absolute;left: 0;bottom: -136rpx;background-image: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xqbuy-bg.png');background-size: 100%;
+		width: 100%;height: 115px;position: fixed;left: 0;bottom: 0px;background-image: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xqbuy-bg.png');background-size: 100%;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -142,13 +142,7 @@
 							</view>
 							
 						</view>
-						<view class="buybtn-box" style="">
-							<!-- <image src="" style="width: 100%;height: auto;" mode="widthFix"></image> -->
-							<view class="buybtn">
-								<text style="color: #00C6C1;margin-right: 5px;font-family: aa;">￥{{data.MemberBuyMoney?data.MemberBuyMoney.toFixed(2):0}}</text>
-								立即购买
-							</view>
-						</view>
+						
 					</view>
 					
 				
@@ -157,6 +151,13 @@
 				
 				
 			</view>
+			<view class="buybtn-box" style="">
+				<!-- <image src="" style="width: 100%;height: auto;" mode="widthFix"></image> -->
+				<view class="buybtn">
+					<text style="color: #00C6C1;margin-right: 5px;font-family: aa;">￥{{data.MemberBuyMoney?data.MemberBuyMoney.toFixed(2):0}}</text>
+					立即购买
+				</view>
+			</view>
 		</view>
 	</scroll-view>
 </template>

pages/friendcircle/friendcircle.vue

@@ -496,14 +496,14 @@
 				};
 				if(this.IsOpenMiAi ==0){
 					this.showAuth = true;
+				}else{
+					this.init();
 				}
 				
 			} else {
 				this.init();
 			}
-			if(this.IsOpenMiAi ==1){
-				this.init();
-			}
+			
 		},
 		onShow(){
 			if (!this.u) {

pages/kotra/activeInner.vue

@@ -156,19 +156,25 @@
 			<view style="padding:10px 0;">
 				<u-loadmore :status="status" bg-color="transparent" :load-text="loadText" :font-size="24" :margin-top="0" :margin-bottom="0" />
 			</view>
+			
 		</scroll-view>
+		<tabbar v-if='barshow==0'></tabbar>
 	</view>
 </template>
 
 <script>
+	import tabbar from "@/components/tabbar/index";
 	export default {
+		components: {
+			tabbar
+		},
 		data() {
 			return {
 				pageTitle: '活动列表',
 				msg: {
 					pageIndex: 1,
 					pageSize: 10,
-					ActivityType: 1
+					ActivityType: 0
 				},
 				dataList:[],
 				pageCount: 1,
@@ -179,6 +185,7 @@
 					nomore: "没有更多了",
 				},
 				IsOpenMiAi:0,//1开始 0 没开启
+				barshow:0,
 			}
 		},
 		created() {},
@@ -190,7 +197,11 @@
 			this.mainColor = this.$uiConfig.mainColor;
 		},
 		onLoad(option) {
+			if(option && option.Id){
 				this.msg.ActivityType = option.Id;
+				this.barshow=1
+			}
+			
 			this.getData(1);
 		},
 		methods: {