作者 xuqiang

提交

... ... @@ -253,7 +253,7 @@
"path" : "pages/my/checkWait",
"style" :
{
"navigationBarTitleText":"成为家乡代言人"
"navigationBarTitleText":"成为乡贤"
}
},
{
... ... @@ -267,7 +267,7 @@
"path" : "pages/my/becomeLand",
"style" :
{
"navigationBarTitleText":"成为家乡代言人"
"navigationBarTitleText":"成为乡贤"
}
},
... ... @@ -370,12 +370,12 @@
"pagePath": "pages/findWonderful/findWonderful",
"iconPath": "static/image/Group_672.png",
"selectedIconPath": "static/image/Group_671.png",
"text": "发现精彩"
"text": "家乡故事"
},{
"pagePath": "pages/index/index",
"iconPath": "static/image/Frame-1.png",
"selectedIconPath": "static/image/Group_670.png",
"text": "找地主"
"text": "找乡贤"
},{
"pagePath": "pages/my/my",
"iconPath": "static/image/Frame.png",
... ...
... ... @@ -7,7 +7,7 @@
关注
</view>
<view class="tabItem" :class="{active:tabIndex == 1}" @click="changeTabIndex(1)">
发现玩法
家乡精彩
</view>
<view class="tabItem" :class="{active:tabIndex == 2}" @click="changeTabIndex(2)">
主题活动
... ... @@ -45,33 +45,20 @@
</view>
</view>
<view class="playTabList" v-if="tabIndex == 1">
<swiper class="classList" :autoplay="false" display-multiple-items="4" :disable-touch="cateList.length > 2 ? false : true">
<swiper-item>
<view class="playTabItem" :class="{active:playTabIndex == 0}" @click="changePlayTab(0)">
全部
<view class="playTabLine" v-if="playTabIndex == 0"></view>
</view>
</swiper-item>
<!-- <swiper-item>
<view class="playTabItem" :class="{active:playTabIndex == 1}" @click="changePlayTab(1)">
本地
<view class="playTabLine" v-if="playTabIndex == 1"></view>
</view>
</swiper-item>-->
<swiper-item>
<view class="playTabItem" :class="{active:playTabIndex == 2}" @click="changePlayTab(2)">
推荐
<view class="playTabLine" v-if="playTabIndex == 2"></view>
</view>
</swiper-item>
<swiper-item v-for="(item,index) in cateList" :key="index">
<view class="playTabItem" :class="{active:playTabIndex == index + 3}" @click="changePlayTab(index + 3)">
{{item.name}}
<view class="playTabLine" v-if="playTabIndex == index + 3"></view>
</view>
</swiper-item>
</swiper>
<scroll-view scroll-x="true" class="classList">
<view :style="{width:'100rpx'}" class="playTabItem" :class="{active:playTabIndex == 0}" @click="changePlayTab(0)">
全部
<view :style="{left:'25rpx'}" class="playTabLine" v-if="playTabIndex == 0"></view>
</view>
<view :style="{width:'100rpx'}" class="playTabItem" :class="{active:playTabIndex == 2}" @click="changePlayTab(2)">
推荐
<view :style="{left:'25rpx'}" class="playTabLine" v-if="playTabIndex == 2"></view>
</view>
<view v-for="(item,index) in cateList" :key="index" :style="{width:item.name.length >= 3 ? '140rpx' : '100rpx'}" class="playTabItem" :class="{active:playTabIndex == index + 3}" @click="changePlayTab(index + 3)">
{{item.name}}
<view :style="{left:item.name.length >= 3 ? '45rpx' : '25rpx'}" class="playTabLine" v-if="playTabIndex == index + 3"></view>
</view>
</scroll-view>
<view class="newHot">
<view class="newHotItem" :class="{active:newHotIndex == 0}" @click="changeNewHot(0)">
最新
... ... @@ -604,19 +591,18 @@
justify-content: space-between;
align-items: center;
.classList{
display: flex;
width: 480rpx;
height: 88rpx;
white-space: nowrap; // 滚动必须加的属性
.playTabItem{
display: inline-block;
position: relative;
width: 120rpx;
text-align: center;
line-height: 88rpx;
color: #969799;
font-size: 28rpx;
font-weight: 600;
.playTabLine{
position: absolute;width: 50rpx;height: 5rpx;background: #35655f;bottom: 18rpx;left:35rpx;
position: absolute;width: 50rpx;height: 5rpx;background: #35655f;bottom: 18rpx;
}
}
.playTabItem.active{color: #35655f;}
... ...
... ... @@ -91,7 +91,7 @@
</view>
</view> -->
</view>
<view class="rightEmp"></view>
<!-- <view class="rightEmp"></view> -->
</view>
</view>
</touch-slide>
... ... @@ -156,7 +156,7 @@
</view>
</view> -->
</view>
<view class="rightEmp"></view>
<!-- <view class="rightEmp"></view> -->
</view>
</view>
</touch-slide>
... ... @@ -221,7 +221,7 @@
</view>
</view> -->
</view>
<view class="rightEmp"></view>
<!-- <view class="rightEmp"></view> -->
</view>
</view>
</touch-slide>
... ... @@ -480,19 +480,19 @@
})
});
if(plus.os.name.toLowerCase() == 'ios'){
this.platFormH = 200
this.platFormH = 160
this.firstH = 60
this.secondH = 30
}else{
this.platFormH = 180
this.platFormH = 140
this.firstH = 40
this.secondH = 10
}
//如果登录人是游侠第一次登录弹出成为地主弹框
if(this.userinfo.group_id == '1' && uni.getStorageSync('landAlertFlag') != this.userinfo.id){
/* if(this.userinfo.group_id == '1' && uni.getStorageSync('landAlertFlag') != this.userinfo.id){
this.showBecomeLand = true
}
} */
this.getAllData()
},
... ... @@ -1111,7 +1111,7 @@
.landInfo .handleList{width: 234rpx;flex-direction: row;}
.handleList .handleImg{width: 78rpx;height: 78rpx;}
/* 服务信息 */
.landInfoWrap .serviceInfo{height: 192rpx;flex-direction: row;}
.landInfoWrap .serviceInfo{height: 92rpx;flex-direction: row;}
.serviceInfo .leftEmp{width: 100rpx;}
.serviceInfo .service{flex: 1;padding-left: 30rpx;}
.service .serviceDesc{padding-top: 14rpx;}
... ...
... ... @@ -22,8 +22,8 @@
</view>
<view class="nameAddress">
<text style="font-size: 32rpx;">{{userInfo.nickname}}</text>
<image v-if="userInfo.group_id == '2'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_481@2x.png" mode=""></image>
<image v-if="userInfo.group_id == '1'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_528@2x.png" mode=""></image>
<!-- <image v-if="userInfo.group_id == '2'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_481@2x.png" mode=""></image>
<image v-if="userInfo.group_id == '1'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_528@2x.png" mode=""></image> -->
</view>
<view class="followFansWrap" v-if="userInfo.group_id == '1'">
<view class="followItem">
... ... @@ -83,13 +83,13 @@
</view>
</view>
<!-- 服务信息 -->
<view class="serviceInfo" :style="{height:userInfo.group_id == '2' ? '220rpx' : '100rpx'}">
<view class="serviceInfo" :style="{height:userInfo.group_id == '2' ? '120rpx' : '100rpx'}">
<view class="leftEmp"></view>
<view class="service">
<view class="serviceDesc">
{{userInfo.bio}}
</view>
<view class="serviceList" v-if="userInfo.group_id == '2'">
<!-- <view class="serviceList" v-if="userInfo.group_id == '2'">
<view class="serviceItem" style="width: 60rpx;">
<view class="serviceImg">
<image src="../../static/image/Group_270.png" mode=""></image>
... ... @@ -115,35 +115,9 @@
</view>
</view>
<view class="rightEmp"></view>
</view>
</view> -->
</view>
</view>
<!-- <view class="userFollowFans" v-if="userInfo.group_id == '1'">
<view class="followItem">
<view class="followTxt">
1.2K
</view>
<view class="followTxt" style="padding-top: 10rpx;">
赞/收藏
</view>
</view>
<view class="followItem">
<view class="followTxt">
1.2K
</view>
<view class="followTxt" style="padding-top: 10rpx;">
关注
</view>
</view>
<view class="followItem">
<view class="followTxt">
1.2K
</view>
<view class="followTxt" style="padding-top: 10rpx;">
粉丝
</view>
</view>
</view> -->
<view class="handleWrap">
<view class="handleItem">
<view class="handleBtn" @click="follow">
... ... @@ -169,24 +143,27 @@
</view>
<!-- 其他信息区域 -->
<view class="otherInfoWrap" :style="{
'height': userInfo.group_id == '2' ? 'calc(100vh - 450rpx - 24rpx - 88rpx - '+statusBarHeight+'rpx)' : 'calc(100vh - 338rpx - 24rpx - 88rpx - '+statusBarHeight+'rpx)',
'height': userInfo.group_id == '2' ? 'calc(100vh - 350rpx - 24rpx - 88rpx - '+statusBarHeight+'rpx)' : 'calc(100vh - 338rpx - 24rpx - 88rpx - '+statusBarHeight+'rpx)',
'background': '#fff'
}">
<view class="otherTabList">
<view class="otherTabItem" :class="{active:otherTabIndex == 0}" @click="changeOtherTab(0)">
动态
<view class="otherTabLine" :style="{left:69 + 204 * otherTabIndex + 102 - 25 + 'rpx'}"></view>
</view>
<view class="otherTabItem" :class="{active:otherTabIndex == 1}" @click="changeOtherTab(1)">
赞过
<view class="otherTabLine" :style="{left:69 + 204 * otherTabIndex + 102 - 25 + 'rpx'}"></view>
</view>
<view class="otherTabItem" :class="{active:otherTabIndex == 2}" @click="changeOtherTab(2)">
收藏
<view class="otherTabLine" :style="{left:69 + 204 * otherTabIndex + 102 - 25 + 'rpx'}"></view>
</view>
<view class="otherTabLine" :style="{left:69 + 204 * otherTabIndex + 102 - 25 + 'rpx'}"></view>
</view>
<scroll-view scroll-y @scrolltolower="scrolltolower">
<view class="otherContent" :style="{
height:userInfo.group_id == '2' ? 'calc(100vh - 450rpx - 24rpx - '+statusBarHeight+'rpx - 88rpx - 88rpx)' : 'calc(100vh - 338rpx - 24rpx - 88rpx - 88rpx - '+statusBarHeight+'rpx)'
height:userInfo.group_id == '2' ? 'calc(100vh - 350rpx - 24rpx - '+statusBarHeight+'rpx - 88rpx - 88rpx)' : 'calc(100vh - 338rpx - 24rpx - 88rpx - 88rpx - '+statusBarHeight+'rpx)'
}">
<u-waterfall v-model="list" ref="uWaterfall" v-if="showList">
<template v-slot:left="{ leftList }">
... ... @@ -694,12 +671,12 @@
}
}
/* 其他信息区域 */
.otherInfoWrap{height: calc(100vh - 88rpx - 473rpx);border-radius: 60rpx 60rpx 0 0;background: #fff;}
.otherInfoWrap{height: calc(100vh - 88rpx - 373rpx);border-radius: 60rpx 60rpx 0 0;background: #fff;}
.otherInfoWrap .otherTabList{height: 88rpx;padding: 0 69rpx;display: flex;position: relative;}
.otherTabList .otherTabItem{flex: 1;text-align: center;line-height: 88rpx;color: #969799;font-size: 28rpx;font-weight: 600;}
.otherTabItem.active{color: #35655f;}
.otherTabList .otherTabLine{position: absolute;width: 48rpx;height: 5rpx;background: #35655f;bottom: 18rpx;transition: 0.5s;}
.otherContent{height: calc(100vh - 88rpx - 473rpx - 88rpx);padding: 0 20rpx;
.otherContent{height: calc(100vh - 88rpx - 373rpx - 88rpx);padding: 0 20rpx;
.demo-warter{
border-radius: 8px;
margin: 5px;
... ...
... ... @@ -14,7 +14,7 @@
<view class="searchWrap">
<view class="search">
<image src="../../static/image/search@2x.png" mode=""></image>
<input type="text" v-model="landParam.keyword" style="font-size: 28rpx;" placeholder="搜索地主" placeholder-style="font-size:28rpx"/>
<input type="text" v-model="landParam.keyword" style="font-size: 28rpx;" placeholder="搜索乡贤" placeholder-style="font-size:28rpx"/>
</view>
</view>
<view @click="search" style="text-align: center;line-height: 62rpx;font-size: 28rpx;width: 70rpx;">
... ...
... ... @@ -52,10 +52,9 @@
家乡
</view>
<view class="infoCenter">
<text class="alertTxt" :class="{active:param.address != '请选择家乡'}">{{param.address}}</text>
</view>
<view class="infoRight">
<text class="alertTxt" :class="{active:param.address != '请选择家乡'}">{{param.address}}</text>
<image src="../../static/image/right_icon.png" mode=""></image>
</view>
</view>
... ... @@ -287,9 +286,11 @@
url: '/uview-ui/components/u-avatar-cropper/u-avatar-cropper',
params: {
// 输出图片宽度,高等于宽,单位px
destWidth: 300,
destWidth: 375,
destHeight: 400,
// 裁剪框宽度,高等于宽,单位px
rectWidth: 250,
rectWidth: 345,
rectHeight: 370,
// 输出的图片类型,如果'png'类型发现裁剪的图片太大,改成"jpg"即可
fileType: 'png',
pageType:'becomeLand'
... ...
... ... @@ -4,7 +4,7 @@
<image src="../../static/image/my/noTask.png" mode=""></image>
</view>
<view class="nowStatus">
{{userInfo.hometown_check_status == 1 ? '等待审核' : userInfo.hometown_check_status == 3 ? '审核未通过' : ''}}
{{userInfo.hometown_check_status == 1 ? '等待审核' : userInfo.hometown_check_status == 3 ? '审核未通过' : '审核已通过'}}
</view>
<view class="desc">
{{userInfo.hometown_cause}}
... ...
<template>
<view class="myWrap" v-if="showMy" :style="{background: userInfo.bg_image == '' ? '#35655f' : 'url('+userInfo.bg_image+') center/auto 100% no-repeat border-box border-box'}" :class="{bgImg:userInfo.bg_image != ''}">
<view class="myWrap" v-if="showMy" :style="{background: userInfo.bg_image == '' ? '#35655f' : 'url('+userInfo.bg_image+') repeat-y','background-size':'100%'}" :class="{bgImg:userInfo.bg_image != ''}">
<!-- 导航栏区域 -->
<view class="navBarWrap">
<image @click="showMoreService = true" src="../../static/image/more.png" mode=""></image>
... ... @@ -104,14 +104,16 @@
<view class="otherTabList">
<view class="otherTabItem" :class="{active:otherTabIndex == 0}" @click="changeOtherTab(0)">
动态
<view class="otherTabLine" v-if="otherTabIndex == 0"></view>
</view>
<view class="otherTabItem" :class="{active:otherTabIndex == 1}" @click="changeOtherTab(1)">
赞过
<view class="otherTabLine" v-if="otherTabIndex == 1"></view>
</view>
<view class="otherTabItem" :class="{active:otherTabIndex == 2}" @click="changeOtherTab(2)">
收藏
<view class="otherTabLine" v-if="otherTabIndex == 2"></view>
</view>
<view class="otherTabLine" :style="{left:69 + 204 * otherTabIndex + 102 - 24 + 'rpx'}"></view>
</view>
<scroll-view scroll-y @scrolltolower="scrolltolower">
<view class="otherContent">
... ... @@ -209,7 +211,7 @@
<view class="serviceItem" @click="openLandAlert" v-if="userInfo.hometown_check_status != 2">
<view class="serviceLeft">
<image src="../../static/image/my/moreService/Frame-1.png" mode=""></image>
成为家乡代言人
成为乡贤
</view>
<image src="../../static/image/right_icon.png" mode=""></image>
</view>
... ... @@ -337,7 +339,6 @@
})
//获取用户信息
this.$request('/user/info').then((res)=>{
console.log('获取用户信息',res)
this.userInfo = res.data
let starList = []
for(let i = 0; i < res.data.star; i ++){
... ... @@ -549,9 +550,9 @@
/* 其他信息区域 */
.otherInfoWrap{height: calc(100vh - 88rpx - 473rpx);border-radius: 60rpx 60rpx 0 0;background: #fff;}
.otherInfoWrap .otherTabList{height: 88rpx;padding: 0 69rpx;display: flex;position: relative;}
.otherTabList .otherTabItem{flex: 1;text-align: center;line-height: 88rpx;color: #969799;font-size: 28rpx;font-weight: 600;}
.otherTabList .otherTabItem{position: relative;width: 204rpx;text-align: center;line-height: 88rpx;color: #969799;font-size: 28rpx;font-weight: 600;}
.otherTabItem.active{color: #35655f;}
.otherTabList .otherTabLine{position: absolute;width: 48rpx;height: 5rpx;background: #35655f;bottom: 18rpx;transition: 0.5s;}
.otherTabItem .otherTabLine{position: absolute;width: 48rpx;height: 5rpx;background: #35655f;bottom: 18rpx;transition: 0.5s;left: 78rpx;}
.otherContent{height: calc(100vh - 88rpx - 473rpx - 88rpx);padding: 0 20rpx;
.demo-warter{
border-radius: 8px;
... ...
... ... @@ -47,15 +47,14 @@
<image src="../../static/image/right_icon.png" mode=""></image>
</view>
</view>
<view class="infoItem" @click="showChooseAddress = true">
<view class="infoItem" v-if="userInfo.hometown_check_status != '2'" @click="showChooseAddress = true">
<view class="infoLeft">
家乡
</view>
<view class="infoCenter">
<text class="alertTxt" :class="{active:param.address != ''}">{{userInfo.address}}</text>
</view>
<view class="infoRight">
<text class="alertTxt" :class="{active:param.address != ''}">{{userInfo.address}}</text>
<image src="../../static/image/right_icon.png" mode=""></image>
</view>
</view>
... ... @@ -66,7 +65,7 @@
个人描述
</view>
<view class="infoCenter">
<input type="text" v-model="userInfo.bio" placeholder="请输入个人描述" placeholder-class="centerInp"/>
<input type="text" v-model="userInfo.bio" maxlength="48" placeholder="请输入个人描述" placeholder-class="centerInp"/>
</view>
<view class="infoRight">
... ... @@ -83,9 +82,9 @@
<image src="../../static/image/right_icon.png" mode=""></image>
</view>
</view>
<view class="infoItem" v-if="userInfo.group_id == '2'" @click="goService">
<view class="infoItem" v-if="userInfo.hometown_check_status == '2'" @click="goService">
<view class="infoLeft">
服务内容
认证家乡
</view>
<view class="infoCenter">
... ... @@ -256,20 +255,6 @@
this.showPersonInfo = true
})
},
chooseAddress(e){
let area_id
if(e > 0 && this.steps[e-1].id == undefined){
return
}
if(e > 0){
area_id = this.steps[e-1].id
}
this.$request('/common/area',{area_id:area_id}).then((res)=>{
this.addressList = res.data
this.current = e
this.show = true
})
},
cancel(e) {
console.log(e);
},
... ... @@ -368,13 +353,6 @@
})
return
} */
if(this.userInfo.bio.length > 27){
uni.showToast({
title:'个人描述长度不可超过27个字',
icon:'none'
})
return
}
var myAmapFun = new amapFile.AMapWX({key:'a8c52aaa1ccef354745fb14886b7d633'});
... ... @@ -447,9 +425,11 @@
url: '/uview-ui/components/u-avatar-cropper/u-avatar-cropper',
params: {
// 输出图片宽度,高等于宽,单位px
destWidth: 300,
destWidth: 375,
destHeight: 400,
// 裁剪框宽度,高等于宽,单位px
rectWidth: 250,
rectWidth: 345,
rectHeight: 370,
// 输出的图片类型,如果'png'类型发现裁剪的图片太大,改成"jpg"即可
fileType: 'png',
pageType:'personInfo'
... ...
... ... @@ -58,11 +58,11 @@ export default {
// type: [String, Number],
// default: 400
// },
// // 裁剪框高度,单位rpx
// rectHeight: {
// type: [String, Number],
// default: 400
// },
// 裁剪框高度,单位rpx
/* rectHeight: {
type: [String, Number],
default: 400
}, */
// // 输出图片宽度,单位rpx
// destWidth: {
// type: [String, Number],
... ... @@ -115,8 +115,11 @@ export default {
// 裁剪框和输出图片的尺寸,高度默认等于宽度
// 输出图片宽度,单位px
destWidth: 200,
destHeight: 100,
// 裁剪框宽度,单位px
rectWidth: 200,
// 裁剪框高度,单位px
rectHeight: 100,
// 输出的图片类型,如果'png'类型发现裁剪的图片太大,改成"jpg"即可
fileType: 'jpg',
src: '', // 选择的图片路径,用于在点击确定时,判断是否选择了图片
... ... @@ -133,16 +136,19 @@ export default {
this.cropperOpt.pixelRatio = rectInfo.pixelRatio;
if (option.destWidth) this.destWidth = option.destWidth;
if (option.destHeight) this.destHeight = option.destHeight;
if (option.rectWidth) {
let rectWidth = Number(option.rectWidth);
let rectHeight = Number(option.rectHeight);
this.cropperOpt.cut = {
x: (this.width - rectWidth) / 2,
y: (this.height - rectWidth) / 2,
width: rectWidth,
height: rectWidth
height: rectHeight
};
}
this.rectWidth = option.rectWidth;
this.rectHeight = option.rectHeight;
if (option.fileType) this.fileType = option.fileType;
// 初始化
this.cropper = new WeCropper(this.cropperOpt)
... ... @@ -166,7 +172,7 @@ export default {
uni.chooseImage({
count: 1, // 默认9
sizeType: ['compressed'], // 可以指定是原图还是压缩图,默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
sourceType: ['album'], // 可以指定来源是相册还是相机,默认二者都有
success: res => {
this.src = res.tempFilePaths[0];
// 获取裁剪图片资源后,给data添加src属性及其值
... ... @@ -188,8 +194,8 @@ export default {
if(!this.src) return this.$u.toast('请先选择图片再裁剪');
let cropper_opt = {
destHeight: Number(this.destWidth), // uni.canvasToTempFilePath要求这些参数为数值
destWidth: Number(this.destWidth),
destWidth: Number(this.destWidth), // uni.canvasToTempFilePath要求这些参数为数值
destHeight: Number(this.destHeight),
fileType: this.fileType
};
this.cropper.getCropperImage(cropper_opt, (path, err) => {
... ... @@ -222,7 +228,7 @@ export default {
uni.chooseImage({
count: 1, // 默认9
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
sourceType: ['album'], // 可以指定来源是相册还是相机,默认二者都有
success: (res) => {
self.src = res.tempFilePaths[0];
// 获取裁剪图片资源后,给data添加src属性及其值
... ...