Commit Graph

286 Commits

Author SHA1 Message Date
曹辉
ef3d1f2e63 修改 2022-12-06 09:53:31 +08:00
shidongli
cfe0d0b30f 简介 2022-12-02 15:28:46 +08:00
曹辉
572852ad7e 修改 2022-12-01 16:56:20 +08:00
曹辉
aed610abff 修改 2022-12-01 14:48:59 +08:00
曹辉
be553787a1 修改 2022-12-01 11:06:42 +08:00
曹辉
17241a4187 修改 2022-12-01 09:59:28 +08:00
shidongli
9b2e0c608a 评价满意度 2022-11-30 16:22:12 +08:00
shidongli
d958c1a44f 提前预约时长 2022-11-30 15:25:58 +08:00
shidongli
6102e8945f 提前预约时长 2022-11-30 15:14:53 +08:00
shidongli
ca49d0c0c2 用户管理 修改 2022-11-29 13:51:46 +08:00
纪寒
e5edbafc1e Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	src/views/system/OperateGoodsInfo/index.vue
#	src/views/system/stationConsumable/indexjs.js
#	src/views/system/stationItem/index.vue
#	src/views/system/stationItem/stationItemjs.js
2022-11-24 16:58:39 +08:00
shidongli
a358920eef 耗材价格 修改 2022-11-24 16:33:27 +08:00
shidongli
61362dfe05 价格 修改 2022-11-24 16:04:50 +08:00
shidongli
a96866f2bf 价格 修改 2022-11-24 16:00:11 +08:00
shidongli
c7f22e6e06 价格 修改 2022-11-24 14:38:27 +08:00
曹辉
92c6a121d7 修改 2022-11-23 16:38:57 +08:00
纪寒
f8869416f5 Merge remote-tracking branch 'origin/dev' 2022-11-21 17:34:42 +08:00
曹辉
34cfa5e34c 修改 2022-11-21 17:10:52 +08:00
纪寒
bdad97584a Merge remote-tracking branch 'origin/dev' 2022-11-21 10:26:49 +08:00
曹辉
d07c6f64f0 修改 2022-11-21 10:24:20 +08:00
纪寒
848242dfeb Merge remote-tracking branch 'origin/dev' 2022-11-21 10:18:01 +08:00
曹辉
d2b266ef19 修改 2022-11-21 10:01:43 +08:00
曹辉
5293c91ab3 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/system/goodsOrder/indexjs.js
#	src/views/system/order/indexjs.js
2022-11-21 09:41:48 +08:00
曹辉
4ae1f94f1c 修改 2022-11-21 09:39:43 +08:00
闫晓茹
3464ee6ba0 已评价 2022-11-20 16:06:06 +08:00
纪寒
b186d2675f Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	src/api/baseurl.js
#	src/main.js
2022-11-18 14:39:33 +08:00
曹辉
b270c12684 修改 2022-11-18 12:50:42 +08:00
曹辉
956bfd00fd 修改 2022-11-17 16:51:49 +08:00
曹辉
f3a6a69b1e 修改 2022-11-17 16:48:25 +08:00
纪寒
2a8c8af8bd Merge remote-tracking branch 'origin/dev' 2022-11-17 12:37:02 +08:00
纪寒
ec8e82531c 去除无用代码 2022-11-17 12:35:55 +08:00
纪寒
ebbbed07d9 去除无用代码 2022-11-16 17:27:12 +08:00
shidongli
f8ec8383f9 护理员app 上传 2022-11-16 14:56:49 +08:00
纪寒
b991484236 运营PC端正式环境配置 2022-11-16 14:08:42 +08:00
曹辉
a55f139254 Merge remote-tracking branch 'origin/dev' into dev 2022-11-16 13:21:59 +08:00
曹辉
53106187dc 修改 2022-11-16 13:21:48 +08:00
闫晓茹
1641ee9ffa 删除 2022-11-16 11:49:46 +08:00
纪寒
e3c8488502 Merge remote-tracking branch 'origin/dev' 2022-11-16 11:41:57 +08:00
闫晓茹
3b2064b9fb 图片 2022-11-16 11:37:08 +08:00
shidongli
e80fb60fab 省市区修改 2022-11-16 10:51:14 +08:00
纪寒
2100e6730f 运营PC端正式环境配置 2022-11-16 10:38:29 +08:00
纪寒
4f4bc04d53 Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	src/views/system/order/index.vue
#	src/views/system/person/index.vue
#	src/views/system/station/index.vue
2022-11-16 10:23:35 +08:00
曹辉
14096572f3 修改 2022-11-16 10:00:42 +08:00
shidongli
db76651c5b 商品信息管理 护理站 2022-11-15 17:38:42 +08:00
闫晓茹
772fe170e9 删除 2022-11-15 16:38:39 +08:00
shidongli
6ba0ae4882 重置 修改 2022-11-15 15:10:54 +08:00
闫晓茹
4479313920 订单状态 2022-11-15 14:59:36 +08:00
shidongli
186d0556a5 省市区 修改 2022-11-15 14:49:01 +08:00
shidongli
b63b8c5756 商品订单管理 商品名称 2022-11-15 14:28:18 +08:00
shidongli
88b4f849af 提前预约时长 整数 2022-11-15 10:57:21 +08:00