Commit Graph

64 Commits

Author SHA1 Message Date
Jason 5e844a1d38 后台页面调整 2022-09-21 16:42:53 +08:00
Jason cbdb12f5d7 修改搜索页面样式问题 2022-09-21 14:11:23 +08:00
Jason 29999f4e4a 调整登录,注册 2022-09-20 12:15:08 +08:00
Jason b512eac708 调整工具函数 2022-09-20 11:06:54 +08:00
Jason 53071be070 Merge tag 'wjx202209160640' into develop
no message

# Conflicts:
#	h5/assets/account.304e4c09.js
#	h5/assets/account.9ecc88ea.js
#	h5/assets/account.e236fd55.js
#	h5/assets/index.24de5888.js
#	h5/assets/index.5ddae38f.js
#	h5/assets/index.9d01590f.js
#	h5/assets/news-card.0f53c999.js
#	h5/assets/news-card.c91540ca.js
#	h5/assets/news-card.cacc1bdf.js
#	h5/assets/news.5c5bd132.js
#	h5/assets/news.7d996083.js
#	h5/assets/news.eb80f754.js
#	h5/assets/pages-as_us-as_us.27714390.js
#	h5/assets/pages-as_us-as_us.8bc9b466.js
#	h5/assets/pages-as_us-as_us.a75e6bf4.js
#	h5/assets/pages-bind_mobile-bind_mobile.1e39d2a7.js
#	h5/assets/pages-bind_mobile-bind_mobile.3d1ff6fd.js
#	h5/assets/pages-bind_mobile-bind_mobile.b0b2132a.js
#	h5/assets/pages-change_password-change_password.3e609524.js
#	h5/assets/pages-change_password-change_password.5516de7d.js
#	h5/assets/pages-change_password-change_password.7fcdae1a.js
#	h5/assets/pages-collection-collection.14907c26.js
#	h5/assets/pages-collection-collection.53abd56e.js
#	h5/assets/pages-collection-collection.5d101da7.js
#	h5/assets/pages-customer_service-customer_service.0e4773a4.js
#	h5/assets/pages-customer_service-customer_service.35e5d1d2.js
#	h5/assets/pages-customer_service-customer_service.c942a0bb.js
#	h5/assets/pages-forget_pwd-forget_pwd.0c22cfa7.js
#	h5/assets/pages-forget_pwd-forget_pwd.0cebded6.js
#	h5/assets/pages-forget_pwd-forget_pwd.41860f0c.js
#	h5/assets/pages-index-index.21b55a1c.js
#	h5/assets/pages-index-index.697592e8.js
#	h5/assets/pages-index-index.e7cbfcb8.js
#	h5/assets/pages-login-login.3d278588.js
#	h5/assets/pages-login-login.583742c3.js
#	h5/assets/pages-login-login.cc17b6ae.js
#	h5/assets/pages-news-news.6e6dfc74.js
#	h5/assets/pages-news-news.e71c4738.js
#	h5/assets/pages-news-news.f27837dc.js
#	h5/assets/pages-register-register.07ea7f19.js
#	h5/assets/pages-register-register.127a8342.js
#	h5/assets/pages-register-register.707197f6.js
#	h5/assets/pages-search-search.5bd1eb0e.js
#	h5/assets/pages-search-search.c9a4fc47.js
#	h5/assets/pages-search-search.fb4812e5.js
#	h5/assets/pages-user-user.29445b03.js
#	h5/assets/pages-user-user.97ccd207.js
#	h5/assets/pages-user-user.e6fd2164.js
#	h5/assets/pages-user_data-user_data.1a85e802.js
#	h5/assets/pages-user_data-user_data.2a0211b5.js
#	h5/assets/pages-user_data-user_data.65619aff.js
#	h5/assets/pages-user_set-user_set.9387105d.js
#	h5/assets/pages-user_set-user_set.a86f2f01.js
#	h5/assets/pages-user_set-user_set.d71e173b.js
#	h5/assets/pages-webview-webview.183e0d8c.js
#	h5/assets/pages-webview-webview.320ac922.js
#	h5/assets/pages-webview-webview.c3fa2ff9.js
#	h5/assets/shop.067e3a04.js
#	h5/assets/tabbar.1370a2f3.js
#	h5/assets/tabbar.3ac4b4ec.js
#	h5/assets/tabbar.5a261344.js
#	h5/assets/u-avatar.0975a40c.js
#	h5/assets/u-avatar.665749d0.js
#	h5/assets/u-avatar.aaafa077.js
#	h5/assets/u-button.4291cf3a.js
#	h5/assets/u-button.6324a944.js
#	h5/assets/u-button.f89bd070.js
#	h5/assets/u-checkbox.4a48075d.js
#	h5/assets/u-checkbox.a9e5c7b5.js
#	h5/assets/u-checkbox.e15726da.js
#	h5/assets/u-form-item.8b18cdc2.js
#	h5/assets/u-form-item.e8316076.js
#	h5/assets/u-form-item.f2bc17f6.js
#	h5/assets/u-form.718bda0a.js
#	h5/assets/u-form.9d11b0a8.js
#	h5/assets/u-form.e908a5a2.js
#	h5/assets/u-icon.947d1557.js
#	h5/assets/u-icon.b22654a8.js
#	h5/assets/u-icon.b511ef4e.js
#	h5/assets/u-image.2abefbca.js
#	h5/assets/u-image.dcffbc78.js
#	h5/assets/u-image.f03d2bad.js
#	h5/assets/u-parse.2b02a1d4.js
#	h5/assets/u-parse.466924cc.js
#	h5/assets/u-parse.cd76eaa8.js
#	h5/assets/u-popup.0657d28e.js
#	h5/assets/u-popup.6fa83f64.js
#	h5/assets/u-popup.c389a818.js
#	h5/assets/u-search.939c3f7f.js
#	h5/assets/u-search.9f49742b.js
#	h5/assets/u-search.dad6632d.js
#	h5/assets/u-verification-code.419886b4.js
#	h5/assets/u-verification-code.8f91217a.js
#	h5/assets/u-verification-code.9a7d2ff4.js
#	h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.75f62b2e.js
#	h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.859f9abd.js
#	h5/assets/uni_modules-vk-uview-ui-components-u-avatar-cropper-u-avatar-cropper.e582869e.js
#	h5/assets/util.7b793930.js
#	h5/assets/z-paging.34848bf3.js
#	h5/assets/z-paging.51f9fb6d.js
#	h5/assets/z-paging.9a4d68b6.js
#	h5/index.html
2022-09-16 18:43:18 +08:00
Jason c0405ebaab H5打包 2022-09-16 18:41:58 +08:00
Jason 3f699d3c7c 打包 2022-09-16 18:23:03 +08:00
Jason 117584acba 保存二维码 2022-09-16 18:15:41 +08:00
Jason 855f6ca3e6 资讯内容样式 2022-09-16 18:04:30 +08:00
Jason 85e8d2d390 资讯收藏调整 2022-09-16 17:58:08 +08:00
Jason 8c48b47cf4 打包 2022-09-16 17:50:39 +08:00
Jason 3ce89c21cf 修改密码bug 2022-09-16 17:13:12 +08:00
Jason 5eb0efe53e 【小程序-登录:后台修改用户账号后,用户再用原账号进行登录操作,提示语展示时间太短】https://www.tapd.cn/56509124/bugtrace/bugs/view?bug_id=1156509124001003526 2022-09-16 16:28:56 +08:00
Jason 4b8ab76a32 输入框添加清空符号,查询输入框添加回车 2022-09-16 16:17:08 +08:00
Jason 2361b79548 修改密码调整 2022-09-16 15:35:04 +08:00
Jason aeb6a7b47b 【小程序-轮播图:跳转至指定链接失败】https://www.tapd.cn/56509124/bugtrace/bugs/view?bug_id=1156509124001003513 2022-09-16 10:25:04 +08:00
Jason d2e6836450 打包 2022-09-15 17:52:47 +08:00
Jason b00cf5bf6c 打包 2022-09-15 17:47:19 +08:00
Jason 092a69b52d 修复h5正式环境新闻资讯报错问题 2022-09-15 16:54:44 +08:00
Jason 991734a41f 公众号登录调试 2022-09-15 15:21:43 +08:00
Jason 486deb6150 h5登录调试 2022-09-15 15:14:10 +08:00
Jason 2abccd483e 公众号登录调试 2022-09-15 15:03:12 +08:00
Jason eea37ebba2 公众号微信登录调试 2022-09-15 14:15:12 +08:00
Jason c3462df82c 公众号登录 2022-09-15 10:53:31 +08:00
Jason 3fe17fae5a 登录配置相关,调整登录逻辑,底部导航配置相关 2022-09-13 19:07:36 +08:00
Jason b8895342ac 登录相关配置 2022-09-13 17:41:24 +08:00
洪树泽 5ecd0ef668 【小程序】个人设置-增加退出按钮,样式调整 2022-09-13 10:54:36 +08:00
洪树泽 301dd7c3ea 【小程序】个人设置样式调整,去除无用代码 2022-09-13 10:13:26 +08:00
Jason 29febf427b lint 代码 2022-09-09 18:42:41 +08:00
Jason 43b9a54b6a 修改密码 2022-09-09 17:58:18 +08:00
linjinyuan 18bb453f04 Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
* 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java:
  修改pages.json
  【移动端】修复头像上传bug
  个人中心及注册页面跳转
2022-09-09 17:00:10 +08:00
linjinyuan bc927846c1 【小程序】-- 咨询中心tabs调整 2022-09-09 16:59:32 +08:00
Jason a4ed4f187d 修改pages.json 2022-09-09 16:22:08 +08:00
洪树泽 caea6872a6 【移动端】修复头像上传bug 2022-09-09 16:06:58 +08:00
Jason f1a80f7c5e 个人中心及注册页面跳转 2022-09-09 15:59:18 +08:00
洪树泽 0a1cf3fb1a 【移动端】个人资料页面调整 2022-09-09 15:51:52 +08:00
Jason ca5a931254 Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
# Conflicts:
#	app/src/utils/util.ts
2022-09-09 14:46:46 +08:00
Jason cc8fa61bea 页面跳转,跳转拦截 2022-09-09 14:44:55 +08:00
洪树泽 145f85edf7 【小程序】个人资料 2022-09-09 14:27:52 +08:00
Jason cda8b3e3b3 首页页面跳转 2022-09-09 11:06:58 +08:00
linjinyuan 5b33f47641 【小程序】-- 请求异常处理 2022-09-09 10:47:19 +08:00
linjinyuan 5db6380252 【小程序】-- 解决下拉加载无法下拉&图片路径调整 2022-09-09 10:43:31 +08:00
洪树泽 59f508d70f Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
部分调整
2022-09-09 10:11:33 +08:00
linjinyuan f5204f0e9d 【小程序】-- 搜索文章 2022-09-09 09:58:29 +08:00
Jason e0b6bab788 忘记密码 2022-09-09 09:50:39 +08:00
洪树泽 2193193df9 Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop
部分调整页面链接
2022-09-09 09:50:31 +08:00
洪树泽 4eb5ec6118 【小程序】增加个人资料,修改密码页面。协议页面调整 2022-09-09 09:18:31 +08:00
洪树泽 d992e9bed0 协议页面对接 2022-09-09 09:06:21 +08:00
洪树泽 42af47b620 Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop 2022-09-09 08:35:24 +08:00
Jason 0f47284235 网站信息,登录,用户 2022-09-08 19:09:53 +08:00