Skip to content

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

相亲项目修改需求

parent 45fbe61e
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 47 deletions
components/matchmaking/index.vue
View file @ d0730dac
......@@ -12,7 +12,8 @@
<view class="box-name">{{item.name}}</view>
</view>
<view class="row">
<view class="boxtc-b-item" v-if="item.Age>0">{{item.Age}}岁</view>
<!-- <view class="boxtc-b-item" v-if="item.Age>0">{{item.Age}}岁</view> -->
<view class="boxtc-b-item" v-if="item.IDCardNo">{{item.IDCardNo}}年</view>
</view>
</view>
</view>
......@@ -27,11 +28,13 @@
<view class="boxt-center">
<view class="row">
<view class="box-name">{{item.name}}</view>
<u-tag v-if="item.Authentication==1" text="已认证" shape="circle" size='mini' style="margin-left: 5px;" mode="dark"/>
</view>
<view class="row">
<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.Marriage}}</view>
<view class="boxtc-b-item" v-if="item.IDCardNo">{{item.IDCardNo}}年</view>
<view class="boxtc-b-item" v-if="item.Education">{{item.Education}}</view>
<view class="boxtc-b-item" v-if="item.Height">{{item.Height}}cm</view>
<view class="boxtc-b-item" v-if="item.Industry">{{item.Industry}}</view>
</view>
</view>
<!-- <view class="boxt-r" v-if="item.MatchingRate>0">
......@@ -139,7 +142,7 @@
font-size: 14px;
color: #111111;
margin-left: 5px;
width: calc(100vw - 30px - 40px - 28px - 15px - 70px);
max-width: calc(100vw - 30px - 40px - 28px - 15px - 70px);
overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis
}
.matchmaking .boxtc-b-item{
......
pages/blindDate/editData.vue
View file @ d0730dac
......@@ -587,16 +587,34 @@ export default {
disabled: false,
must: true,
},
{
name: "年收入",
field: "YearMoney",
placehloder: "请填写年收入",
subType: 1,
unit: "万",
showType: "number",
disabled: false,
must: true,
},
{
name: "年收入",
field: "YearMoneyTypeStr",
placehloder: "请选择年收入情况",
subType: 2,
array: [],
mode: "selector",
disabled: false,
must: true,
},
// {
// name: "年收入",
// field: "YearMoney",
// placehloder: "请填写年收入",
// subType: 1,
// unit: "万",
// showType: "number",
// disabled: false,
// must: true,
// },
{
name: "工作行业",
field: "Industry",
placehloder: "教育行业、旅游行业",
subType: 1,
showType: "text",
disabled: false,
},
{
name: "毕业院校",
field: "SchoolInfo",
......@@ -605,22 +623,22 @@ export default {
showType: "text",
disabled: false,
},
{
name: "工作单位",
field: "WorkUnit",
placehloder: "请填写工作单位",
subType: 1,
showType: "text",
disabled: false,
},
{
name: "职位",
field: "Job",
placehloder: "请填写职位",
subType: 1,
showType: "text",
disabled: false,
},
// {
// name: "工作单位",
// field: "WorkUnit",
// placehloder: "请填写工作单位",
// subType: 1,
// showType: "text",
// disabled: false,
// },
// {
// name: "职位",
// field: "Job",
// placehloder: "请填写职位",
// subType: 1,
// showType: "text",
// disabled: false,
// },
],
},
{
......@@ -726,7 +744,7 @@ export default {
MarriageStr: "",
Job: "",
WorkUnit: "",
YearMoney: "",
YearMoney: 0,
// NativePlace:"",//籍贯（省）
// HuKou:"",//籍贯（国家）
OtherInfo: "",
......@@ -765,6 +783,8 @@ export default {
DWProvince: 0, //个人省
DWCity: 0, //个人市
DWDistrict: 0, //个人区
YearMoneyType:'',//年收入下拉id
Industry:'',//职业类型
},
locationtype: "", //判断地址选择是那个
//控制图片显示
......@@ -837,7 +857,9 @@ export default {
this.data.HouseInfo = arr[arg.detail.value].Id;
} else if (e == "CarInfoStr") {
this.data.CarInfo = arr[arg.detail.value].Id;
}
} else if (e == "YearMoneyTypeStr"){
this.data.YearMoneyType = arr[arg.detail.value].Id;
}
} else if (mode == "date") {
this.data[e] = arg.detail.value;
} else if (mode == "region") {
......@@ -1178,6 +1200,26 @@ export default {
}
);
},
GetYearMoney(){
this.request2(
{
url: "/api/appletmiai/GetYearMoneyTypeEnumList",
data: {},
},
(res) => {
if (res.resultCode == 1) {
if (res.data.length > 0) {
this.dataList[2].childDataList.map((x) => {
if (x.name == "年收入") {
x.array = res.data;
return;
}
});
}
}
}
);
},
//获取个人资料
getInfo() {
......@@ -1344,6 +1386,7 @@ export default {
// 4-14
this.GetHouseList(); //获取房屋枚举
this.GetCarList(); //获取车辆枚举
this.GetYearMoney();//获取年收入枚举
uni.setNavigationBarTitle({
title: this.pageTitle,
});
......
pages/blindDate/personal/mydate.vue
View file @ d0730dac
......@@ -114,9 +114,9 @@
<u-icon name="location" :color="mainColor" size="24" ></u-icon>
<text style="margin-left: 5px;">{{x.Address}}</text>
</view>
<view class="r-Remark" >
<!-- <view class="r-Remark" >
{{x.Remark!=null && x.Remark !=''?x.Remark:'无'}}
</view>
</view> -->
</view>
</view>
</view>
......
pages/blindDate/persondetails.vue
View file @ d0730dac
......@@ -303,12 +303,18 @@
>{{ dataList.PName }}{{ dataList.CName }}人</text
>
</view>
<view class="box-jc-c-item-i" v-if="dataList.Job">
<!-- <view class="box-jc-c-item-i" v-if="dataList.Job">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-gz.png"
></image>
<text>{{ dataList.Job }}</text>
</view>
</view> -->
<view class="box-jc-c-item-i" v-if="dataList.Industry">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-gz.png"
></image>
<text>{{ dataList.Industry }}</text>
</view>
<view class="box-jc-c-item-i" v-if="dataList.MarriageStr">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-hy.png"
......@@ -325,8 +331,8 @@
<text style="margin: 0 5px" v-if="dataList.CarInfoStr">·</text>
<text v-if="dataList.CarInfoStr">{{ dataList.CarInfoStr }}</text>
<text style="margin: 0 5px">·</text>
<text v-if="dataList.YearMoney"
>年收入{{ dataList.YearMoney }}万元</text
<text v-if="dataList.YearMoneyTypeStr"
>年收入{{ dataList.YearMoneyTypeStr }}</text
>
</view>
<view class="box-jc-c-item-i">
......@@ -603,19 +609,20 @@
class="xboxfixed-item"
style="background: #3183fe"
v-if="mall_UserInfo.UserId != dataList.Id"
@click="goknowTA()"
>
<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
<!-- <button
open-type="contact"
:send-message-title="dataList.Name"
:send-message-path="path"
:send-message-img="dataList.Photo"
:show-message-card="true"
></button>
></button> -->
</view>
</view>
</view>
......@@ -826,6 +833,12 @@ export default {
url: "/pages/friendcircle/my-news?UserId=" + this.UserId,
});
},
goknowTA(){//想认识TA
uni.navigateTo({
url: "/pages/index/index?page_id=2636" ,
});
},
},
};
</script>
......
pages/friendcircle/friendcircle.vue
View file @ d0730dac
......@@ -305,8 +305,13 @@
<view class="text" :style="{'font-size': '11px',color:mainColor}" v-if="x.address && x.address!=''">
{{x.address}}
</view>
<view class="r-sj">
<text>{{x.createTime}}</text>
<view class="r-sj">
<view style="display: flex;align-items: center;">
<text style="margin-right: 20rpx;">{{x.createTime}}</text>
<text :style="{'color': mainColor}" @click="dynamicDelete(x,i)" v-if="mall_UserInfo.UserId &&mall_UserInfo.UserId == x.createEmpId">删除</text>
</view>
<view class="r-sj-d" @click="getdian(x,i)">
<view class="dian"></view>
<view class="dian"></view>
......@@ -384,7 +389,9 @@
</u-popup>
</view>
<tabbar v-if='barshow==0'></tabbar>
<u-modal v-model="rzshow" :content="showtext" :show-cancel-button='true' @confirm='queren'></u-modal>
<u-modal v-model="rzshow" :content="showtext" :show-cancel-button='true' @confirm='queren'></u-modal>
<u-modal v-model="showdelete" content="删除该动态？" :show-cancel-button='true' @cancel='showdelete=false' @confirm='deletepyq()'></u-modal>
</div>
</template>
......@@ -446,7 +453,10 @@
barshow:0,
IsOpenMiAi:0,//1开启 0 没开启
isAttestation:0,
showtext:'去认证',
showtext:'去认证',
mall_UserInfo:null,
dynamicObj:null,//动态删除数据
showdelete:false,
}
},
created() {
......@@ -456,7 +466,8 @@
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.pricecolor = this.$uiConfig.pricecolor;
this.windowWidth = this.$utils.SystemInfo().windowWidth;
this.windowWidth = this.$utils.SystemInfo().windowWidth;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo") : null;
this.msg.UserId = uni.getStorageSync("mall_UserInfo").UserId ? uni.getStorageSync("mall_UserInfo").UserId : 0;
let basedata = wx.getStorageSync("basedata")
this.isAttestation = basedata.user_info.isAttestation?basedata.user_info.isAttestation:0;
......@@ -938,6 +949,32 @@
innerAudioContext.stop();
}
},
dynamicDelete(x,index){//动态删除 自己删除自己的
this.dynamicObj={
articleId:x.id,
index:index
},
this.showdelete = true
},
deletepyq(){//删除朋友圈动态
this.request2({
url: '/api/AppletEducation/GetDeleteDynamic',
data: {articleId:this.dynamicObj.articleId}
},
res => {
if (res.resultCode == 1) {
uni.showToast({
title: res.message,
icon: 'none',
duration: 2000
});
this.g.splice(this.dynamicObj.index,1)
}
}
);
}
}
}
......
pages/index/index.vue
View file @ d0730dac
......@@ -23,10 +23,11 @@
<view
class="content"
:style="{
'padding-bottom': showtabs == ture ? '100rpx' : 0,
'padding-bottom': showtabs == true ? boxpaddingbottom+'px' : 0,
paddingTop: pagePaddingBottom,
}"
>
<view
class="index-title"
:class="{ MainTopLeft: pageTitleStr.length > 10 }"
......@@ -345,6 +346,7 @@ export default {
carrierType: "", //载体type
AppletID: 0, //判断小程序的id,相亲：11
page_idt:0,//首页组件分享参数
boxpaddingbottom:0,//底部的高度
};
},
components: {
......@@ -398,6 +400,7 @@ export default {
},
});
let c = this.$uiConfig.is_bang ? 78 : 50;
this.boxpaddingbottom= c
this.contentHeight = this.$utils.calcContentHeight(c);
if (options && options.page_id) {
this.pageId = options.page_id;
......
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