Skip to content

Commit

Permalink
fix some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
bailicangdu committed Jun 14, 2017
1 parent de469c7 commit cc7d965
Show file tree
Hide file tree
Showing 38 changed files with 747 additions and 11 deletions.
2 changes: 1 addition & 1 deletion config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
index: path.resolve(__dirname, '../weixin/index.html'),
assetsRoot: path.resolve(__dirname, '../weixin'),
assetsSubDirectory: 'static',
assetsPublicPath: '/weixin/',
assetsPublicPath: '/',
productionSourceMap: true,
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
Expand Down
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -636,5 +636,4 @@
</symbol>
</defs>
</svg>
</body>
</html>
19 changes: 10 additions & 9 deletions src/frames/conversation/groupchat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,9 @@
this.gropname=res.petname;
//this.groupconversine=[...res.grouphead];
});
socket.on('chat', function (data) {
//console.log(data);//聊天返回内容
socket.on('chat', (data) => {
console.log(data);//聊天返回内容
this.groupconversine.push(data)
});
chatData().then((res) => {
this.chatData=res;
Expand Down Expand Up @@ -272,13 +273,13 @@
this.clickmore=false;
},
async clickSend(){
this.groupconversine.push({
"wxid":"xulianjie442154157",
"avatar":this.userInfo.avatar,
"sendobject":0,
"content":this.inputmessage,
"user_id":this.userInfo.id,
});
// this.groupconversine.push({
// "wxid":"xulianjie442154157",
// "avatar":this.userInfo.avatar,
// "sendobject":0,
// "content":this.inputmessage,
// "user_id":this.userInfo.id,
// });
this.light=false;
socket.emit('chat', {user_id: this.userInfo.id, content: this.inputmessage});
Expand Down
1 change: 1 addition & 0 deletions src/frames/dialogue/dialogue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
try{
const res = await login({username: this.inputaccounts})
if (res.status == 200) {
localStorage.setItem('user_id', res.user_info.id.toString())
this.GET_USERINFO(res.user_info)
this.LOGIN_COVER(false)
}
Expand Down
639 changes: 639 additions & 0 deletions weixin/index.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions weixin/static/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions weixin/static/js/aboutwc.4c769f907da0ebe045de.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/addressbook.b5bc84badd17a06b5894.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions weixin/static/js/app.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/cardbag.41111d417a907608db80.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/chat.4949fd6fa9889335d4ca.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/chatmessage.b58415092ac09b806498.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/collect.44638360d18408b335ed.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/computer.31eded42d1b107b870f3.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/currency.a8d5e65da4f8f075dc68.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/details.74c5d6eb0ce5bb56c19e.min.js

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions weixin/static/js/dialogue.475b0cf24edc52436134.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/disturbance.e907968e0a3873b01e65.min.js

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions weixin/static/js/find.43dbf9f423b86c48386c.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/friendcircle.6af1cdfab057fd3b4ceb.min.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions weixin/static/js/groupchat.4fdfc970a06742c4e0ad.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/groupchatmessage.5a4f5a7f1468a8559bab.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions weixin/static/js/help.e743c35707ad636be767.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/login.af085b0a9a92f645d9cb.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions weixin/static/js/manifest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions weixin/static/js/me.33e1fb0c7fae680b8c16.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/miniapps.e57c0077cebd29e2cd24.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/more.665ed89984fd8976ffdb.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/newmessage.c34b1386b5db608e45a0.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/personaldetails.8d3017d7e43b1626455c.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/photoalbum.2820731419523eddc424.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/privacy.519f2e3381d9908087ef.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/search.6b2a5dd5a71bcd39b5c3.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/settings.08d9fcfb1c2d827d7825.min.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions weixin/static/js/singlechat.f04c11601bd029c042bb.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/transfer.5b94c330a7146b508c32.min.js

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions weixin/static/js/vendor.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions weixin/static/js/wallet.d8aea85bff3aa2196fbf.min.js

Large diffs are not rendered by default.

0 comments on commit cc7d965

Please sign in to comment.