Merge pull request 'xbx' (#96) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/96
This commit was merged in pull request #96.
This commit is contained in:
2020-09-10 17:21:57 +08:00
3 changed files with 4 additions and 4 deletions

View File

@@ -156,7 +156,7 @@ export default {
this.getallorder(0); this.getallorder(0);
const user = uni.getStorageSync('userinfo'); const user = uni.getStorageSync('userinfo');
console.log(user) console.log(user)
this.imService.login(user.userId,user.member_nickname,user.member_avatar) this.imService.login(user.member_id,user.member_nickname,user.member_avatar)
this.imService.connectIM() this.imService.connectIM()
// 订单状态: 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 // 订单状态: 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
}, },

View File

@@ -1,6 +1,6 @@
<template> <template>
<view> <view>
<image :src="list.picture" class="picture" mode=""></image> <image :src="list.picture" class="picture" mode="widthFix"></image>
<view class="box"> <view class="box">
<view class="info"> <view class="info">
<text class="title u-line-2">{{ list.title }}</text> <text class="title u-line-2">{{ list.title }}</text>
@@ -43,7 +43,7 @@
page { page {
} }
.picture { .picture {
width: 100%; width: 750rpx;
} }
.box { .box {
width: 100%; width: 100%;

View File

@@ -77,7 +77,7 @@ export default {
this.getCache(); this.getCache();
const user = uni.getStorageSync('userinfo'); const user = uni.getStorageSync('userinfo');
console.log(user) console.log(user)
this.imService.login(user.userId,user.member_nickname,user.member_avatar) this.imService.login(user.member_id,user.member_nickname,user.member_avatar)
this.imService.connectIM() this.imService.connectIM()
}, },
methods: { methods: {