Commit 4948185e authored by 罗林杰's avatar 罗林杰

修改bug

parent f8af0fe2
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<u-read-more ref="uReadMore" :toggle="true" color="#415C9E" <u-read-more ref="uReadMore" :toggle="true" color="#415C9E"
:textIndent="0" showHeight="126rpx"> :textIndent="0" showHeight="126rpx">
<view @click="gotoDetail(info)" style="font-size: 28rpx;color: #333333;"> <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}} {{info.content}}
</view> </view>
</view> </view>
...@@ -401,4 +401,11 @@ ...@@ -401,4 +401,11 @@
} }
} }
.detail{
width: 500rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style> </style>
...@@ -422,6 +422,10 @@ ...@@ -422,6 +422,10 @@
.timetext { .timetext {
font-size: 14px; 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-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
......
...@@ -1008,6 +1008,9 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article"; ...@@ -1008,6 +1008,9 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
} }
.my-article-content{ .my-article-content{
padding: 30rpx 42rpx; padding: 30rpx 42rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
} }
......
...@@ -28,9 +28,13 @@ ...@@ -28,9 +28,13 @@
<image class="poptime-img" :src="baseUrl+'/activity/date.png'"/> <image class="poptime-img" :src="baseUrl+'/activity/date.png'"/>
<view class="poptime-text">{{activityDetail.startTime}}</view> <view class="poptime-text">{{activityDetail.startTime}}</view>
</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"> <view class="pop-price">
<image class="popprice-img" :src="baseUrl+'/activity/unitPrice.png'"/> <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>
<view class="pop-time" style="margin-top: 10px;"> <view class="pop-time" style="margin-top: 10px;">
<view class="poptime-text">已报名人数:{{activityDetail.applicationCount}}/{{activityDetail.maxApplicationCount}}</view> <view class="poptime-text">已报名人数:{{activityDetail.applicationCount}}/{{activityDetail.maxApplicationCount}}</view>
...@@ -50,7 +54,6 @@ ...@@ -50,7 +54,6 @@
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view class="all-price"> <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-if="activityDetail.applicationCount != activityDetail.maxApplicationCount" class="all-button" @click="submitorder">确认报名</view>
<view v-else class="all-button" style="background: #999999;" >报名人数已满</view> <view v-else class="all-button" style="background: #999999;" >报名人数已满</view>
</view> </view>
...@@ -445,7 +448,7 @@ export default { ...@@ -445,7 +448,7 @@ export default {
.all-price{ .all-price{
height: 192rpx; height: 192rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: center;
align-items: center; align-items: center;
.all-money{ .all-money{
font-size: 16px; font-size: 16px;
...@@ -457,7 +460,7 @@ export default { ...@@ -457,7 +460,7 @@ export default {
} }
} }
.all-button{ .all-button{
width: 328rpx; width: 460rpx;
height: 88rpx; height: 88rpx;
background: #BD1A2D; background: #BD1A2D;
border-radius: 22px 22px 22px 22px; border-radius: 22px 22px 22px 22px;
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<image :src="baseUrl+'/user/indexabout.png'" mode="aspectFill"></image> <image :src="baseUrl+'/user/indexabout.png'" mode="aspectFill"></image>
<view class="title" style="font-family: SC-Bold;">关于我自己</view> <view class="title" style="font-family: SC-Bold;">关于我自己</view>
</view> </view>
<view class="one">{{ userData.memIntroduce }}</view> <view class="detail">{{ userData.memIntroduce ? userData.memIntroduce : '' }}</view>
<view class="one"></view> <view class="one"></view>
</view> </view>
</view> </view>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<image :src="baseUrl+'/user/indexlove.png'" mode="aspectFill"></image> <image :src="baseUrl+'/user/indexlove.png'" mode="aspectFill"></image>
<view class="title" style="font-family: SC-Bold;">兴趣爱好</view> <view class="title" style="font-family: SC-Bold;">兴趣爱好</view>
</view> </view>
<view class="one">{{ userData.memHobby }}</view> <view class="detail">{{ userData.memHobby ? userData.memHobby : '' }}</view>
<view class="one"></view> <view class="one"></view>
</view> </view>
</view> </view>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<image :src="baseUrl+'/user/indexcharacter.png'" mode="aspectFill"></image> <image :src="baseUrl+'/user/indexcharacter.png'" mode="aspectFill"></image>
<view class="title" style="font-family: SC-Bold;">心仪的Ta</view> <view class="title" style="font-family: SC-Bold;">心仪的Ta</view>
</view> </view>
<view class="one">{{ userData.memHalfDesire }}</view> <view class="detail">{{ userData.memHalfDesire ? userData.memHalfDesire : '' }}</view>
<view class="one"></view> <view class="one"></view>
</view> </view>
</view> </view>
...@@ -824,6 +824,14 @@ ...@@ -824,6 +824,14 @@
font-size: 28rpx; font-size: 28rpx;
margin-top: 26rpx; margin-top: 26rpx;
} }
.detail{
color: #434343;
font-size: 28rpx;
margin-top: 25rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
} }
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
v-model="addParams.title" v-model="addParams.title"
border="none" border="none"
placeholder="请输入标题" placeholder="请输入标题"
maxlength="40"
></u--input> ></u--input>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
v-model="userInfo.memNickName" v-model="userInfo.memNickName"
border="none" border="none"
placeholder="请输入昵称" placeholder="请输入昵称"
maxlength="10"
></u--input> ></u--input>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
v-model="userInfo.memWxCode" v-model="userInfo.memWxCode"
border="none" border="none"
placeholder="请输入微信号" placeholder="请输入微信号"
maxlength="10"
></u--input> ></u--input>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
...@@ -160,6 +162,7 @@ ...@@ -160,6 +162,7 @@
v-model="userInfo.memCollege" v-model="userInfo.memCollege"
border="none" border="none"
placeholder="请输入毕业院校" placeholder="请输入毕业院校"
maxlength="8"
></u--input> ></u--input>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
...@@ -171,6 +174,7 @@ ...@@ -171,6 +174,7 @@
v-model="userInfo.memCareer" v-model="userInfo.memCareer"
border="none" border="none"
placeholder="请输入职业" placeholder="请输入职业"
maxlength="8"
></u--input> ></u--input>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
...@@ -182,6 +186,7 @@ ...@@ -182,6 +186,7 @@
v-model="userInfo.memYearIncome" v-model="userInfo.memYearIncome"
border="none" border="none"
placeholder="请输入年收入" placeholder="请输入年收入"
maxlength="8"
></u--input> ></u--input>
<span slot="right">万元</span> <span slot="right">万元</span>
</u-form-item> </u-form-item>
...@@ -194,6 +199,7 @@ ...@@ -194,6 +199,7 @@
v-model="userInfo.memWorkPlace" v-model="userInfo.memWorkPlace"
border="none" border="none"
placeholder="请输入工作单位" placeholder="请输入工作单位"
maxlength="8"
></u--input> ></u--input>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
...@@ -259,6 +265,7 @@ ...@@ -259,6 +265,7 @@
v-model="userInfo.memMarriageRemarks" v-model="userInfo.memMarriageRemarks"
border="none" border="none"
placeholder="请输入婚姻状况备注" placeholder="请输入婚姻状况备注"
maxlength="12"
></u--input> ></u--input>
</u-form-item> </u-form-item>
<u-form-item <u-form-item
...@@ -270,6 +277,7 @@ ...@@ -270,6 +277,7 @@
v-model="userInfo.memMbti" v-model="userInfo.memMbti"
border="none" border="none"
placeholder="请输入16型人格" placeholder="请输入16型人格"
maxlength="8"
></u--input> ></u--input>
</u-form-item> </u-form-item>
</u--form> </u--form>
......
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
编辑 编辑
</view> </view>
</view> </view>
<view class="detail"> <view >
<view>{{userInfo.memIntroduce ? userInfo.memIntroduce : ''}}</view> <view class="detail">{{userInfo.memIntroduce ? userInfo.memIntroduce : ''}}</view>
</view> </view>
</view> </view>
<!-- 兴趣爱好--> <!-- 兴趣爱好-->
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
编辑 编辑
</view> </view>
</view> </view>
<view class="detail"> <view >
<view>{{userInfo.memHobby ? userInfo.memHobby : ''}}</view> <view class="detail">{{userInfo.memHobby ? userInfo.memHobby : ''}}</view>
</view> </view>
</view> </view>
<!-- 心仪的Ta--> <!-- 心仪的Ta-->
...@@ -197,8 +197,8 @@ ...@@ -197,8 +197,8 @@
编辑 编辑
</view> </view>
</view> </view>
<view class="detail"> <view>
<view>{{userInfo.memHalfDesire ? userInfo.memHalfDesire : ''}}</view> <view class="detail">{{userInfo.memHalfDesire ? userInfo.memHalfDesire : ''}}</view>
</view> </view>
</view> </view>
<!-- 未来规划--> <!-- 未来规划-->
...@@ -212,8 +212,8 @@ ...@@ -212,8 +212,8 @@
编辑 编辑
</view> </view>
</view> </view>
<view class="detail"> <view >
<view>{{userInfo.memFuturePlan ? userInfo.memFuturePlan : ''}}</view> <view class="detail">{{userInfo.memFuturePlan ? userInfo.memFuturePlan : ''}}</view>
</view> </view>
</view> </view>
......
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