Merge pull request 'zmr' (#263) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/263
This commit is contained in:
commit
dd3d3c17c4
@ -6,7 +6,7 @@
|
||||
<u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
|
||||
<text>视频</text>
|
||||
</view>
|
||||
<image class="head" :src="item.article_pic"></image>
|
||||
<image class="head" :src="item.article_pic" mode="aspectFill"></image>
|
||||
</view>
|
||||
<view class="title" v-if="">{{ item.article_title }}</view>
|
||||
<view class="jianjie">{{ item.article_content }}</view>
|
||||
@ -103,7 +103,7 @@
|
||||
}
|
||||
}
|
||||
>image{
|
||||
width: 37rpx;
|
||||
width: 35rpx;
|
||||
height: 8rpx;
|
||||
padding: 20rpx;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="notice">
|
||||
<view class="notice" :style="{height : height + 'px'}">
|
||||
<view v-for="(item,index) in notice" :key="index" @click="gotoInfo(index)">
|
||||
<view class="time_notice">{{ item.addtime }}</view>
|
||||
<view class="notice_view">
|
||||
@ -36,6 +36,7 @@
|
||||
margin: 0 auto;
|
||||
text-align: left;
|
||||
line-height: 40rpx;
|
||||
letter-spacing: 2rpx;
|
||||
}
|
||||
.notice_view > view:nth-child(3){
|
||||
height: 84rpx;
|
||||
@ -77,7 +78,8 @@
|
||||
props: ['list'],
|
||||
data() {
|
||||
return {
|
||||
notice : []
|
||||
notice : [],
|
||||
height : ''
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
@ -86,6 +88,8 @@
|
||||
this.notice = newVal;
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
},
|
||||
methods: {
|
||||
gotoInfo(index) {
|
||||
console.log(index);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view class="special">
|
||||
<view v-if="type == 'spike'" @click="spikeGoods">
|
||||
<image :src="item.groupbuy_image1"></image>
|
||||
<image :src="item.groupbuy_image1" mode="aspectFill"></image>
|
||||
<view class="right">
|
||||
<view class="name u-line-1">{{ item.goods_name }}</view>
|
||||
<view class="price">
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
/* #endif */
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
padding: 0 30rpx;
|
||||
// padding: 0 30rpx;
|
||||
}
|
||||
|
||||
.operat-span {
|
||||
|
||||
@ -158,13 +158,16 @@
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
.label {
|
||||
padding: 6rpx 10rpx;
|
||||
margin: 0 10rpx 10rpx 0;
|
||||
font-size: 24rpx;
|
||||
height: 40rpx;
|
||||
padding: 4rpx 14rpx;
|
||||
margin-right: 10rpx;
|
||||
margin-bottom: 10rpx;
|
||||
font-size: 26rpx;
|
||||
text-align: center;
|
||||
line-height: 38rpx;
|
||||
color: #fff;
|
||||
border-radius: 6rpx;
|
||||
background-color: #000000;
|
||||
opacity: 0.5;
|
||||
border-radius: 10rpx;
|
||||
background-color: rgba(0, 0, 0, .6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -631,6 +631,7 @@
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
lines: 2;
|
||||
letter-spacing: 2rpx;
|
||||
}
|
||||
|
||||
.more-content-box {
|
||||
@ -859,6 +860,7 @@
|
||||
margin-bottom: 20rpx;
|
||||
lines: 1;
|
||||
text-overflow: ellipsis;
|
||||
letter-spacing: 2rpx;
|
||||
}
|
||||
|
||||
.centent {
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
padding: 39rpx 0 30rpx;
|
||||
}
|
||||
.content{
|
||||
width:630rpx;
|
||||
width:94%;
|
||||
padding: 30rpx;
|
||||
background:rgba(255,255,255,1);
|
||||
border-radius:20rpx;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view>
|
||||
<view id="viewes" :style="{height : height + 'px'}">
|
||||
<!-- 公告咨询 -->
|
||||
<notice :list="list"></notice>
|
||||
</view>
|
||||
@ -15,6 +15,13 @@
|
||||
},
|
||||
onLoad() {
|
||||
this.informationList();
|
||||
var _that = this
|
||||
uni.getSystemInfo({
|
||||
success: function (res) {
|
||||
console.log(res.windowHeight);
|
||||
_that.height = res.windowHeight
|
||||
}
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
titletext() {},
|
||||
@ -36,7 +43,9 @@
|
||||
page {
|
||||
background-color: #ECECEC;
|
||||
}
|
||||
|
||||
#viewes{
|
||||
background: #ECECEC;
|
||||
}
|
||||
.sousuo {
|
||||
height: 113rpx;
|
||||
border: 1px #f00 solid;
|
||||
|
||||
@ -59,7 +59,7 @@
|
||||
<div :class="[audio.visible ? 'record-icon record-open':'record-icon']" @click="switchAudioKeyboard"></div>
|
||||
<div class="record-input" @longpress="onRecordStart" @touchend="onRecordEnd" v-if="audio.visible" >{{audio.recording ? '松开发送' : '按住录音'}}</div>
|
||||
<div class="message-input" v-else>
|
||||
<input type="text" placeholder="发送消息" v-model="content">
|
||||
<input type="text" placeholder="发送消息" v-model="content" @click="bindtapInput">
|
||||
</div>
|
||||
<div class="file-icon img-video" @click="sendImage"></div>
|
||||
<div class="file-icon" @click="sendVideo"></div>
|
||||
@ -84,6 +84,7 @@
|
||||
return {
|
||||
//聊天文本框
|
||||
content: '',
|
||||
bottom : '',
|
||||
friend: null,
|
||||
currentUser: null,
|
||||
//已经接收到的消息
|
||||
@ -154,6 +155,11 @@
|
||||
this.imService.resetFriendUnReadMessage(this.friend);
|
||||
},
|
||||
methods: {
|
||||
bindtapInput(){
|
||||
console.log("222")
|
||||
var _that = this;
|
||||
_that.bottom = 14
|
||||
},
|
||||
initialListeners () {
|
||||
//传入监听器，收到一条私聊消息总是滚到到页面底部
|
||||
this.imService.onNewPrivateMessageReceive = (friendId, message)=> {
|
||||
|
||||
@ -54,7 +54,9 @@
|
||||
<view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)">
|
||||
<image :src="item.img"></image>
|
||||
<view>{{ item.title }}</view>
|
||||
<view class="order-num" v-if="item.number">{{ item.number }}</view>
|
||||
<view class="order-num" v-if="item.number">
|
||||
<text>{{ item.number }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view @click="toOtherPage('/order/Index?current=1')">
|
||||
<image src="/static/image/mine/6.png"></image>
|
||||
@ -410,11 +412,15 @@ export default {
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
position: relative;
|
||||
.order-num {
|
||||
z-index: 9;
|
||||
.order-num{
|
||||
position: absolute;
|
||||
top: -12rpx;
|
||||
right: -16rpx;
|
||||
right: -38rpx;
|
||||
width: 50rpx;
|
||||
}
|
||||
.order-num > text {
|
||||
z-index: 9;
|
||||
float: left;
|
||||
border: 1rpx solid #FF7807;
|
||||
height: 24rpx;
|
||||
border-radius: 12rpx;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user