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

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

Browse Source
This commit is contained in:
ghusermoon
2020-08-11 15:40:53 +08:00
parent 1ef4db7dc4 20259ddf00
commit 9a0dc4c6d1
15 changed files with 185 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pages/index/index.vue
View File

@@ -27,11 +27,11 @@
<view class="list">
<view>
<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
@getArticlelist="getArticlelist"></videoItem>
@updateList="updateList"></videoItem>
</view>
<view style="margin-left:20rpx">
<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
@getArticlelist="getArticlelist"></videoItem>
@updateList="updateList"></videoItem>
</view>
</view>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
@@ -96,6 +96,9 @@
display: flex;
flex-direction: column;
height: 100vh;
/* #ifdef APP-PLUS */
padding-bottom: 100rpx;
/* #endif */
overflow: hidden;
.top {
@@ -366,6 +369,12 @@
}
})
},
// 屏蔽更新列表
updateList() {
console.log(111);
this.page = 0;
this.getArticlelist();
},
// 发现下拉加载
swiperBottom(e) {
this.getArticlelist();

47
pages/information/information.vue
View File

@@ -3,14 +3,14 @@
<u-navbar :is-back="false" :title-size="36" title="消息">
<view class="slot-wrap">
<image src="../../static/pageD/info(3).png" @click="delMessage()"></image>
<image src="../../static/pageD/info(2).png"></image>
<image src="../../static/pageD/info(2).png" @click="kefu()"></image>
</view>
</u-navbar>
<view class="content">
<!-- 正文内容 -->
</view>
<!-- <view class="sousuo"></view> -->
<view class="backes">
<view class="backes" style="border-bottom: 1px #ececec solid;">
<titles :information="information_dles"></titles>
</view>
<!-- 消息通知 -->
@@ -105,6 +105,49 @@
},
methods: {
kefu(){
if(!this.$store.state.hasLogin){
this.$refs.uToast.show({
title: "请先登录",
type: 'warning'
})
}else{
function Friend(uuid, name, avatar,time = "", text = "",date = "") {
this.uuid = uuid;
this.name = name;
this.avatar = avatar;
this.online = false;
this.unReadMessage = 0;
this.text = text;
this.time = time;
this.date = date
}
const token = uni.getStorageSync('token');
let that = this
uni.request({
url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
data:{
userId: 1
},
method:"POST",
header:{
"Authorization" : 'Bearer' + " " + token
},
success(res){
console.log(res)
res = res.data
let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
that.$u.route({
url:"/pageD/privateChat/privateChat",
params:{
id:JSON.stringify(user)
}
})
}
})
}
},
gochat(id){
this.$u.route({
url:"/pageD/privateChat/privateChat",

34
pages/mine/index.vue
View File

@@ -46,7 +46,7 @@
<view class="title">
<view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')">
<view class="title-text">查看全部订单</view>
<view class="title-text-more">查看全部订单</view>
<image src="/static/image/mine/21.png"></image>
</view>
</view>
@@ -71,14 +71,14 @@
<image src="/static/image/mine/37.png"></image>
<view>拼团中</view>
</view>
<view @click="toOtherPage('/order/Index?current=6')">
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
<view @click="toOtherPage('/order/Index?current=7')">
<image src="/static/image/mine/3.png"></image>
<view>待评价</view>
</view>
<view @click="toOtherPage('/order/Index?current=6')">
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
</view>
</view>
<view class="tool">
@@ -250,8 +250,9 @@ export default {
> view {
margin-right: 80rpx;
text-align: center;
font-size: 24rpx;
color:rgba(51,51,51,1);
font-size: 26rpx;
font-weight: 500;
color: #333;
> view:first-child {
margin-bottom: 10rpx;
}
@@ -275,7 +276,7 @@ export default {
.title {
height: 76rpx;
font-size: 28rpx;
color: rgba(51,51,51,1);
color: #666;
position: relative;
display: flex;
align-items: center;
@@ -290,6 +291,10 @@ export default {
transform: translate(-50%,0);
}
}
.title-text-more {
font-size: 24rpx;
color: #999;
}
.content {
padding: $content-padding-top 0 $content-padding-bottom;
display: flex;
@@ -329,6 +334,7 @@ export default {
}
}
.content {
align-items: center;
justify-content: space-between;
> view {
display: flex;
@@ -337,22 +343,22 @@ export default {
justify-content: space-between;
}
> view:nth-child(1){
@include image-size($image-width: 33rpx, $image-height: 36rpx);
@include image-size($image-width: 36rpx, $image-height: 34rpx);
}
> view:nth-child(2){
@include image-size($image-width: 38rpx, $image-height: 32rpx);
@include image-size($image-width: 38rpx, $image-height: 36rpx);
}
> view:nth-child(3){
@include image-size($image-width: 41rpx, $image-height: 33rpx);
@include image-size($image-width: 40rpx, $image-height: 36rpx);
}
> view:nth-child(4){
@include image-size($image-width: 40rpx, $image-height: 35rpx);
@include image-size($image-width: 38rpx, $image-height: 38rpx);
}
> view:nth-child(5){
@include image-size($image-width: 37rpx, $image-height: 37rpx);
@include image-size($image-width: 36rpx, $image-height: 40rpx);
}
> view:nth-child(6){
@include image-size($image-width: 33rpx, $image-height: 35rpx);
@include image-size($image-width: 36rpx, $image-height: 40rpx);
}
}
}