Skip to content

C
cust-app
Commit 2a7cc30c authored by liwei's avatar liwei
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 812769d2 772ad369
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 45 deletions
pages/components/article/Item.vue
View file @ 2a7cc30c
......@@ -38,7 +38,7 @@
<u-read-more ref="uReadMore" :toggle="true" color="#415C9E"
:textIndent="0" showHeight="126rpx">
<view @click="gotoDetail(info)" style="font-size: 28rpx;color: #333333;">
<view class="" style="line-height: 1.5;">
<view class="detail" style="line-height: 1.5;">
{{info.content}}
</view>
</view>
......@@ -401,4 +401,11 @@
}
}
.detail{
width: 500rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
pages/components/article/List.vue
View file @ 2a7cc30c
......@@ -194,9 +194,7 @@
//处理动态照片
if (item.pictureId != null){
const urlArray = JSON.parse(item.pictureId)
console.log('urlArray.id:',urlArray.id)
if (urlArray.id.length>0){
console.log('11111111111111')
let arr = []
urlArray.id.forEach(item => {
getOssUrl(item).then(imgRes => {
......@@ -228,7 +226,6 @@
}
})
this.$refs.paging.completeByTotal(list,res.data.total);
console.log('22222222',this.dataList)
})
// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
......
pages/tab/index.vue
View file @ 2a7cc30c
......@@ -422,6 +422,10 @@
.timetext {
font-size: 14px;
width: 300rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #666666;
......
pages/tab/my.vue
View file @ 2a7cc30c
......@@ -127,7 +127,7 @@
<view class="my-article-content" v-if="articleInfo.content !== null">
{{articleInfo.content}}
</view>
<view :class="['my-article-image-1',articleImg.length == 2 ? 'my-article-image-2':'']" v-if="articleImg.length">
<view class="my-article-image-1" v-if="articleImg.length">
<image v-for="item in articleImg" :src="item" mode="aspectFill"></image>
</view>
</view>
......@@ -1010,6 +1010,9 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
}
.my-article-content{
padding: 30rpx 42rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 28rpx;
color: #333333;
}
......@@ -1018,8 +1021,8 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
justify-content: space-between;
padding: 30rpx 42rpx;
image{
width: calc(33% - 10rpx);
height: 198rpx;
width: calc(26% - 10rpx);
height: 168rpx;
border-radius: 12rpx;
}
}
......
pagesActivity/activityDetail.vue
View file @ 2a7cc30c
......@@ -28,9 +28,13 @@
<image class="poptime-img" :src="baseUrl+'/activity/date.png'"/>
<view class="poptime-text">{{activityDetail.startTime}}</view>
</view>
<view class="pop-time">
<image class="poptime-img" :src="baseUrl+'/activity/date.png'"/>
<view class="poptime-text">{{activityDetail.endTime}}</view>
</view>
<view class="pop-price">
<image class="popprice-img" :src="baseUrl+'/activity/unitPrice.png'"/>
<view class="popprice-text"><text>{{activityDetail.applicationFee}}￥</text></view>
<view class="popprice-text"><text>￥{{activityDetail.applicationFee}}</text></view>
</view>
<view class="pop-time" style="margin-top: 10px;">
<view class="poptime-text">已报名人数：{{activityDetail.applicationCount}}/{{activityDetail.maxApplicationCount}}</view>
......@@ -50,7 +54,6 @@
<!-- </view>-->
<!-- </view>-->
<view class="all-price">
<view class="all-money">共计：<text>￥{{totalprice}}</text></view>
<view v-if="activityDetail.applicationCount != activityDetail.maxApplicationCount" class="all-button" @click="submitorder">确认报名</view>
<view v-else class="all-button" style="background: #999999;" >报名人数已满</view>
</view>
......@@ -445,7 +448,7 @@ export default {
.all-price{
height: 192rpx;
display: flex;
justify-content: space-between;
justify-content: center;
align-items: center;
.all-money{
font-size: 16px;
......@@ -457,7 +460,7 @@ export default {
}
}
.all-button{
width: 328rpx;
width: 460rpx;
height: 88rpx;
background: #BD1A2D;
border-radius: 22px 22px 22px 22px;
......
pagesArticle/articleDetail.vue
View file @ 2a7cc30c
......@@ -157,9 +157,11 @@ export default{
//设置上级评论id 加这个逻辑是为了保证永远只有两层结构
if (value.parentId == null){
//点击的第一层评论
this.parentId = value.businessId
this.commentId = value.businessId
} else {
//点击的第二层评论
this.parentId = value.parentId
this.commentId = value.businessId
}
},
......@@ -255,6 +257,7 @@ export default{
const params = {
articleId: this.articleInfo.businessId,//动态id
commentContent:value,//评论内容
parentId:this.parentId,//上级评论ID
commentId: this.commentId
}
comment(params).then(res=>{
......
pagesArticle/components/articleItem.vue
View file @ 2a7cc30c
......@@ -218,6 +218,7 @@
.item {
display: flex;
justify-content: space-between;
white-space: pre-wrap;
padding: 40rpx 0 0rpx 0;
margin-left: 32rpx;
margin-right: 32rpx;
......@@ -288,6 +289,9 @@
font-size: 28rpx;
color: #333333;
margin-bottom: 16rpx;
max-width: 700rpx;
word-wrap: break-word; // 允许长单词或URL地址换行到下一行
word-break: break-all; // 对于中文非常有用，允许任意字符间的断行
::v-deep .u-read-more__toggle {
justify-content: flex-end !important;
......
pagesArticle/publishArticle.vue
View file @ 2a7cc30c
......@@ -117,6 +117,7 @@
// 删除图片
deletePic(event) {
this[`fileList${event.name}`].splice(event.index, 1)
this.uploadImgJSON.id.splice(event.index, 1)
},
// 新增图片
afterRead(event) {
......
pagesUser/component/Item.vue
View file @ 2a7cc30c
......@@ -38,7 +38,7 @@
<u-read-more ref="uReadMore" :toggle="true" color="#415C9E"
:textIndent="0" showHeight="126rpx">
<view @click="gotoDetail(info)" style="font-size: 28rpx;color: #333333;">
<view class="" style="line-height: 1.5;">
<view class="detail" style="line-height: 1.5;">
{{info.content}}
</view>
</view>
......@@ -435,4 +435,11 @@
}
}
.detail{
width: 500rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
pagesUser/userInfo.vue
View file @ 2a7cc30c
......@@ -109,7 +109,7 @@
</view>
</view>
<view class="strs" v-if="userData.articleContent !== null">
{{userData.articleContent}}
{{userData.articleContent ? userData.articleContent : ''}}
</view>
<view :class="['imgs',articleUrl.length == 2 ? 'twoTemp':'']" v-if="articleUrl !== null && articleUrl.length">
<image v-for="item in articleUrl" :src="item"
......@@ -125,7 +125,7 @@
<image :src="baseUrl+'/user/indexabout.png'" mode="aspectFill"></image>
<view class="title" style="font-family: SC-Bold;">关于我自己</view>
</view>
<view class="one">{{ userData.memIntroduce }}</view>
<view class="detail">{{ userData.memIntroduce ? userData.memIntroduce : '' }}</view>
<view class="one"></view>
</view>
</view>
......@@ -136,7 +136,7 @@
<image :src="baseUrl+'/user/indexlove.png'" mode="aspectFill"></image>
<view class="title" style="font-family: SC-Bold;">兴趣爱好</view>
</view>
<view class="one">{{ userData.memHobby }}</view>
<view class="detail">{{ userData.memHobby ? userData.memHobby : '' }}</view>
<view class="one"></view>
</view>
</view>
......@@ -147,7 +147,7 @@
<image :src="baseUrl+'/user/indexcharacter.png'" mode="aspectFill"></image>
<view class="title" style="font-family: SC-Bold;">心仪的Ta</view>
</view>
<view class="one">{{ userData.memHalfDesire }}</view>
<view class="detail">{{ userData.memHalfDesire ? userData.memHalfDesire : '' }}</view>
<view class="one"></view>
</view>
</view>
......@@ -796,6 +796,14 @@
font-size: 28rpx;
margin-top: 26rpx;
}
.detail{
color: #434343;
font-size: 28rpx;
margin-top: 25rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
}
......@@ -1097,6 +1105,9 @@
}
.strs{
padding: 30rpx 42rpx;
max-width: 700rpx;
word-wrap: break-word; // 允许长单词或URL地址换行到下一行
word-break: break-all; // 对于中文非常有用，允许任意字符间的断行
font-size: 28rpx;
color: #333333;
}
......
pagesme/feedBack/publishFeedBack.vue
View file @ 2a7cc30c
......@@ -16,6 +16,7 @@
v-model="addParams.title"
border="none"
placeholder="请输入标题"
maxlength="40"
></u--input>
</u-form-item>
<u-form-item
......
pagesme/goldCoin/recharge.vue
View file @ 2a7cc30c
......@@ -40,19 +40,19 @@
<view class="divss">
<view class="namne">提示</view>
<view class="namnes">充值成功，预计10秒钟后到账</view>
<u-count-down
:time="10000"
format="mm:ss"
:auto-start="true"
@change="updateTimeData"
>
<view class="time">
<text class="time__doc"></text>
<view class="time__custom">
<text class="time__custom__item">{{ showSeconds }}</text>
</view>
</view>
</u-count-down>
<!-- <u-count-down-->
<!-- :time="10000"-->
<!-- format="mm:ss"-->
<!-- :auto-start="true"-->
<!-- @change="updateTimeData"-->
<!-- >-->
<!-- <view class="time">-->
<!-- <text class="time__doc"></text>-->
<!-- <view class="time__custom">-->
<!-- <text class="time__custom__item">{{ showSeconds }}</text>-->
<!-- </view>-->
<!-- </view>-->
<!-- </u-count-down>-->
<view class="button" @click="confirm">确认</view>
</view>
</view>
......
pagesme/me/doubleauth.vue
View file @ 2a7cc30c
......@@ -19,7 +19,7 @@
<view class="auth-btn" @click="goEducationAuth()" v-if="userInfo.memEducationAuthen=='1'">查看</view>
<view class="auth-btn" @click="goEducationAuth()" v-else>立即认证</view>
</view>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" ></ELM>
</view>
</template>
......
pagesme/me/educationcertification.vue
View file @ 2a7cc30c
......@@ -18,7 +18,7 @@
</view>
</view>
</u-popup>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" :isCancel="false" @confirm="confirm"></ELM>
</view>
</template>
......@@ -103,7 +103,7 @@
updateUser(params).then(res => {
if (res.data.code == 200) {
this.isConfirm = true;
this.tipMsg = "操作成功";
this.tipMsg = "上传成功";
this.singleNoClose();
this.loadPage();
this.$refs.elm.showDialog();
......
pagesme/me/updateBasicInformation.vue
View file @ 2a7cc30c
......@@ -39,6 +39,7 @@
v-model="userInfo.memNickName"
border="none"
placeholder="请输入昵称"
maxlength="10"
></u--input>
</u-form-item>
<u-form-item
......@@ -50,6 +51,7 @@
v-model="userInfo.memWxCode"
border="none"
placeholder="请输入微信号"
maxlength="10"
></u--input>
</u-form-item>
<u-form-item
......@@ -160,6 +162,7 @@
v-model="userInfo.memCollege"
border="none"
placeholder="请输入毕业院校"
maxlength="8"
></u--input>
</u-form-item>
<u-form-item
......@@ -171,6 +174,7 @@
v-model="userInfo.memCareer"
border="none"
placeholder="请输入职业"
maxlength="8"
></u--input>
</u-form-item>
<u-form-item
......@@ -182,6 +186,7 @@
v-model="userInfo.memYearIncome"
border="none"
placeholder="请输入年收入"
maxlength="8"
></u--input>
<span slot="right">万元</span>
</u-form-item>
......@@ -194,6 +199,7 @@
v-model="userInfo.memWorkPlace"
border="none"
placeholder="请输入工作单位"
maxlength="8"
></u--input>
</u-form-item>
<u-form-item
......@@ -259,6 +265,7 @@
v-model="userInfo.memMarriageRemarks"
border="none"
placeholder="请输入婚姻状况备注"
maxlength="12"
></u--input>
</u-form-item>
<u-form-item
......@@ -270,6 +277,7 @@
v-model="userInfo.memMbti"
border="none"
placeholder="请输入16型人格"
maxlength="8"
></u--input>
</u-form-item>
</u--form>
......
pagesme/me/updateInformation.vue
View file @ 2a7cc30c
......@@ -121,11 +121,13 @@
<view class="lable">
<view class="lable-div" style="margin-right: 20rpx;">
职业：{{ userInfo.memCareer ? userInfo.memCareer : '' }}</view>
</view>
<view class="lable">
<view class="lable-div" style="background-color: #FFE3DE;" v-if="userInfo.memYearIncome">
年薪：{{ userInfo.memYearIncome }}k
</view>
</view>
<view class="lable" style="margin-top: 24rpx;" v-if="userInfo.memMarriage">
<view class="lable" v-if="userInfo.memMarriage">
<view class="lable-div" style="background-color: #F2E8F9;">
婚姻状况：{{userInfo.memMarriage == '0' ? '无婚史' : '有婚史'}}
</view>
......@@ -165,8 +167,8 @@
编辑
</view>
</view>
<view class=" mt25 fs28" style="color: #434343; ">
<view>{{userInfo.memIntroduce ? userInfo.memIntroduce : ''}}</view>
<view >
<view class="detail">{{userInfo.memIntroduce ? userInfo.memIntroduce : ''}}</view>
</view>
</view>
<!-- 兴趣爱好-->
......@@ -180,8 +182,8 @@
编辑
</view>
</view>
<view class=" mt25 fs28" style="color: #434343; ">
<view>{{userInfo.memHobby ? userInfo.memHobby : ''}}</view>
<view >
<view class="detail">{{userInfo.memHobby ? userInfo.memHobby : ''}}</view>
</view>
</view>
<!-- 心仪的Ta-->
......@@ -195,8 +197,8 @@
编辑
</view>
</view>
<view class=" mt25 fs28" style="color: #434343; ">
<view>{{userInfo.memHalfDesire ? userInfo.memHalfDesire : ''}}</view>
<view>
<view class="detail">{{userInfo.memHalfDesire ? userInfo.memHalfDesire : ''}}</view>
</view>
</view>
<!-- 未来规划-->
......@@ -210,8 +212,8 @@
编辑
</view>
</view>
<view class=" mt25 fs28" style="color: #434343; ">
<view>{{userInfo.memFuturePlan ? userInfo.memFuturePlan : ''}}</view>
<view >
<view class="detail">{{userInfo.memFuturePlan ? userInfo.memFuturePlan : ''}}</view>
</view>
</view>
......@@ -981,5 +983,12 @@ import {getOssUrl} from "../../api/article";
padding: 0 38rpx;
}
}
.detail{
color: #434343;
font-size: 28rpx;
margin-top: 25rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
uni_modules/uview-ui/components/u-upload/u-upload.vue
View file @ 2a7cc30c
......@@ -61,7 +61,7 @@
<u-icon
name="close"
color="#ffffff"
size="10"
size="16"
></u-icon>
</view>
</view>
......@@ -452,8 +452,8 @@
top: $u-upload-deletable-top;
right: $u-upload-deletable-right;
background-color: $u-upload-deletable-bgColor;
height: $u-upload-deletable-height;
width: $u-upload-deletable-width;
height: 32rpx;
width: 32rpx;
@include flex;
border-bottom-left-radius: $u-upload-deletable-boder-bottom-left-radius;
align-items: center;
......@@ -463,6 +463,7 @@
&__icon {
position: absolute;
transform: scale(0.7);
line-height: 14px;
top: $u-upload-icon-top;
right: $u-upload-icon-right;
/* #ifdef H5 */
......
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