These are chat archives for Anddward/L_and_W

28th
Jun 2016
cocowuhuiling
@cocowuhuiling
Jun 28 2016 01:03 UTC
ok
cocowuhuiling
@cocowuhuiling
Jun 28 2016 01:23 UTC
屏幕快照 2016-06-28 上午9.22.58.png
Anddward.Liao
@Anddward
Jun 28 2016 01:24 UTC
npm install
cocowuhuiling
@cocowuhuiling
Jun 28 2016 02:45 UTC
刘灯生了个小公举
cocodeMacBook-Pro:zookeProject/Gms-website(master) $ gulp
module.js:341
    throw err;
    ^

Error: Cannot find module './lib/create-error'
    at Function.Module._resolveFilename (module.js:339:15)
    at Function.Module._load (module.js:290:25)
    at Module.require (module.js:367:17)
    at require (internal/module.js:16:19)
    at Object.<anonymous> (/Users/coco/Documents/zookeProject/Gms-website/node_modules/gulp-uglify/minifier.js:9:19)
    at Module._compile (module.js:413:34)
    at Object.Module._extensions..js (module.js:422:10)
    at Module.load (module.js:357:32)
    at Function.Module._load (module.js:314:12)
    at Module.require (module.js:367:17)
cocodeMacBook-Pro:zookeProject/Gms-website(master) $ npm install                                                                                                                 1 ↵
npm WARN enoent ENOENT: no such file or directory, open '/Users/coco/Documents/zookeProject/Gms-website/node_modules/in-publish/package.json'
npm WARN enoent ENOENT: no such file or directory, open '/Users/coco/Documents/zookeProject/Gms-website/node_modules/normalize-package-data/package.json'
npm WARN bl@0.7.0 requires a peer of stream-browserify@* but none was installed.
报错了
:worried:
Anddward.Liao
@Anddward
Jun 28 2016 02:54 UTC
:clap:
删除 node_modules ,再 npm install ?
以后node更新的东西,不需要进行版本管理,因为会经常更新
cocowuhuiling
@cocowuhuiling
Jun 28 2016 02:56 UTC
cocowuhuiling
@cocowuhuiling
Jun 28 2016 03:38 UTC
.gitignore对node_modules不生效
Anddward.Liao
@Anddward
Jun 28 2016 03:39 UTC
how
cocowuhuiling
@cocowuhuiling
Jun 28 2016 03:39 UTC
屏幕快照 2016-06-28 上午11.39.29.png
Anddward.Liao
@Anddward
Jun 28 2016 03:41 UTC
git status
cocowuhuiling
@cocowuhuiling
Jun 28 2016 03:43 UTC
```
cocodeMacBook-Pro:zookeProject/Gms-website(master !*) $ gs
On branch master
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    deleted:    node_modules/express/node_modules/qs/.eslintignore
    deleted:    node_modules/express/node_modules/qs/CHANGELOG.md
    deleted:    node_modules/express/node_modules/qs/CONTRIBUTING.md
    deleted:    node_modules/express/node_modules/qs/LICENSE
    deleted:    node_modules/express/node_modules/qs/lib/index.js
    deleted:    node_modules/express/node_modules/qs/lib/parse.js
    deleted:    node_modules/express/node_modules/qs/lib/stringify.js
    deleted:    node_modules/express/node_modules/qs/lib/utils.js
    deleted:    node_modules/express/node_modules/qs/package.json
    deleted:    node_modules/express/node_modules/qs/test/parse.js
    deleted:    node_modules/express/node_modules/qs/test/stringify.js
    deleted:    node_modules/express/node_modules/qs/test/utils.js
    modified:   node_modules/express/package.json
    modified:   node_modules/gulp-autoprefixer/node_modules/object-assign/package.json
    modified:   node_modules/gulp-autoprefixer/node_modules/through2/package.json
    modified:   node_modules/gulp-autoprefixer/package.json
    modified:   node_modules/gulp-declare/package.json
    modified:   node_modules/gulp-handlebars/node_modules/through2/package.json
    modified:   node_modules/gulp-handlebars/package.json
    modified:   node_modules/gulp-imagemin/node_modules/object-assign/package.json
    modified:   node_modules/gulp-imagemin/package.json
    modified:   node_modules/gulp-less/node_modules/object-assign/package.json
    modified:   node_modules/gulp-less/node_modules/vinyl-sourcemaps-apply/package.json
    modified:   node_modules/gulp-less/package.json
    modified:   node_modules/gulp-minify-css/node_modules/object-assign/package.json
    modified:   node_modules/gulp-minify-css/node_modules/readable-stream/package.json
    modified:   node_modules/gulp-minify-css/node_modules/vinyl-sourcemaps-apply/package.json
    modified:   node_modules/gulp-minify-css/package.json
    modified:   node_modules/gulp-ruby-sass/node_modules/object-assign/package.json
    modified:   node_modules/gulp-ruby-sass/node_modules/path-exists/package.json
    modified:   node_modules/gulp-ruby-sass/node_modules/vinyl-fs/package.json
    modified:   node_modules/gulp-ruby-sass/package.json
    modified:   node_modules/gulp-sass/node_modules/vinyl-sourcemaps-apply/package.json
Anddward.Liao
@Anddward
Jun 28 2016 03:46 UTC
git rm -r node_modules
cocowuhuiling
@cocowuhuiling
Jun 28 2016 03:47 UTC
cocodeMacBook-Pro:zookeProject/Gms-website(master !*) $ git rm -r node_modules
error: the following files have local modifications:
    node_modules/express/package.json
    node_modules/gulp-autoprefixer/node_modules/object-assign/package.json
    node_modules/gulp-autoprefixer/node_modules/through2/package.json
    node_modules/gulp-autoprefixer/package.json
    node_modules/gulp-declare/package.json
    node_modules/gulp-handlebars/node_modules/through2/package.json
    node_modules/gulp-handlebars/package.json
    node_modules/gulp-imagemin/node_modules/object-assign/package.json
    node_modules/gulp-imagemin/package.json
Anddward.Liao
@Anddward
Jun 28 2016 03:47 UTC
git add .
git rm -r node_modules
cocowuhuiling
@cocowuhuiling
Jun 28 2016 03:48 UTC
cocodeMacBook-Pro:zookeProject/Gms-website(master !*) $ git add .
cocodeMacBook-Pro:zookeProject/Gms-website(master !+) $ git rm -r node_modules
error: the following files have changes staged in the index:
    node_modules/express/package.json
    node_modules/gulp-autoprefixer/node_modules/object-assign/package.json
    node_modules/gulp-autoprefixer/node_modules/through2/package.json
    node_modules/gulp-autoprefixer/package.json
    node_modules/gulp-declare/package.json
Anddward.Liao
@Anddward
Jun 28 2016 03:53 UTC
你先正常 commit,我来处理冲突
commit 了没有
cocowuhuiling
@cocowuhuiling
Jun 28 2016 03:56 UTC
现在push上去了
Anddward.Liao
@Anddward
Jun 28 2016 03:57 UTC
cocowuhuiling
@cocowuhuiling
Jun 28 2016 03:58 UTC
我下午解决那个s8页面的箭头问题
Anddward.Liao
@Anddward
Jun 28 2016 04:19 UTC
去掉node_modules的版本管理了,得闲pull下来看看
cocowuhuiling
@cocowuhuiling
Jun 28 2016 04:36 UTC
恩,我看一下
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:25 UTC
s8页面,箭头的那个问题解决了
Anddward.Liao
@Anddward
Jun 28 2016 06:28 UTC
:clap:
git 的问题解决了吗
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:29 UTC
Anddward.Liao
@Anddward
Jun 28 2016 06:29 UTC
你的tower有没有绑定微信?
tower的任务会推送到微信吗
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:30 UTC
好像没有
Anddward.Liao
@Anddward
Jun 28 2016 06:31 UTC
哦,有两个小问题在tower上面
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:31 UTC
嘻嘻,我刚刚才看到
Anddward.Liao
@Anddward
Jun 28 2016 06:31 UTC
你发现有问题也可以写上去,你做不了那么多,我就去认领
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:31 UTC
恩,我现在自己发现了一个问题
Anddward.Liao
@Anddward
Jun 28 2016 06:34 UTC
新闻资讯页面,瓷砖胶那一块需要处理一下
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:34 UTC
Anddward.Liao
@Anddward
Jun 28 2016 06:35 UTC
是9column,但是padding好像有点问题,瓷砖胶那块往右边突出了一点点
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:39 UTC
屏幕快照 2016-06-28 下午2.38.54.png
Anddward.Liao
@Anddward
Jun 28 2016 06:41 UTC
时讯快读那一块,右边的padding不要那么多
cocowuhuiling
@cocowuhuiling
Jun 28 2016 06:42 UTC
?
不懂
哪个右边的padding
Anddward.Liao
@Anddward
Jun 28 2016 06:46 UTC
Screen Shot 2016-06-28 at 14.45.11.png
我下手改了下,大概是这样子
左边col-9的添加22px right padding,右边瓷砖胶介绍原本的20px left padding
cocowuhuiling
@cocowuhuiling
Jun 28 2016 07:16 UTC
ok,明白
我现在修改,刚才在做亚美的页面
cocowuhuiling
@cocowuhuiling
Jun 28 2016 07:27 UTC
老公,我看到你设计图上border是加在下面的一行文字上
Anddward.Liao
@Anddward
Jun 28 2016 07:29 UTC
上下都要,i change my mind 。。。 sorry
cocowuhuiling
@cocowuhuiling
Jun 28 2016 07:29 UTC
没事
Anddward.Liao
@Anddward
Jun 28 2016 07:29 UTC
因为有些图片有白边,所以会出现类似这样的
Screen Shot 2016-06-28 at 15.29.56.png
cocowuhuiling
@cocowuhuiling
Jun 28 2016 07:30 UTC
ok,明白
cocowuhuiling
@cocowuhuiling
Jun 28 2016 07:36 UTC
tower上的小问题都解决了
Anddward.Liao
@Anddward
Jun 28 2016 07:37 UTC
:smile:
Anddward.Liao
@Anddward
Jun 28 2016 08:45 UTC
push 了,看下tower
cocowuhuiling
@cocowuhuiling
Jun 28 2016 08:46 UTC
ok
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:28 UTC
还剩下一个问题
我没有发现箭头消失
Anddward.Liao
@Anddward
Jun 28 2016 09:28 UTC
那你push就可以了
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:29 UTC
恩,已经push上去了
我有留3个fixme
等等,我现在又push了一次上去
Anddward.Liao
@Anddward
Jun 28 2016 09:33 UTC
应该是箭头没有加入到版本控制,所以我这边没有
你确定所有文件都已经add了吗
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:33 UTC
Anddward.Liao
@Anddward
Jun 28 2016 09:33 UTC
git status
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:36 UTC
对,我确定已经push上去了
我刚才有新的push
你看一下你有没有这张图片?images/icon/arrow_icon_left@2x.png
Anddward.Liao
@Anddward
Jun 28 2016 09:39 UTC
Screen Shot 2016-06-28 at 17.37.53.png
Screen Shot 2016-06-28 at 17.38.08.png
coding 上面找不到这张图片,所以我pull下来也没有
应该是你没有add的原因
你试下git status
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:39 UTC
cry,为什么
arrow_icon_left@2x.png
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:45 UTC
这些dotdot不好看
屏幕快照 2016-06-28 下午5.45.16.png
Anddward.Liao
@Anddward
Jun 28 2016 09:46 UTC
对,这个是当时匆忙从阿里巴巴上面抄下来的
我也想换成项目符
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:46 UTC
还有一些123的
Anddward.Liao
@Anddward
Jun 28 2016 09:47 UTC
先直接不要.和1、2、3,统一成首行缩进
设计的时候文本是直接从阿里巴巴上面抄下来的,所以带了一些.和1,2,3
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:48 UTC
去掉了之后好很多了
老公,我看了s8 箭头的那个commit 确实了没有commit上去
你自己加上去先吧
刚才发给你了
Anddward.Liao
@Anddward
Jun 28 2016 09:51 UTC
你顺手add一下就可以了
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:51 UTC
这个是我当时commit上去的
Anddward.Liao
@Anddward
Jun 28 2016 09:52 UTC
去到项目目录
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:52 UTC
不行啊
Anddward.Liao
@Anddward
Jun 28 2016 09:52 UTC
git status
看看有没有,没有的话,git add .
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:52 UTC
不行
Anddward.Liao
@Anddward
Jun 28 2016 09:52 UTC
显示什么?
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:53 UTC
什么都没
怎么commit?
Anddward.Liao
@Anddward
Jun 28 2016 09:53 UTC
git status
呢?
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:53 UTC
cocodeMacBook-Pro:zookeProject/Gms-website(master) $ gs
On branch master
nothing to commit, working directory clean
clean
Anddward.Liao
@Anddward
Jun 28 2016 09:54 UTC
git add list/…..(对应的文件)
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:55 UTC
直接忽略掉了图片
cocodeMacBook-Pro:zookeProject/Gms-website(master) $ git add dist/images/icon/arrow_icon_left@2x.png
The following paths are ignored by one of your .gitignore files:
dist/images/icon/arrow_icon_left@2x.png
Use -f if you really want to add them.
Anddward.Liao
@Anddward
Jun 28 2016 09:56 UTC
.gitignore 里面有表达式忽略了这个文件
cocowuhuiling
@cocowuhuiling
Jun 28 2016 09:57 UTC
我更改了gitignore
你pull一下代码
箭头的图片push上去了
Anddward.Liao
@Anddward
Jun 28 2016 09:59 UTC
:clap:
我的箭头终于出现鸟
新闻中心,缩小之后,瓷砖胶排列到墙面涂料下面,这个你觉得你好不好实现
cocowuhuiling
@cocowuhuiling
Jun 28 2016 10:06 UTC
这个我有些fixme
有写fixme
晚上跟老公详谈
Anddward.Liao
@Anddward
Jun 28 2016 10:07 UTC
:ok:
cocowuhuiling
@cocowuhuiling
Jun 28 2016 10:07 UTC
具体原因要面对面说比较好