Merge branch 'dev' of https://code.itechtop.cn/yangyang/ztx_wx_minapp into dev
# Conflicts: # unpackage/dist/dev/mp-weixin/app.js # unpackage/dist/dev/mp-weixin/app.json # unpackage/dist/dev/mp-weixin/common/vendor.js # unpackage/dist/dev/mp-weixin/pages/index/index.js # unpackage/dist/dev/mp-weixin/pages/index/register.wxss # unpackage/dist/dev/mp-weixin/project.config.json # unpackage/dist/dev/mp-weixin/training/trainList.js # unpackage/dist/dev/mp-weixin/webView/newList/newList.json # unpackage/dist/dev/mp-weixin/webView/vipSystem.json # unpackage/dist/dev/mp-weixin/webView/vipSystem.wxml
Showing
24 changed files
with
1127 additions
and
4 deletions
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
pages/myCenter/myCenter.vue
0 → 100644
unpackage/dist/dev/mp-weixin/app.json
0 → 100644
This diff could not be displayed because it is too large.
File mode changed
-
Please register or sign in to post a comment