Skip to content

Commit a980b38

Browse files
Wster11Wster11
committed
merge easemob/master
2 parents 4ff1cdf + a7f1c29 commit a980b38

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1091
-1078
lines changed

‎.babelrc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@
88
}],
99
"stage-2"
1010
],
11-
"plugins": ["transform-vue-jsx", "transform-runtime"]
11+
"plugins": [
12+
"transform-vue-jsx",
13+
"transform-runtime",
14+
["import", { "libraryName": "ant-design-vue", "libraryDirectory": "es", "style": "css" }]
15+
]
1216
}

‎build/webpack.dev.conf.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
3434
compress: true,
3535
host: HOST || config.dev.host,
3636
port: PORT || config.dev.port,
37-
open: config.dev.autoOpenBrowser,
37+
open: true,
3838
overlay: config.dev.errorOverlay
3939
? { warnings: false, errors: true }
4040
: false,

‎package-lock.json‎

Lines changed: 0 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"ant-design-vue": "^1.3.17",
1515
"easemob-emedia": "^2.1.3",
1616
"easemob-webrtc": "^3.2.2",
17-
"element-ui": "^2.12.0",
1817
"lodash": "^4.17.15",
1918
"moment": "^2.24.0",
2019
"vue": "^2.5.2",
@@ -64,7 +63,6 @@
6463
"shelljs": "^0.7.6",
6564
"uglifyjs-webpack-plugin": "^1.1.1",
6665
"url-loader": "^0.5.8",
67-
"vant": "^2.12.19",
6866
"vue-loader": "^13.3.0",
6967
"vue-style-loader": "^3.0.1",
7068
"vue-template-compiler": "^2.5.2",

‎src/App.vue‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<div id="app">
3-
<router-view />
4-
</div>
2+
<div id="app">
3+
<router-view />
4+
</div>
55
</template>
66

77
<script>
@@ -28,19 +28,13 @@ export default{
2828
</script>
2929

3030
<style>
31-
@import url('./utils/theme/base.css');
32-
33-
#app {
34-
font-family: 'Avenir', Helvetica, Arial, sans-serif;
35-
-webkit-font-smoothing: antialiased;
36-
-moz-osx-font-smoothing: grayscale;
37-
text-align: center;
38-
color: #2c3e50;
39-
margin-top: 60px;
40-
}
41-
.el-message-box{
42-
width: 50%;
43-
max-width: 400px;
44-
}
45-
31+
@import url('./utils/theme/base.css');
32+
#app {
33+
font-family: 'Avenir', Helvetica, Arial, sans-serif;
34+
-webkit-font-smoothing: antialiased;
35+
-moz-osx-font-smoothing: grayscale;
36+
text-align: center;
37+
color: #2c3e50;
38+
margin-top: 60px;
39+
}
4640
</style>

‎src/components/addModal/addFriend.vue‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
title="添加好友"
44
v-model="showAddFriendModal"
55
@ok="submitValue"
6-
@cancel="showAddFriendModal = false"
6+
@canca="showAddFriendModal = false"
77
>
8-
<el-form :model="form">
9-
<el-form-item label="用户名">
10-
<el-input v-model="form.name" auto-complete="off"></el-input>
11-
</el-form-item>
12-
</el-form>
8+
<a-form :model="form">
9+
<a-form-item laba="用户名">
10+
<a-input v-model="form.name" auto-complete="off"></a-input>
11+
</a-form-item>
12+
</a-form>
1313
<div slot="footer" class="dialog-footer">
14-
<el-button @click="showAddFriendModal = false">取 消</el-button>
15-
<el-button type="primary" @click="submitValue">确 定</el-button>
14+
<a-button @click="showAddFriendModal = false">取 消</a-button>
15+
<a-button type="primary" @click="submitValue">确 定</a-button>
1616
</div>
1717
</a-modal>
1818
</template>

‎src/components/addModal/firendBlack.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<li v-for="item in fidendList" :key="item.name">
99
{{item.name}}
1010
<label class="icon-x" @click="select(item)" >
11-
<i class="el-icon-remove-outline"></i>
11+
<a-icon type="minus-circle" />
1212
</label>
1313
</li>
1414
</ul>

‎src/components/addModal/getFriendRequest.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<template>
22
<div>
3-
<el-dialog title="请求添加好友" :visible="this.isShowFriendRequest">
3+
<a-modal title="请求添加好友" :visible="this.isShowFriendRequest">
44
<p :class="$style.p">{{this.$store.state.friendModule.friendRequest.status}}</p>
55
<div slot="footer" class="dialog-footer">
6-
<el-button @click="refusedClick">拒绝</el-button>
7-
<el-button type="primary" @click="acceptSubmit">接受</el-button>
6+
<a-button @click="refusedClick">拒绝</a-button>
7+
<a-button type="primary" @click="acceptSubmit">接受</a-button>
88
</div>
9-
</el-dialog>
9+
</a-modal>
1010
</div>
1111
</template>
1212

0 commit comments

Comments
 (0)