Commit 025b973d authored by 罗超's avatar 罗超

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

# Conflicts:
#	components/navpage/index.vue
#	pages.json
#	pages/index/index.vue
parents 0f22cb84 fec91b99
......@@ -18,7 +18,7 @@
<view class="boxtc-b-item">{{item.Marriage}}</view>
</view>
</view>
<view class="boxt-r">
<view class="boxt-r" v-if="item.MatchingRate>0">
匹配度 {{item.MatchingRate}}%
</view>
</view>
......
......@@ -28,6 +28,7 @@
<rubik v-if="subItem.Id == 'rubik'" :ad="subItem.data"></rubik>
<!-- 网课列表 -->
<rgoods v-if="subItem.Id == 'educationCustom'" :goods="subItem.data"></rgoods>
<matchmaking v-if="subItem.Id == 'miaiuser'" :navs="subItem.data"></matchmaking>
</template>
</template>
</template>
......@@ -66,12 +67,14 @@
import activity from "@/components/navpage/activity";
import rubik from "@/components/rubik/index";
import rgoods from "@/components/study/index.vue";
import matchmaking from "@/components/matchmaking/index";
export default {
components: {
cats,
activity,
rubik,
rgoods
rgoods,
matchmaking
},
props: ["navs"],
data() {
......
......@@ -649,6 +649,8 @@
}
},{
"path":"carrier/list"//品牌详情
},{
"path":"identification"//身份识别
}] }
],
"globalStyle": {
......
......@@ -222,7 +222,9 @@
}
},
onShow() {
this.setAllMsgSee()
if(this.g.length>0){
this.setAllMsgSee()
}
},
created() {
this.mainColor = this.$uiConfig.mainColor;
......
......@@ -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>
......
......@@ -198,9 +198,8 @@ export default {
},
goUserinfo(x){//用户信息
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId
url: '/pages/blindDate/persondetails?UserId='+ x.CreateBy
});
innerAudioContext.stop();
}
},
......
......@@ -132,7 +132,9 @@
},
onShow() {
this.getMiaiMessagePageList();
this.setAllMsgSee();
if(this.sysMsgData.length>0){
this.setAllMsgSee()
}
},
mounted() {
uni.setNavigationBarTitle({
......
......@@ -206,7 +206,9 @@
this.pricecolor = this.$uiConfig.pricecolor;
},
onShow(){
// this.setAllMsgSee();
if(this.visitorData.length>0){
this.setAllMsgSee()
}
this.getMiaiMessageVisitorPageList()
},
......
......@@ -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) {
......
......@@ -18,6 +18,7 @@
<u-icon name="arrow-left" size="44"></u-icon>
</view>
</view>
<!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> -->
<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
:is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
<template v-for="(item, i) in myPageData.home_pages.navs">
......
......@@ -142,7 +142,7 @@
</view>
<view class="ac-x-r" :style="{'color':mainColor}">
<view style="margin-bottom: 5px;">
{{item.IsFree==1?'免费':'需要星星:'+item.Price }}
{{item.IsFree==1 || item.Price==0?'免费':'需要星星:'+item.Price }}
</view>
<view class="activeJoin-x" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==0">未开始</view>
<view class="activeJoin-x" :style="{'background-color':IsOpenMiAi==1?mainColor:'#000450'}" v-if="item.ActivityStatus==1">马上加入</view>
......@@ -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 && IsOpenMiAi==1'></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() {},
......@@ -186,11 +193,16 @@
uni.setNavigationBarTitle({
title: this.pageTitle,
});
this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
this.mainColor = this.$uiConfig.mainColor;
},
onLoad(option) {
this.msg.ActivityType = option.Id;
this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
if(option && option.Id){
this.msg.ActivityType = option.Id;
this.barshow=1
}
this.getData(1);
},
methods: {
......
......@@ -114,7 +114,7 @@
<view class="acdetailBottom">
<u-divider color="#0B0B0B;" half-width="50" border-color="#0B0B0B" fontSize="35">活动详情</u-divider>
<view class="acdetail_Intro" v-html="dataList.ActivityInfo">
<rich-text :nodes="dataList.ActivityInfo"></rich-text>
</view>
</view>
<template v-if="isShowBtn">
......@@ -191,6 +191,10 @@
(res) => {
if (res.resultCode == 1) {
this.dataList = res.data;
let richtext = res.data.ActivityInfo;
let regex = new RegExp('<img', 'gi');
richtext = richtext.replace(regex, `<img width="100%"`); //图片超出的处理
this.dataList.ActivityInfo = richtext
}
}
);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment