Browse Source

兼容新版本的hbuilder(loading组件命名冲突)

master
xsx 2 weeks ago
parent
commit
8fa3f32577
  1. 3
      README.md
  2. 6
      im-uniapp/components/chat-message-item/chat-message-item.vue
  3. 3
      im-uniapp/components/custom-loading/custom-loading.vue
  4. 8
      im-uniapp/pages/chat/chat.vue

3
README.md

@ -47,7 +47,8 @@ https://www.yuque.com/u1475064/imk5n2/qtezcg32q1d0dr29#SbvXq
#### 付费服务 #### 付费服务
商业版: https://www.yuque.com/u1475064/imk5n2/qtezcg32q1d0dr29 商业版授权: https://www.yuque.com/u1475064/imk5n2/qtezcg32q1d0dr29
付费代部署: https://www.yuque.com/u1475064/imk5n2/qgq5cvgmavallqnl
#### 项目结构 #### 项目结构
| 模块 | 功能 | | 模块 | 功能 |

6
im-uniapp/components/chat-message-item/chat-message-item.vue

@ -30,7 +30,7 @@
<image class="send-image" :style="imageStyle" mode="aspectFill" <image class="send-image" :style="imageStyle" mode="aspectFill"
:src="contentData.thumbUrl" lazy-load="true" @click.stop="onShowFullImage()"> :src="contentData.thumbUrl" lazy-load="true" @click.stop="onShowFullImage()">
</image> </image>
<loading v-if="sending"></loading> <custom-loading v-if="sending"></custom-loading>
</view> </view>
</long-press-menu> </long-press-menu>
</view> </view>
@ -43,7 +43,7 @@
<view class="file-size">{{ fileSize }}</view> <view class="file-size">{{ fileSize }}</view>
</view> </view>
<view class="file-icon iconfont icon-file"></view> <view class="file-icon iconfont icon-file"></view>
<loading v-if="sending"></loading> <custom-loading v-if="sending"></custom-loading>
</view> </view>
</long-press-menu> </long-press-menu>
</view> </view>
@ -66,7 +66,7 @@
</view> </view>
</long-press-menu> </long-press-menu>
<view v-if="sending&&(isTextMessage||isAudioMessage)" class="sending"> <view v-if="sending&&(isTextMessage||isAudioMessage)" class="sending">
<loading :size="40" icon-color="#656adf" :mask="false"></loading> <custom-loading :size="40" icon-color="#656adf" :mask="false"></custom-loading>
</view> </view>
<view v-else-if="sendFail" @click="onSendFail" <view v-else-if="sendFail" @click="onSendFail"
class="send-fail iconfont icon-warning-circle-fill"></view> class="send-fail iconfont icon-warning-circle-fill"></view>

3
im-uniapp/components/loading/loading.vue → im-uniapp/components/custom-loading/custom-loading.vue

@ -7,6 +7,7 @@
<script> <script>
export default { export default {
name: 'custom-loading',
data() { data() {
return {} return {}
}, },
@ -68,4 +69,4 @@ export default {
transform: rotate(360deg) transform: rotate(360deg)
} }
} }
</style> </style>

8
im-uniapp/pages/chat/chat.vue

@ -2,14 +2,14 @@
<view class="tab-page"> <view class="tab-page">
<nav-bar search @search="onSearch()">消息</nav-bar> <nav-bar search @search="onSearch()">消息</nav-bar>
<view v-if="loading" class="chat-loading"> <view v-if="loading" class="chat-loading">
<loading :size="50" :mask="false"> <custom-loading :size="50" :mask="false">
<view>消息接收中...</view> <view>消息接收中...</view>
</loading> </custom-loading>
</view> </view>
<view v-else-if="initializing" class="chat-loading"> <view v-else-if="initializing" class="chat-loading">
<loading :size="50" :mask="false"> <custom-loading :size="50" :mask="false">
<view>正在初始化...</view> <view>正在初始化...</view>
</loading> </custom-loading>
</view> </view>
<view class="nav-bar" v-if="showSearch"> <view class="nav-bar" v-if="showSearch">
<view class="nav-search"> <view class="nav-search">

Loading…
Cancel
Save