Compare commits

...

514 Commits

Author SHA1 Message Date
王景 2c494200c2 Merge branch 'msb_prod'
1 year ago
王景 e40200199b merge: merge conflict
1 year ago
ch ea10aa3d17 Merge branch 'fix/add_publishCertificates_ch' into msb_prod
1 year ago
ch 408a4667ce fix: 添加营业执照
1 year ago
ch 43c000eae2 Merge branch 'fix/add_publishCertificates_ch' into msb_prod
1 year ago
ch 4145f90ac9 fix: 修改服务端口
1 year ago
ch 9e6b270987 Merge branch 'msb_prod' of https://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_prod
1 year ago
ch 24bb9c8c42 Merge branch 'fix/add_publishCertificates_ch' into msb_prod
1 year ago
ch cc51bc8709 fix: nuxt version
1 year ago
陈辉 425f630b2a Merge branch 'fix/add_publishCertificates_ch' into 'msb_prod'
1 year ago
ch 89c0ce7cf5 fix: node 版本
1 year ago
陈辉 29841ba9c4 Merge branch 'fix/add_publishCertificates_ch' into 'msb_prod'
1 year ago
ch a10143b26d fix: 文字样式
1 year ago
ch fde9ef42ef feature: add publish certificates
1 year ago
ch 99c6010bb7 pref:打包命令统一
2 years ago
ch c7199f96db pref:优化获取支付二维码提示
2 years ago
ch 090fd92d51 clear
2 years ago
ch 64287e9c3f fix:点赞,已购买bug
2 years ago
ch 8142659b0c Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 58fdbb7236 提交最后一个评价跳转页面
2 years ago
ch 3d5673bbe7 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 2117d22715 提交最后一个有提示
2 years ago
ch 2fe0933c25 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 35823e2c4a 修改分页为加载更多
2 years ago
ch 33f83236a7 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch b4b38d8a4a 修改分页为加载更多
2 years ago
ch 7374cdfdaf Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch ca9c17ba69 修改追评图片
2 years ago
ch 30cb0f66a0 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 0c7494a097 修改分页
2 years ago
ch 1f398092d2 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 9288f0ac43 评论跳转
2 years ago
ch 9f0a219fa1 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch cd1032d988 pc验收问题
2 years ago
ch a0bd0ca45c Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 09ba7e8819 修改
2 years ago
覃昌波 56991e2fba 更新 Dockerfile
2 years ago
覃昌波 b3b6db82e5 更新 Dockerfile
2 years ago
覃昌波 4669a69b12 更新 Dockerfile
2 years ago
覃昌波 20b9748f64 更新 Dockerfile
2 years ago
覃昌波 a8ec9b7c77 更新 Dockerfile
2 years ago
覃昌波 1ef83e8765 更新 Dockerfile
2 years ago
ch 7af76834f6 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch e17951e223 回复添加到第一条
2 years ago
ch 9ec022fc0f 回复undefind
2 years ago
ch 887cea6f90 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 430399c54f fix:修改标签数据统计
2 years ago
ch 10a22e7e52 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch b067e2130b 修改图片预览箭头
2 years ago
ch 302c0b9e40 Merge branch 'feature/zfbpay-0629-ch' into msb_test
2 years ago
ch ebc3039353 支付宝图标过大问题
2 years ago
ch 593a3cfcd2 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 47deb31894 评论500
2 years ago
ch f04113a6d8 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 41c35825fa 有评价时提示
2 years ago
ch 9f07b75bea Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 3a65dd736f 修改评论显示问题
2 years ago
ch 428e3165d1 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch 510408068d 纯空格不让提交
2 years ago
ch 85fc3fb293 Merge branch 'feature/comment-0624-ch' into msb_test
2 years ago
ch ddc982a35d token
2 years ago
ch 2375f95fcb Merge branch 'feature/zfbpay-0629-ch' into msb_test
2 years ago
ch 96176a68cc 修改命名
2 years ago
ch 1e73cdfbce Merge branch 'feature/zfbpay-0629-ch' into msb_test
2 years ago
ch c8302cf9ef 修改token
2 years ago
ch 60b1f0be39 添加支付宝支付
2 years ago
ch 11878e566f fix:修复立即购买跳空页面问题
2 years ago
ch 91812512bc 修改评论数量,点击追评的效果
2 years ago
ch e771928e88 fix:放开提交评论注释
2 years ago
ch b81c463e9b fix:评价跳转
2 years ago
ch 8d00cb4242 修复去追评
2 years ago
ch 845ad5dba8 修改bug
2 years ago
ch 264a108a33 评价跳转
2 years ago
ch e96d372369 其他宝贝评价
2 years ago
ch a93838e595 商品评价
2 years ago
ch e78c41f6c2 评价
2 years ago
ch 5864830b29 fix:提交订单订单来源
2 years ago
ch e7540706b9 fix:支付弹窗偶现黑屏问题
2 years ago
ch 3cce4c2c14 二维码生成
2 years ago
ch 0b70cd4f49 fate: 支持接口修改
2 years ago
ch 69e86583ec 请求地址
2 years ago
ch 00d5bb7c82 请求地址
2 years ago
ch 22dab20d79 fix:update sdk
2 years ago
ch 150f61315e fix: update im SDK
2 years ago
ch 69abc97570 fix: update im SDK
2 years ago
ch 9876af66ad fix:sdk修改
2 years ago
ch b8a6c1e9f5 fix:imSDK close
2 years ago
ch adafa9ff2c pref: update imSDK
2 years ago
ch b96a231952 fix:通知消息不更新问题
2 years ago
ch d04791081c fea: im改造
2 years ago
ch 30cdc50558 fix:修改uuid报错
2 years ago
ch af06861fc9 fix: 修改uuid不重复问题
2 years ago
ch ff49fedd42 fix: 每次刷新UUID不一样
2 years ago
ch 1c5402a7b0 修改uuid
2 years ago
ch c259a61025 添加uuid
2 years ago
ch 8b18ca4f73 下载页
2 years ago
ch b07a9f04c2 Merge branch 'feature/ad-0531-ch' into msb_test
2 years ago
ch 0f98983398 fix: 广告请求前缀
2 years ago
ch 01a05c6916 Merge branch 'feature/ad-0531-ch' into msb_test
2 years ago
ch 666bee10e1 fat:添加分类跳转
2 years ago
ch da8bb5704e Merge branch 'feature/ad-0531-ch' into msb_test
2 years ago
ch f81e70891e fat:添加分类跳转
2 years ago
ch 536ff98861 Merge branch 'feature/ad-0531-ch' into msb_test
2 years ago
ch 27d2e49aff fix:banner不显示
2 years ago
ch 72408674a7 Merge branch 'feature/ad-0531-ch' into msb_test
2 years ago
ch 295537b06c 广告请求
2 years ago
ch 23113a3e7c Merge branch 'feature/task315-0526-ch' into msb_test
2 years ago
ch 4ecf12211a 下载样式
2 years ago
ch 7bb20db2d8 下载页
2 years ago
ch 4d1a40b5d0 广告
2 years ago
ch e8fd578806 添加动效
2 years ago
ch 8d5f2d6a2c Merge branch 'fix/goods-0525' into msb_prod
2 years ago
ch 68619cea53 Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch f0e60a44c7 弹框判断
2 years ago
ch cb274ee8a4 Merge branch 'fix/goods-0525' into msb_prod
2 years ago
ch c9ad86300e Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 5741b4ecf9 弹框
2 years ago
ch be4082e868 Merge branch 'msb_test' into msb_prod
2 years ago
ch c700fdf8c8 Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch a959ab5036 加跳转按钮
2 years ago
ch 78b693c788 Merge branch 'fix/im-0526' into msb_prod
2 years ago
ch 3f9b83e419 修改生产地址
2 years ago
ch df94ad7575 下载页
2 years ago
ch 9eb41b5297 Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 466ae538a8 修改发货消息
2 years ago
ch c102995fdc Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 53152aa224 修改
2 years ago
ch d89bb54566 Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 802a17906b 修改
2 years ago
ch 21987554f8 Merge branch 'fix/im-0526' into msb_test
2 years ago
ch fed8881529 添加已读
2 years ago
ch 2a63673248 修改消息已读
2 years ago
ch e3341ac65f Merge branch 'fix/im-0526' into msb_test
2 years ago
ch 697b08c666 修改点击区域
2 years ago
ch dca519590e Merge branch 'fix/im-0526' into msb_test
2 years ago
ch abdf037373 处理文件消息
2 years ago
ch a0099fddc1 Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 0f8d21bd2d 修改改虚拟商品提交订单
2 years ago
ch 6aa4eec34f Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 469270c769 修改提交订单的地址问题
2 years ago
ch 487254db76 修改
2 years ago
ch 66f9530883 Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 8370bdd5f0 报错
2 years ago
ch 235d8e0cff 页面html
2 years ago
ch 494c288e20 Merge branch 'fix/goods-0525' into msb_test
2 years ago
ch 9bf02bfc56 pref:虚拟商品订单详情
2 years ago
ch d11be41163 pref:下载页面
2 years ago
ch e0ce483a2b Merge branch 'fix/im-0526' into msb_test
2 years ago
ch 7d26167a30 修改im store问
2 years ago
ch 3672052d81 Merge branch 'fix/im-0526' into msb_test
2 years ago
ch 49e78efda8 IM收货消息
2 years ago
ch efaa39c832 pref:虚拟商品提交订单
2 years ago
ch 9df955e8d6 添加请求超时时间
2 years ago
张征 581a6385e5 fix:修改冲突
2 years ago
张征 3c2ff793ab merge:合并修复bug以及首页修改
2 years ago
张征 e4f8336673 fix:修改首页,修改bug
2 years ago
张征 3200e2492e Merge branch 'fix/ui-0521-zz' into msb_test
2 years ago
张征 f4a4435c8e feat:修改首页
2 years ago
ch 8e339ea56a Merge branch 'fix/code-0520-ch' into msb_test
2 years ago
ch f3deb67326 修改APP二维码为公众号二维码
2 years ago
ch dd58b90d97 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 b6d530da8f fix:修改banner
2 years ago
张征 44234d4659 Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
2 years ago
张征 c73b8cc2b2 fix:修改ui
2 years ago
肖广 8336805b1f Merge branch 'feature/task1.0.0' into 'msb_prod'
2 years ago
肖广 5fd5690c50 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 ff037a1bca Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 641ea8a7fe feat: 首页支持上拉刷新,首页固定图标位置适配屏宽,UI调整
2 years ago
ch bc378dc73d Merge branch 'feature/task1.0.0-0505-ch' into msb_prod
2 years ago
ch 8aa28e0346 APP二维码
2 years ago
ch 112f3ac1fc Merge branch 'feature/task1.0.0-0505-ch' into msb_prod
2 years ago
ch ac257746d4 Merge branch 'feature/task1.0.0-0505-ch' into msb_test
2 years ago
ch 5b4e495bc5 sku处理回退
2 years ago
肖广 e0458dd21e Merge branch 'feature/task1.0.0' into 'msb_prod'
2 years ago
张征 950a2d3699 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 2aad2172e3 Merge branch 'feature/task1.0.0-0507-zz' into msb_test
2 years ago
张征 c14ce44b14 fix:修改收货地址
2 years ago
肖广 b6ea4af6ed Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang ed326844ce feat: 首页分类UI调整
2 years ago
张征 84cb8d281b Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 ea82937dad fix:修改申请售后
2 years ago
张征 480fe88330 Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test
2 years ago
张征 8517931645 fix:修改申请售后
2 years ago
肖广 827cb7c36b Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 7f06e29597 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 4bdf753c6e feat: 点击吸顶栏搜索滚动到顶部并且输入框聚焦
2 years ago
张征 c71a4ea7bb Merge branch 'feature/task1.0.0-0507-zz' into msb_test
2 years ago
张征 15b7867528 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 bc24c7511a fix:修改最大库存
2 years ago
肖广 2d213cf6c6 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 e5bc34804b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 944a2416da feat: 替换banner图片
2 years ago
张征 a4c147c2ad Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 971784c627 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0
2 years ago
张征 f40ae45a0d Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 bd881886cf fix:修改待支付
2 years ago
肖广 1b84783101 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 76d3173ad4 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 3e5325fab9 feat: 添加404页面
2 years ago
张征 ae326e6f6b Merge branch 'feature/task1.0.0-0507-zz' into msb_test
2 years ago
张征 dcf0404a30 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 c097a9251c fix:修改im
2 years ago
肖广 ca20e3a37a Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 9cb021e001 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 0f9e6aa0e7 feat: 删除个人中心消息模块
2 years ago
xiaoguang e332e95afa feat: 调整UI
2 years ago
张征 67176fa1fb Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
2 years ago
张征 b944477d8d fix:修改sku价格
2 years ago
张征 688fd6ea8c Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test
2 years ago
张征 f8d393661f fix:修改sku价格
2 years ago
ch cf8ea99afb Merge branch 'feature/task1.0.0' into msb_test
2 years ago
ch d43b2d77da Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
2 years ago
ch fbbc5a8a27 Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
2 years ago
张征 fd33b79f7e Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 37ef0f9d04 fix:修复二次添加
2 years ago
张征 09199ee816 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0
2 years ago
张征 1a0aa89c65 fix:修复二次添加地址
2 years ago
ch 3358e2c5a7 sku选择问题,提交订单金额
2 years ago
肖广 a9b35a9672 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 87ea7307e7 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang b88f6ba9ce feat: dockerfile添加static目录
2 years ago
张征 137945dbe6 fix:修改看了又看
2 years ago
张征 1bc1a46999 fix:修改看了又看
2 years ago
张征 8f7e940158 Merge branch 'feature/task1.0.0-0507-zz' into msb_test
2 years ago
张征 d4c546c525 fix:修改收货地址
2 years ago
张征 501ef99b89 fix:修改手机号
2 years ago
张征 d52997cc07 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 57d1e74077 fix:修改配置
2 years ago
张征 aed8c463db Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 0c81f5afd5 fix:修改刷新报错
2 years ago
张征 f0c23a102f fix:修改点击商品详情为新开窗口
2 years ago
张征 9635c9c3a6 feat:完成售后订单开发
2 years ago
肖广 2f1c3d9ba1 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 1bd4650def Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 72b97f1813 feat: 添加秒杀商品售罄状态
2 years ago
张征 442614a67a Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 30e2d194fa Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 3137da82c3 fix:修复订单bug
2 years ago
肖广 80a73d11d8 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 bc10181ee4 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 904bdc32ac fixbug: 修复个人资料页面切换数据丢失
2 years ago
张征 8e1fac846f Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test
2 years ago
肖广 24201b110e Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
张征 e1cfc41ebb Merge branch 'feature/task1.0.0' into msb_test
2 years ago
肖广 4372719082 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 4f0f97e219 feat: 响应状态码为退出登录时,返回reject
2 years ago
张征 1240635f5c fix:修改为你推荐
2 years ago
张征 0d918cadfc Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
2 years ago
张征 e69a45ac87 merge
2 years ago
肖广 21c967e12a Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 5dfb2871b9 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang ab41262326 fixbug: 修复bug1239
2 years ago
张征 597a3c8aae Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 32d3dd5938 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 c11e89124c fix:修改接口地址
2 years ago
肖广 0ed9fc9885 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 2c317806a1 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang ff4a767917 feat: 未登录跳首页放入中间件判断
2 years ago
肖广 de75b1bbaa Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 9956949fac Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang e97096ffbc feat: 去掉路由前置钩子内未登录跳转页面逻辑
2 years ago
ch 73ce946530 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
ch 9da1383799 Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
2 years ago
ch c4ecf74934 注释个人中心拦截器
2 years ago
肖广 17b1346ff1 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 93e9dcac03 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang c3d6cad1d6 feat: 秒杀相关判断修正
2 years ago
肖广 4c47b8d78b Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 824a307232 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 71af82d03c feat: 修改UI问题
2 years ago
张征 a8c54f76d2 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 c867fb7246 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 864e6e3740 fix:修改bug
2 years ago
张征 e636883bd6 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 54a0fc8b2d Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 b19649a9a3 fix:修复bug
2 years ago
ch 9bd6c2ab59 购物车计算Bar悬浮效果
2 years ago
肖广 62d587d575 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 862d0e2152 feat: 首页点击新开浏览器窗口跳转
2 years ago
ch 262d51d993 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
ch 96835cbc3a Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
2 years ago
ch c01f524201 订单列表点击
2 years ago
肖广 c45d530980 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 e3519ba9ba Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 946f85a8b3 feat: 修复个人中午物流未显示bug
2 years ago
肖广 12203846d6 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 0d4dc2b0e6 feat: 修改头部购物车面板UI,获取用户信息时机修改
2 years ago
ch 468179c860 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
ch 5b5710caa9 Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
2 years ago
ch 8b8e5372de 修改3级Bug
2 years ago
张征 01d6e31ae0 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 44ee987139 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 775c5f663c fix:修改禅道bug
2 years ago
张征 ccabddea26 fix:修改禅道bug
2 years ago
肖广 750d1ea0f4 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 07e8794bfb Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 022c5579f1 feat: 删除测试代码
2 years ago
肖广 d230fab63a Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 4349b3bf1c Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 7190f03a69 feat: 未登录打开个人中心跳转首页
2 years ago
ch 55ead5e145 Merge branch 'feature/task1.0.0-0505-ch' into msb_test
2 years ago
ch c4c4ce7554 物流信息
2 years ago
ch 7d0f236488 Merge branch 'feature/task1.0.0-0505-ch' into msb_test
2 years ago
ch c3af52a00a 修改2级以上BUg
2 years ago
肖广 f4d5383420 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 4f90c93ebd Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang f5745ec642 feat: 修改热门分类请求时机
2 years ago
ch f3ce1e00dc Merge branch 'msb_test' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into msb_test
2 years ago
ch 1567936184 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
肖广 10f2033592 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
ch c09cbb9900 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0
2 years ago
肖广 a9fe82e2ea Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
ch 6461354a0d 确认收货
2 years ago
xiaoguang c543931458 feat: 登录弹窗隐藏时重置表单
2 years ago
肖广 f71938ace0 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 8a238e0b3b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang c91e940631 feat: 修复变量未引入使用报错
2 years ago
肖广 62e1b9ac6a Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 6420f107ba Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 2a15109002 feat: 修复bug
2 years ago
肖广 d16c9e002d Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 2f7bb07ff6 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang f0f78b8118 feat: 添加首页固定按钮
2 years ago
肖广 30d31c925d Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 8265d096d9 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 63d5c862bb feat: 添加购物车/删除购物车商品时,更新购物车面板
2 years ago
肖广 16a70bd821 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 1e2240b692 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 477412e6f9 feat: 无购物车商品信息时隐藏面板
2 years ago
肖广 d261e30fb8 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 c16126e94e Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 279b82b8fc feat: 获取购物车商品前端判断是否登录
2 years ago
肖广 09d03faf61 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 465f2508f9 feat: 修改登录systemId值
2 years ago
肖广 0bac60fa84 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 5128c50ddd Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
ch a7b5be58ba Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
2 years ago
ch 879a7bd04d commit
2 years ago
xiaoguang a184f61263 feat: 公共页头添加购物车面板
2 years ago
张征 fe4465369a feat:添加购物车
2 years ago
张征 83dd6c4a3f Merge branch 'msb_test' into feature/task1.0.0-0507-zz
2 years ago
张征 d3f1bc392e fix:添加购物车
2 years ago
张征 327bb81131 Merge branch 'feature/task1.0.0-0507-zz' into msb_test
2 years ago
肖广 191f13df5a Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 07d647a39d feat: 添加app二维码
2 years ago
张征 907bc68327 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 7cabe4e455 fix:修改库存判断
2 years ago
肖广 9ac2719a63 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 69dc3a2984 feat: 首页秒杀tab显示根据是否有miao秒杀活动
2 years ago
肖广 fd74d83201 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 3a62ab6ec1 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 9dcde1aac8 feat: 退出登录调用接口
2 years ago
张征 c2d4c8103d Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 f187e9dea7 fix:修复秒杀倒计时
2 years ago
肖广 3bc4d1f436 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 e26b717d4f Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang ef68371ae1 feat: 首页为你精选添加分页,分页组件封装
2 years ago
肖广 a92571d7c3 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 090aee4fb5 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 07b895568e feat: 添加首页为你精选模块
2 years ago
肖广 69bafb4a5b Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 b31ab791be Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 5c4e39121f feat: 添加首页新品上架模块
2 years ago
ch 637a85627e Merge branch 'feature/task1.0.0-0505-ch' into msb_test
2 years ago
ch 3937bae2cd 商品详情加入购物车
2 years ago
ch 739ebc150e Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
2 years ago
ch ce37efec56 购物车 添加为你精选
2 years ago
张征 45fad297dc Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 a6116c717c feat:完成秒杀详情
2 years ago
ch 303e9e1d28 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
2 years ago
ch 94d6a9314e 描边
2 years ago
肖广 73ce315352 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 c95929b3ec Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang a646a2bad4 feat: 首页秒杀商品数据另外查询
2 years ago
张征 bbd5d7b308 feat:完成为你竞选
2 years ago
ch 0312416318 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
ch 3aa811277d Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
2 years ago
ch 5fb7387ab3 购物车
2 years ago
ch 386545a5eb 购物车
2 years ago
肖广 6b14d5e35a Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 22b6f26626 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang bb4cd7749f feat: 补充秒杀页面活动已结束/已开始判断以及页面交互
2 years ago
肖广 1f305f8721 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 1dadcc18e4 feat: 秒杀活动倒计时
2 years ago
ch 9ff48b6fc3 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
ch f3d14a0e4d Merge branch 'feature/task1.0.0-0505-ch' into feature/task1.0.0
2 years ago
ch 3ab78fe8cd 订单列表
2 years ago
肖广 68f6fb076e Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 db98ef32a4 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang ebaf192430 feat: 物流列表添加分页
2 years ago
肖广 7f37270236 Merge branch 'feature/task1.0.0' into 'msb_test'
2 years ago
肖广 889ea111be Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 1592804a33 feat: 完成物流列表
2 years ago
张征 82772ab10e fix:完成为你推荐
2 years ago
肖广 a638c32ef7 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 2eae09f08b feat: 恢复首页秒杀模块请求数据
2 years ago
xiaoguang 186b108e88 feat: 首页秒杀模块添加倒计时
2 years ago
肖广 0dee3f4bf7 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 8c9866507e feat: 页头吸顶添加点击事件
2 years ago
张征 ac8ea65e89 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
张征 60a17cd9d9 fix:完成为你竞选
2 years ago
ch 812f7cf645 Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
2 years ago
ch 525fab7605 Merge branch 'feature/task1.0.0' into msb_test
2 years ago
肖广 3f574d42df Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang cfa2c4d6d8 feat: 个人主页订单栏添加点击事件
2 years ago
肖广 8d75c38eca Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang d26ee0eada feat: 首页秒杀模块,秒杀页面
2 years ago
ch 93fffc585b Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 33be84ff2b fix:修改监听路由
2 years ago
ch fd60fd70be Merge branch 'feature/task1.0.0' into msb_test
2 years ago
张征 c7158ba6ba 完成跳转
2 years ago
ch 8bad595e02 Merge branch 'feature/task1.0.0-0505-ch' into msb_test
2 years ago
ch ccbfd52580 修改支付金额
2 years ago
张征 7de8f176ae Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
2 years ago
张征 fc829b4d49 feat:完成删除和编辑地址
2 years ago
肖广 0b9bc32561 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 528b973e52 feat: 添加首页秒杀模块
2 years ago
xiaoguang 69e6474f63 feat: 调整热门分类逻辑以及交互
2 years ago
张征 19b13516ce Merge branch 'feature/task1.0.0' into feature/task1.0.0-0507-zz
2 years ago
张征 867e6dd653 feat:个人中心收货地址
2 years ago
肖广 092f140fb3 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang bc58bb9f45 feat: 修改用户资料组件方法命名
2 years ago
肖广 e64e06e1b9 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang d5917b2c86 feat: 添加个人资料页面,支持个人资料编辑
2 years ago
肖广 c04bedcf62 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 6aa3e4992e feat: 添加公共头部底部边框
2 years ago
xiaoguang 936db76a1f feat: 添加个人中心首页,element-ui更改主题色
2 years ago
ch cc7d65458f Merge branch 'feature/task1.0.0-0505-ch' into msb_test
2 years ago
ch 21532de9b9 添加收货地址
2 years ago
ch 9d912d9154 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
2 years ago
张征 dfdd61c054 fix:添加插件
2 years ago
ch 8704cf0839 Merge branch 'feature/task1.0.0-0507-zz' into feature/task1.0.0-0505-ch
2 years ago
张征 834146eeba feat:完成收货地址开发
2 years ago
张征 a670935eff feat:完成收货地址开发
2 years ago
肖广 ac63e5e014 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 691770268f feat: 添加个人主页左侧导航栏
2 years ago
ch 297bb83e27 Merge branch 'feature/task1.0.0-0505-ch' into msb_test
2 years ago
ch b8eae56db6 支付成功页样式修改
2 years ago
覃昌波 fbd7c4bcef 更新 deploy.yaml
2 years ago
张征 032b6b01b9 fix:修改图片地址
2 years ago
肖广 ae27ae2744 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang e9a3cf9d60 feat: static目录下图片文件移动到assets目录
2 years ago
张征 08c5478bf1 feat:订单地址
2 years ago
ch 79d9ac308b 添加未登录非法访问跳转到首页
2 years ago
ch d17fa25389 IP访问
2 years ago
肖广 672e1c6dde Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 03606dadb0 feat: 消息/购物车页面跳转前前置登录拦截
2 years ago
ch 3aafeee978 详情细节,测试部署修改
2 years ago
ch ce51644388 Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
2 years ago
ch 4beb13e940 合并
2 years ago
肖广 e43abc1a64 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 3198052e6f feat: styleResources配置前置
2 years ago
ch cd91ec945a 支付倒计时修改,订单详情步骤条
2 years ago
肖广 8eb0eee86a Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang c152d778ff feat: 安装@nuxtjs/style-resources插件,配置scss全局变量
2 years ago
张征 c0e1a257fb fix:修改搜索
2 years ago
张征 17062ed082 merge:合并主干
2 years ago
肖广 9622df128b Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 5eebfbddf8 feat: 公共页头点击事件添加路由跳转
2 years ago
张征 a62da2faa5 fix:修改样式问题
2 years ago
张征 09bae8e4df feat:完成立即购买
2 years ago
张征 7049ca6890 feat:完成商品详情
2 years ago
肖广 722af3e2e0 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 45eb27529b feat: 热门分类添加显示条件,添加页面滚动事件监听
2 years ago
ch bc1c7b76aa Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch
2 years ago
ch a1a77bb300 Merge remote-tracking branch 'origin/feature/task1.0.0-0507-zz' into feature/task1.0.0
2 years ago
ch 8e3b894d10 pay
2 years ago
ch 0f0b283387 订单详情
2 years ago
张征 966d13922f feat:开发商品详情
2 years ago
肖广 818f988257 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 00788dbd5c feat: 首页登录注销
2 years ago
xiaoguang 440189d305 feat: 全局控制登录弹窗,添加全局登录拦截方法
2 years ago
张征 0dc039da16 merge:合并主干分时
2 years ago
张征 3461adb9fa feat:开发商品详情
2 years ago
肖广 dfce24e466 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang b78c6dd6cc feat: store文件添加登录相关方法
2 years ago
向强 1b3a21b703 Update deploy.yaml
2 years ago
ch ed7e8ea61d Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0
2 years ago
ch 3cf9e54b01 按钮封装
2 years ago
肖广 4a9421c7e8 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang e9c6d82843 feat: 新增登录模块以及登录功能
2 years ago
向强 2941a103c2 Add new file
2 years ago
向强 af97e38581 Add new file
2 years ago
ch 4d951c6221 删除cookies插件
2 years ago
张征 be7f50ddcd merge:合并主分支
2 years ago
ch f0dec01534 Merge branch 'feature/task1.0.0' of http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc into feature/task1.0.0
2 years ago
ch 7e67f0785d 修改
2 years ago
肖广 34d160a754 Merge branch 'feature/task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
ch 69aecdd145 请求结果处理
2 years ago
张征 7d42def8d0 feat:开发商品列表
2 years ago
ch 2d51a034be 删除header组件
2 years ago
ch 6b6ce39d0c 添加订单列表,提交订单
2 years ago
xiaoguang 4bcea0029d feat: 添加公共页尾,页头置顶样式
2 years ago
ch d2a97c734b 提交订单基础逻辑
2 years ago
肖广 e957575ae2 Merge branch 'task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 804dd15fe0 feat: 文件位置调整
2 years ago
肖广 995e299027 Merge branch 'task1.0.0_xg' into 'feature/task1.0.0'
2 years ago
xiaoguang 83a91066a7 feat: 公共页头编写,热门分类数据通过访问接口实现
2 years ago
张征 35675e0129 add goods list
2 years ago
陈辉 0453ffad89 css说明
2 years ago
陈辉 cc28e37e9d css兼容
2 years ago
ch 43696cd09d 公共方法
2 years ago
xiaoguang 6a4f67a78a feat: global.scss引入flex文件
2 years ago
ch 359c587e1b 添加utils scss
2 years ago
xiaoguang 6c28bb3304 feat: 添加公共flex样式
2 years ago
xiaoguang 66536dad2d feat: 新增eslint prettier格式化
2 years ago
ch e99accc36b 修改打包命令
2 years ago
ch 9403e17b29 添加API接口地址
2 years ago
ch 639908a2d9 添加运行说明
2 years ago
ch 8354c35ffd 修改说明文件 请求说明补充
2 years ago
ch f9aa2852ee 修改说明文件
2 years ago
ch 38c2d3a412 忽略env.js文件
2 years ago
ch d8111ebe57 删除env文件
2 years ago
ch b3c9b0662a create project
2 years ago

@ -0,0 +1,16 @@
{
"env": {
"test": {
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": "current"
}
}
]
]
}
}
}

@ -0,0 +1,13 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false

94
.gitignore vendored

@ -0,0 +1,94 @@
# Created by .ignore support plugin (hsz.mobi)
### Node template
# Logs
/logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.history/
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
# nyc test coverage
.nyc_output
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration
.lock-wscript
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# Dependency directories
node_modules/
jspm_packages/
# TypeScript v1 declaration files
typings/
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
# Yarn Integrity file
.yarn-integrity
# dotenv environment variables file
.env
# parcel-bundler cache (https://parceljs.org/)
.cache
# next.js build output
.next
# nuxt.js build output
.nuxt
# Nuxt generate
dist
# vuepress build output
.vuepress/dist
# Serverless directories
.serverless
# IDE / Editor
.idea
# Service worker
sw.*
# macOS
.DS_Store
# Vim swap files
*.swp
env.js

@ -0,0 +1,2 @@
registry=https://registry.npm.taobao.org/
sass_binary_site="https://npm.taobao.org/mirrors/node-sass"

@ -0,0 +1,13 @@
FROM node:14.17.0
WORKDIR /workload
COPY nuxt.config.js /workload/nuxt.config.js
COPY package.json /workload/package.json
COPY .nuxt /workload/.nuxt
COPY static /workload/static
RUN npm config set registry https://registry.npm.taobao.org \
&& npm install
EXPOSE 3000
CMD npm run start

@ -1,92 +1,161 @@
<!--
* @Author: ch
* @Date: 2022-05-05 15:39:29
* @LastEditors: ch
* @LastEditTime: 2022-05-07 11:39:38
* @Description: file content
-->
# shop-pc
马士兵严选pc
## 前置环境
## Getting started
由于项目依赖问题,开发 `node` 版本必须是 `14`
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
如果电脑安装 `Node 18`,那么怎么添多个 `node` 版本,可以使用 `nvm` 版本管理工具。具体安装可以参考下面教程
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
[window install nvm](https://juejin.cn/post/7074108351524634655)
[mac install nvm](https://juejin.cn/post/7206882855200047161)
## Add your files
## 修改前端接口请求地址
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
进入到 ` plugins/config/env.js` 中:
```js
// 修改对应值即可
const ENV = {
base_url: "https://k8s-horse-gateway.mashibing.cn",
imUrl: "wss://k8s-horse-gateway.mashibing.cn",
};
export default ENV;
```
cd existing_repo
git remote add origin http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc.git
git branch -M main
git push -uf origin main
```
## Integrate with your tools
- [ ] [Set up project integrations](http://internel-git.mashibing.cn/yanxuan-frontend/shop-pc/-/settings/integrations)
## Collaborate with your team
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
## Test and Deploy
Use the built-in continuous integration in GitLab.
> `注意 ⚠️`:通常本地开发访问线上接口地址时会出现跨越(协议、域名、端口不一样时就会出现跨越问题),此时后端服务需要配置跨域相关的内容。
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
## 运行&打包
***
- 运行直接执行 npm run dev 打包执行 npm run build 即可,会根据分支读取不同环境变量配置;
# Editing this README
## 环境变量配置
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
- 环境变量配置文件 env.config;
- 配置与分支对应关系msb_prod -> prod msb_beta -> beta msb_test -> test msb-其他 -> dev
- 输出的环境变量文件plugins/config/env.js
- 修改环境变量配置后需要执行 “ node env.config " 输出的环境变量才会更新
## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
## Name
Choose a self-explaining name for your project.
## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
```js
// 直接引入输出的配置文件即可
import ENV from "@/plugins/config/env.js";
// 直接访问你在配置文件中定义的属性
console.log(ENV.baseUrl);
```
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
## 公共方法 utils
- 公共方法统一放置 utils 文件夹内,可以按分类建方法文件 如:验证类 verify.js 请求类 request.js
- 所有公共方法采用大驼峰命名法
- 所有的方法都从 index.js 输出,引入时统一引入 index不允许直接引入方法文件
- 所有方法文件如果导出的是多个方法,不允许在定义方法时导出,必须在文件底部一一导出,并附上方法简单的注释
```js
// 正确
import {Req, IsPhone} from '@/common/utils';
// 错误
import {Req} from '@/common/utils/request';
import {IsPhone} from '@/common/utils/utils';
// 正确
const IsPhone = (str) => {....}
const IsEmail = (str) => {....}
export {
// 判断手机号
IsPhone,
// 判断邮箱
IsEmail
}
```
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
## 组件
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
- 根目录的 components 只放置真正的组件,某个页面的业务模块应该在 pages 的相应目录下新建 module 目录放置
- 所有的自定义组件文件名以大驼峰命名,且在 templet 中使用也用大驼峰形式使用(包括页面内的模块组件)
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
## storage 的使用
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
- 不要在页面内直接使用 loaclStorage全都放置到 vuex 中做一次管理
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.
## 请求
## Contributing
State if you are open to contributions and what your requirements are for accepting them.
- 项目中有两个 axios 请求实例,一个事 nuxt 自带的(不需要 Token 请使用这个),一个是额外封装的(需要 Token 请使用这个);
- 需要 Token 的请求,不要写在 asyncData 中;
- 所有请求方法命名以Api+请求类型+具体方) 法命名
- 所有请求使用 ToAsyncAwait 包裹
- 不允许使用 try catch 和 then 处理返回结果
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
```js
// 使用示例
// xxapi.js
import {ToAsyncAwait, ReqestTk} from '@/common/utils'
const ApiGetUserInfo = (parapms) => ToAsyncAwait(ReqestTk.get('xxxxUrl',{params}));
exprot {
// 获取用户信息
ApiGetUserInfo
}
// user.vue
improt {ApiGetUserInfo} from '@/common/api/xxapi.js';
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
const getUserInfo = async () =>{
const {error, result} = await ApiGetUserInfo();
if(error){
alert(error);
return false;
}
app.userInfo = result;
}
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.
```
## License
For open source projects, say how it is licensed.
## css
- 采用 BEM 命名法
### 兼容 CSS
```css
/* 以下兼容方式的样式请使用util.css中的adj方法 */
.my-class {
transform: translate3d(-50%, 0, 0);
-webkit-transform: translate3d(-50%, 0, 0);
-moz-transform: translate3d(-50%, 0, 0);
-o-transform: translate3d(-50%, 0, 0);
-ms-transform: translate3d(-50%, 0, 0);
}
/* 使用以下方法 */
@import "~/assets/scss/util.scss";
.my-class {
@include adj(transform, translate3d(-50%, 0, 0));
}
```
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
## 登录相关
```javascript
// 访问token
this.$store.state.token;
// 设置token
this.$store.commit("setToken");
// 退出登录
this.$store.commit("setLoginOut");
// 获取登录的用户信息
this.$store.state.userInfo;
// 登录拦截
// 示例:点击购买课程前需要判断当前用户是否登录,未登录则弹出登录弹窗
function onPurchaseCourse() {
if (!this.$isLoginValidate()) {
return;
}
// 此处省略其他业务代码...
}
```

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 756 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 850 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 613 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 972 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 928 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 763 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 752 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 812 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 904 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 728 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 374 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 928 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 842 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 567 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 535 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 815 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save