Logo white

wxd / MShopWeApp

Sign in
  • Sign in
  • Project
  • Files
  • Commits
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Commits 6,318
  • Compare
  • Branches 5
  • Tags 0
  • MShopWeApp
05 May, 2020
6 commits
  • Merge branch 'dev' into 'test' ...
    b232834d
    品牌图片有本地图片和网络图片俩种的正确显示
    
    See merge request !406
    后端研发-苏明海 authored
    2020-05-05 10:44:01 +0800  
    Browse Code »
  • 品牌图片有本地图片和网络图片俩种的正确显示
    80cade98
    yvan.ni authored
    2020-05-05 10:43:24 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    1a7d8010
    Dev
    
    See merge request !403
    后端研发-苏明海 authored
    2020-05-05 09:59:33 +0800  
    Browse Code »
  • 商品详情显示多条码的图片
    7b40fe0a
    yvan.ni authored
    2020-05-05 09:58:08 +0800  
    Browse Code »
  • 绑定手机的bug优化
    0f783bec
    yvan.ni authored
    2020-05-05 09:57:23 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    f6ec2830
    Dev
    
    See merge request !400
    后端研发-苏明海 authored
    2020-05-05 09:48:18 +0800  
    Browse Code »

04 May, 2020
3 commits
  • 在店内搜索-1的bug去掉
    a4763fba
    yvan.ni authored
    2020-05-04 16:49:33 +0800  
    Browse Code »
  • 多条码,显示不同的图片
    207fd013
    yvan.ni authored
    2020-05-04 16:37:39 +0800  
    Browse Code »
  • bug优化,在计算等级价的时候
    f1c3cd63
    yvan.ni authored
    2020-05-04 16:35:57 +0800  
    Browse Code »

30 Apr, 2020
5 commits
  • Merge branch 'dev' into 'test' ...
    9e7f0ca4
    Dev
    
    See merge request !397
    后端研发-苏明海 authored
    2020-04-30 14:53:02 +0800  
    Browse Code »
  • Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
    8d52ee9d
    yvan.ni authored
    2020-04-30 10:47:59 +0800  
    Browse Code »
  • 1. 要有门店的跳转 ...
    c4657cb8
    2.  首页如果是自定义模板,就要用默认的
    yvan.ni authored
    2020-04-30 10:47:42 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    994853fe
    测试修改提交
    
    See merge request !394
    后端研发-苏明海 authored
    2020-04-30 10:10:57 +0800  
    Browse Code »
  • 测试修改提交
    45a3e23b
    season authored
    2020-04-30 10:10:48 +0800  
    Browse Code »

29 Apr, 2020
6 commits
  • Merge branch 'dev' into 'test' ...
    029937fd
    在确认的时候,不要控制急速模式
    
    See merge request !377
    后端研发-苏明海 authored
    2020-04-29 18:13:43 +0800  
    Browse Code »
  • 在确认的时候,不要控制急速模式
    69c76d3c
    yvan.ni authored
    2020-04-29 18:12:21 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    edcc5562
    默认门店修改后, 空对象要判断pickup_id是否有值。
    
    See merge request !375
    后端研发-苏明海 authored
    2020-04-29 16:25:10 +0800  
    Browse Code »
  • 默认门店修改后, 空对象要判断pickup_id是否有值。
    165792ff
    yvan.ni authored
    2020-04-29 15:48:38 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    a44c102a
    Dev
    
    See merge request !373
    后端研发-苏明海 authored
    2020-04-29 11:43:38 +0800  
    Browse Code »
  • 1. 已拼多少份, 要改成已拼多少件 ...
    26e18681
    2.   当会员没有默认门店的情况下调用,要判读对象是不是存在,是不是有门店pickup_id
    yvan.ni authored
    2020-04-29 11:39:58 +0800  
    Browse Code »

28 Apr, 2020
2 commits
  • 购物车,商品如果是下架了,就不能结算的优化
    a7d0f63e
    yvan.ni authored
    2020-04-28 11:05:57 +0800  
    Browse Code »
  • 生日, 评价有礼, 节日有礼 新人礼在领取礼包的时候 "buyFrom": 2 ,保证来源的显示
    1bfdbfcc
    yvan.ni authored
    2020-04-28 11:05:16 +0800  
    Browse Code »

27 Apr, 2020
4 commits
  • Merge branch 'dev' into 'test' ...
    6e5a3052
    礼包详情也,立即兑换也要加buyFrom参数
    
    See merge request !370
    后端研发-苏明海 authored
    2020-04-27 16:29:13 +0800  
    Browse Code »
  • 礼包详情也,立即兑换也要加buyFrom参数
    2fbf11ce
    yvan.ni authored
    2020-04-27 15:06:49 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    e8713e63
    1.  礼包购买的时候
    
    2.  导航不显示图标的显示
    
    See merge request !368
    后端研发-苏明海 authored
    2020-04-27 14:27:54 +0800  
    Browse Code »
  • 1. 礼包购买的时候 ...
    060b2bc6
    2.  导航不显示图标的显示
    yvan.ni authored
    2020-04-27 14:26:21 +0800  
    Browse Code »

25 Apr, 2020
3 commits
  • Merge branch 'dev' into 'test' ...
    acf175cd
    自定义导航的显示,小程序优化
    
    See merge request !366
    后端研发-苏明海 authored
    2020-04-25 18:15:48 +0800  
    Browse Code »
  • 自定义导航的显示,小程序优化
    6148220d
    yvan.ni authored
    2020-04-25 18:10:58 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    9263d910
    Dev
    
    See merge request !364
    后端研发-苏明海 authored
    2020-04-25 13:55:03 +0800  
    Browse Code »

24 Apr, 2020
6 commits
  • 锁库的数据要读多一点,pageSzie:1000
    1f6b85f7
    yvan.ni authored
    2020-04-24 16:19:32 +0800  
    Browse Code »
  • 已拼多少分,改成已拼多少件
    1d6b900d
    yvan.ni authored
    2020-04-24 15:41:53 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    ddb2cb65
    添加新方法
    
    See merge request !363
    后端研发-苏明海 authored
    2020-04-24 11:46:26 +0800  
    Browse Code »
  • 添加新方法
    70f4f641
    yvan.ni authored
    2020-04-24 11:38:41 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    4223fe78
    Dev
    
    See merge request !362
    后端研发-苏明海 authored
    2020-04-24 11:24:08 +0800  
    Browse Code »
  • 1. 解决急速模式的问题 ...
    724e8f1c
    2. 阶梯团 还差多少人活动最优时,要转化成整形计算
    yvan.ni authored
    2020-04-24 09:19:35 +0800  
    Browse Code »

23 Apr, 2020
4 commits
  • 1、商品线下库存 默认门店要显示, 如果库存不足,要提示(库存不足) ...
    f23c7b78
    2、多条吗商品在切换的时的库存控制
    3、 订单列表中立即支付的bug修复
    yvan.ni authored
    2020-04-23 17:01:56 +0800  
    Browse Code »
  • 立即支付的库存判断
    aecfcdd8
    yvan.ni authored
    2020-04-23 09:56:04 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    82e21a3d
    商品详情的显示可出库数
    
    See merge request !361
    后端研发-苏明海 authored
    2020-04-23 09:08:07 +0800  
    Browse Code »
  • 商品详情的显示可出库数
    aa90b8a0
    yvan.ni authored
    2020-04-23 09:06:28 +0800  
    Browse Code »

22 Apr, 2020
1 commit
  • Merge branch 'dev' into 'test' ...
    50cb1f68
    门店在使用的时候,只用深度拷贝,不能用赋值,避免线下库存混乱显示的情况
    
    See merge request !360
    后端研发-苏明海 authored
    2020-04-22 17:50:59 +0800  
    Browse Code »