Skip to content

M
mallapp
Commit c07f7c05 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 57eec44c
Show whitespace changes
Inline Side-by-side
Showing with 444 additions and 198 deletions
components/pubu/index.vue
View file @ c07f7c05
...@@ -6,7 +6,14 @@ ...@@ -6,7 +6,14 @@
:active-color="mainColor" :active-color="mainColor"
@change="change" @change="change"
style="margin-bottom: 30rpx" style="margin-bottom: 30rpx"
v-if="dataObj.showCat"
></u-tabs> ></u-tabs>
<u-empty
v-if="curDataObj.goodsList.length == 0"
text="暂无内容"
mode="list"
></u-empty>
<view v-if="curDataObj.goodsList.length > 0">
<view class="con" v-if="dataObj.listStyle == 5"> <view class="con" v-if="dataObj.listStyle == 5">
<view class="left"> <view class="left">
<view <view
...@@ -14,9 +21,13 @@ ...@@ -14,9 +21,13 @@
:key="index" :key="index"
v-if="index % 2 == 0" v-if="index % 2 == 0"
class="left-item" class="left-item"
@click="jumpPage(item)"
> >
<image :src="item.picUrl" class="item-img" mode="widthFix"></image> <image
:src="item.picUrl"
class="item-img"
mode="widthFix"
@click="jumpPage(item)"
></image>
<view class="flex between CreateByInfo"> <view class="flex between CreateByInfo">
<view class="flex CreateByName" @click="jumpPagePerson(item)"> <view class="flex CreateByName" @click="jumpPagePerson(item)">
<image <image
...@@ -132,6 +143,8 @@ ...@@ -132,6 +143,8 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view <view
class="choosetype" class="choosetype"
:style="{ background: mainColor }" :style="{ background: mainColor }"
...@@ -155,25 +168,54 @@ ...@@ -155,25 +168,54 @@
</view> </view>
</view> </view>
<view <!-- <view
class="fabuBtn" class="fabuBtn"
@click="toggleFabu"
:style="{ background: mainColor }" :style="{ background: mainColor }"
> >
发布 发布
</view> -->
<!-- 发布动态按钮 -->
<view class="fbanniu" @click="toggleFabu">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/fabupyq.png"
style="height: 26rpx"
mode="aspectFit"
></image>
<text style="font-size: 10px; color: #fff">发布</text>
</view> </view>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
<u-modal
v-model="show"
:content="showtext"
:show-cancel-button="true"
@confirm="queren"
></u-modal>
</view> </view>
</template> </template>
<script> <script>
import auth from "@/components/auth/index.vue";
export default { export default {
props: ["dataObj"], props: ["dataObj"],
components: {
auth,
},
data() { data() {
return { return {
current: 0, current: 0,
mainColor: "", mainColor: "",
curDataObj: {}, curDataObj: {},
isShowFabu: false, isShowFabu: false,
show: false,
showtext: "",
u: {},
isAttestation: 0,
}; };
}, },
computed: {}, computed: {},
...@@ -207,6 +249,19 @@ export default { ...@@ -207,6 +249,19 @@ export default {
this.isShowFabu = !this.isShowFabu; this.isShowFabu = !this.isShowFabu;
}, },
jumpfabu(type) { jumpfabu(type) {
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: "",
};
this.showAuth = true;
} else {
if (this.isAttestation == 1) {
//判断是否认证了
// uni.navigateTo({
// url: "/pages/blindDate/postPublishing?ForumId=" + this.msg.ForumId,
// });
if (type === 1) { if (type === 1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/blindDate/releasePosts", url: "/pages/blindDate/releasePosts",
...@@ -216,6 +271,33 @@ export default { ...@@ -216,6 +271,33 @@ export default {
url: "/pages/blindDate/postPublishing", url: "/pages/blindDate/postPublishing",
}); });
} }
} else if (this.isAttestation == 0) {
this.show = true;
this.showtext = "还未认证，是否去认证？";
} else if (this.isAttestation == 2) {
this.show = true;
this.showtext = "还未上传身份证信息,是否去上传？";
}
}
},
queren() {
let mall_UserInfo = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo")
: null;
if (mall_UserInfo != null) {
if (this.isAttestation == 0) {
uni.navigateTo({
url:
"/pages/blindDate/editData?UserId=" +
mall_UserInfo.UserId +
"&Jumptype=2&type=1",
});
} else if (this.isAttestation == 2) {
uni.navigateTo({
url: "/pages/blindDate/personal/IDidentification?Jumptype=2",
});
}
}
}, },
//点赞 //点赞
dianzan(item) { dianzan(item) {
...@@ -237,6 +319,7 @@ export default { ...@@ -237,6 +319,7 @@ export default {
duration: 2000, duration: 2000,
icon: "none", icon: "none",
}); });
this.$emit("refresh");
uni.reLaunch({ uni.reLaunch({
url: "/pages/index/index", url: "/pages/index/index",
}); });
...@@ -264,6 +347,7 @@ export default { ...@@ -264,6 +347,7 @@ export default {
duration: 2000, duration: 2000,
icon: "none", icon: "none",
}); });
this.$emit("refresh");
uni.reLaunch({ uni.reLaunch({
url: "/pages/index/index", url: "/pages/index/index",
}); });
...@@ -271,10 +355,31 @@ export default { ...@@ -271,10 +355,31 @@ export default {
} }
); );
}, },
getisAttestation() {
//认证成功
this.request2(
{
url: "/api/Mall/GetHome",
data: { page_id: 0, open_school: 0, StoreId: 0 },
},
(res) => {
uni.setStorageSync("basedata", res.data);
let basedata = wx.getStorageSync("basedata");
this.isAttestation = basedata.user_info.isAttestation
? basedata.user_info.isAttestation
: 0;
this.isFaTie = basedata.user_info.isFaTie
? basedata.user_info.isFaTie
: 0;
},
(error) => {}
);
},
}, },
mounted() { mounted() {
this.getisAttestation();
console.log("tag", this.dataObj);
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
console.log(29, this.dataObj);
this.dataObj.catList.map((item, index) => { this.dataObj.catList.map((item, index) => {
if (index === this.current) { if (index === this.current) {
this.curDataObj = JSON.parse(JSON.stringify(item)); this.curDataObj = JSON.parse(JSON.stringify(item));
...@@ -366,8 +471,8 @@ export default { ...@@ -366,8 +471,8 @@ export default {
} }
.choosetype { .choosetype {
position: fixed; position: fixed;
right: 30rpx; right: 20rpx;
bottom: 240rpx; bottom: 270rpx;
width: 480rpx; width: 480rpx;
height: 100rpx; height: 100rpx;
// background-color: #00c6c1; // background-color: #00c6c1;
...@@ -391,19 +496,33 @@ export default { ...@@ -391,19 +496,33 @@ export default {
} }
} }
} }
.fabuBtn { // .fabuBtn {
// position: fixed;
// right: 30rpx;
// bottom: 130rpx;
// width: 100rpx;
// height: 100rpx;
// // background-color: #00c6c1;
// border-radius: 50%;
// text-align: center;
// line-height: 99rpx;
// font-size: 32rpx;
// font-family: PingFang SC;
// font-weight: 500;
// color: #ffffff;
// }
.fbanniu {
width: 42px;
height: 42px;
border-radius: 21px;
position: fixed; position: fixed;
right: 30rpx; right: 20rpx;
bottom: 130rpx; bottom: 180rpx;
width: 100rpx; background: #40766e;
height: 100rpx; display: flex;
// background-color: #00c6c1; flex-direction: column;
border-radius: 50%; align-items: center;
text-align: center; justify-content: center;
line-height: 99rpx; z-index: 99;
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
color: #ffffff;
} }
</style> </style>
components/tabbar/index.vue
View file @ c07f7c05
...@@ -94,8 +94,22 @@ ...@@ -94,8 +94,22 @@
bottom: 10upx; bottom: 10upx;
border-radius: 150upx; border-radius: 150upx;
} }
/* ----------------不显示图标导航样式-------------- */
.txtBtn2 {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #b2b3b4;
}
.activeTxtBtn2 {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 800;
/* color: #111111; */
}
</style> </style>
<template> <template>
<view>
<view v-if="isShowIcon === 1"> <view v-if="isShowIcon === 1">
<view <view
class="tabbarMain" class="tabbarMain"
...@@ -136,6 +150,49 @@ ...@@ -136,6 +150,49 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="isShowIcon === 0">
<view
class="tabbarMain"
:class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
v-if="navs && navs.length > 0"
>
<view
class="tabBtnMina"
:class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']"
mode=""
>
<view
class="itmMain"
v-for="(x, i) in navs"
:key="i"
@click.stop="goUrl(x.url)"
>
<!-- <image
class="imgse"
:fade-show="false"
v-if="active != i"
mode="heightFix"
:src="x.icon"
></image>
<image
class="imgse"
:fade-show="false"
v-if="active === i"
mode="heightFix"
:src="x.active_icon"
></image> -->
<text
class="txtBtn"
:class="{ activeTxtBtn2: active == i }"
:style="{ color: active == i ? x.active_color : x.color }"
>{{ x.text }}</text
>
</view>
</view>
</view>
</view>
</view>
</template> </template>
<script> <script>
...@@ -156,6 +213,8 @@ export default { ...@@ -156,6 +213,8 @@ export default {
let data = uni.getStorageSync("basedata"); let data = uni.getStorageSync("basedata");
if (data) { if (data) {
this.isShowIcon = data.navbar.isShowIcon; this.isShowIcon = data.navbar.isShowIcon;
} else {
this.isShowIcon = 1;
} }
}, },
mounted() { mounted() {
......
pages/blindDate/postDetails2.vue
View file @ c07f7c05
...@@ -581,6 +581,8 @@ ...@@ -581,6 +581,8 @@
align-items: center; align-items: center;
font-weight: bold; font-weight: bold;
margin-top: 15px; margin-top: 15px;
box-sizing: border-box;
padding: 0 30rpx;
" "
> >
<text>评论</text> <text>评论</text>
...@@ -588,7 +590,10 @@ ...@@ -588,7 +590,10 @@
</view> </view>
<u-empty v-if="g.length == 0" text="暂无回复" mode="list"></u-empty> <u-empty v-if="g.length == 0" text="暂无回复" mode="list"></u-empty>
<view v-if="g.length > 0"> <view
v-if="g.length > 0"
style="box-sizing: border-box; padding: 0 30rpx"
>
<view v-for="(x, i) in g" :key="i" style="width: 100%"> <view v-for="(x, i) in g" :key="i" style="width: 100%">
<view <view
class="pl-top" class="pl-top"
...@@ -1267,7 +1272,6 @@ export default { ...@@ -1267,7 +1272,6 @@ export default {
(res) => { (res) => {
this.ReplyNum = res.data.totalCount; this.ReplyNum = res.data.totalCount;
this.commentData = res.data; this.commentData = res.data;
console.log(1155, this.commentData);
} }
); );
}, },
...@@ -1738,7 +1742,25 @@ export default { ...@@ -1738,7 +1742,25 @@ export default {
icon: "none", icon: "none",
}); });
// this.init(1); // this.init(1);
// this.getActivityInfo(); if (type === 1) {
this.getCount();
} else {
this.request2(
{
url: "/api/AppletMiai/GetActivityDiscussPageList",
data: this.msg,
},
(res) => {
if (res.resultCode == 1) {
this.g = res.data.pageData;
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
}
}
);
}
} }
} }
); );
...@@ -1771,8 +1793,25 @@ export default { ...@@ -1771,8 +1793,25 @@ export default {
duration: 2000, duration: 2000,
icon: "none", icon: "none",
}); });
// this.init(1); if (type === 1) {
// this.getActivityInfo(); this.getCount();
} else {
this.request2(
{
url: "/api/AppletMiai/GetActivityDiscussPageList",
data: this.msg,
},
(res) => {
if (res.resultCode == 1) {
this.g = res.data.pageData;
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
}
}
);
}
} }
} }
); );
......
pages/blindDate/postbar.vue
View file @ c07f7c05
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</view> </view>
<view class="right"> <view class="right">
<view class="activetitle">{{ x.ActivityTitle }}</view> <view class="activetitle">{{ x.ActivityTitle }}</view>
<view class="Content" v-html="x.Content"></view> <view class="Content">{{ x.LabelList.join(",") }}</view>
<view class="hot" v-if="x.HotCommentList.length > 0"> <view class="hot" v-if="x.HotCommentList.length > 0">
<view class="hotTag">人气点评</view> <view class="hotTag">人气点评</view>
<view class="hotCon">{{ x.HotCommentList[0].Comment }}</view> <view class="hotCon">{{ x.HotCommentList[0].Comment }}</view>
...@@ -197,7 +197,12 @@ ...@@ -197,7 +197,12 @@
<view style="width: 100%; height: 50px"></view> <view style="width: 100%; height: 50px"></view>
</scroll-view> </scroll-view>
</view> </view>
<view class="release" v-if="isFaTie == 1" @click.stop="gopublishing()"> <view
class="release"
v-if="isFaTie == 1"
@click.stop="gopublishing()"
style="display: none"
>
<!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pp-fabu.png" style="width: 100%;height: 100%;"></image> --> <!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pp-fabu.png" style="width: 100%;height: 100%;"></image> -->
<!-- 发布动态按钮 --> <!-- 发布动态按钮 -->
<view class="fbanniu"> <view class="fbanniu">
...@@ -479,15 +484,37 @@ export default { ...@@ -479,15 +484,37 @@ export default {
this.isShowFabu = !this.isShowFabu; this.isShowFabu = !this.isShowFabu;
}, },
jumpfabu(type) { jumpfabu(type) {
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: "",
};
this.showAuth = true;
} else {
if (this.isAttestation == 1) {
//判断是否认证了
// uni.navigateTo({
// url: "/pages/blindDate/postPublishing?ForumId=" + this.msg.ForumId,
// });
if (type === 1) { if (type === 1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/blindDate/releasePosts", url: "/pages/blindDate/releasePosts",
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: "/pages/blindDate/postPublishing", url:
"/pages/blindDate/postPublishing?ForumId=" + this.msg.ForumId,
}); });
} }
} else if (this.isAttestation == 0) {
this.show = true;
this.showtext = "还未认证，是否去认证？";
} else if (this.isAttestation == 2) {
this.show = true;
this.showtext = "还未上传身份证信息,是否去上传？";
}
}
}, },
}, },
}; };
...@@ -763,6 +790,7 @@ export default { ...@@ -763,6 +790,7 @@ export default {
position: absolute; position: absolute;
top: 60rpx; top: 60rpx;
right: 30rpx; right: 30rpx;
z-index: 999;
box-sizing: border-box; box-sizing: border-box;
padding: 0 20rpx; padding: 0 20rpx;
.tiezi, .tiezi,
......
pages/index/index.vue
View file @ c07f7c05
...@@ -204,6 +204,7 @@ ...@@ -204,6 +204,7 @@
<Pubu <Pubu
v-if="d.id == 'blindDatePPPlus'" v-if="d.id == 'blindDatePPPlus'"
:dataObj="d.data" :dataObj="d.data"
@refresh="refreshPage"
></Pubu> ></Pubu>
</template> </template>
</view> </view>
...@@ -333,7 +334,7 @@ export default { ...@@ -333,7 +334,7 @@ export default {
orderPopupdata: {}, //离线收益的弹窗 orderPopupdata: {}, //离线收益的弹窗
showorder: false, //显示弹出 showorder: false, //显示弹出
carrierType: "", //载体type carrierType: "", //载体type
AppletID:0,//判断小程序的id,相亲：11 AppletID: 0, //判断小程序的id,相亲：11
}; };
}, },
components: { components: {
...@@ -371,7 +372,7 @@ export default { ...@@ -371,7 +372,7 @@ export default {
miaiactivitytype, miaiactivitytype,
miaiactivityCustom, miaiactivityCustom,
orderPopup, orderPopup,
Pubu Pubu,
}, },
onLoad(options) { onLoad(options) {
let that = this; let that = this;
...@@ -622,11 +623,7 @@ export default { ...@@ -622,11 +623,7 @@ export default {
} }
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
}, },
created() { created() {},
let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
this.AppletID = basedata.home_pages.id?basedata.home_pages.id:0;
console.log(631,this.AppletID)
},
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
onShareTimeline() { onShareTimeline() {
setTimeout(() => { setTimeout(() => {
...@@ -1541,6 +1538,11 @@ export default { ...@@ -1541,6 +1538,11 @@ export default {
//选择取消地址 //选择取消地址
this.$refs.city[0].getPickcar(Name); this.$refs.city[0].getPickcar(Name);
}, },
refreshPage() {
// this.init();
// this.$forceUpdate();
// console.log("tag", "刷新");
},
yj() { yj() {
uni.navigateTo({ uni.navigateTo({
// url: '/pages/blindDate/persondetails?UserId=123978' // url: '/pages/blindDate/persondetails?UserId=123978'
...@@ -1639,5 +1641,4 @@ export default { ...@@ -1639,5 +1641,4 @@ export default {
font-size: 36rpx; font-size: 36rpx;
color: #8f8f94; color: #8f8f94;
} */ } */
</style> </style>
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