Merge branch 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini into dev
* '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
Showing
pagesA/GoodSkuList/GoodSkuList.vue
0 → 100644
pagesA/SetPwd/SetPwd.vue
0 → 100644
pagesA/VertifyPhone/VertifyPhone.vue
0 → 100644
pagesA/integralDetail/integralDetail.vue
0 → 100644
pagesA/setting/setting.vue
0 → 100644
static/icon-bottom-row.png
0 → 100644
1.24 KB
static/integral-empty-icon.png
0 → 100644
106 KB
This source diff could not be displayed because it is too large.
You can
view the blob
instead.