Merge pull request 'xbx' (#151) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/151
This commit is contained in:
commit
def8f0cf1b
@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<view class="notice">
|
||||
<view v-for="(item,index) in notice" :key="index">
|
||||
<view v-for="(item,index) in notice" :key="index" @click="gotoInfo(index)">
|
||||
<view class="time_notice">{{ item.addtime }}</view>
|
||||
<view class="notice_view">
|
||||
<image :src="item.picture" mode="aspectFill" ></image>
|
||||
<view class="text_view u-line-2">{{ item.content }}</view>
|
||||
<view class="notice_list" @click="gotoInfo(index)">
|
||||
<view class="notice_list">
|
||||
<text>查看详情</text>
|
||||
<u-icon name="arrow-right" color="#666"></u-icon>
|
||||
</view>
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
<image src="/static/image/common/10.png"></image>
|
||||
<text>输入达人名称</text>
|
||||
</view>
|
||||
<view class="list">
|
||||
<darenItem style="margin-top:20rpx;" v-for="item in recommendList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
|
||||
<view class="list" style="margin-left:-20rpx">
|
||||
<darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -76,7 +76,7 @@ export default {
|
||||
},
|
||||
searchValue() {
|
||||
uni.navigateTo({
|
||||
url: '/pageB/search/index?type=1'
|
||||
url: '/pageB/search/index?type=2'
|
||||
})
|
||||
},
|
||||
},
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
<image src="/static/image/shop/11.png"></image>
|
||||
<view>店铺信息</view>
|
||||
</view>
|
||||
<view @click="switchCurrent(3)">
|
||||
<view @click="customers()">
|
||||
<image src="/static/image/shop/12.png"></image>
|
||||
<view>联系客服</view>
|
||||
</view>
|
||||
@ -109,6 +109,43 @@ export default {
|
||||
// if(e.index == 0) this.show = true;
|
||||
},
|
||||
methods: {
|
||||
customers(){
|
||||
console.log(this.$store.state.hasLogin)
|
||||
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
|
||||
}
|
||||
console.log(123)
|
||||
this.$u.api.getAtwillUserInfo({
|
||||
id:this.sid
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
|
||||
this.$u.route({
|
||||
url:"/pageD/privateChat/privateChat",
|
||||
params:{
|
||||
id:JSON.stringify(user)
|
||||
}
|
||||
|
||||
})
|
||||
}).catch((err)=>{
|
||||
console.log(err)
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
toDetailsPage(id) {
|
||||
// console.log(11);
|
||||
this.$u.route('pageB/photo/index', {
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -297,7 +297,8 @@ IMService.prototype.initialIMListeners = function () {
|
||||
friend.text = message.type != "text" ? "其他消息" : message.payload.text
|
||||
let time = new Date(message.timestamp)
|
||||
friend.date = message.timestamp
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
|
||||
console.log(that.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in that.friends){
|
||||
@ -322,7 +323,7 @@ IMService.prototype.initialIMListeners = function () {
|
||||
friend.text = message.type != "text" ? "其他消息" : message.payload.text
|
||||
let time = new Date(message.timestamp)
|
||||
friend.date = message.timestamp
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
console.log(this.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in this.friends){
|
||||
@ -537,7 +538,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
|
||||
friend.text = message
|
||||
let time = new Date()
|
||||
friend.date = time.getTime()
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
|
||||
|
||||
console.log(that.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in that.friends){
|
||||
@ -561,7 +564,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
|
||||
friend.text = message
|
||||
let time = new Date()
|
||||
friend.date = time.getTime()
|
||||
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
|
||||
friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
|
||||
|
||||
|
||||
console.log(this.friends)
|
||||
that.friendsarr = []
|
||||
for(let i in this.friends){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user