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
01 Oct, 2019
4 commits
  • Merge branch 'qa' into 'master' ...
    e264ceba
    Qa
    
    See merge request !75
    后端研发-苏明海 authored
    2019-10-01 20:50:36 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    679ea30f
    Test
    
    See merge request !74
    后端研发-苏明海 authored
    2019-10-01 20:50:13 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    d136056c
    商品详情的分享BUG
    
    See merge request !73
    后端研发-苏明海 authored
    2019-10-01 20:49:55 +0800  
    Browse Code »
  • 商品详情的分享BUG
    e01a122d
    yvan.ni authored
    2019-10-01 20:42:49 +0800  
    Browse Code »

30 Sep, 2019
6 commits
  • Merge branch 'qa' into 'master' ...
    caecfc5e
    Qa
    
    See merge request !72
    后端研发-苏明海 authored
    2019-09-30 10:34:54 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    5b9edb07
    Test
    
    See merge request !71
    后端研发-苏明海 authored
    2019-09-30 09:46:19 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    20782b6a
    确认收货的bug修复
    
    See merge request !70
    后端研发-苏明海 authored
    2019-09-30 09:45:55 +0800  
    Browse Code »
  • 确认收货的bug修复
    69337e60
    yvan.ni authored
    2019-09-30 09:44:18 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    24b92218
    Test
    
    See merge request !69
    后端研发-苏明海 authored
    2019-09-30 09:17:01 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    5927a939
    订单列表,和订单详情关于退款完成后。以及退款进行中的bug优化
    
    See merge request !68
    后端研发-苏明海 authored
    2019-09-30 09:16:45 +0800  
    Browse Code »

29 Sep, 2019
6 commits
  • 订单列表,和订单详情关于退款完成后。以及退款进行中的bug优化
    32008b6e
    yvan.ni authored
    2019-09-29 18:49:11 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    aabb1e6e
    Test
    
    See merge request !67
    后端研发-苏明海 authored
    2019-09-29 18:28:22 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    6374408e
    订单列表关于退款完成不在订单里面显示
    
    See merge request !66
    后端研发-苏明海 authored
    2019-09-29 18:28:06 +0800  
    Browse Code »
  • 订单列表关于退款完成不在订单里面显示
    4cf43e02
    yvan.ni authored
    2019-09-29 17:08:03 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    84ae444e
    Test
    
    See merge request !65
    后端研发-苏明海 authored
    2019-09-29 14:01:35 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    c86288d7
    订单列表,和订单详情,关于退款中不能收货的优化完成
    
    See merge request !64
    后端研发-苏明海 authored
    2019-09-29 14:01:17 +0800  
    Browse Code »

27 Sep, 2019
8 commits
  • Merge branch 'qa' of ssh://git.vipzhuang.cn:22032/wxd/MShopWeApp ...
    be02eca2
    # Conflicts:
    #	app.js
    后端研发-田富滉 authored
    2019-09-27 20:06:43 +0800  
    Browse Code »
  • 订单列表,和订单详情,关于退款中不能收货的优化完成
    c2c416fd
    yvan.ni authored
    2019-09-27 18:08:56 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    05be2e3b
    Test
    
    See merge request !59
    后端研发-苏明海 authored
    2019-09-27 17:07:23 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    a39d9d37
    Dev
    
    See merge request !58
    后端研发-苏明海 authored
    2019-09-27 17:07:05 +0800  
    Browse Code »
  • 确认收货的bug有货
    240c74c1
    yvan.ni authored
    2019-09-27 17:03:05 +0800  
    Browse Code »
  • 12121
    079e1bda
    yvan.ni authored
    2019-09-27 16:59:28 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    ded290a7
    Dev
    
    See merge request !53
    后端研发-苏明海 authored
    2019-09-27 16:29:20 +0800  
    Browse Code »
  • 退款界面调整,处理时间,完成时间, 整单的金额显示
    3b278963
    yvan.ni authored
    2019-09-27 15:56:39 +0800  
    Browse Code »

26 Sep, 2019
4 commits
  • 关于退款的单个退和整单退的判断
    3adebc5c
    yvan.ni authored
    2019-09-26 20:34:55 +0800  
    Browse Code »
  • user_id. 改成NULL
    b76ce575
    yvan.ni authored
    2019-09-26 20:15:50 +0800  
    Browse Code »
  • 商品详情中评,和提现的修改
    9f9f80a1
    yvan.ni authored
    2019-09-26 20:14:39 +0800  
    Browse Code »
  • 订单列表
    ad40684d
    yvan.ni authored
    2019-09-26 19:25:11 +0800  
    Browse Code »

23 Sep, 2019
12 commits
  • Merge branch 'qa' into 'master' ...
    edf4b573
    Qa
    
    See merge request !51
    后端研发-苏明海 authored
    2019-09-23 18:02:34 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    5d30cbd8
    Test
    
    See merge request !50
    后端研发-苏明海 authored
    2019-09-23 18:02:19 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    dad70a80
    订单列表的,点击跳到相应的位置
    
    See merge request !49
    后端研发-苏明海 authored
    2019-09-23 18:02:01 +0800  
    Browse Code »
  • 订单列表的,点击跳到相应的位置
    52be705b
    yvan.ni authored
    2019-09-23 18:01:42 +0800  
    Browse Code »
  • Merge branch 'qa' into 'master' ...
    d752bc28
    Qa
    
    See merge request !48
    后端研发-苏明海 authored
    2019-09-23 17:54:29 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    df937faa
    Test
    
    See merge request !47
    后端研发-苏明海 authored
    2019-09-23 17:54:13 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    4d38fed5
    多条码,再选择商品购买
    
    See merge request !46
    后端研发-苏明海 authored
    2019-09-23 17:53:21 +0800  
    Browse Code »
  • 多条码,再选择商品购买
    d9494925
    yvan.ni authored
    2019-09-23 17:52:57 +0800  
    Browse Code »
  • Merge branch 'qa' into 'master' ...
    3146dcfd
    Qa
    
    See merge request !45
    后端研发-苏明海 authored
    2019-09-23 17:34:25 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    3c621863
    Test
    
    See merge request !44
    后端研发-苏明海 authored
    2019-09-23 17:34:10 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    cf6b974f
    订单列表立即支付失败,修复
    
    See merge request !43
    后端研发-苏明海 authored
    2019-09-23 17:33:52 +0800  
    Browse Code »
  • 取消订单失败,修复
    8a8eecae
    yvan.ni authored
    2019-09-23 17:32:04 +0800  
    Browse Code »