曾 / uniapp-wuduhuajiao

Commit 8714e5b177a2fcd3572e15a22668b030302dd31a

Authored by 曾
2 parents fc1b1b9c 35953948

Merge branch 'develop' of http://39.98.150.180/sherkxuan/uniapp-wuduhuajiao into develop

Inline Side-by-side
Showing 2 changed files with 17 additions and 4 deletions
uniapp-wuduhuajiao/pages/meeting/meeting.css
  View file @8714e5b
@@ -49,10 +49,15 @@ @@ -49,10 +49,15 @@
49 flex: 1; 49 flex: 1;
50 } 50 }
51 .bottom-input{ 51 .bottom-input{
  52 + width: 650rpx;
52 margin-top: 20rpx; 53 margin-top: 20rpx;
  54 + display: flex;
  55 + align-items: center;
  56 + justify-content: space-between;
  57 + flex-direction: row;
53 } 58 }
54 .input { 59 .input {
55 - width: 650rpx; 60 + width: 500rpx;
56 height: 80rpx; 61 height: 80rpx;
57 background: #111118; 62 background: #111118;
58 border-radius: 20px; 63 border-radius: 20px;
@@ -60,6 +65,13 @@ @@ -60,6 +65,13 @@
60 padding: 10px; 65 padding: 10px;
61 font-size: 12px; 66 font-size: 12px;
62 color: #ffffff; 67 color: #ffffff;
  68 + flex: 1;
  69 +}
  70 +.submit-btn{
  71 + width: 110rpx;
  72 + margin-left: 10rpx;
  73 + flex: none;
  74 + padding: 0;
63 } 75 }
64 .name { 76 .name {
65 width: 100px; 77 width: 100px;
uniapp-wuduhuajiao/pages/meeting/meeting.nvue
  View file @8714e5b
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 </view> 19 </view>
20 <view v-if="!meetingServiceUser.userId" class="list-waiting"> 20 <view v-if="!meetingServiceUser.userId" class="list-waiting">
21 <text style="color: #fff;">等待客服加入</text> 21 <text style="color: #fff;">等待客服加入</text>
22 - <text class="simple-btn" style="margin-top:40px;" @click="handleInviteServiceUser" v-if="!hasInvite && joinType == 'customer'">邀请客服</text> 22 + <text class="simple-btn" style="margin-top:40px;" @click="handleInviteServiceUser" v-if="!hasInvite && (joinType == 'customer' || joinType == 'seller')">邀请客服</text>
23 </view> 23 </view>
24 <block v-if="meetingServiceUser.userId && !meetingServiceUser.meeting"> 24 <block v-if="meetingServiceUser.userId && !meetingServiceUser.meeting">
25 <image v-if="meetingServiceUser.userInfo && meetingServiceUser.userInfo.avatar" :src="meetingServiceUser.userInfo.avatar | imageUrlFilter" style="width: 300rpx;height: 360rpx;border-radius: 40rpx;" mode="aspectFill"></image> 25 <image v-if="meetingServiceUser.userInfo && meetingServiceUser.userInfo.avatar" :src="meetingServiceUser.userInfo.avatar | imageUrlFilter" style="width: 300rpx;height: 360rpx;border-radius: 40rpx;" mode="aspectFill"></image>
@@ -102,7 +102,8 @@ @@ -102,7 +102,8 @@
102 </scroll-view> 102 </scroll-view>
103 <view class="bottom-input"> 103 <view class="bottom-input">
104 <input class="input" placeholder="想说点什么？" placeholder-style="color:#fff" v-model="messageContent" 104 <input class="input" placeholder="想说点什么？" placeholder-style="color:#fff" v-model="messageContent"
105 - @confirm="sendMessage" confirm-type="send" :confirm-hold="true" /> 105 + :confirm-hold="true" />
  106 + <button class="btn submit-btn" v-if="messageContent" @click="sendMessage">发送</button>
106 </view> 107 </view>
107 </view> 108 </view>
108 </view> 109 </view>
@@ -198,7 +199,7 @@ @@ -198,7 +199,7 @@
198 ...mapState(['user', 'statistics', 'common']), 199 ...mapState(['user', 'statistics', 'common']),
199 startBtnVisible() { 200 startBtnVisible() {
200 if (this.userId == this.meetingServiceUser.userId) { 201 if (this.userId == this.meetingServiceUser.userId) {
201 - return !this.meetingServiceUser.meeting && this.meetingBusinessUser.userId; 202 + return !this.meetingServiceUser.meeting;
202 } 203 }
203 return false; 204 return false;
204 }, 205 },