|  mabo | 0df88e08e4 | table不随屏幕改变尺寸问题 | 2021-05-27 16:37:00 +08:00 | 
				
					
						|  mabo | 087ffe230d | 商品选择器组件修改,菜单栏调整 | 2021-05-27 10:32:05 +08:00 | 
				
					
						|  mabo | f5786e46c3 | 运费模板配置 | 2021-05-26 10:30:08 +08:00 | 
				
					
						|  mabo | ff85c3f68f | 运费模板修改 | 2021-05-25 18:58:55 +08:00 | 
				
					
						|  mabo | c9c6b1d690 | Merge branch 'dev-ryan' into ma | 2021-05-25 18:37:55 +08:00 | 
				
					
						|  mabo | 978db4e624 | 配送模板修改 | 2021-05-25 18:37:29 +08:00 | 
				
					
						|  mabo | 7729031efa | 修改一些问题,删除无用文件,商品选择器回显 | 2021-05-25 17:08:23 +08:00 | 
				
					
						|  lemon橪 | 020ddf0588 | 合并master | 2021-05-25 14:27:45 +08:00 | 
				
					
						|  lemon橪 | e5dbd18bf3 | 小程序直播部分,暂未写完 | 2021-05-25 14:27:18 +08:00 | 
				
					
						|  mabo | 7e668cc6d5 | 管理端,商品回显修改 | 2021-05-25 14:26:48 +08:00 | 
				
					
						|  mabo | a36946de1a | Merge branch 'master' into ma | 2021-05-24 18:16:03 +08:00 | 
				
					
						|  mabo | 882e222c5a | 商品选择器回显 | 2021-05-24 18:14:06 +08:00 | 
				
					
						|  Chopper | ad363b1fb6 | readme 修正 | 2021-05-24 15:50:28 +08:00 | 
				
					
						|  Chopper | b339e39761 | 脚本提交,直接覆盖 | 2021-05-24 15:47:27 +08:00 | 
				
					
						|  Chopper | 3051486cd1 | 一键推送github脚本 | 2021-05-24 15:46:32 +08:00 | 
				
					
						|  Chopper | 35af0f2744 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui # Conflicts:
#	manager/src/views/promotion/coupon/coupon.vue
#	seller/src/views/promotion/coupon/coupon.vue | 2021-05-24 15:45:46 +08:00 | 
				
					
						|  Chopper | 5d393cbb06 | 调整页面细节 | 2021-05-24 15:44:50 +08:00 | 
				
					
						|  mabo | 44c88468d4 | Merge branch 'ma' # Conflicts:
#	manager/src/config/index.js | 2021-05-21 17:47:48 +08:00 | 
				
					
						|  mabo | 05d35c3974 | 一些bug修改 | 2021-05-21 17:46:29 +08:00 | 
				
					
						|  lemon橪 | 9e9abe9e1e | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui | 2021-05-21 16:56:51 +08:00 | 
				
					
						|  lemon橪 | 41093b2032 | 修改一些bug完善,新增app更新新功能 | 2021-05-21 16:45:47 +08:00 | 
				
					
						|  mabo | ae730cacf3 | Merge branch 'dev-ryan' into ma | 2021-05-21 10:47:12 +08:00 | 
				
					
						|  mabo | f31ac92bb9 | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui # Conflicts:
#	seller/src/config/index.js | 2021-05-21 10:25:55 +08:00 | 
				
					
						|  mabo | b1b587a50c | bug修改 | 2021-05-21 10:24:56 +08:00 | 
				
					
						|  pikachu | 7fed294388 | Merge branch 'lanmao' | 2021-05-20 19:20:04 +08:00 | 
				
					
						|  pikachu | 3c0555c815 | 参数为空校验 | 2021-05-20 19:14:38 +08:00 | 
				
					
						|  pikachu | f625a7e056 | 参数为空校验 | 2021-05-20 19:09:21 +08:00 | 
				
					
						|  lemon橪 | 38dc952a07 | 合并master | 2021-05-20 11:11:56 +08:00 | 
				
					
						|  lemon橪 | 92aa9fccaf | 修改一些可见的bug,优化运费模板中地址选择问题 | 2021-05-20 11:09:51 +08:00 | 
				
					
						|  pikachu | 63c559c8be | 折叠面板展示问题 | 2021-05-20 09:57:57 +08:00 | 
				
					
						|  pikachu | b190a443be | 修改参数中是否必填和索引选中问题 | 2021-05-20 09:45:59 +08:00 | 
				
					
						|  pikachu | 5e52e7f157 | 修改参数展示 | 2021-05-20 09:23:20 +08:00 | 
				
					
						|  Chopper | 530fd30cc2 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui | 2021-05-20 09:17:51 +08:00 | 
				
					
						|  pikachu | d927eaadf7 | 去掉参数参数类型 | 2021-05-20 08:30:40 +08:00 | 
				
					
						|  pikachu | 697e4820a4 | 去掉商品参数的一些信息 | 2021-05-20 08:29:32 +08:00 | 
				
					
						|  Chopper | 9ce380e5da | 店铺详情查看,如果还未设置结算周期无法展示问题处理 | 2021-05-19 20:22:28 +08:00 | 
				
					
						|  pikachu | 8971996731 | chushihua | 2021-05-19 19:28:44 +08:00 | 
				
					
						|  mabo | 7c8d071c97 | bug修改 | 2021-05-19 18:22:17 +08:00 | 
				
					
						|  mabo | cca4245316 | 发布商品,运费模板设置 | 2021-05-19 14:45:04 +08:00 | 
				
					
						|  mabo | 030adb7ae6 | 修改bug,商家端添加商品,选择运费模板 | 2021-05-19 14:10:05 +08:00 | 
				
					
						|  lemon橪 | e359e674cf | 合并master | 2021-05-19 09:51:27 +08:00 | 
				
					
						|  mabo | 95d0d4032f | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui | 2021-05-18 18:03:05 +08:00 | 
				
					
						|  mabo | 6d0e7b3825 | 修改bug,更改字体图标 | 2021-05-18 18:03:00 +08:00 | 
				
					
						|  lemon橪 | 3efefc4c02 | 解决发送短信的问题 | 2021-05-18 18:02:25 +08:00 | 
				
					
						|  Chopper | 76697f6a92 | Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui | 2021-05-18 14:18:24 +08:00 | 
				
					
						|  Chopper | d32ea4f1ce | 增加商品索引初始化功能 | 2021-05-18 14:18:08 +08:00 | 
				
					
						|  lemon橪 | 9dfc3a1eba | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into dev-ryan | 2021-05-18 14:02:50 +08:00 | 
				
					
						|  lemon橪 | 239ce64e9c | 短信签名图片上传样式优化 | 2021-05-18 09:28:16 +08:00 | 
				
					
						|  lemon橪 | 9a7422b107 | 修改管理端上传地址错误 | 2021-05-17 18:18:24 +08:00 | 
				
					
						|  mabo | c3ed622031 | Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui # Conflicts:
#	seller/src/config/index.js | 2021-05-17 18:13:56 +08:00 |