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
27 Sep, 2019
7 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 »
  • 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
17 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 »
  • Merge branch 'qa' into 'master' ...
    822b2cba
    Qa
    
    See merge request !42
    后端研发-苏明海 authored
    2019-09-23 17:23:42 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    58dd73cb
    Test
    
    See merge request !41
    后端研发-苏明海 authored
    2019-09-23 17:23:26 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    8eed6c01
    Dev
    
    See merge request !40
    后端研发-苏明海 authored
    2019-09-23 17:23:06 +0800  
    Browse Code »
  • 购物车的金额问题
    942c493e
    yvan.ni authored
    2019-09-23 17:12:04 +0800  
    Browse Code »
  • 购物车修改
    06e54515
    yvan.ni authored
    2019-09-23 16:45:43 +0800  
    Browse Code »

21 Sep, 2019
4 commits
  • Merge branch 'qa' into 'master' ...
    ba6b40b5
    Qa
    
    See merge request !39
    后端研发-苏明海 authored
    2019-09-21 17:50:40 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    dd832437
    Test
    
    See merge request !38
    后端研发-苏明海 authored
    2019-09-21 17:50:19 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    ea141f52
    拼团详情的修改
    
    See merge request !37
    后端研发-苏明海 authored
    2019-09-21 17:50:04 +0800  
    Browse Code »
  • 拼团详情的修改
    d01eb916
    yvan.ni authored
    2019-09-21 09:13:20 +0800  
    Browse Code »

20 Sep, 2019
8 commits
  • Merge branch 'qa' into 'master' ...
    ceeda120
    Qa
    
    See merge request !36
    后端研发-苏明海 authored
    2019-09-20 15:38:54 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    0dac7505
    Test
    
    See merge request !35
    后端研发-苏明海 authored
    2019-09-20 15:38:28 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    7b8676aa
    关于支付尾款的修改,和显示
    
    See merge request !34
    后端研发-苏明海 authored
    2019-09-20 15:38:11 +0800  
    Browse Code »
  • 关于支付尾款的修改,和显示
    308396c3
    yvan.ni authored
    2019-09-20 15:27:37 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    42464d23
    Test
    
    See merge request !33
    后端研发-苏明海 authored
    2019-09-20 11:27:49 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    a880f9f7
    Dev
    
    See merge request !32
    后端研发-苏明海 authored
    2019-09-20 11:27:31 +0800  
    Browse Code »
  • 是否删除订单的提示
    095e0d0f
    yvan.ni authored
    2019-09-20 11:26:23 +0800  
    Browse Code »
  • 购物车问题
    2b97296d
    yvan.ni authored
    2019-09-20 11:23:51 +0800  
    Browse Code »