Commits · 6ec2a62c3756de6f5f7e342ecb8c693392eb2ac3 · wangjian / FuLiMini

25 Apr, 2022 1 commit
- 1 · 6ec2a62c
  wangjian authored Apr 25, 2022
  
  6ec2a62c
24 Apr, 2022 5 commits
- 1 · a2f6fb87
  wangjian authored Apr 24, 2022
  
  a2f6fb87
- 1 · 50474d4b
  wangjian authored Apr 24, 2022
  
  50474d4b
- fixbug · 1cf86515
  wangjian authored Apr 24, 2022
  
  1cf86515
- ·1 · 21f50f3f
  wangjian authored Apr 24, 2022
  
  21f50f3f
- 1 · 460d553a
  wangjian authored Apr 24, 2022
  
  460d553a
22 Apr, 2022 3 commits
- 1 · 49f05bfe
  wangjian authored Apr 22, 2022
  
  49f05bfe
- 1 · 6dec8742
  wangjian authored Apr 22, 2022
  
  6dec8742
- 1 · 956dd105
  wangjian authored Apr 22, 2022
  
  956dd105
20 Apr, 2022 8 commits

1 · 8ce583e6
wangjian authored Apr 20, 2022

8ce583e6

Merge branch 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini into dev · dd239ec7

authored Apr 20, 2022

* 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini:
  删除dist
  手噢耶动画

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/integral/integral.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/selectAccount/selectAccount.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/home/home.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	unpackage/dist/dev/mp-weixin/pagesA/integral/integral.js
#	unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js

dd239ec7

1 · 0b665a17
wangjian authored Apr 20, 2022

0b665a17
删除dist · bde32aa8
shibukun authored Apr 20, 2022

bde32aa8
手噢耶动画 · 488af975
shibukun authored Apr 20, 2022

488af975
1 · 57b9f144
wangjian authored Apr 20, 2022

57b9f144

Merge branch 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini into dev · 1a442095

authored Apr 20, 2022

* 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini:
  退出账号
  设置
  积分详情
  代码修改
  合并代码
  首页修改
  商品列表
  商品列表
  商品列表

# Conflicts:
#	pages.json
#	pages/mine/mine.vue
#	router/router.js
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/integral/integral.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/selectAccount/selectAccount.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/home/home.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml
#	unpackage/dist/dev/mp-weixin/pagesA/integral/integral.js
#	unpackage/dist/dev/mp-weixin/project.config.json
#	unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js

1a442095

添加 · 79e4eec5
wangjian authored Apr 20, 2022

79e4eec5

19 Apr, 2022 3 commits
- 退出账号 · 7d9d45fe
  shibukun authored Apr 19, 2022
  
  7d9d45fe
- 设置 · b15bd44f
  shibukun authored Apr 19, 2022
  
  b15bd44f
- 积分详情 · af5481aa
  shibukun authored Apr 19, 2022
  
  af5481aa
18 Apr, 2022 19 commits

代码修改 · 032a549b
shibukun authored Apr 18, 2022

032a549b
合并代码 · 6aadc432
shibukun authored Apr 18, 2022

6aadc432
Merge branch 'dev' of gitlab.jntmedia.cn:wangjian/FuLiMini into dev · 2b1525c5
shibukun authored Apr 18, 2022

2b1525c5
首页修改 · 329dab2f
shibukun authored Apr 18, 2022

329dab2f
商品列表 · b94b8bdb
shibukun authored Apr 18, 2022

b94b8bdb
商品列表 · b3a6044e
shibukun authored Apr 18, 2022

b3a6044e
商品列表 · 1f55765a
shibukun authored Apr 18, 2022

1f55765a
添加store · e1ee1876
wangjian authored Apr 18, 2022

e1ee1876

Merge branch 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini into dev · 578ddf12

authored Apr 18, 2022

* 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini:
  首页

# Conflicts:
#	pages/home/home.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/integral/integral.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/selectAccount/selectAccount.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/main.js
#	unpackage/dist/dev/mp-weixin/common/main.wxss
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/home/home.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.json
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml
#	unpackage/dist/dev/mp-weixin/pages/order/order.js
#	unpackage/dist/dev/mp-weixin/pagesA/integral/integral.js
#	unpackage/dist/dev/mp-weixin/pagesA/login/login.js
#	unpackage/dist/dev/mp-weixin/pagesA/selectAccount/selectAccount.js
#	unpackage/dist/dev/mp-weixin/project.config.json
#	unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js

578ddf12

Merge branch 'master' into dev · 4a170230

authored Apr 18, 2022

* master:
  1
  1

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/integral/integral.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/selectAccount/selectAccount.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/main.js
#	unpackage/dist/dev/mp-weixin/common/main.wxss
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/home/home.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.json
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml
#	unpackage/dist/dev/mp-weixin/pages/order/order.js
#	unpackage/dist/dev/mp-weixin/pagesA/integral/integral.js
#	unpackage/dist/dev/mp-weixin/pagesA/login/login.js
#	unpackage/dist/dev/mp-weixin/pagesA/selectAccount/selectAccount.js
#	unpackage/dist/dev/mp-weixin/project.config.json
#	unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js

4a170230

合并冲突 · a9f9a33d
shibukun authored Apr 18, 2022

a9f9a33d
1 · 2b3f2dff
wangjian authored Apr 18, 2022

2b3f2dff
首页 · a36ddfbb
shibukun authored Apr 18, 2022

a36ddfbb
1 · 0df0b1e0
wangjian authored Apr 18, 2022

0df0b1e0
删除dist文件 · 1e1439d8
shibukun authored Apr 18, 2022

1e1439d8
添加忽略文件 · c138c802
shibukun authored Apr 18, 2022

c138c802
合并代码 · 304a0165
shibukun authored Apr 18, 2022

304a0165
添加图片 · f48d6b70
shibukun authored Apr 18, 2022

f48d6b70
首页 · 7cf16f98
shibukun authored Apr 18, 2022

7cf16f98

15 Apr, 2022 1 commit
- 添加登录 · d5c91777
  wangjian authored Apr 15, 2022
  
  d5c91777