From c2dadc51b8d308152b0b3878096f42a6b12d0ebe Mon Sep 17 00:00:00 2001 From: xiaoshan Date: Thu, 14 Dec 2023 11:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git reset | 441 ++++++++++++++++++++++++++++++++++++++++ pages/repair/repair.vue | 1 + 2 files changed, 442 insertions(+) create mode 100644 git reset diff --git a/git reset b/git reset new file mode 100644 index 0000000..432448d --- /dev/null +++ b/git reset @@ -0,0 +1,441 @@ +commit 078f63b9a161e788b1dd8ed0d5a0398ade7e65bd (HEAD -> master) +Merge: e6797bb 3a44044 +Author: xiaoshan +Date: Wed Dec 13 20:25:20 2023 +0800 + + 合并 + +commit e6797bb6acc0180182f8976fa634f9f4ad824d01 +Author: xiaoshan +Date: Wed Dec 13 20:19:34 2023 +0800 + + 定位 + +commit 3a44044565e5142883d608964aafc5f53957be58 (origin/master, origin/HEAD) +Author: xiaoshan +Date: Tue Dec 12 20:56:55 2023 +0800 + + 集美特模板 + +commit 22df59193653b18d38a4a61c6f3428113980bdac +Author: xiaoshan +Date: Tue Dec 12 18:28:32 2023 +0800 + + 'jimeite' + +commit 0efc8a5f0120da58cf28e23e183db3f9c725b42c +Merge: 7cd3d29 1221d7f +Author: DL <1923459541@163.com> +Date: Mon Dec 11 09:53:22 2023 +0800 + + '修改' + +commit 7cd3d294d7866eb3c75791e22cf799778acba751 +Author: DL <1923459541@163.com> +Date: Mon Dec 11 09:51:16 2023 +0800 + + 修改 + +commit 1221d7f1ae155cc2f9b5ea2f7ed260c5ea07f743 +Author: xiaoshan +Date: Fri Dec 8 14:17:53 2023 +0800 + + add + +commit f41df7e2240b856a46a51ce5812b72f57d5f6c23 +Author: xiaoshan +Date: Fri Dec 8 13:19:25 2023 +0800 + + 补充上一条 + +commit 3d8e7e3a7e8b3acc98af587b46d34e80909296ba +Author: xiaoshan +Date: Fri Dec 8 13:09:43 2023 +0800 + + 删除设置密码页 + +commit 55497577d39665fcaf061a3bac9a2bfebf2018ab +Author: xiaoshan +Date: Fri Dec 8 13:08:51 2023 +0800 + + 删除多余登录页 + +commit f20f4a1e468de8c1848a052dcc7423bf1bfa720e +Author: xiaoshan +Date: Fri Dec 8 13:07:26 2023 +0800 + + 登录接口 + +commit a4d31904b77a744000e14f7c321a25eefba50e64 +Merge: ec0c295 1835f0f +Author: xiaoshan +Date: Fri Dec 8 10:43:09 2023 +0800 + + Merge branch 'master' of http://gitea.lianxianke.cn/qichexitong/car-repair-mini-app + +commit ec0c2950b6ba75530cdd532baae13b7fee1c3138 +Author: xiaoshan +Date: Fri Dec 8 10:43:05 2023 +0800 + + 合并 + +commit 1835f0fd9d3a689dee030acf76e56a849668ecf7 +Author: DL <1923459541@163.com> +Date: Fri Dec 8 10:12:43 2023 +0800 + + 修改 + +commit e4929e959e154fe9f0a4c7f91ffd16b7835ff584 +Author: DL <1923459541@163.com> +Date: Fri Dec 8 10:05:19 2023 +0800 + + 123 + +commit d2e22ffd7658249d994887a45c8badca269a9089 +Author: DL <1923459541@163.com> +Date: Thu Dec 7 17:17:47 2023 +0800 + + 我的工单 + +commit 3dc1b00d9582e06c24d33cea4b7a72c20cf97968 +Author: DL <1923459541@163.com> +Date: Thu Dec 7 13:49:12 2023 +0800 + + 登录认证，首页 + +commit 311110df25590610b632b3024f58af96aad25502 +Author: xiaoshan +Date: Mon Nov 27 11:41:39 2023 +0800 + + 删除非必要模块 + +commit 4d02449eb42c1e9c02acfb616023221a2b834685 (master_dev) +Author: xiaoshan +Date: Fri Nov 24 10:43:33 2023 +0800 + + 合并 + +commit fb7c874860cc9f423e95480cb782a72072940472 +Merge: afa083f 16a5e19 +Author: xiaoshan +Date: Fri Nov 24 10:43:14 2023 +0800 + + Merge branch 'master_dev' of http://gitea.lianxianke.cn/qichexitong/car-repair-mini-app into master_dev + +commit 16a5e190938ea00c313adbdd13f3a8f6e3231094 (origin/master_dev) +Author: xiaoshan +Date: Fri Nov 24 10:34:45 2023 +0800 + + 123 + +commit afa083fe70fa20969aed883a9f46083cafca2a73 +Author: xiaoshan +Date: Fri Nov 24 10:28:27 2023 +0800 + + 调试 + +commit c7f5f3a1d7c3165acb666aca2f6582ad91e4c28a +Author: xiaoshan +Date: Thu Oct 26 18:57:10 2023 +0800 + + 推流拉流基础 + +commit 3fd206d25349003a5568bf99b3e6ad4c56bdf1bc +Author: xiaoshan +Date: Tue Oct 24 16:33:23 2023 +0800 + + aaa + +commit 276390adc813aab9a3d899de7902e50bef7b3305 +Author: xiaoshan +Date: Tue Oct 24 13:43:57 2023 +0800 + + 反馈 + +commit 17793e722738a536ef9871d2a035e25d3e4eb5ba +Author: xiaoshan +Date: Mon Oct 23 18:11:59 2023 +0800 + + 收货地址，轮播广告 + +commit 317a8bc93e7c06889476dc2479a912e4c523c4ee +Author: xiaoshan +Date: Tue Oct 17 14:34:13 2023 +0800 + + 图标 + +commit dc0dce6f8a1b7e52e09428147d0f6ca7b3a67e30 +Author: xiaoshan +Date: Tue Oct 17 10:35:53 2023 +0800 + + 工人中心 + +commit 47d91562c99f6876d9160840c310ce812891810a +Author: xiaoshan +Date: Mon Oct 16 14:59:17 2023 +0800 + + 111 + +commit d937c6a6773ef3c9956d72431e21aabd9c3288bb +Author: xiaoshan +Date: Fri Oct 13 18:14:11 2023 +0800 + + 个人中心 + +commit 57e0dc875c28fefe3f141e98bee5e326c753634c +Author: xiaoshan +Date: Fri Oct 13 14:56:49 2023 +0800 + + 个人信息 + +commit b69a0adc5e50159aef6892f7c3a39370234170c3 +Author: xiaoshan +Date: Wed Oct 11 17:19:39 2023 +0800 + + 登录模块 + +commit 179796675592c054966f186daa153f1f5601b762 +Author: heyi <806572349@qq.com> +Date: Fri Sep 8 14:04:47 2023 +0800 + + add 阿里云oss + +commit ca630460b5adce266887d7a3741a70c722ac75fe +Author: heyi <806572349@qq.com> +Date: Thu Sep 7 20:25:18 2023 +0800 + + fix + +commit 956080e0b251156306b042c4d1ce638b50241c38 +Author: heyi <806572349@qq.com> +Date: Thu Sep 7 20:17:22 2023 +0800 + + 图片和视频上传组件 + +commit dafd32441579a0b5fe2703434f3e258c10d22b9f +Author: heyi <806572349@qq.com> +Date: Thu Sep 7 20:01:44 2023 +0800 + + fix + +commit 2df8defd2b9293851c5172e67742162e9fca7536 +Author: heyi <806572349@qq.com> +Date: Thu Sep 7 14:23:25 2023 +0800 + + 增加oss 上传工具类，优化上传组件 + +commit 376048fddb5acfd4b39cfde4dfdcaffa957f0621 +Author: heyi <806572349@qq.com> +Date: Thu Sep 7 10:11:27 2023 +0800 + + add 视频上传组件 + +commit 2c634ecd6fe98f2a73fbcb546c006fe6cfc2f283 +Author: xiaoshan +Date: Wed Sep 6 17:55:48 2023 +0800 + + websocket + +commit 13309008f04f8c32c08cfc505c5368eca625a97a +Author: heyi <806572349@qq.com> +Date: Thu Jul 27 10:41:07 2023 +0800 + + update + +commit e7b00d50ac3638eccf748e62f95dbbe4b2ee4a0e +Author: heyi <806572349@qq.com> +Date: Wed Jul 26 19:31:53 2023 +0800 + + add 预览图片，并且长按保存 工具类 + +commit 9fc69a0fb0ae5397bc72b83d1ad4244c71df2e18 +Author: heyi <806572349@qq.com> +Date: Wed Jul 26 19:31:21 2023 +0800 + + add livepulish case + +commit 38a7486cffc7b5ddb01966cabf92523188d55f42 +Author: heyi <806572349@qq.com> +Date: Sat May 20 11:52:51 2023 +0800 + + add 图片缓存框架 + +commit 6425981d01585c013d2b3e63f29255c204eeb780 +Author: heyi <806572349@qq.com> +Date: Fri May 19 18:25:17 2023 +0800 + + add 图片缓存框架 + +commit d38dca62fefc67d7566242452fd42cf8343eed00 +Author: heyi <806572349@qq.com> +Date: Fri May 19 18:14:33 2023 +0800 + + add 二维码 + +commit e8b7be817994a0f9767f654210c86a9f59aa96c1 +Author: heyi <806572349@qq.com> +Date: Fri May 19 18:13:08 2023 +0800 + + add 二维码 + +commit b62600f6e69540f83707f5aec689ab31b2bb3db7 +Author: xiaoshan +Date: Thu May 11 17:52:06 2023 +0800 + + 图片上传组件自定义删除图片点击无效bug + +commit 36ed22583fcf4dbb6525a39caae7c670cd4a09f7 +Author: xiaoshan +Date: Thu May 11 17:49:02 2023 +0800 + + 视频上传组件 + +commit e065beebd35535c2c3fad39bc0179ae463e168df +Author: xiaoshan +Date: Thu May 11 11:55:59 2023 +0800 + + 图片上传组件高度不设置默认与宽度相等 + +commit 17e8819886929eebaba75afea33c982d6b6fa9de +Author: xiaoshan +Date: Thu May 11 11:07:34 2023 +0800 + + 图片上传组件完善 + +commit 7f17f2e07e55c2b9f8a093441722595841719401 +Author: xiaoshan +Date: Tue May 9 09:27:43 2023 +0800 + + 图片上传v-model实现 + +commit b1fe206a56c930177c356f9ade056a7045b0820a +Author: xiaoshan +Date: Sat May 6 17:38:59 2023 +0800 + + 图片上传组件 + +commit 2abf7b80b6ff0c4c1b51ade83aebde654cdb9b24 +Author: heyi <806572349@qq.com> +Date: Fri May 5 22:46:13 2023 +0800 + + add 权限 + +commit ca912137ef37ac08bb8036d62cebcbf076995d93 +Author: heyi <806572349@qq.com> +Date: Fri May 5 15:10:08 2023 +0800 + + add z-paging + +commit f9de1fc4f08da21ef01717353bacf8b3cb675e38 +Author: heyi <806572349@qq.com> +Date: Fri May 5 13:27:00 2023 +0800 + + add readme + +commit 1ddb735c1d0b6837680029a62770aa0017744588 +Author: heyi <806572349@qq.com> +Date: Fri May 5 13:15:43 2023 +0800 + + add uview2 + +commit 3b7b1f21e315d6c828d6b0a4f2677340ca166e41 +Author: RuoYi +Date: Thu Apr 6 15:17:04 2023 +0800 + + 修复ColorUI缺少Icon的问题(I6BZE6) + +commit ee5b341812e50f5f8d0a3a97ca6eaa439fe7591d +Author: RuoYi +Date: Wed Dec 28 13:59:09 2022 +0800 + + RuoYi-App 1.1.0 + +commit 1c5aefbf4fb628fbb31cefe9aff1feaa52fbaf72 +Author: RuoYi +Date: Wed Dec 28 13:32:49 2022 +0800 + + 优化登录页面验证码显示效果 + +commit 55fb5c5f619ff593b2a17b2de5e06b27f738e973 +Author: RuoYi +Date: Wed Dec 28 10:03:07 2022 +0800 + + 升级uni-ui到最新版本1.4.23 + +commit 9bca5bebd5409c3056c02681d61afe04667c20c7 +Author: RuoYi +Date: Tue Dec 27 14:53:28 2022 +0800 + + 修复首页图标显示不了问题(I5UHNY) + +commit 36e400027e92e5612f5343982614cefa392fc56f +Author: RuoYi +Date: Tue Dec 27 14:45:52 2022 +0800 + + 修复permission路由拦截参数错误(I5RYY7) + +commit e8d206ceed76722f1ef533627ff8b00d47981a85 +Author: RuoYi +Date: Tue Dec 27 14:45:04 2022 +0800 + + 修复打包h5后找不到iconfont文件(I5PC17) + +commit 01ff1e617e30082a1221bfbacbf229f9562fb186 +Author: RuoYi +Date: Tue Aug 2 10:20:10 2022 +0800 + + 升级uni-ui到最新版本1.4.20 + +commit 9218925e83f74dafbb7e83276e715344d05a23c3 +Author: RuoYi +Date: Mon Aug 1 22:30:46 2022 +0800 + + README + +commit 3435bdc04f02226c7573eaf0d4746d0cc96e3fc1 +Author: RuoYi +Date: Mon Aug 1 22:30:36 2022 +0800 + + gitignore + +commit 77874e22b3643b9edf5c7f5dbe799d92411fd21e +Author: RuoYi +Date: Mon Aug 1 21:14:20 2022 +0800 + + gitignore + +commit ceb7c8b85461150e9f6bf02b916fbd090545744e +Author: RuoYi +Date: Mon Aug 1 21:01:14 2022 +0800 + + gitignore + +commit ff1d17eb314230de18f39a32cd838b887cfda1ca +Author: RuoYi +Date: Mon Aug 1 20:59:12 2022 +0800 + + 初次进入App时进入登录页 + +commit 0ca2bd20b8e3b6daa18d17283b68bc7e9a71c212 +Author: RuoYi +Date: Mon Aug 1 08:14:57 2022 +0800 + + RuoYi-App 1.0.0 + +commit 766bf58c8b0478a1ae272967b84bad6a2b788667 +Author: RuoYi +Date: Thu Jul 28 20:12:36 2022 +0800 + + 添加新群号：133713780 + +commit 0b60bfc29f0eb37a19473b461f24beae07753807 +Author: RuoYi +Date: Sun Jul 17 17:28:35 2022 +0800 + + README + +commit 4fff6ec81fedcd3a2cd89573a02a16fc02409aef +Author: RuoYi +Date: Sun Jul 17 17:28:11 2022 +0800 + + LICENSE diff --git a/pages/repair/repair.vue b/pages/repair/repair.vue index 62deb1b..5b3cc94 100644 --- a/pages/repair/repair.vue +++ b/pages/repair/repair.vue @@ -1,5 +1,6 @@