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
8 commits
  • Merge branch 'qa' into 'master' ...
    1d6fbb08
    Qa
    
    See merge request !405
    后端研发-苏明海 authored
    2020-05-05 10:00:38 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    3070a58f
    Test
    
    See merge request !404
    后端研发-苏明海 authored
    2020-05-05 10:00:23 +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 'qa' into 'master' ...
    9c839742
    Qa
    
    See merge request !402
    后端研发-苏明海 authored
    2020-05-05 09:51:51 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    5d8adae2
    Test
    
    See merge request !401
    后端研发-苏明海 authored
    2020-05-05 09:49:19 +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
12 commits
  • Merge branch 'qa' into 'master' ...
    dd8cf591
    Qa
    
    See merge request !399
    后端研发-苏明海 authored
    2020-04-30 14:53:47 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    cbf2084a
    Test
    
    See merge request !398
    后端研发-苏明海 authored
    2020-04-30 14:53:27 +0800  
    Browse Code »
  • 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 'qa' into 'master' ...
    35f0690b
    Qa
    
    See merge request !396
    后端研发-苏明海 authored
    2020-04-30 10:11:35 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    329b0843
    Test
    
    See merge request !395
    后端研发-苏明海 authored
    2020-04-30 10:11:17 +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 »
  • Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp ...
    bae40a29
    # Conflicts:
    #	app.js
    season authored
    2020-04-30 10:07:51 +0800  
    Browse Code »
  • Merge branch 'master' of http://git.vipzhuang.cn/wxd/MShopWeApp
    8b3ba506
    season authored
    2020-04-30 09:47:43 +0800  
    Browse Code »
  • 删除app.js
    06f716a8
    season authored
    2020-04-30 09:47:19 +0800  
    Browse Code »

29 Apr, 2020
10 commits
  • 1
    de6cd7aa
    后端研发-苏明海 authored
    2020-04-29 19:03:29 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    e8b288d4
    Test
    
    See merge request !378
    后端研发-苏明海 authored
    2020-04-29 18:14:01 +0800  
    Browse Code »
  • 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 'test' into 'qa' ...
    1caefbbe
    Test
    
    See merge request !376
    后端研发-苏明海 authored
    2020-04-29 16:25:48 +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 'test' into 'qa' ...
    88de374e
    Test
    
    See merge request !374
    后端研发-苏明海 authored
    2020-04-29 11:45:02 +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
5 commits
  • Merge branch 'qa' into 'master' ...
    47bd743f
    Qa
    
    See merge request !372
    后端研发-苏明海 authored
    2020-04-27 16:48:26 +0800  
    Browse Code »
  • Merge branch 'test' into 'qa' ...
    dfd2f311
    Test
    
    See merge request !371
    后端研发-苏明海 authored
    2020-04-27 16:29:32 +0800  
    Browse Code »
  • 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 'test' into 'qa' ...
    b3751cf3
    Test
    
    See merge request !369
    后端研发-苏明海 authored
    2020-04-27 14:28:11 +0800  
    Browse Code »