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
30 Apr, 2020
2 commits
  • 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
1 commit
  • 1
    de6cd7aa
    后端研发-苏明海 authored
    2020-04-29 19:03:29 +0800  
    Browse Code »

27 Apr, 2020
7 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 »
  • 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
5 commits
  • Merge branch 'test' into 'qa' ...
    05db5add
    Test
    
    See merge request !367
    后端研发-苏明海 authored
    2020-04-25 18:16:10 +0800  
    Browse Code »
  • 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 'test' into 'qa' ...
    7801de3f
    Test
    
    See merge request !365
    后端研发-苏明海 authored
    2020-04-25 13:55:25 +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
6 commits
  • Merge branch 'dev' into 'test' ...
    50cb1f68
    门店在使用的时候,只用深度拷贝,不能用赋值,避免线下库存混乱显示的情况
    
    See merge request !360
    后端研发-苏明海 authored
    2020-04-22 17:50:59 +0800  
    Browse Code »
  • 门店在使用的时候,只用深度拷贝,不能用赋值,避免线下库存混乱显示的情况
    265ba202
    yvan.ni authored
    2020-04-22 16:59:47 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    00285884
    团购,优惠活动,积分购,搭配购的商品, prom_type一律为0,要取线下库存
    
    See merge request !359
    后端研发-苏明海 authored
    2020-04-22 16:32:58 +0800  
    Browse Code »
  • 团购,优惠活动,积分购,搭配购的商品, prom_type一律为0,要取线下库存
    7f5868f9
    yvan.ni authored
    2020-04-22 16:13:53 +0800  
    Browse Code »
  • Merge branch 'dev' into 'test' ...
    d92b5860
    Dev
    
    See merge request !358
    后端研发-苏明海 authored
    2020-04-22 09:53:07 +0800  
    Browse Code »
  • 商品分组的效果,以及商品分组的链接不是需要展示的商品的bug修复
    31bdb593
    yvan.ni authored
    2020-04-22 09:52:08 +0800  
    Browse Code »

21 Apr, 2020
2 commits
  • 取消订单的不要显示删除按钮
    6d7a67ad
    yvan.ni authored
    2020-04-21 11:33:58 +0800  
    Browse Code »
  • 购物车,商品详情,确认订单页对于 wxd_erp_yqty 预出库存的优化
    23771f77
    yvan.ni authored
    2020-04-21 10:01:38 +0800  
    Browse Code »

17 Apr, 2020
3 commits
  • Merge branch 'dev' into 'test' ...
    df554a7c
    Dev
    
    See merge request !357
    后端研发-苏明海 authored
    2020-04-17 16:38:08 +0800  
    Browse Code »
  • 1.首页的bug修复, undefined ...
    0a9961c8
    2. 线下门店库存  要根据门店来显示可售数量
    yvan.ni authored
    2020-04-17 16:36:35 +0800  
    Browse Code »
  • 首页显示一级分类
    7cf635ab
    yvan.ni authored
    2020-04-17 14:27:58 +0800  
    Browse Code »

15 Apr, 2020
1 commit
  • 1.优惠券的显示方式 ...
    d1e92b88
    2.商家有开通等级卡功能,不能等级会员在商品详情页购买商品会员bug
    yvan.ni authored
    2020-04-15 11:33:52 +0800  
    Browse Code »

14 Apr, 2020
2 commits
  • Merge branch 'dev' into 'test' ...
    f68cd82f
    在没有地址时 ,也要微信获取地址
    
    See merge request !356
    后端研发-苏明海 authored
    2020-04-14 19:01:28 +0800  
    Browse Code »
  • 在没有地址时 ,也要微信获取地址
    a7a33b66
    yvan.ni authored
    2020-04-14 14:52:28 +0800  
    Browse Code »

13 Apr, 2020
1 commit
  • Merge branch 'dev' into 'test' ...
    619c3082
    Dev
    
    See merge request !355
    后端研发-苏明海 authored
    2020-04-13 17:01:26 +0800  
    Browse Code »