Skip to content

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

1

parents 2f3fe2f8 905d1c7b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1338 additions and 211 deletions
components/auth/index.vue
View file @ cfc9c0fd
...@@ -92,6 +92,9 @@ ...@@ -92,6 +92,9 @@
//调用获取code //调用获取code
getCode(obj) { getCode(obj) {
var that = this; var that = this;
uni.showLoading({
title: '登录中'
});
uni.getUserInfo({ uni.getUserInfo({
provider: 'weixin', provider: 'weixin',
success: info => { success: info => {
...@@ -117,9 +120,7 @@ ...@@ -117,9 +120,7 @@
getLogin(obj) { getLogin(obj) {
var that = this; var that = this;
that.showLogin =false that.showLogin =false
uni.showLoading({
title: '登录中'
});
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0; let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0; let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0; let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
......
components/miaiactivityCustom/index.vue 0 → 100644
View file @ cfc9c0fd
<template>
<div class="goods-box" :class="{ flex: goods.catPosition == 'left' }">
<div :class="{ 'right-slider': goods.catPosition == 'top' }">
<!-- 只是商品 -->
<template>
<!--列表模式-->
<style6 v-if="goods.listStyle == -1" :goods-info="goods"></style6>
<!--左右滚动-->
<style5 v-if="goods.listStyle == 0" :goods-info="goods"></style5>
<!--一行一个-->
<style1 v-if="goods.listStyle == 1" :goods-info="goods"></style1>
</template>
</div>
</div>
</template>
<script>
import style1 from './style1';
import style5 from './style5';
import style6 from './style6';
export default {
props: ['goods'],
components: {
style1,
style5,
style6,
},
data() {
return {
mainColor: '',
currentList: [],
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
if (this.goods.showCat) {
this.currentList = this.goods.catList[0].goodsList;
} else {
this.currentList = this.goods.list;
}
},
methods: {
}
};
</script>
<style>
.style4View {
display: inline-block;
width: 100%;
padding-left: 80px;
box-sizing: border-box;
}
.goods-box {
/* margin: 20rpx 0; */
}
.goods-box .tips {
z-index: 50 !important;
}
.goods-box.flex {
display: flex;
}
.goods-box.flex .left-slider {
width: 80px;
position: absolute;
}
.goods-box.flex .right-slider {
flex: 1;
width: 1rpx;
}
.defaultz .van-sticky {
z-index: 1 !important;
}
.goods-box .van-tabs__scroll {
background: none;
}
.goods-box ._div {
width: 100%;
}
</style>
components/miaiactivityCustom/style1.vue 0 → 100644
View file @ cfc9c0fd
<template>
<div :style="{
'background-color': goodsInfo.backgroundColor,
'paddingLeft':goodsInfo.PaddingLeft+'px',
'paddingRight':goodsInfo.PaddingRight+'px',
'paddingTop':goodsInfo.PaddingTop+'px',
'paddingBottom':goodsInfo.PaddingBottom+'px'
}">
<div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{
borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'
}">
<image style="
width: calc(100vw - 24px);
height: 100vw;
border-radius: 10rpx 10rpx 0 0;
"
mode='aspectFill' :src="item.picUrl" />
<div class="good-info">
<div class="good-name" v-if="item.name">{{ item.name }}</div>
<div>
<view style="display:inline-block;padding: 2px 4px;border-radius: 2px;font-size: 10px;color: #FAF8F9;margin-right:5px"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}}
</view>
</div>
</div>
</div>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</div>
</template>
<script>
import auth from '@/components/auth/index.vue';
export default {
components: {
auth
},
props: ['goodsInfo'],
data() {
return {
mainColor: '',
showSku: false,
sku: {},
showAuth: false,
u: {},
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
methods: {
openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo');
if (item.linkUrl) {
uni.navigateTo({
url: item.linkUrl,
});
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
</script>
<style>
.good_study_one {
margin: 12px;
position: relative;
border: 1rpx solid transparent;
border-radius: 10rpx;
/* border: 1px solid rgb(226, 226, 226); */
overflow: hidden;
}
.good_study_one .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.good_study_one .guding {
position: relative;
}
.good_study_one .guding .img-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
}
.good_study_one .good-info {
padding: 12rpx;
margin-top: -5px;
}
.good_study_one .good-info .good-name {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
margin-bottom: 13px;
}
.good_study_one .good-info .good-price-info {
display: flex;
}
.good_study_one .good-info .good-price-info .price {
color: #999999;
font-size: 11px;
flex: 1;
}
.good_study_one .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
</style>
components/miaiactivityCustom/style5.vue 0 → 100644
View file @ cfc9c0fd
<template>
<view style="width:100%;padding: 12px;" :style="{
'background-color': goodsInfo.backgroundColor,
}">
<view class="her_Two_study" :style="{
'padding-top':goodsInfo.PaddingTop+'px',
'padding-right':goodsInfo.PaddingRight+'px',
'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px'
}">
<view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)">
<view class="img-box">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
</view>
<view class="good-info">
<view class="good-name" v-if="item.name">{{ item.name }}</view>
<view style="width: 130px;">
<view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}}
</view>
</view>
</view>
</view>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default {
components: {
auth
},
props: ['goodsInfo'],
data() {
return {
mainColor: '',
showAuth: false,
u: {},
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
mounted(){
},
methods: {
openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo');
if (item.linkUrl) {
uni.navigateTo({
url: item.linkUrl,
});
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
</script>
<style>
.good-five-stydy {
position: relative;
margin-bottom: 14px;
display: flex;
box-sizing: border-box;
padding: 0 1px 1px 0;
width:600px;
}
.good-five-stydy:last-child{
margin-bottom:0!important;
}
.good-five-stydy .img-box {
width: 110px;
height: 70px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-five-stydy .good-info {
height: 70px;
padding: 0 12px ;
flex: 1;
border: 10rpx;
padding-bottom: 0;
display: flex;
flex-direction: column;
justify-content: space-between;
/* width:20%; */
}
.good-five-stydy .good-info .good-name {
font-size: 13px;
margin-bottom:5px;
white-space:pre-wrap;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
width:130px;
}
.good-five-stydy .good-info .good-price-info {
display: flex;
justify-items: center;
align-items: flex-end;
height: 22px;
flex: 1;
padding-bottom: 10rpx;
}
.good-five-stydy .good-info .good-price-info .price {
color: #999999;
flex: 1;
font-size: 14px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.good-five-stydy .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
.her_Two_study { overflow-x: auto !important; display: flex; white-space: nowrap; }
.style_five_label{
float:left;
padding: 0px 5px;
border-radius: 2px;
height: 18px;
line-height: 18px;
font-size: 10px;
color: #FAF8F9;
margin:0 5px 5px 0;
}
</style>
components/miaiactivityCustom/style6.vue 0 → 100644
View file @ cfc9c0fd
<template>
<view style="width:100%;padding: 12px;" :style="{
'background-color': goodsInfo.backgroundColor,
}">
<view :style="{
'padding-top':goodsInfo.PaddingTop+'px',
'padding-right':goodsInfo.PaddingRight+'px',
'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px'
}">
<view class="good-four-study" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)">
<view class="img-box">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
</view>
<view class="good-info">
<view class="good-name" v-if="item.name">{{ item.name }}</view>
<view>
<view style="display:inline-block;padding: 2px 4px;border-radius: 2px;font-size: 10px;color: #FAF8F9;margin-right:5px"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}}
</view>
</view>
</view>
</view>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default {
components: {
auth
},
props: ['goodsInfo'],
data() {
return {
mainColor: '',
showAuth: false,
u: {},
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
mounted(){
},
methods: {
openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo');
if (item.linkUrl) {
uni.navigateTo({
url: item.linkUrl,
});
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
</script>
<style>
.good-four-study {
position: relative;
margin-bottom: 14px;
display: flex;
box-sizing: border-box;
padding: 0 1px 1px 0;
overflow: hidden;
}
.good-four-study:last-child{
margin-bottom:0!important;
}
.good-four-study .img-box {
width: 125px;
height: 70px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-four-study .good-info {
padding: 0 12px 12px 12px;
flex: 1;
width: 1rpx;
border: 10rpx;
padding-bottom: 0;
display: flex;
flex-direction: column;
/* width:20%; */
}
.good-four-study .good-info .good-name {
font-size: 13px;
margin-bottom:5px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.good-four-study .good-info .good-price-info {
display: flex;
justify-items: center;
align-items: flex-end;
height: 22px;
flex: 1;
padding-bottom: 10rpx;
}
.good-four-study .good-info .good-price-info .price {
color: #999999;
flex: 1;
font-size: 14px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.good-four-study .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
</style>
pages.json
View file @ cfc9c0fd
...@@ -580,12 +580,18 @@ ...@@ -580,12 +580,18 @@
"path":"personal/myrecruitstick"//我的招募贴 "path":"personal/myrecruitstick"//我的招募贴
},{ },{
"path":"richText"//富文本编辑页面 "path":"richText"//富文本编辑页面
<<<<<<< HEAD
},{ },{
"path":"message"//消息 "path":"message"//消息
},{ },{
"path":"visitor"//访客 "path":"visitor"//访客
} }
] ]
=======
},{
"path":"personal/mydate"//我的约会
}]
>>>>>>> 905d1c7b161914cd80dd0125e60e7e1d88d2b3bf
}, },
//韩国馆项目 { "root": "pages/kotra", "pages": [{ "path": "contanctus" },{ "path": "contanctDetail" },{ "path": "compInformation" },{ //韩国馆项目 { "root": "pages/kotra", "pages": [{ "path": "contanctus" },{ "path": "contanctDetail" },{ "path": "compInformation" },{
"path": "activeInner" "path": "activeInner"
......
pages/appointment/personal/pointBalance.vue
View file @ cfc9c0fd
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
title: '余额' title: '余额'
}); });
this.IsShowRecharge = uni.getStorageSync("basedata") ? uni.getStorageSync("basedata").mall.setting.IsShowRecharge:0//完成时打开 this.IsShowRecharge = uni.getStorageSync("basedata") ? uni.getStorageSync("basedata").mall.setting.IsShowRecharge:0//完成时打开
this.IsOpenMiAi = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").IsOpenMiAi:0;//是否开启相亲模式 this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
}, },
methods:{ methods:{
init(){ init(){
......
pages/appointment/personal/pointRecharge.vue
View file @ cfc9c0fd
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
title: '充值余额' title: '充值余额'
}); });
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo"):{}; this.mall_UserInfo = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo"):{};
this.IsOpenMiAi = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").IsOpenMiAi:0;//是否开启相亲模式 this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
if(this.IsOpenMiAi==1){ if(this.IsOpenMiAi==1){
this.showName= '星星' this.showName= '星星'
} }
...@@ -86,9 +86,9 @@ ...@@ -86,9 +86,9 @@
this.RechargeMsg.PointGoodsId = item.ID; this.RechargeMsg.PointGoodsId = item.ID;
}, },
queren(){ queren(){
let mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):''; let basedata = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting:'';
let url='/api/WeChatPay/GetPointPayInfo' let url='/api/WeChatPay/GetPointPayInfo'
if(mall_UserInfo.IsOpenMiAi==1){ if(basedata.is_show_miai==1){
url='/api/WeChatPay/GetStarsPayInfo' url='/api/WeChatPay/GetStarsPayInfo'
} }
this.request2({ this.request2({
......
pages/blindDate/personal/mydate.vue 0 → 100644
View file @ cfc9c0fd
<style>
.details{
display: flex;
flex-direction: column;
padding: 0 15px;
}
.item{
width: 100%;
display: flex;
align-items: flex-start;
margin-top: 20px;
}
.item-left{
width: 80rpx;
height: 80rpx;
position: relative;
}
.item-right{
width: calc(100vw - 30px - 80rpx - 15px);
margin-left: 15px;
font-size: 11px;
color: #666666;
}
.item-r-text{
font-size: 15px;
color: #000000;
font-weight: 400;
}
.r-flex{
width: 100%;
display: flex;
align-items: flex-start;
margin-top: 8px;
}
.r-Remark{
width: 100%;
padding: 13px 12px;
background: #EDEDED;
color: #777777;
border-radius: 6px;
margin-top: 10px;
}
</style>
<template>
<view class="mydate" :style="{ height: contentHeight }">
<u-tabs
:list="list"
:is-scroll="false"
:current="current"
@change="change"
:active-color="mainColor"
></u-tabs>
<u-empty v-if="g.length == 0" text="暂无约会记录" mode="list"></u-empty>
<view
v-if="g.length > 0"
style="
height: calc(100vh);
width: calc(100vw);
overflow: hidden;
"
>
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }"
>
<view class="details">
<view class="item" v-for="(x, i) in g" :key="i" >
<view class="item-left">
<u-avatar :src="x.WoManPhoto" v-if="UserId==x.ManId" size="80"></u-avatar>
<u-avatar :src="x.ManPhoto" v-else size="80"></u-avatar>
</view>
<view class="item-right">
<view v-if="UserId==x.ManId" class="item-r-text">{{x.WoManName}}</view>
<view v-else class="item-r-text">{{x.ManName}}</view>
<view class="r-flex">
<u-icon name="clock-o" size="24" ></u-icon>
<text style="margin-left: 5px;">{{x.Time}}</text>
</view>
<view class="r-flex">
<u-icon name="location" :color="mainColor" size="24" ></u-icon>
<text style="margin-left: 5px;">{{x.Address}}</text>
</view>
<view class="r-Remark" >
{{x.Remark!=null && x.Remark !=''?x.Remark:'无'}}
</view>
</view>
</view>
</view>
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#FFF"
/>
</scroll-view>
</view>
<!-- 加载中 -->
<view class="loading" v-if="loading">
<u-loading mode="flower" size="48">></u-loading>
<Text style="color: #fff; margin-top: 10rpx;">加载中...</Text>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
</view>
</template>
<script>
import auth from "@/components/auth/index.vue";
export default {
components: {
auth
},
data() {
return {
pageTitle: "我的约会",
showAuth:false,
u:{},
show:false,
current:0,
mainColor: "",
contentHeight: 0,
msg:{
pageIndex: 1,
pageSize:10,
},
page_count: 1,
g: [],
loading: false,
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
UserId:0,
};
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.mainColor = this.$uiConfig.mainColor;
let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0;
this.UserId = UserId
},
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad: function (option) {
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
this.init();
}
},
methods: {
init() {
this.request2(
{
url: '/api/AppletMiai/GetMiaiMyDatingPageList',
data: this.msg
},
res => {
if(res.resultCode==1){
this.loading = false;
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
}
}
);
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
this.init();
},
//关闭登录窗口
gbAuth(){
uni.navigateBack()
},
},
};
</script>
<style>
.mydate {
width: 100%;
height: 100%;
background: #FFF;
position: relative;
}
</style>
pages/blindDate/personal/mysignupList.vue
View file @ cfc9c0fd
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<view <view
v-if="g.length > 0" v-if="g.length > 0"
style=" style="
height: calc(100vh); height: calc(100vh - 50px);
width: calc(100vw); width: calc(100vw);
overflow: hidden; overflow: hidden;
padding-bottom: 50px;
" "
> >
<scroll-view <scroll-view
......
pages/blindDate/postDetails.vue
View file @ cfc9c0fd
...@@ -56,16 +56,13 @@ ...@@ -56,16 +56,13 @@
} }
.postDetails .activitytime{ .postDetails .activitytime{
width: 100%; width: 100%;
height: 30px;
border-radius: 2px; border-radius: 2px;
margin-top: 15px; margin-top: 15px;
display: flex;
align-items: center;
justify-content: space-between;
background: #F0F0F0; background: #F0F0F0;
font-size: 11px; font-size: 11px;
color: #111111; color: #111111;
padding: 0 15px; padding: 10px 15px 0;
} }
.postDetails .content{ .postDetails .content{
font-size: 13px; font-size: 13px;
...@@ -283,6 +280,23 @@ ...@@ -283,6 +280,23 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.details-top{
width: 100%;
height: 223px;
}
.activitytime-item{
width: 100%;
display: flex;
align-items: flex-start;
margin-bottom: 10px;
}
.activitytime-item-l{
width: 220rpx;
color: #666666;
}
</style> </style>
<template> <template>
<view class="postDetails"> <view class="postDetails">
...@@ -302,8 +316,11 @@ ...@@ -302,8 +316,11 @@
@scroll='inputscroll' @scroll='inputscroll'
style="height: 100%;" style="height: 100%;"
> >
<view class="details-top">
<image style="width: 100%;height: 100%;" :src="details.ImageList[0]" mode="aspectFill"></image>
</view>
<view class="details"> <view class="details">
<view class="details-title">{{details.ActivityTitle}}</view> <view class="details-title"><text v-if="details.Label!=null&& details.Label!='' " :style="{color:mainColor}">【{{details.Label}}】</text>{{details.ActivityTitle}}</view>
<view class="details-info"> <view class="details-info">
<view class="details-info-l"> <view class="details-info-l">
<view style="width: 35px;height: 35px;border-radius: 50%;position: relative;"> <view style="width: 35px;height: 35px;border-radius: 50%;position: relative;">
...@@ -318,23 +335,49 @@ ...@@ -318,23 +335,49 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if='details.UserId!=sendMsg.ReplyUserId' class="details-info-r" :style="{background:mainColor}" @click="getfollow(details)"> <view v-if='details.UserId!=UserId' class="details-info-r" :style="{background:mainColor}" @click="getfollow(details)">
{{details.IsFocus==0?'关注':details.IsFocus==1?'已关注':'互相关注'}} {{details.IsFocus==0?'关注':details.IsFocus==1?'已关注':'互相关注'}}
</view> </view>
</view> </view>
<view class="activitytime" v-if='details.IsOpenEnroll==1'> <view class="activitytime" >
<text>活动截止时间：{{details.Deadline}}</text> <view class="activitytime-item" v-if='details.IsOpenEnroll==1'>
<text>{{gettime()}}</text> <view class="activitytime-item-l">
报名截止时间
</view>
<text>{{details.Deadline}}</text>
</view>
<view class="activitytime-item">
<view class="activitytime-item-l">
开始时间
</view>
<text>{{details.StartTime}}</text>
</view>
<view class="activitytime-item">
<view class="activitytime-item-l">
结束时间
</view>
<text>{{details.EndTime}}</text>
</view>
<view class="activitytime-item" v-if='details.IsOpenEnroll==1'>
<view class="activitytime-item-l">
报名人数
</view>
<text>男 {{details.ManNum}}人 <text style="margin-left: 10px;">女 {{details.WoManNum}}人 </text> </text>
</view>
<view class="activitytime-item" v-if="details.LocationName !=null && details.LocationName!=''">
<view class="activitytime-item-l">
活动地址
</view>
<view style="display: flex;flex-wrap: wrap;">
<u-icon name="location" :color="mainColor" size="30" ></u-icon>
<text style="margin-left: 5px;">{{details.LocationName}}</text>
</view>
</view>
</view> </view>
<view class="content" v-html="details.Content"> <view class="content" v-html="details.Content">
<rich-text :nodes="details.Content"></rich-text> <rich-text :nodes="details.Content"></rich-text>
</view> </view>
<!-- <view style="width: 100%;" v-if="details.ImageList.length>0">
<view v-for="(x, i) in details.ImageList" :key="i">
<image :src="x" mode="widthFix" class="imgs" @click="previewImage(i,details.ImageList)"></image>
</view>
</view> -->
<view class="esignup" v-if="details.IsOpenEnroll==1"> <view class="esignup" v-if="details.IsOpenEnroll==1">
<view v-if='Enrollcount==0' style="font-size: 12px;color: #111111;">暂无人报名</view> <view v-if='Enrollcount==0' style="font-size: 12px;color: #111111;">暂无人报名</view>
<view v-if='Enrollcount>0'> <view v-if='Enrollcount>0'>
...@@ -376,7 +419,7 @@ ...@@ -376,7 +419,7 @@
</view> </view>
<view class="pl-left twopl" v-if="x.ReplyList.length>0" @click="showtwo(x)"> <view class="pl-left twopl" v-if="x.ReplyList.length>0" @click="showtwo(x)">
<view style="font-size: 11px;color: #333333;margin: 5px 0;" v-for="(item, index) in x.ReplyList" :key="index"> <view style="font-size: 11px;color: #333333;margin: 5px 0;" v-for="(item, index) in x.ReplyList" :key="index">
<text :style="{color:mainColor}">{{item.ReplyUserName}}</text>：{{item.Content}} <text :style="{color:mainColor}">{{item.UserName}}</text>：{{item.Content}}
</view> </view>
<view v-if="x.ReplyList.length>3" style="font-size: 11px;color: #00C6C1;margin: 5px 0"> <view v-if="x.ReplyList.length>3" style="font-size: 11px;color: #00C6C1;margin: 5px 0">
查看全部 查看全部
...@@ -403,9 +446,12 @@ ...@@ -403,9 +446,12 @@
<view class="btn-l" @click="showreply=true"> <view class="btn-l" @click="showreply=true">
说点什么呗 说点什么呗
</view> </view>
<view class="btn-r" v-if="details.IsOpenEnroll==1" :style="{background:mainColor}" @click="gosigUp()"> <view class="btn-r" v-if="details.IsOpenEnroll==1 && gettime() == true " :style="{background:mainColor}" @click="gosigUp()">
立即报名 立即报名
</view> </view>
<view class="btn-r" v-if="details.IsOpenEnroll==1 && gettime() == false " >
活动结束
</view>
<view class="btn-r" v-if="details.IsOpenEnroll==2" > <view class="btn-r" v-if="details.IsOpenEnroll==2" >
暂无活动 暂无活动
</view> </view>
...@@ -526,15 +572,21 @@ ...@@ -526,15 +572,21 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
</view> </view>
</template> </template>
<script> <script>
import auth from "@/components/auth/index.vue";
export default{ export default{
components: {
auth
},
data(){ data(){
return{ return{
pageTitle: "活动详情", pageTitle: "活动详情",
mainColor: "", mainColor: "",
showAuth:false,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:20, pageSize:20,
...@@ -576,6 +628,7 @@ ...@@ -576,6 +628,7 @@
ReplyUserId:0,//回复用户id ReplyUserId:0,//回复用户id
ImageList:[],//图片列表 ImageList:[],//图片列表
}, },
UserId:0,
show:false, show:false,
ParentName:'', ParentName:'',
twodata:{},//弹窗的数据 twodata:{},//弹窗的数据
...@@ -608,6 +661,7 @@ ...@@ -608,6 +661,7 @@
} }
let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0; let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0;
this.sendMsg.ReplyUserId = UserId this.sendMsg.ReplyUserId = UserId
this.UserId = UserId
}, },
methods:{ methods:{
...@@ -624,9 +678,20 @@ ...@@ -624,9 +678,20 @@
richtext = richtext.replace(regex, `<img width="100%"`); //图片超出的处理 richtext = richtext.replace(regex, `<img width="100%"`); //图片超出的处理
this.details.Content = richtext this.details.Content = richtext
this.init()//评论列表 this.init()//评论列表
//判断是否登录
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
// this.showAuth = true;
} else{
if(this.details.IsOpenEnroll==1){ if(this.details.IsOpenEnroll==1){
this.GetActivityEnrollPageList()//获取招募贴报名列表 this.GetActivityEnrollPageList()//获取招募贴报名列表
} }
}
} }
); );
...@@ -679,11 +744,13 @@ ...@@ -679,11 +744,13 @@
} }
}, },
gettime(){//判断 活动是进行还是结束 gettime(){//判断 活动是进行还是结束
let text = '进行中';
let type = true
if((new Date()).getTime() >= (new Date(this.details.Deadline)).getTime()){ if((new Date()).getTime() >= (new Date(this.details.Deadline)).getTime()){
text = 已结束
type = false
} }
return text return type
}, },
//图片预览 //图片预览
previewImage(index, images) { previewImage(index, images) {
...@@ -696,6 +763,14 @@ ...@@ -696,6 +763,14 @@
this.showreply = false this.showreply = false
}, },
setSend(type=1){ setSend(type=1){
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
let Id = this.sendMsg.ParentId let Id = this.sendMsg.ParentId
uni.showLoading({ uni.showLoading({
title:'发表中~' title:'发表中~'
...@@ -755,12 +830,25 @@ ...@@ -755,12 +830,25 @@
this.initialize() this.initialize()
} }
); );
}
}, },
getimgs(){ getimgs(){
//判断是否登录
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
let sendMsg = encodeURIComponent(JSON.stringify(this.sendMsg)) let sendMsg = encodeURIComponent(JSON.stringify(this.sendMsg))
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/sendimg?sendMsg=' + sendMsg url: '/pages/blindDate/sendimg?sendMsg=' + sendMsg
}) })
}
}, },
Children(){ Children(){
this.initialize() this.initialize()
...@@ -781,6 +869,7 @@ ...@@ -781,6 +869,7 @@
this.sendMsg.Content =''; this.sendMsg.Content ='';
this.sendMsg.ParentId =0; this.sendMsg.ParentId =0;
this.sendMsg.ImageList =[]; this.sendMsg.ImageList =[];
this.sendMsg.ImageList =0;
this.ParentName=''; this.ParentName='';
this.showreply = false this.showreply = false
this.showreply2 = false this.showreply2 = false
...@@ -788,6 +877,8 @@ ...@@ -788,6 +877,8 @@
}, },
replyone(x,type=1){ replyone(x,type=1){
this.sendMsg.ParentId = x.Id; this.sendMsg.ParentId = x.Id;
this.sendMsg.ReplyUserId = x.UserId;
this.ParentName = x.UserName; this.ParentName = x.UserName;
if(type==1){ if(type==1){
...@@ -843,7 +934,7 @@ ...@@ -843,7 +934,7 @@
}, },
longpress(x,i,type){ longpress(x,i,type){
if(this.sendMsg.ReplyUserId == this.details.UserId || this.sendMsg.ReplyUserId == x.UserId ){ if(this.UserId == this.details.UserId || this.UserId == x.UserId ){
this.delete.DiscussId = x.Id this.delete.DiscussId = x.Id
this.delete.Copycontent = x.Content this.delete.Copycontent = x.Content
this.delete.index = i this.delete.index = i
...@@ -881,14 +972,24 @@ ...@@ -881,14 +972,24 @@
); );
}, },
gosigUp(){//报名页面 gosigUp(){//报名页面
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
let details = encodeURIComponent(JSON.stringify(this.details)) let details = encodeURIComponent(JSON.stringify(this.details))
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/stickSignUp?details=' + details url: '/pages/blindDate/stickSignUp?details=' + details
}) })
}
}, },
gobmlist(){//查看当前活动的报名列表 gobmlist(){//查看当前活动的报名列表
let type =0 let type =0
if(this.details.UserId==this.sendMsg.ReplyUserId){//如果是自己看自己的招募贴 if(this.details.UserId==this.UserId){//如果是自己看自己的招募贴
type =1 type =1
} }
uni.navigateTo({ uni.navigateTo({
...@@ -896,6 +997,14 @@ ...@@ -896,6 +997,14 @@
}) })
}, },
getfollow(x){ getfollow(x){
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
let ID=0 let ID=0
if(x.IsFocus!=0){ if(x.IsFocus!=0){
ID = x.MyFollowId ID = x.MyFollowId
...@@ -925,6 +1034,8 @@ ...@@ -925,6 +1034,8 @@
} }
); );
}
}, },
keyboardheightchange(e){ keyboardheightchange(e){
console.log(e.detail.height) console.log(e.detail.height)
...@@ -932,7 +1043,14 @@ ...@@ -932,7 +1043,14 @@
that.oneheight=e.detail.height-1; that.oneheight=e.detail.height-1;
that.$forceUpdate() that.$forceUpdate()
}, },
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
},
//关闭登录窗口
gbAuth(){
this.showAuth = false;
},
} }
} }
......
pages/blindDate/postPublishing.vue
View file @ cfc9c0fd
This diff is collapsed.
pages/blindDate/postbar.vue
View file @ cfc9c0fd
...@@ -38,7 +38,9 @@ ...@@ -38,7 +38,9 @@
<image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image> <image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image>
</view> </view>
<view style="margin-left: 5px;display: flex;flex-direction: column;height: 30px;justify-content: space-between;"> <view style="margin-left: 5px;display: flex;flex-direction: column;height: 30px;justify-content: space-between;">
<text style="width: calc(100vw - 75px - 310rpx);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 12px;color: #111111;">{{x.UserName}}</text> <text style="width: calc(100vw - 75px - 310rpx);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 12px;color: #111111;">
{{x.UserName}}
</text>
<view style="display: flex;align-items: center;font-size: 10px;color: #858687;"> <view style="display: flex;align-items: center;font-size: 10px;color: #858687;">
<text>报名{{x.EnrollNum}}人</text> <text>报名{{x.EnrollNum}}人</text>
<text style="margin-left: 5px;">{{x.ReplyNum}}留言</text> <text style="margin-left: 5px;">{{x.ReplyNum}}留言</text>
...@@ -53,7 +55,9 @@ ...@@ -53,7 +55,9 @@
<!-- 大图模式 --> <!-- 大图模式 -->
<view v-if="showtype==2" class="maxbox" @click="gopostdetails(x)"> <view v-if="showtype==2" class="maxbox" @click="gopostdetails(x)">
<image :src="x.ImageList[0]" mode="aspectFill" style="width: 100%;height: 410rpx;border-radius: 15px;"></image> <image :src="x.ImageList[0]" mode="aspectFill" style="width: 100%;height: 410rpx;border-radius: 15px;"></image>
<view style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 16px;color: #111111;padding-top: 15px;">{{x.ActivityTitle}}</view> <view style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 16px;color: #111111;padding-top: 10px;">
<text v-if="x.Label!=null && x.Label!=''" :style="{color:mainColor}">【{{x.Label}}】</text>
{{x.ActivityTitle}}</view>
<view class="max-b"> <view class="max-b">
<view style="width: 35px;height: 35px;border-radius: 15px;position: relative;"> <view style="width: 35px;height: 35px;border-radius: 15px;position: relative;">
<image :src="x.Photo" style="width: 100%;height: 100%;border-radius: 15px;"></image> <image :src="x.Photo" style="width: 100%;height: 100%;border-radius: 15px;"></image>
...@@ -61,13 +65,17 @@ ...@@ -61,13 +65,17 @@
<image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image> <image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image>
</view> </view>
<view style="margin-left: 10px;display: flex;flex-direction: column;height: 35px;justify-content: space-between;"> <view style="margin-left: 10px;display: flex;flex-direction: column;height: 35px;justify-content: space-between;">
<text style="width: calc(100vw - 75px);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 14px;color: #111111;">{{x.UserName}}</text> <text style="width: calc(100vw - 75px);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 14px;color: #111111;">
{{x.UserName}}
</text>
<view style="display: flex;align-items: center;justify-content: space-between;font-size: 11px;color: #858687;"> <view style="display: flex;align-items: center;justify-content: space-between;font-size: 11px;color: #858687;">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<text>报名{{x.EnrollNum}}人</text> <text v-if="x.IsOpenEnroll==1" style="margin-right: 5px;">报名{{x.EnrollNum}}人</text>
<text style="margin-left: 5px;">{{x.ReplyNum}}留言</text> <text >{{x.ReplyNum}}留言</text>
</view> </view>
<text v-if="x.IsOpenEnroll==1">{{x.Deadline}}截止</text> <text v-if="x.IsOpenEnroll==1">{{x.Deadline}}截止</text>
<text v-if="x.IsOpenEnroll==2">创建时间:{{x.CreateDate}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -136,7 +144,7 @@ export default { ...@@ -136,7 +144,7 @@ export default {
nomore: "没有更多了", nomore: "没有更多了",
}, },
forumList:[], forumList:[],
showtype:2, showtype:2,//好像这里没配置了 直接显示的大图模式
}; };
}, },
created() { created() {
...@@ -165,10 +173,11 @@ export default { ...@@ -165,10 +173,11 @@ export default {
nickName: "未登录", nickName: "未登录",
avatarUrl: "" avatarUrl: ""
}; };
this.showAuth = true; // this.showAuth = true;
} else{ } else{
this.GetForumList()
} }
this.GetForumList()
}, },
methods: { methods: {
...@@ -242,9 +251,19 @@ export default { ...@@ -242,9 +251,19 @@ export default {
} }
}, },
gopublishing(){//发帖 gopublishing(){//发帖
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else{
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/postPublishing' url: '/pages/blindDate/postPublishing'
}) })
}
}, },
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
...@@ -253,7 +272,7 @@ export default { ...@@ -253,7 +272,7 @@ export default {
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth(){ gbAuth(){
uni.navigateBack() this.showAuth = false;
}, },
gopostdetails(x){//招募贴的 gopostdetails(x){//招募贴的
uni.navigateTo({ uni.navigateTo({
...@@ -352,6 +371,6 @@ export default { ...@@ -352,6 +371,6 @@ export default {
height: 35px; height: 35px;
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 15px; margin-top: 10px;
} }
</style> </style>
pages/blindDate/stickSignUp.vue
View file @ cfc9c0fd
...@@ -79,11 +79,11 @@ ...@@ -79,11 +79,11 @@
<view class="box-c-l">联系电话</view> <view class="box-c-l">联系电话</view>
<input type="number" v-model="addMsg.Mobile" placeholder="请填写联系电话"> <input type="number" v-model="addMsg.Mobile" placeholder="请填写联系电话">
</view> </view>
<view class="box-c-i"> <!-- <view class="box-c-i">
<view class="box-c-l">报名人数</view> <view class="box-c-l">报名人数</view>
<u-number-box v-model="addMsg.PeopleNum" :min='1' @change="valChange"></u-number-box> <u-number-box v-model="addMsg.PeopleNum" :min='1' @change="valChange"></u-number-box>
</view> </view> -->
<view class="box-c-i"> <view class="box-c-i">
<view class="box-c-l">备注</view> <view class="box-c-l">备注</view>
<input type="text" v-model="addMsg.Remark" placeholder="请填写备注内容"> <input type="text" v-model="addMsg.Remark" placeholder="请填写备注内容">
......
pages/friendcircle/friendcircle.vue
View file @ cfc9c0fd
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
created() { created() {
this.is_bang = this.$uiConfig.is_bang ? 85 : 52; this.is_bang = this.$uiConfig.is_bang ? 85 : 52;
this.contentHeight = this.$utils.calcContentHeight(-40) + "px"; this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.IsOpenMiAi = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").IsOpenMiAi:0;//是否开启相亲模式 this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
this.pricecolor = this.$uiConfig.pricecolor; this.pricecolor = this.$uiConfig.pricecolor;
...@@ -494,16 +494,25 @@ ...@@ -494,16 +494,25 @@
nickName: "未登录", nickName: "未登录",
avatarUrl: "" avatarUrl: ""
}; };
if(this.IsOpenMiAi ==0){
this.showAuth = true; this.showAuth = true;
}
} else { } else {
this.init(); this.init();
} }
if(this.IsOpenMiAi ==1){
this.init();
}
}, },
onShow(){ onShow(){
if (!this.u) { if (!this.u) {
} else { } else {
if(this.IsOpenMiAi ==0){
this.getDMCount(); this.getDMCount();
}
} }
}, },
...@@ -513,9 +522,9 @@ ...@@ -513,9 +522,9 @@
methods: { methods: {
init() { init() {
this.loading = true; this.loading = true;
let mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):''; let basedata = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting:'';
let url='/api/AppletSchool/GetDynamicList' let url='/api/AppletSchool/GetDynamicList'
if(mall_UserInfo.IsOpenMiAi==1){ if(basedata.is_show_miai==1){
url='/api/AppletSchool/GetMiAiDynamicList' url='/api/AppletSchool/GetMiAiDynamicList'
} }
this.request2({ this.request2({
...@@ -536,8 +545,11 @@ ...@@ -536,8 +545,11 @@
this.status = "nomore"; this.status = "nomore";
} }
} }
if(this.IsOpenMiAi ==0){
this.getDMCount() this.getDMCount()
} }
}
); );
}, },
getDMCount(){ getDMCount(){
...@@ -603,9 +615,21 @@ ...@@ -603,9 +615,21 @@
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth() { gbAuth() {
uni.navigateBack()
this.showAuth = false
}, },
getdian(x, i) { //点击点点 getdian(x, i) { //点击点点
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else {
if(this.dianindex == i){ if(this.dianindex == i){
this.g[i].dianshow = !this.g[i].dianshow; this.g[i].dianshow = !this.g[i].dianshow;
this.dianindex = i this.dianindex = i
...@@ -616,6 +640,8 @@ ...@@ -616,6 +640,8 @@
} }
this.$forceUpdate() this.$forceUpdate()
}
}, },
dianzan(x, i) { //点赞 dianzan(x, i) { //点赞
this.choiceId = x.id; this.choiceId = x.id;
...@@ -728,6 +754,17 @@ ...@@ -728,6 +754,17 @@
); );
}, },
addComment() { addComment() {
this.u = uni.getStorageSync("mall_UserInfo");
console.log(this.u)
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else {
if (this.commentMsg.Content == '') { if (this.commentMsg.Content == '') {
uni.showToast({ uni.showToast({
title: '请输入评论', title: '请输入评论',
...@@ -750,6 +787,8 @@ ...@@ -750,6 +787,8 @@
} }
} }
); );
}
}, },
init2(type) { //根据id去查询当前的数据 只更新当前数据 init2(type) { //根据id去查询当前的数据 只更新当前数据
...@@ -821,9 +860,18 @@ ...@@ -821,9 +860,18 @@
} }
}, },
btnclick(item) {//跳入发布 btnclick(item) {//跳入发布
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: "未登录",
avatarUrl: ""
};
this.showAuth = true;
} else {
uni.navigateTo({ uni.navigateTo({
url: '/pages/friendcircle/release' url: '/pages/friendcircle/release'
}) })
}
innerAudioContext.stop(); innerAudioContext.stop();
}, },
......
pages/friendcircle/mydetails.vue
View file @ cfc9c0fd
...@@ -385,9 +385,9 @@ ...@@ -385,9 +385,9 @@
if(type==1){//第一次进来判断 if(type==1){//第一次进来判断
this.loading = true; this.loading = true;
} }
let mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):''; let basedata = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting:'';
let url='/api/AppletEducation/GetDynamicDetial' let url='/api/AppletEducation/GetDynamicDetial'
if(mall_UserInfo.IsOpenMiAi && mall_UserInfo.IsOpenMiAi==1){ if(basedata.is_show_miai==1){
url='/api/AppletMiai/GetMiAiDynamicDetial' url='/api/AppletMiai/GetMiAiDynamicDetial'
} }
this.request2({ this.request2({
......
pages/friendcircle/release.vue
View file @ cfc9c0fd
...@@ -510,9 +510,9 @@ ...@@ -510,9 +510,9 @@
title: '发布中...' title: '发布中...'
}) })
console.log(this.addMsg) console.log(this.addMsg)
let mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):''; let basedata = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting:'';
let url='/api/AppletEducation/GetPublishDynamic' let url='/api/AppletEducation/GetPublishDynamic'
if(mall_UserInfo.IsOpenMiAi==1){ if(basedata.is_show_miai==1){
url='/api/appletmiai/GetPublishDynamic' url='/api/appletmiai/GetPublishDynamic'
} }
this.request2({ this.request2({
......
pages/index/index.vue
View file @ cfc9c0fd
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
</view> </view>
</view> </view>
<view @click='yj' style="width: 200px;height: 50px;">活动</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" <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> :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"> <template v-for="(item, i) in myPageData.home_pages.navs">
...@@ -63,6 +63,8 @@ ...@@ -63,6 +63,8 @@
<matchmaking v-if="d.id == 'miaiuser'" :navs="d.data" :key="di"></matchmaking> <matchmaking v-if="d.id == 'miaiuser'" :navs="d.data" :key="di"></matchmaking>
<!-- 相亲活动 --> <!-- 相亲活动 -->
<miaiactivitytype v-if="d.id == 'miaiactivitytype'" :goods="d.data"></miaiactivitytype> <miaiactivitytype v-if="d.id == 'miaiactivitytype'" :goods="d.data"></miaiactivitytype>
<!-- 相亲活动自定义 -->
<miaiactivityCustom v-if="d.id == 'miaiactivityCustom'" :goods="d.data"></miaiactivityCustom>
</template> </template>
</view> </view>
...@@ -123,7 +125,7 @@ ...@@ -123,7 +125,7 @@
import navpage from "@/components/navpage/index"; import navpage from "@/components/navpage/index";
import matchmaking from "@/components/matchmaking/index" import matchmaking from "@/components/matchmaking/index"
import miaiactivitytype from "@/components/miaiactivitytype/index" import miaiactivitytype from "@/components/miaiactivitytype/index"
import miaiactivityCustom from "@/components/miaiactivityCustom/index"
const innerAudioContext = uni.createInnerAudioContext(); const innerAudioContext = uni.createInnerAudioContext();
export default { export default {
data() { data() {
...@@ -194,7 +196,8 @@ ...@@ -194,7 +196,8 @@
educationteacher, educationteacher,
navpage, navpage,
matchmaking, matchmaking,
miaiactivitytype miaiactivitytype,
miaiactivityCustom
}, },
onLoad(options) { onLoad(options) {
let that = this; let that = this;
...@@ -1130,8 +1133,12 @@ ...@@ -1130,8 +1133,12 @@
yj(){ yj(){
uni.navigateTo({ uni.navigateTo({
<<<<<<< HEAD
// url: '/pages/blindDate/message' // url: '/pages/blindDate/message'
url: '/pages/blindDate/visitor' url: '/pages/blindDate/visitor'
=======
url: '/pages/blindDate/personal/mydate'
>>>>>>> 905d1c7b161914cd80dd0125e60e7e1d88d2b3bf
}) })
} }
}, },
......
pages/kotra/activeInner.vue
View file @ cfc9c0fd
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
this.IsOpenMiAi = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").IsOpenMiAi:0;//是否开启相亲模式 this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
onLoad(option) { onLoad(option) {
......
pages/kotra/activeInnerDetail.vue
View file @ cfc9c0fd
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
this.IsOpenMiAi = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").IsOpenMiAi:0;//是否开启相亲模式 this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
onLoad(option) { onLoad(option) {
......
plugin/api.js
View file @ cfc9c0fd
...@@ -4,7 +4,8 @@ export default { ...@@ -4,7 +4,8 @@ export default {
// Vue.prototype.host2 = "http://192.168.0.110:8200" // Vue.prototype.host2 = "http://192.168.0.110:8200"
// Vue.prototype.host2 = "https://mallApi.oytour.com" // Vue.prototype.host2 = "https://mallApi.oytour.com"
// Vue.prototype.host2 = "http://192.168.1.5:8088" // Vue.prototype.host2 = "http://192.168.1.5:8088"
Vue.prototype.host2 = "http://192.168.1.13:8088" Vue.prototype.host2 = "http://192.168.1.48:8019"
// Vue.prototype.host2 = "http://192.168.1.13:8088"
// Vue.prototype.host2 = "http://testmall.oytour.com/" // Vue.prototype.host2 = "http://testmall.oytour.com/"
Vue.prototype.request = function(param, success, failed) { Vue.prototype.request = function(param, success, failed) {
...@@ -171,6 +172,13 @@ export default { ...@@ -171,6 +172,13 @@ export default {
MallBaseId: 11, MallBaseId: 11,
}; };
break; break;
case 9:
appObj = {//罗演的杂货铺
AppId: '',
TenantId: 20,
MallBaseId: 10,
};
break;
} }
return appObj; return appObj;
} }
......
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