Commit 9b882ed3 authored by 罗超's avatar 罗超

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

# Conflicts:
#	pages/blindDate/visitor.vue
parents a6c49578 49192358
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="auth-page"> <div class="auth-page">
<u-popup v-model="showDialog" mode="center" :mask-close-able="false" custom-style="padding:0;background:none;"> <u-popup v-model="showDialog" mode="center" :mask-close-able="false" custom-style="padding:0;background:none;">
<img :src="pageinfo.pic_url" mode="widthFix" /> <img :src="pageinfo.pic_url" mode="widthFix" />
<!-- <button :style="sureStyle" class="hotsopt" open-type="getUserInfo" @getuserinfo="showLogin==true?getUserInfo():''"></button> --> <button :style="sureStyle" class="hotsopt" open-type="getUserInfo" v-if="canIUseGetUserProfile == false" @getuserinfo="showLogin==true?getoldUser():''"></button>
<button :style="sureStyle" class="hotsopt" @tap="showLogin==true?getUserProfile():''"></button> <button :style="sureStyle" class="hotsopt" v-if="canIUseGetUserProfile == true" @tap="showLogin==true?getUserProfile():''"></button>
<button :style="cancelStyle" class="hotsopt" @click="close"></button> <button :style="cancelStyle" class="hotsopt" @click="close"></button>
</u-popup> </u-popup>
<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon> <coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
...@@ -26,23 +26,59 @@ ...@@ -26,23 +26,59 @@
couponMessage: '', couponMessage: '',
ComeFrom:'', ComeFrom:'',
showLogin:true, showLogin:true,
canIUseGetUserProfile:false,
msg:{}
}; };
}, },
created() { created() {
this.pageinfo = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').auth_page : {}; this.pageinfo = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').auth_page : {};
if (wx.getUserProfile) {
console.log('进入新的')
this.canIUseGetUserProfile = true
}
let x = this.pageinfo.hotspot; let x = this.pageinfo.hotspot;
let y = this.pageinfo.hotspot_cancel; let y = this.pageinfo.hotspot_cancel;
this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`; this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`;
this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`; this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`;
}, },
methods: { methods: {
getUserProfile(){ getoldUser(){//旧的 兼容电脑端
//4.27注释掉 给予新的提示不能在电脑端登录
// var that = this;
// uni.login({
// provider: 'weixin',
// success: function (loginRes) {
// console.log(loginRes.authResult);
// // 获取用户信息
// uni.getUserInfo({
// provider: 'weixin',
// success: function (infoRes) {
// console.log(infoRes,'infoRes')
// that.getUserInfo(infoRes)
// }
// });
// }
// });
uni.showToast({
title: '电脑端暂时不能获取用户信息,请转到手机端使用!',
icon: 'none'
});
this.showDialog = false;
this.$emit('gbAuth');
},
getUserProfile(){//新的获取用户资料
var that = this; var that = this;
wx.getUserProfile({ wx.getUserProfile({
desc: '用于完善资料', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写 desc: '用于完善资料', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写
success: info => { success: info => {
console.log(info.userInfo) console.log(info)
this.msg = {
Id: 0,
AliasName: info.userInfo.nickName,
Photo: info.userInfo.avatarUrl,
};
that.getUserInfo(info) that.getUserInfo(info)
}, },
fail: () => { fail: () => {
uni.showToast({ uni.showToast({
...@@ -68,6 +104,7 @@ ...@@ -68,6 +104,7 @@
OpenId: '', OpenId: '',
Name: info.userInfo.nickName, Name: info.userInfo.nickName,
Photo: info.userInfo.avatarUrl, Photo: info.userInfo.avatarUrl,
Gender:info.userInfo.gender,
Moblie: '', Moblie: '',
SuperiorId: 0, SuperiorId: 0,
code: res.code code: res.code
...@@ -134,6 +171,7 @@ ...@@ -134,6 +171,7 @@
OpenId: obj.OpenId, OpenId: obj.OpenId,
Name: obj.Name, Name: obj.Name,
Photo: obj.Photo, Photo: obj.Photo,
Gender:obj.Gender,
Moblie: '', Moblie: '',
SuperiorId: pid, SuperiorId: pid,
SmallShopId: SmallShopId, SmallShopId: SmallShopId,
...@@ -161,11 +199,29 @@ ...@@ -161,11 +199,29 @@
uni.removeStorageSync("Up"); uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword"); uni.removeStorageSync("CounponPassword");
uni.removeStorageSync("KeyWord"); uni.removeStorageSync("KeyWord");
let uid = uni.getStorageSync("mall_UserInfo").UserId;
that.msg.Id = uid
let IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
if(IsOpenMiAi==0){//不是相亲模式的时候去更新头像和昵称
that.updateuserinfo(that.msg);//更新用户头像
}
} }
} }
); );
}, },
updateuserinfo(msg) {
this.request2({
url: "/api/MemberUser/SetMemberPhoto",
data: msg,
},
(res) => {
//静默处理不做任何提示
},
(error) => {}
);
},
goLook() { goLook() {
this.showCoupons = false; this.showCoupons = false;
}, },
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
余额¥ <text style="font-size: 20px;">{{x.SurplusPrice}}</text> 余额¥ <text style="font-size: 20px;">{{x.SurplusPrice}}</text>
</view> </view>
<view class="chosen"> <view class="chosen">
<u-radio-group v-model="currentChosen"> <u-radio-group v-model="value" @change="radioChange" >
<u-radio shape="circle" :name="x.Id" :icon-size="36" :active-color="mc"></u-radio> <u-radio shape="circle" :name="x.Id" :icon-size="36" :active-color="mc"></u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
...@@ -53,11 +53,13 @@ ...@@ -53,11 +53,13 @@
mc: "", mc: "",
show: true, show: true,
currentChosen: "", currentChosen: "",
value:'',
ts: [] ts: []
}; };
}, },
mounted() { mounted() {
this.mc = this.$uiConfig.mainColor; this.mc = this.$uiConfig.mainColor;
this.value = this.current;
this.currentChosen = this.current; this.currentChosen = this.current;
this.ts = this.list this.ts = this.list
this.ts.forEach(x => { this.ts.forEach(x => {
...@@ -71,6 +73,14 @@ ...@@ -71,6 +73,14 @@
} else { } else {
this.$emit('close', -1) this.$emit('close', -1)
} }
},
radioChange(e){
if(this.currentChosen != e){
this.currentChosen = e
}else{
this.currentChosen = 0;
this.value = 0
}
} }
}, },
}; };
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<view class="rule">{{x.coupon_data.rule}}</view> <view class="rule">{{x.coupon_data.rule}}</view>
</view> </view>
<view class="chosen"> <view class="chosen">
<u-radio-group v-model="currentChosen"> <u-radio-group v-model="value" @change="radioChange" >
<u-radio shape="circle" :name="x.id" :icon-size="36" :active-color="mc"></u-radio> <u-radio shape="circle" :name="x.id" :icon-size="36" :active-color="mc"></u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
...@@ -55,12 +55,14 @@ ...@@ -55,12 +55,14 @@
mc: "", mc: "",
show: true, show: true,
currentChosen: "", currentChosen: "",
value:'',
ts: [] ts: []
}; };
}, },
mounted() { mounted() {
this.mc = this.$uiConfig.mainColor; this.mc = this.$uiConfig.mainColor;
this.currentChosen = this.current; this.currentChosen = this.current;
this.value = this.current;
this.ts = this.list this.ts = this.list
this.ts.forEach(x => { this.ts.forEach(x => {
x.start_time = x.start_time.split(' ')[0].replace(/-/g, '.') x.start_time = x.start_time.split(' ')[0].replace(/-/g, '.')
...@@ -74,6 +76,14 @@ ...@@ -74,6 +76,14 @@
} else { } else {
this.$emit('close', -1) this.$emit('close', -1)
} }
},
radioChange(e){
if(this.currentChosen != e){
this.currentChosen = e
}else{
this.currentChosen = 0;
this.value = 0
}
} }
}, },
}; };
......
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
}; };
good.DetailList.push(g); good.DetailList.push(g);
uni.navigateTo({ uni.navigateTo({
url: '/pages/order-submit/education-submit?formData=' + url: '/pages/order-submit/neweducation-submit?formData=' +
encodeURIComponent(JSON.stringify(good)) + encodeURIComponent(JSON.stringify(good)) +
'&IsFormShoppingCart=2&ShoppingCartIdList=' + '&IsFormShoppingCart=2&ShoppingCartIdList=' +
JSON.stringify(ShoppingCartIdList), JSON.stringify(ShoppingCartIdList),
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
mode="widthFix" mode="widthFix"
style="width: 90rpx; height: 90rpx;" style="width: 90rpx; height: 90rpx;"
/> />
<text :style="{'color':navs.color}" style="font-size:26rpx;margin-top:20rpx;">{{ c.name }}</text> <text :style="{'color':navs.color}" style="font-size:26rpx;margin-top:10rpx;">{{ c.name }}</text>
</u-grid-item> </u-grid-item>
</u-grid> </u-grid>
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</div> </div>
...@@ -41,7 +41,6 @@ export default { ...@@ -41,7 +41,6 @@ export default {
created() { created() {
let tempArray = []; let tempArray = [];
this.height = this.navs.rows * this.height; this.height = this.navs.rows * this.height;
console.log(this.navs)
this.navs.navs.forEach((x, i) => { this.navs.navs.forEach((x, i) => {
tempArray.push(x); tempArray.push(x);
if ( if (
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<view v-for="(item, index) of navs.list" :key="index" slot="slot{{index}}"> <view v-for="(item, index) of navs.list" :key="index" slot="slot{{index}}">
<view class="pb-box"> <view class="pb-box">
<u-avatar :src="item.Photo" size="72"></u-avatar> <u-avatar :src="item.Photo" size="72"></u-avatar>
<image class="gstyle2" v-if="item.SexStr=='男'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image> <image class="gstyle2" v-if="item.SexStr=='男'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png" ></image>
<image class="gstyle2" v-if="item.SexStr=='女'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image> <image class="gstyle2" v-if="item.SexStr=='女'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png" ></image>
<view class="boxt-center"> <view class="boxt-center">
<view class="row"> <view class="row">
<view class="box-name">{{item.name}}</view> <view class="box-name">{{item.name}}</view>
</view> </view>
<view class="row"> <view class="row">
<view class="boxtc-b-item">{{item.Age}}</view> <view class="boxtc-b-item" v-if="item.Age>0">{{item.Age}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -22,21 +22,21 @@ ...@@ -22,21 +22,21 @@
<view class="matchmaking-box" v-for="(item,index) in navs.list" :key='index' @click="goDetail(item)" v-if="navs.listStyle==-1 || navs.listStyle==0"> <view class="matchmaking-box" v-for="(item,index) in navs.list" :key='index' @click="goDetail(item)" v-if="navs.listStyle==-1 || navs.listStyle==0">
<view class="box-top"> <view class="box-top">
<u-avatar :src="item.Photo" size="80"></u-avatar> <u-avatar :src="item.Photo" size="80"></u-avatar>
<image class="gstyle" v-if="item.SexStr=='男'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image> <image class="gstyle" v-if="item.SexStr=='男'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png" ></image>
<image class="gstyle" v-if="item.SexStr=='女'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image> <image class="gstyle" v-if="item.SexStr=='女'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png" ></image>
<view class="boxt-center"> <view class="boxt-center">
<view class="row"> <view class="row">
<view class="box-name">{{item.name}}</view> <view class="box-name">{{item.name}}</view>
</view> </view>
<view class="row"> <view class="row">
<view class="boxtc-b-item">{{item.Age}}</view> <view class="boxtc-b-item" v-if="item.Age>0">{{item.Age}}</view>
<view class="boxtc-b-item">{{item.Education}}</view> <view class="boxtc-b-item">{{item.Education}}</view>
<view class="boxtc-b-item">{{item.Marriage}}</view> <view class="boxtc-b-item">{{item.Marriage}}</view>
</view> </view>
</view> </view>
<view class="boxt-r" v-if="item.MatchingRate>0"> <!-- <view class="boxt-r" v-if="item.MatchingRate>0">
匹配度 {{item.MatchingRate}}% 匹配度 {{item.MatchingRate}}%
</view> </view> -->
</view> </view>
<view class="box-img"> <view class="box-img">
<view v-if="navs.listStyle==-1 && item.AlbumList.length>0" class="box-img-one"> <view v-if="navs.listStyle==-1 && item.AlbumList.length>0" class="box-img-one">
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</view> </view>
<view class="good-info" v-if="item.name && item.name!=''"> <view class="good-info" v-if="item.name && item.name!=''">
<view class="good-name">{{ item.name }}</view> <view class="good-name">{{ item.name }}</view>
<view style="width: 130px;"> <view style="width: 150px;">
<view class="style_five_label" <view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex"> :style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}} {{subItem}}
...@@ -85,22 +85,23 @@ ...@@ -85,22 +85,23 @@
margin-bottom:0!important; margin-bottom:0!important;
} }
.good-five-stydy .img-box { .good-five-stydy .img-box {
width: 110px; width: 300rpx;
height: 70px; height: 100px;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2; box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.good-five-stydy .img-box2 { .good-five-stydy .img-box2 {
width: 278rpx; width: 300rpx;
height: 144rpx; height: 100px;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2; box-shadow: 0 4px 10px 1px #D2D2D2;
margin-right: 12px;
} }
.good-five-stydy .good-info { .good-five-stydy .good-info {
height: 70px; height: 100px;
padding: 0 12px ; padding: 0 12px ;
flex: 1; flex: 1;
border: 10rpx; border: 10rpx;
...@@ -121,7 +122,7 @@ ...@@ -121,7 +122,7 @@
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
line-clamp: 2; line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
width:130px; width:300rpx;
} }
.good-five-stydy .good-info .good-price-info { .good-five-stydy .good-info .good-price-info {
......
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
} }
}, },
created() { created() {
console.log(this.ad) // console.log(this.ad)
this.ad.list.forEach((x) => { this.ad.list.forEach((x) => {
x.formatStyle = { x.formatStyle = {
width: x.width, width: x.width,
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.u-radio-group { .u-radio-group {
display: inline-flex; display: flex;
flex-wrap: wrap;
} }
</style> </style>
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
}, },
{ {
"root": "pages/live", "root": "pages/live",
"plugins": { // "plugins": {
"live-player-plugin": { // "live-player-plugin": {
"version": "1.2.9", // "version": "1.3.0",
"provider": "wx2b03c6e691cd7370" // "provider": "wx2b03c6e691cd7370"
} // }
}, // },
"pages": [{ "pages": [{
"path": "index" "path": "index"
}, { }, {
...@@ -239,6 +239,8 @@ ...@@ -239,6 +239,8 @@
"path":"education-submit" "path":"education-submit"
},{ },{
"path":"education-success" "path":"education-success"
},{
"path":"neweducation-submit"//新的甲鹤结算页面
} }
] ]
}, },
...@@ -443,6 +445,14 @@ ...@@ -443,6 +445,14 @@
"path": "personal/payment-order"//课程代付 "path": "personal/payment-order"//课程代付
},{ },{
"path":"investigation" "path":"investigation"
},{
"path":"Jiaheactivity"//甲鹤活动
},{
"path":"JIaheactivitydetails"//活动详情
},{
"path":"jieheactivityBM"//甲鹤活动报名
},{
"path":"personal/JhphoneRz"//电话认证
}] }]
}, },
//线下服务 //线下服务
...@@ -527,7 +537,7 @@ ...@@ -527,7 +537,7 @@
"root": "pages/appointment", "root": "pages/appointment",
// "plugins": { // "plugins": {
// "live-player-plugin": { // "live-player-plugin": {
// "version": "1.2.5", // "version": "1.3.0",
// "provider": "wx2b03c6e691cd7370" // "provider": "wx2b03c6e691cd7370"
// } // }
// }, // },
...@@ -582,10 +592,14 @@ ...@@ -582,10 +592,14 @@
},{ },{
"path":"personal/followlist"//关注列表 "path":"personal/followlist"//关注列表
},{ },{
"path":"persondetails",//人物详情 "path":"personal/peoplescreen"//人物筛选
},{
"path":"oldpersondetails",//之前的人物详情
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{
"path":"persondetails"//人物详情
},{ },{
"path":"personal/editmaterial"//资料编辑 "path":"personal/editmaterial"//资料编辑
},{ },{
...@@ -627,6 +641,8 @@ ...@@ -627,6 +641,8 @@
"path":"editData"//编辑资料 "path":"editData"//编辑资料
},{ },{
"path":"xqposter"//相亲分享海报 "path":"xqposter"//相亲分享海报
},{
"path":"personal/IDidentification"//身份证验证
}] }]
}, },
//韩国馆项目 { "root": "pages/kotra", "pages": [{ "path": "contanctus" },{ "path": "contanctDetail" },{ "path": "compInformation" },{ //韩国馆项目 { "root": "pages/kotra", "pages": [{ "path": "contanctus" },{ "path": "contanctDetail" },{ "path": "compInformation" },{
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
> >
<view class="ftBox" v-if="type==0"> <view class="ftBox" v-if="type==0">
<view class="interDList" v-for="(x, i) in g" :key="i"> <view class="interDList" v-for="(x, i) in g" :key="i">
<view style="position: relative;"> <view style="position: relative;" @click="goUserinfo(x)">
<u-avatar :src="x.Photo" size="80"></u-avatar> <u-avatar :src="x.Photo" size="80"></u-avatar>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
<image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
</view> </view>
<view :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}"> <view :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}">
<view class="teinfo">{{x.UserName}}</view> <view class="teinfo">{{x.UserName}}</view>
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<view class="interDList" style="border-bottom: none;"> <view class="interDList" style="border-bottom: none;">
<view style="position: relative;" @click="goUserinfo(x)"> <view style="position: relative;" @click="goUserinfo(x)">
<u-avatar :src="x.Photo" size="80"></u-avatar> <u-avatar :src="x.Photo" size="80"></u-avatar>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
<image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
</view> </view>
<view class="interDList-r" :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}"> <view class="interDList-r" :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}">
<view class="teinfo">{{x.UserName}}</view> <view class="teinfo">{{x.UserName}}</view>
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId url: '/pages/blindDate/persondetails?UserId='+ x.UserId
}); });
innerAudioContext.stop();
} }
}, },
......
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
:style="{ height: '100%' }"> :style="{ height: '100%' }">
<view class="ftBox" v-if="type==1"> <view class="ftBox" v-if="type==1">
<view class="interDList" v-for="(x, i) in g" :key="i"> <view class="interDList" v-for="(x, i) in g" :key="i">
<view class="box-top"> <view class="box-top" @click="goUserinfo(x)">
<view class="box-top-l" > <view class="box-top-l" >
<u-avatar :src="x.Photo" size="80"></u-avatar> <u-avatar :src="x.Photo" size="80"></u-avatar>
<image class="gstyle" v-if="x.Sex==1" <image class="gstyle" v-if="x.Sex==1"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png"> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png">
</image> </image>
<image class="gstyle" v-if="x.Sex==2" <image class="gstyle" v-if="x.Sex==2"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png"> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png">
</image> </image>
</view> </view>
<view class="box-top-r"> <view class="box-top-r">
...@@ -67,14 +67,14 @@ ...@@ -67,14 +67,14 @@
</view> </view>
<view class="ftBox" v-if="type==2"> <view class="ftBox" v-if="type==2">
<view class="interDList" v-for="(x, i) in g" :key="i"> <view class="interDList" v-for="(x, i) in g" :key="i">
<view class="box-top"> <view class="box-top" @click="goUserinfo(x)">
<view class="box-top-l" > <view class="box-top-l" >
<u-avatar :src="x.Photo" size="80"></u-avatar> <u-avatar :src="x.Photo" size="80"></u-avatar>
<image class="gstyle" v-if="x.Sex==1" <image class="gstyle" v-if="x.Sex==1"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png"> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png">
</image> </image>
<image class="gstyle" v-if="x.Sex==2" <image class="gstyle" v-if="x.Sex==2"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png"> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png">
</image> </image>
</view> </view>
<view class="box-top-r"> <view class="box-top-r">
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
nomore: "没有更多了", nomore: "没有更多了",
}, },
windowWidth: 0, windowWidth: 0,
showone:true,
msgType: { msgType: {
} }
...@@ -164,6 +165,10 @@ ...@@ -164,6 +165,10 @@
if (this.page_count == 1) { if (this.page_count == 1) {
this.status = "nomore"; this.status = "nomore";
} }
if(this.showone == true && this.g.length>0){
this.setAllMsgSee()
this.showone = false
}
} }
} }
); );
...@@ -203,7 +208,7 @@ ...@@ -203,7 +208,7 @@
}, },
goUserinfo(x){ goUserinfo(x){
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId url: '/pages/blindDate/persondetails?UserId='+ x.CreateBy
}); });
}, },
//设置全部消息为已看 //设置全部消息为已看
...@@ -252,9 +257,7 @@ ...@@ -252,9 +257,7 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
if(this.g.length>0){
this.setAllMsgSee()
}
}, },
onLoad(options) { onLoad(options) {
......
<template>
<view class="range-slider" :style="'width:' + width + 'rpx;height:' + height + 'rpx'">
<view class="range-bar" :style="'width:100%;height:' + barHeight + 'rpx'">
<view class="range-bar-bg" :style="'background-color:' + backgroundColor + ''"></view>
<view class="range-bar-progress" :style="'margin-left:' + progressBarLeft + 'rpx;width:' + progressBarWidth + 'rpx;background-color:' + activeColor + ''"></view>
</view>
<view
class="block"
:class="{ active: isMinActive }"
:style="'width:' + blockSize + 'rpx;height:' + blockSize + 'rpx;margin-left:' + minBlockLeft + 'rpx;'"
@touchstart="_onBlockTouchStart"
@touchmove.stop="_onBlockTouchMove"
@touchend="_onBlockTouchEnd"
:data-left="minBlockLeft"
data-tag="minBlock"
>
<slot name="minBlock"></slot>
</view>
<view
class="block"
:class="{ active: isMaxActive }"
:style="'width:' + blockSize + 'rpx;height:' + blockSize + 'rpx;margin-left:' + maxBlockLeft + 'rpx;'"
@touchstart="_onBlockTouchStart"
@touchmove.stop="_onBlockTouchMove"
@touchend="_onBlockTouchEnd"
:data-left="maxBlockLeft"
data-tag="maxBlock"
>
<slot name="maxBlock"></slot>
</view>
</view>
</template>
<script>
/**
* range-slider v1.0.6
*/
const _windowWidth = uni.getSystemInfoSync().windowWidth;
export default {
data() {
return {
isMinActive: false,
isMaxActive: false,
//#ifdef H5
MAX_LENGTH: 294,
maxBlockLeft: 300,
//#endif
// #ifndef H5
MAX_LENGTH: 700,
maxBlockLeft: 350,
// #endif
minBlockLeft: 0,
progressBarLeft: 0,
progressBarWidth: 350,
originalMinValue: 0,
originalMaxValue: 0
};
},
components: {},
props: {
//组件宽度
width: {
type: Number,
default: 750
},
//组件高度
height: {
type: Number,
default: 100
},
//滑块大小
blockSize: {
type: Number,
default: 50
},
//区间进度条高度
barHeight: {
type: Number,
default: 5
},
//背景条颜色
backgroundColor: {
type: String,
default: '#e9e9e9'
},
//已选择的颜色
activeColor: {
type: String,
default: '#1aad19'
},
//最小值
min: {
type: Number,
default: 0
},
//最大值
max: {
type: Number,
default: 100
},
//设置初始值
values: {
type: Array,
default: function() {
return [0, 100];
}
},
//步长值
step: {
type: Number,
default: 1
},
//live模式,是否动态更新
liveMode: {
type: Boolean,
default: true
}
},
created: function() {
//使用自定义组件编译模式时,支持生命周期为:created
this._refresh();
},
onLoad: function(option) {
//不使用自定义组件编译模式时,支持生命周期为:onload
this._refresh();
},
onUnload: function() {},
watch: {
//组件宽度
width: function(newVal, oldVal, changedPath) {
var that = this;
if (newVal != that.width) {
this._refresh();
}
},
//滑块大小
blockSize: function(newVal, oldVal, changedPath) {
var that = this;
if (newVal != that.blockSize) {
this._refresh();
}
},
//最小值
min: function(newVal, oldVal, changedPath) {
var that = this;
if (newVal != that.min) {
that._refresh();
}
},
//最大值
max: function(newVal, oldVal, changedPath) {
var that = this;
if (newVal != that.max) {
that._refresh();
}
},
//设置初始值
values: function(newVal, oldVal, changedPath) {
var that = this;
var values = that.values;
console.log('refresh', newVal, oldVal);
if (that._isValuesValid(newVal) && that._isValuesValid(values)) {
if (values[0] != oldVal[0] || values[1] != oldVal[1]) that._refresh();
}
}
},
methods: {
//补0
_pad: function(num, n) {
return Array(n - ('' + num).length + 1).join(0) + num;
},
_pxToRpx: function(px) {
return (750 * px) / _windowWidth;
},
_onBlockTouchStart: function(e) {
let tag = e.target.dataset.tag;
if (tag == 'minBlock' || tag == 'maxBlock') {
this.isMinActive = tag == 'minBlock';
this.isMaxActive = tag == 'maxBlock';
//兼容h5平台及某版本微信
if (e.hasOwnProperty('changedTouches')) {
this._blockDownX = e.changedTouches[0].pageX;
} else {
this._blockDownX = e.pageX;
}
//#ifdef H5
this._blockLeft = parseFloat(e.target.dataset.left);
//#endif
// #ifndef H5
this._blockLeft = e.target.dataset.left;
// #endif
this._curBlock = e.target.dataset.tag;
}
},
_onBlockTouchMove: function(e) {
let tag = e.target.dataset.tag;
if (tag == 'minBlock' || tag == 'maxBlock') {
var that = this;
var values = that._calculateValues(e);
that._refreshProgressBar(values[2], values[3]);
that._refreshBlock(values[2], values[3]);
//拖动时也触发事件
var eventDetail = {
minValue: this.formatNumber(values[0], this.step),
maxValue: this.formatNumber(values[1], this.step),
fromUser: true,
originalValue: {
minValue: values[0],
maxValue: values[1]
}
};
this.originalMinValue = values[0];
this.originalMaxValue = values[1];
var eventOption = {};
//
if (this.liveMode) that.$emit('rangechange', eventDetail, eventOption);
}
},
_onBlockTouchEnd: function(e) {
let tag = e.target.dataset.tag;
this.isMinActive = false;
this.isMaxActive = false;
if (tag == 'minBlock' || tag == 'maxBlock') {
var that = this;
var values = that._calculateValues(e.mp.changedTouches[0]);
that._refreshProgressBar(values[2], values[3]);
that._refreshBlock(values[2], values[3]);
var eventDetail = {
minValue: this.formatNumber(values[0], this.step),
maxValue: this.formatNumber(values[1], this.step),
fromUser: true,
originalValue: {
minValue: values[0],
maxValue: values[1]
}
};
this.originalMinValue = values[0];
this.originalMaxValue = values[1];
var eventOption = {};
that.$emit('rangechange', eventDetail, eventOption);
}
},
_isValuesValid: function(values) {
return values != null && values != undefined && values.length == 2;
},
/**
* 根据手势计算相关数据
*/
_calculateValues: function(e) {
var pageX = e.pageX;
//兼容h5平台
if (e.hasOwnProperty('changedTouches')) {
pageX = e.changedTouches[0].pageX;
}
var that = this;
var moveLength = pageX - that._blockDownX;
var left = that._blockLeft + that._pxToRpx(moveLength);
left = Math.max(0, left);
left = Math.min(left, that.MAX_LENGTH);
var minBlockLeft = that.minBlockLeft;
var maxBlockLeft = that.maxBlockLeft;
if (that._curBlock == 'minBlock') {
minBlockLeft = left;
} else {
maxBlockLeft = left;
}
var range = that.max - that.min;
var minLeft = Math.min(minBlockLeft, maxBlockLeft);
var maxLeft = Math.max(minBlockLeft, maxBlockLeft);
var minValue = (minLeft / that.MAX_LENGTH) * range + that.min;
var maxValue = (maxLeft / that.MAX_LENGTH) * range + that.min;
return [minValue, maxValue, minLeft, maxLeft];
},
/**
* 计算滑块坐标
*/
_calculateBlockLeft: function(minValue, maxValue) {
var that = this;
var blockSize = that.blockSize;
var range = that.max - that.min;
var minLeft = ((minValue - that.min) / range) * that.MAX_LENGTH;
var maxLeft = ((maxValue - that.min) / range) * that.MAX_LENGTH;
return [minLeft, maxLeft];
},
/**
* 刷新进度条视图
*/
_refreshProgressBar: function(minBlockLeft, maxBlockLeft) {
var that = this;
var blockSize = that.blockSize;
that.progressBarLeft = minBlockLeft + blockSize / 2;
that.progressBarWidth = Math.abs(maxBlockLeft - minBlockLeft);
},
/**
* 刷新滑块视图
*/
_refreshBlock: function(minBlockLeft, maxBlockLeft) {
var that = this;
that.minBlockLeft = minBlockLeft;
that.maxBlockLeft = maxBlockLeft;
},
/**
* 刷新整个视图
*/
_refresh: function() {
var that = this;
var MAX_LENGTH = that.width - that.blockSize;
that.MAX_LENGTH = MAX_LENGTH;
that.maxBlockLeft = MAX_LENGTH;
that.progressBarWidth = MAX_LENGTH;
var values = that.values;
if (this.originalMinValue && this.originalMinValue) {
values = [this.originalMinValue || values[0], this.originalMaxValue || values[1]];
}
if (that._isValuesValid(values)) {
values[0] = Math.max(that.min, values[0]);
values[0] = Math.min(values[0], that.max);
values[1] = Math.max(that.min, values[1]);
values[1] = Math.min(values[1], that.max);
var leftValues = that._calculateBlockLeft(values[0], values[1]);
that._refreshProgressBar(leftValues[0], leftValues[1]);
that._refreshBlock(leftValues[0], leftValues[1]);
}
},
formatNumber(num, step) {
//格式化数字,保留几位小数
let stepStr = '' + step;
let index = stepStr.indexOf('.');
let len = index > -1 ? stepStr.length - index - 1 : 0;
let offestNum = parseInt(1 + Array(('' + len).length + 1).join(0)) * 0.1;
let tmpNum = num * offestNum;
return ((parseInt(tmpNum / step + (step > 1 ? 1 : step) * 0.5) * step) / offestNum).toFixed(len);
}
}
};
</script>
<style>
.range-slider {
position: relative;
}
.range-bar {
position: absolute;
}
.range-bar {
position: absolute;
top: 50%;
transform: translate(0, -50%);
border-radius: 10000rpx;
}
.range-bar-bg {
position: absolute;
width: 100%;
height: 100%;
border-radius: 10000rpx;
}
.range-bar-progress {
position: absolute;
width: 100%;
height: 100%;
background-color: blueviolet;
}
.block {
position: absolute;
top: 50%;
transform: translate(0, -50%);
background: #fff;
border-radius: 50%;
box-shadow: 0rpx 0rpx 6rpx #ccc;
}
.block.active {
transform: translate(0, -50%) scale(1.5);
}
</style>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<style lang="scss" scoped>
.IDidentification{
width: 100%;
height: 100vh;
.box{
width: 100%;
padding: 15px;
}
.box-c{
margin-top: 20px;
}
.box-c-item{
width: 100%;
height: 50px;
display: flex;
align-items: center;
border-bottom: 1px solid #e2e2e2;
}
.box-c-item-l{
width: 140rpx;
font-size: 14px;
color: #111111;
font-weight: bold;
}
.box-c-item-r{
width: 1px;
flex: 1;
}
.btn{
width: 100%;
margin-top: 50px;
display: flex;
align-items: center;
justify-content: center;
}
.btn-box{
width: 400rpx;
height: 88rpx;
border-radius: 44rpx;
color: #FFFFFF;
font-size: 16px;
display: flex;
align-items: center;
justify-content: center;
}
}
</style>
<template>
<view class="IDidentification">
<view class="box">
<view style="font-size: 18px;font-weight: bold;">
实名认证
</view>
<view style="font-size: 12px;color: #999999;">确保用户信息真实,承诺保障信息安全。</view>
<view class="box-c">
<view class="box-c-item">
<view class="box-c-item-l">真实姓名</view>
<view class="box-c-item-r">
<input type="text" v-model="data.RealName" placeholder="请输入真实姓名">
</view>
</view>
<view class="box-c-item">
<view class="box-c-item-l">身份证号</view>
<view class="box-c-item-r">
<input type="idcard" v-model="data.IDCardNo" placeholder="请输入身份证号">
</view>
</view>
</view>
<view class="btn">
<view class="btn-box" :style="{background:mainColor}" @click="gorenzheng">
立即认证
</view>
</view>
</view>
</view>
</template>
<script>
export default{
data(){
return{
pageTitle: '身份认证',
mainColor:'',
mall_UserInfo:null,
Jumptype:0,
data:{},
UserId:0,
}
},
created() {
this.mainColor = this.$uiConfig.mainColor;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):null;
uni.setNavigationBarTitle({
title: this.pageTitle
});
},
onLoad(options) {
if(options && options.Jumptype){
this.Jumptype = options.Jumptype
}
this.UserId = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserId:null;
this.getInfo()
},
methods:{
getInfo(){
this.request2(
{
url: '/api/AppletMiai/GetMiAiBaseIfo',
data: { UserId:this.UserId}
},
res => {
if(res.resultCode==1){
this.data=res.data
}
}
);
},
gorenzheng(){
let regName =/^[\u4e00-\u9fa5]{2,4}$/;
if(!regName.test(this.data.RealName)){
uni.showToast({
title:'真实姓名填写有误',
icon:'none'
})
return false;
}
let isIdCard = this.isIdCard(this.data.IDCardNo)
if(isIdCard==false){
uni.showToast({
title:'身份证号填写有误',
icon:'none'
})
}else{
this.data.birthday = this.getBirthdayFromIdCard(this.data.IDCardNo)
this.getCallinterface()
}
},
getCallinterface(){
let pages = getCurrentPages(); // 当前页面
let beforePage = pages[pages.length - 2]; // 前一个页面
this.request2({
url: '/api/AppletMiai/GetSetMiAiBaseInfo',
data: this.data
},
res => {
if (res.resultCode == 1) {
uni.showToast({
title: res.message,
duration: 2000,
icon:"success",
success:()=>{
setTimeout(()=>{
if(this.Jumptype == 0){
uni.navigateBack({
delta: 1
});
}else if(this.Jumptype == 2){
uni.navigateBack({
success: function() {
beforePage.$vm.getisAttestation(); // 执行前一个页面的方法
}
});
}
},1000)
}
});
}
}
);
},
getBirthdayFromIdCard(idCard) { //获取出生日期
var birthday = "";
if(idCard != null && idCard != ""){
if(idCard.length == 15){
birthday = "19"+idCard.substr(6,6);
} else if(idCard.length == 18){
birthday = idCard.substr(6,8);
}
birthday = birthday.replace(/(.{4})(.{2})/,"$1-$2-");
}
return birthday;
},
isIdCard(idCard) {//身份证号码的验证
// 15位和18位身份证号码的正则表达式
var regIdCard = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
// 如果通过该验证,说明身份证格式正确,但准确性还需计算
if (regIdCard.test(idCard)) {
if (idCard.length == 18) {
var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
5, 8, 4, 2); // 将前17位加权因子保存在数组里
var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2); // 这是除以11后,可能产生的11位余数、验证码,也保存成数组
var idCardWiSum = 0; // 用来保存前17位各自乖以加权因子后的总和
for (var i = 0; i < 17; i++) {
idCardWiSum += idCard.substring(i, i + 1) * idCardWi[i];
}
var idCardMod = idCardWiSum % 11;// 计算出校验码所在数组的位置
var idCardLast = idCard.substring(17);// 得到最后一位身份证号码
// 如果等于2,则说明校验码是10,身份证号码最后一位应该是X
if (idCardMod == 2) {
if (idCardLast == "X" || idCardLast == "x") {
//alert("恭喜通过验证啦!");
return true;
} else {
//alert("身份证号码错误!");
return false;
}
} else {
// 用计算出的验证码与最后一位身份证号码匹配,如果一致,说明通过,否则是无效的身份证号码
if (idCardLast == idCardY[idCardMod]) {
//alert("恭喜通过验证啦!");
return true;
} else {
//alert("身份证号码错误!");
return false;
}
}
}else{
return true;
}
} else {
//alert("身份证格式不正确!");
return false;
}
}
}
}
</script>
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<view class="interDList" v-for="(x, i) in g" :key="i"> <view class="interDList" v-for="(x, i) in g" :key="i">
<view style="position: relative;" @click="goUserinfo(x)"> <view style="position: relative;" @click="goUserinfo(x)">
<u-avatar :src="x.Photo" size="80"></u-avatar> <u-avatar :src="x.Photo" size="80"></u-avatar>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
</view> </view>
<view :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}"> <view :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}">
<view class="teinfo">{{x.Name}}</view> <view class="teinfo">{{x.Name}}</view>
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<view class="interDList" v-for="(x, i) in g" :key="i"> <view class="interDList" v-for="(x, i) in g" :key="i">
<view style="position: relative;" @click="goUserinfo(x)"> <view style="position: relative;" @click="goUserinfo(x)">
<u-avatar :src="x.Photo" size="80"></u-avatar> <u-avatar :src="x.Photo" size="80"></u-avatar>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
<image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image> <image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
</view> </view>
<view :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}"> <view :style="{'width':(windowWidth-30-45-20-30)+'px','margin-left':'10px'}">
<view class="teinfo">{{x.Name}}</view> <view class="teinfo">{{x.Name}}</view>
......
...@@ -27,7 +27,12 @@ ...@@ -27,7 +27,12 @@
<view style="width: calc(100vw - 30px - 40px);"> <view style="width: calc(100vw - 30px - 40px);">
<view style="display: flex;align-items: center;justify-content: space-between;width: 100%;"> <view style="display: flex;align-items: center;justify-content: space-between;width: 100%;">
<view style="font-size: 10px;color: #B2B2B2;">{{x.ForumName}}</view> <view style="font-size: 10px;color: #B2B2B2;">{{x.ForumName}}</view>
<u-icon name="delete" :size="35" color="111" @click.native.stop='cancel(x,i)'></u-icon> <view style="display: flex;align-items: center;">
<image @click.native.stop='xiugai(x,i)' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xiangq-xg.png" style="width: 35rpx;height: 35rpx;margin-right: 15rpx;"></image>
<image @click.native.stop='cancel(x,i)' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xiangq-sc.png" style="width: 35rpx;height: 35rpx"></image>
</view>
</view> </view>
<view style="font-size: 14px;color: #111111;line-height: 18px;margin-top: 5px;"> <view style="font-size: 14px;color: #111111;line-height: 18px;margin-top: 5px;">
{{x.ActivityTitle}} {{x.ActivityTitle}}
...@@ -139,7 +144,35 @@ export default { ...@@ -139,7 +144,35 @@ export default {
} }
}, },
methods: { methods: {
Children(Id){
this.request2(
{
url: '/api/AppletMiai/GetActivityPageList',
data: {
pageIndex: 1,
pageSize:10,
ForumId:0,
UserId:this.msg.UserId,
Id:Id
},
},
res => {
if(res.resultCode==1){
let data = res.data.pageData[0]
this.g.map((x,i)=>{
if(x.Id == data.Id){
console.log(this.g[i])
console.log(data)
this.g[i] = data
this.$forceUpdate()
return
}
})
}
}
);
},
init() { init() {
this.request2( this.request2(
...@@ -186,6 +219,11 @@ export default { ...@@ -186,6 +219,11 @@ export default {
this.show=true this.show=true
}, },
xiugai(x,i){
uni.navigateTo({
url: '/pages/blindDate/postPublishing?ForumId=' + x.ForumId+'&Id='+x.Id
})
},
//图片预览 //图片预览
previewImage(index, images) { previewImage(index, images) {
uni.previewImage({ uni.previewImage({
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
show:false, show:false,
current:0, current:0,
list: [ list: [
{ name: "不限" }, { name: "全部" },
{ name: "正常" }, { name: "正常" },
{ name: "取消" }, { name: "取消" },
], ],
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多了", nomore: "没有更多了",
}, },
showone:true
} }
}, },
methods: { methods: {
...@@ -81,6 +82,10 @@ ...@@ -81,6 +82,10 @@
if (this.pageCount == 1) { if (this.pageCount == 1) {
this.status = "nomore"; this.status = "nomore";
} }
if( this.showone == true && this.sysMsgData.length>0){
this.setAllMsgSee()
this.showone = false
}
} }
} }
); );
...@@ -132,9 +137,7 @@ ...@@ -132,9 +137,7 @@
}, },
onShow() { onShow() {
this.getMiaiMessagePageList(); this.getMiaiMessagePageList();
if(this.sysMsgData.length>0){
this.setAllMsgSee()
}
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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