theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'zmr' (#263) from zmr into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/263
This commit is contained in:
zhaomingrui 2020-08-20 14:30:12 +08:00
commit dd3d3c17c4
10 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/index/video-item/index.vue
View File

@ -6,7 +6,7 @@
<u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon> <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
<text>视频</text> <text>视频</text>
</view> </view>
<image class="head" :src="item.article_pic"></image> <image class="head" :src="item.article_pic" mode="aspectFill"></image>
</view> </view>
<view class="title" v-if="">{{ item.article_title }}</view> <view class="title" v-if="">{{ item.article_title }}</view>
<view class="jianjie">{{ item.article_content }}</view> <view class="jianjie">{{ item.article_content }}</view>
@ -103,7 +103,7 @@
} }
} }
>image{ >image{
width: 37rpx; width: 35rpx;
height: 8rpx; height: 8rpx;
padding: 20rpx; padding: 20rpx;
} }

8
components/informations/notice/notice.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="notice"> <view class="notice" :style="{height : height + 'px'}">
<view v-for="(item,index) in notice" :key="index" @click="gotoInfo(index)"> <view v-for="(item,index) in notice" :key="index" @click="gotoInfo(index)">
<view class="time_notice">{{ item.addtime }}</view> <view class="time_notice">{{ item.addtime }}</view>
<view class="notice_view"> <view class="notice_view">
@ -36,6 +36,7 @@
margin: 0 auto; margin: 0 auto;
text-align: left; text-align: left;
line-height: 40rpx; line-height: 40rpx;
letter-spacing: 2rpx;
} }
.notice_view > view:nth-child(3){ .notice_view > view:nth-child(3){
height: 84rpx; height: 84rpx;
@ -77,7 +78,8 @@
props: ['list'], props: ['list'],
data() { data() {
return { return {
notice : [] notice : [],
height : ''
}; };
}, },
watch: { watch: {
@ -86,6 +88,8 @@
this.notice = newVal; this.notice = newVal;
} }
}, },
onLoad() {
},
methods: { methods: {
gotoInfo(index) { gotoInfo(index) {
console.log(index); console.log(index);

4
components/shop/special-shop/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="special"> <view class="special">
<view v-if="type == 'spike'" @click="spikeGoods"> <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="right">
<view class="name u-line-1">{{ item.goods_name }}</view> <view class="name u-line-1">{{ item.goods_name }}</view>
<view class="price"> <view class="price">
@ -16,7 +16,7 @@
</view> </view>
<view v-if="type == 'group'" @click="toDetailsPage"> <view v-if="type == 'group'" @click="toDetailsPage">
<image :src="item.pintuan_image"></image> <image :src="item.pintuan_image"></image>
<view class="right"> <view class="right">
<view class="name u-line-1">{{ item.pintuan_goods_name }}</view> <view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
<view class="price group"> <view class="price group">
<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view> <view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>

2
pageB/components/userinfo/index.vue
View File

@ -75,7 +75,7 @@
/* #endif */ /* #endif */
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
padding: 0 30rpx; // padding: 0 30rpx;
} }
.operat-span { .operat-span {

15
pageB/photo/index.vue
View File

@ -158,13 +158,16 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.label { .label {
padding: 6rpx 10rpx; height: 40rpx;
margin: 0 10rpx 10rpx 0; padding: 4rpx 14rpx;
font-size: 24rpx; margin-right: 10rpx;
margin-bottom: 10rpx;
font-size: 26rpx;
text-align: center;
line-height: 38rpx;
color: #fff; color: #fff;
border-radius: 6rpx; border-radius: 10rpx;
background-color: #000000; background-color: rgba(0, 0, 0, .6);
opacity: 0.5;
} }
} }
} }

2
pageB/video/video.nvue
View File

@ -631,6 +631,7 @@
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
lines: 2; lines: 2;
letter-spacing: 2rpx;
} }
.more-content-box { .more-content-box {
@ -859,6 +860,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
lines: 1; lines: 1;
text-overflow: ellipsis; text-overflow: ellipsis;
letter-spacing: 2rpx;
} }
.centent { .centent {

2
pageD/activity/activity.vue
View File

@ -81,7 +81,7 @@
padding: 39rpx 0 30rpx; padding: 39rpx 0 30rpx;
} }
.content{ .content{
width:630rpx; width:94%;
padding: 30rpx; padding: 30rpx;
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border-radius:20rpx; border-radius:20rpx;

13
pageD/notice/notice.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view> <view id="viewes" :style="{height : height + 'px'}">
<!-- 公告咨询 --> <!-- 公告咨询 -->
<notice :list="list"></notice> <notice :list="list"></notice>
</view> </view>
@ -15,6 +15,13 @@
}, },
onLoad() { onLoad() {
this.informationList(); this.informationList();
var _that = this
uni.getSystemInfo({
success: function (res) {
console.log(res.windowHeight);
_that.height = res.windowHeight
}
});
}, },
methods: { methods: {
titletext() {}, titletext() {},
@ -36,7 +43,9 @@
page { page {
background-color: #ECECEC; background-color: #ECECEC;
} }
#viewes{
background: #ECECEC;
}
.sousuo { .sousuo {
height: 113rpx; height: 113rpx;
border: 1px #f00 solid; border: 1px #f00 solid;

8
pageD/privateChat/privateChat.vue
View File

@ -59,7 +59,7 @@
<div :class="[audio.visible ? 'record-icon record-open':'record-icon']" @click="switchAudioKeyboard"></div> <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="record-input" @longpress="onRecordStart" @touchend="onRecordEnd" v-if="audio.visible" >{{audio.recording ? '松开发送' : '按住录音'}}</div>
<div class="message-input" v-else> <div class="message-input" v-else>
<input type="text" placeholder="发送消息" v-model="content"> <input type="text" placeholder="发送消息" v-model="content" @click="bindtapInput">
</div> </div>
<div class="file-icon img-video" @click="sendImage"></div> <div class="file-icon img-video" @click="sendImage"></div>
<div class="file-icon" @click="sendVideo"></div> <div class="file-icon" @click="sendVideo"></div>
@ -84,6 +84,7 @@
return { return {
//聊天文本框 //聊天文本框
content: '', content: '',
bottom : '',
friend: null, friend: null,
currentUser: null, currentUser: null,
//已经接收到的消息 //已经接收到的消息
@ -154,6 +155,11 @@
this.imService.resetFriendUnReadMessage(this.friend); this.imService.resetFriendUnReadMessage(this.friend);
}, },
methods: { methods: {
bindtapInput(){
console.log("222")
var _that = this;
_that.bottom = 14
},
initialListeners () { initialListeners () {
//传入监听器，收到一条私聊消息总是滚到到页面底部 //传入监听器，收到一条私聊消息总是滚到到页面底部
this.imService.onNewPrivateMessageReceive = (friendId, message)=> { this.imService.onNewPrivateMessageReceive = (friendId, message)=> {

14
pages/mine/index.vue
View File

@ -54,7 +54,9 @@
<view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)"> <view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)">
<image :src="item.img"></image> <image :src="item.img"></image>
<view>{{ item.title }}</view> <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>
<!-- <view @click="toOtherPage('/order/Index?current=1')"> <!-- <view @click="toOtherPage('/order/Index?current=1')">
<image src="/static/image/mine/6.png"></image> <image src="/static/image/mine/6.png"></image>
@ -410,11 +412,15 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
.order-num { .order-num{
z-index: 9;
position: absolute; position: absolute;
top: -12rpx; top: -12rpx;
right: -16rpx; right: -38rpx;
width: 50rpx;
}
.order-num > text {
z-index: 9;
float: left;
border: 1rpx solid #FF7807; border: 1rpx solid #FF7807;
height: 24rpx; height: 24rpx;
border-radius: 12rpx; border-radius: 12rpx;