Skip to content

M
mallapp
Commit eb9457f0 authored by Mac's avatar Mac
Browse files
Options

修改样式

parent c638a625
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 73 deletions
pages/blindDate/editData.vue
View file @ eb9457f0
......@@ -778,7 +778,7 @@
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.dataList[1].childDataList.map(x=>{
this.dataList[2].childDataList.map(x=>{
if(x.name == '学历'){
x.array = res.data;
return
......@@ -819,7 +819,7 @@
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.dataList[1].childDataList.map(x=>{
this.dataList[2].childDataList.map(x=>{
if(x.name == '房屋'){
x.array = res.data;
return
......@@ -839,7 +839,7 @@
res => {
if(res.resultCode==1){
if(res.data.length > 0){
this.dataList[1].childDataList.map(x=>{
this.dataList[2].childDataList.map(x=>{
if(x.name == '车辆'){
x.array = res.data;
return
......@@ -890,12 +890,20 @@
this.data.SexStr="";
this.dataList[1].childDataList.map(x=>{
if(x.name == '性别'){
console.log(x)
x.disabled = false;
return
}
})
}
if(this.data.RealName && this.data.RealName!=''){
this.dataList[1].childDataList.map(x=>{
if(x.field == 'Birthday'){
x.disabled = true;
return
}
})
}
}
......
pages/blindDate/personal/IDidentification.vue
View file @ eb9457f0
......@@ -60,13 +60,13 @@
<view class="box-c-item">
<view class="box-c-item-l">真实姓名</view>
<view class="box-c-item-r">
<input type="text" v-model="addMsg.Name" placeholder="请输入真实姓名">
<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="addMsg.cardNo" placeholder="请输入身份证号">
<input type="idcard" v-model="data.IDCardNo" placeholder="请输入身份证号">
</view>
</view>
</view>
......@@ -86,12 +86,10 @@
pageTitle: '身份认证',
mainColor:'',
mall_UserInfo:null,
addMsg:{
Name:'',
cardNo:'',
},
Jumptype:0
Jumptype:0,
data:{},
UserId:0,
}
},
created() {
......@@ -105,25 +103,40 @@
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.addMsg.Name)){
if(!regName.test(this.data.RealName)){
uni.showToast({
title:'真实姓名填写有误',
icon:'none'
})
return false;
}
let isIdCard = this.isIdCard(this.addMsg.cardNo)
let isIdCard = this.isIdCard(this.data.IDCardNo)
if(isIdCard==false){
uni.showToast({
title:'身份证号填写有误',
icon:'none'
})
}else{
let birthday = this.getBirthdayFromIdCard(this.addMsg.cardNo)
this.data.birthday = this.getBirthdayFromIdCard(this.data.IDCardNo)
this.getCallinterface()
}
......@@ -131,7 +144,19 @@
getCallinterface(){
let pages = getCurrentPages(); // 当前页面
let beforePage = pages[pages.length - 2]; // 前一个页面
setTimeout(()=>{
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
......@@ -143,46 +168,14 @@
}
});
}
},1000)
// this.request2({
// url: '/api/AppletMiai/GetSetMiAiBaseInfo',
// data: msg
// },
// 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 == 1){
// uni.reLaunch({
// url: '/pages/blindDate/persondetails?UserId='+ this.UserId+'&Jumptype=1'
// })
// }else if(this.Jumptype == 2){
// uni.navigateBack({
// success: function() {
// beforePage.$vm.getisAttestation(); // 执行前一个页面的方法
// }
// });
// }
// },1000)
// }
// });
}
});
// }
// }
// );
}
}
);
},
getBirthdayFromIdCard(idCard) { //获取出生日期
var birthday = "";
......
pages/blindDate/persondetails.vue
View file @ eb9457f0
......@@ -133,10 +133,10 @@
}
.box-grdt-i-c-w{
width: 100%;
height: 50px;
height: 35px;
display: flex;
align-items: center;
justify-content: center;
color: #999999;
}
.box-c-item{
......@@ -151,6 +151,41 @@
color: #333333;
}
}
.boxfixed{
width: 100%;
height: 88rpx;
position: fixed;
bottom: 30px;
display: flex;
align-items: center;
justify-content: center;
}
.xboxfixed{
width: 558rpx;
height: 88rpx;
display: flex;
align-items: center;
justify-content: space-between;
}
.xboxfixed-item{
width: 260rpx;
height: 88rpx;
border-radius: 44rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 15px;
color: #FFFFFF;
position: relative;
button{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0
}
}
}
</style>
......@@ -172,6 +207,8 @@
<view class="box-jc-top">
<view class="box-jc-t-l">
<text style="margin-right: 5px;font-size: 14px;font-weight: bold;">{{dataList.Name}}</text>
<image v-if="dataList.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan2.png" style="width: 36rpx;height: 36rpx;margin-top: 3rpx;"></image>
<image v-if="dataList.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv2.png" style="width: 36rpx;height: 36rpx;margin-top: 3rpx;"></image>
<u-tag text="未认证" bg-color='#e2e2e2' color='#FFF' size='mini' border-color='#e2e2e2' v-if="dataList.IsAttestation==0"/>
<u-tag text="已认证" :bg-color='mainColor' color='#FFF' size='mini' :border-color='mainColor' v-if="dataList.IsAttestation==1"/>
</view>
......@@ -227,14 +264,14 @@
<!-- 身份认证 -->
<view class="box-sf">
<text style="font-size: 13px;font-weight: bold;">身份认证</text>
<view class="box-sf-item" @click="gosfzrenz">
<view class="box-sf-item" @click="gosfzrenz" v-if="dataList.IsAttestation!=1">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-sfr-n.png" style="width: 50px;height: 50px;margin-bottom: 5px;"></image>
未认证
</view>
<!-- <view class="box-sf-item">
<view class="box-sf-item" v-if="dataList.IsAttestation==1">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-sfr.png" style="width: 50px;height: 50px;margin-bottom: 5px;"></image>
已认证
</view> -->
</view>
</view>
<!-- 个人动态 -->
<view class="box-grdt" @click="gogerendongtai()">
......@@ -396,6 +433,20 @@
</view>
</view>
<view class="boxfixed">
<view class="xboxfixed">
<view class="xboxfixed-item" style="background: #00C6C1;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-fx.png" style="width: 54rpx;height: 54rpx;margin-right: 10px;"></image>
<text>推给朋友</text>
<button open-type="share" ></button>
</view>
<view class="xboxfixed-item" style="background: #3183FE;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-hi.png" style="width: 54rpx;height: 54rpx;margin-right: 10px;"></image>
<text>想认识TA</text>
<button open-type="contact" :send-message-title="dataList.Name" :send-message-path="path" :send-message-img="dataList.Photo" :show-message-card="true"></button>
</view>
</view>
</view>
</view>
</template>
......@@ -461,8 +512,6 @@
let windowWidth = this.$utils.SystemInfo().windowWidth;
this.pjwidth = (windowWidth - 60 - 30)/4+'px'
console.log(this.pjwidth)
},
onShow() {
......
pages/share/add/add.vue
View file @ eb9457f0
......@@ -2,11 +2,14 @@
<view class="s_addStyle" :style="{'height':contentHeight}">
<image :src="userinfo.CustomModel.HeadImage" style="width: 100%;height: 165px;"></image>
<view style='width: 94%;margin-left: 3%;margin-top: 10px;'>
<Text style='padding: 10px 0;width: 100%;border-bottom: 1px solid #f5f5f5;display: inline-block;'>
<Text style='padding: 10px 0;width: 100%;border-bottom: 1px solid #f5f5f5;display: inline-block;' v-if='IsOpenMiAi==0'>
欢迎加入
<Text :style="{color:mainColor}">{{topname}}</Text>
，请填写申请信息
</Text>
<Text style='padding: 10px 0;width: 100%;border-bottom: 1px solid #f5f5f5;display: inline-block;' v-if='IsOpenMiAi==1'>
请填写信息
</Text>
<view class='addTbox'>
<view class="addTbox_l">
<Text>邀请人</Text>
......@@ -26,7 +29,7 @@
</view>
<input class="uni-input" type="number" v-model="msg.Mobile" placeholder="请填写手机号码" />
</view>
<view class='addTbox'>
<view class='addTbox' v-if="IsOpenMiAi==0">
<u-checkbox-group @change="Select">
<u-checkbox v-model="checked" shape="circle" :active-color="mainColor" label-size='24'>我已经阅读并了解</u-checkbox>
</u-checkbox-group>
......@@ -73,13 +76,15 @@
msg: {
Name: '',
Mobile: '',
}
},
IsOpenMiAi:0,//相亲模式1开启 0 没开启
}
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
this.getUserInfo()
},
mounted() {
......@@ -130,21 +135,21 @@
uni.requestSubscribeMessage({
tmplIds: that.userinfo.template_message_list,
complete(res) {
if (that.checked == false) {
if (that.checked == false && that.IsOpenMiAi==0) {//并且不是详情模式
uni.showToast({
title: "请先查看分销协议并同意",
icon: "none"
});
return false
}
if (that.name == '') {
if (that.msg.Name == '') {
uni.showToast({
title: "请输入真实姓名",
icon: "none"
});
return false
}
if (that.mobile == '') {
if (that.msg.Mobile == '') {
uni.showToast({
title: "请填写手机号码",
icon: "none"
......
pages/share/index/index.vue
View file @ eb9457f0
......@@ -5,7 +5,7 @@
<view class="arrow" @click="redirectPrev">
<u-icon name="arrow-left" size="48" color="#000"></u-icon>
</view>
<view class="title">{{pageTitle}}</view>
<view class="title">{{IsOpenMiAi==0?pageTitle:'商务合作'}}</view>
</view>
<view class="headStatus" v-if="scrollTop > 50 && sharestatus.Status==3" :style="[
headStyle,
......@@ -16,25 +16,27 @@
<view class="arrow" @click="redirectPrev">
<u-icon name="arrow-left" size="48" color="#000"></u-icon>
</view>
<view class="title" v-if="scrollTop > 50">{{pageTitle}}</view>
<view class="title" v-if="scrollTop > 50">{{IsOpenMiAi==0==0?pageTitle:'商务合作'}}</view>
</view>
<view class="shareadd" v-if=" sharestatus.Status==1">
<u-empty text=" " mode="data"></u-empty>
<Text style='margin: 10px 0;'>{{sharestatus.Msg}}</Text>
<Text style='margin: 10px 0;' v-if='IsOpenMiAi==0'>{{sharestatus.Msg}}</Text>
<view class="shareadd_b" :style="{background:mainColor}" @click="goaddurl">
<Text>{{sharestatus.ApplyForName}}</Text>
</view>
</view>
<view v-if="sharestatus.Status==2" class="steatus_t" :style="{'padding-top':44+nav+'px'}">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/img-share-status.png" style="width: 100%;height: 165px;"></image>
<image v-if="IsOpenMiAi==0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/img-share-status.png" style="width: 100%;height: 165px;"></image>
<image v-if="IsOpenMiAi==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-bghz.png" mode="aspectFill" style="width: 100%;height: 165px;"></image>
<Text style='margin-top: 70px;'>谢谢您的支持，请等待审核</Text>
<view style="display: flex;align-items: center;justify-content: center;margin-top: 60rpx;">
<u-button shape="circle" type="error" size="medium" @click='goshoping'>去首页逛逛</u-button>
</view>
</view>
<view v-if="sharestatus.Status==4" class="steatus_t" :style="{'padding-top':44+nav+'px'}">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/img-share-status.png" style="width: 100%;height: 165px;"></image>
<Text style='margin-top: 70px;' v-if='IsOpenMiAi==1'>未申请成为合作伙伴</Text>
<image v-if="IsOpenMiAi==0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/img-share-status.png" style="width: 100%;height: 165px;"></image>
<image v-if="IsOpenMiAi==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-bghz.png" mode="aspectFill" style="width: 100%;height: 165px;"></image>
<!-- <Text style='margin-top: 70px;' v-if='IsOpenMiAi==1'>未申请成为合作伙伴</Text> -->
<Text style='margin-top: 70px;' v-if='IsOpenMiAi==0'>{{sharestatus.Msg}}</Text>
</view>
<view style="width: 100%;height: 100%;background: #f3f4f6;" v-if="sharestatus.Status==3">
......@@ -43,7 +45,7 @@
<view class="arrow" @click="redirectPrev">
<u-icon name="arrow-left" size="48" color="#fff"></u-icon>
</view>
<view class="title" style="color: #FFFFFF;font-size: 16px;">{{pageTitle}}</view>
<view class="title" style="color: #FFFFFF;font-size: 16px;">{{IsOpenMiAi==0?pageTitle:'操作中心'}}</view>
<view style="width: 24px;height: 24px;"></view>
</view>
<view class="sharebox_top_t">
......
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