Commits · c9bda32de2f6e31f8064c5cf396407a77e3e5db7 · pengguangpu / doublescreen-front

14 Feb, 2020 1 commit
- 添加前后屏指令交互常量js文件；支付成功页添加指令传递&接收逻辑； · c9bda32d
  pengguangpu authored Feb 14, 2020
  
  c9bda32d
13 Feb, 2020 21 commits
- 合并远程分支； · 3f0efb0d
  pengguangpu authored Feb 13, 2020
  
  3f0efb0d
- 联调打印；主流程联调； · e8b9d858
  pengguangpu authored Feb 13, 2020
  
  e8b9d858
- 去掉支付的storeId测试数据 · 3f54ae30
  gaodapeng authored Feb 13, 2020
  
  3f54ae30
- Merge branch 'dev-1.0' of… · a1d40c6f
  gaodapeng authored Feb 13, 2020
```
Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-front into dev-1.0

# Conflicts:
#	pages/balance/balance.js
```
  a1d40c6f
- 删除重复内容，优化界面和代码 · d5765a1d
  gaodapeng authored Feb 13, 2020
  
  d5765a1d
- 结算js · abaa943c
  jiangjiantao authored Feb 13, 2020
  
  abaa943c
- 支付bugfix&支付背景&数据存储 · 0c9d686c
  jiangjiantao authored Feb 13, 2020
  
  0c9d686c
- 支付bugfix · c2b59d6f
  jiangjiantao authored Feb 13, 2020
  
  c2b59d6f
- Merge branch 'dev-1.0' of… · 96a7b480
  jiangjiantao authored Feb 13, 2020
```
Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-front into dev-1.0
```
  96a7b480
- 支付bugfix · 2c3fb903
  jiangjiantao authored Feb 13, 2020
  
  2c3fb903
- 补充提交 · 96c43b17
  gaodapeng authored Feb 13, 2020
  
  96c43b17
- 修改了支付内容 · 922c93bf
  gaodapeng authored Feb 13, 2020
  
  922c93bf
- Merge branch 'dev-1.0' of… · 90227f26
  gaodapeng authored Feb 13, 2020
```
Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-front into dev-1.0

# Conflicts:
#	pages/balance/balance.js
```
  90227f26
- Merge branch 'dev-1.0' of… · c4bb1b19
  jiangjiantao authored Feb 13, 2020
```
Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-front into dev-1.0
```
  c4bb1b19
- 支付调试 · 8065328e
  jiangjiantao authored Feb 13, 2020
  
  8065328e
- 添加支付成功页本地数据获取逻辑； · f53a33e8
  pengguangpu authored Feb 13, 2020
  
  f53a33e8
- 修改支付内容 · dd25744f
  gaodapeng authored Feb 13, 2020
  
  dd25744f
- 合并远程代码； · 0341da15
  pengguangpu authored Feb 13, 2020
  
  0341da15
- 添加本地存储支付数据方法; · 7435e495
  pengguangpu authored Feb 13, 2020
  
  7435e495
- 前后屏联合调试 · 1c8029ce
  jiangjiantao authored Feb 13, 2020
  
  1c8029ce
- 修复语法错误 · 137c5dcb
  gaodapeng authored Feb 13, 2020
  
  137c5dcb
12 Feb, 2020 1 commit
- 增加支付模块 · a0041802
  gaodapeng authored Feb 12, 2020
  
  a0041802
06 Feb, 2020 8 commits
- 增加动画，去除弹窗中的close · cec1724d
  gaodapeng authored Feb 06, 2020
  
  cec1724d
- 核销券 · 0e3880a1
  jiangjiantao authored Feb 06, 2020
  
  0e3880a1
- 核销兑换券 · 87d52a91
  jiangjiantao authored Feb 06, 2020
  
  87d52a91
- 解决home.js冲突；添加支付结果页的参数获取逻辑、打印回调逻辑； · edf4cae0
  pengguangpu authored Feb 06, 2020
  
  edf4cae0
- 页面串联起来+代码合并 · 0b3d1e22
  jiangjiantao authored Feb 06, 2020
  
  0b3d1e22
- 页面串连起来 · 07e4a344
  jiangjiantao authored Feb 06, 2020
  
  07e4a344
- 去除无用代码 · b8531189
  gaodapeng authored Feb 06, 2020
  
  b8531189
- 封装完成扫码弹窗，并测试通过 · d44ca0af
  gaodapeng authored Feb 06, 2020
  
  d44ca0af
05 Feb, 2020 6 commits
- 增加自定义弹窗，UI调整完毕，并调通部分控制逻辑 · 0bc2313b
  gaodapeng authored Feb 05, 2020
  
  0bc2313b
- 合并代码 · 8d5fddc2
  jiangjiantao authored Feb 05, 2020
  
  8d5fddc2
- 扫商品页面交互 · eb04515b
  jiangjiantao authored Feb 05, 2020
  
  eb04515b
- 编写优惠券布局；添加打印逻辑；添加前后屏交互逻辑； · c4f9beb1
  pengguangpu authored Feb 05, 2020
  
  c4f9beb1
- 手动删除.tea文件夹； · 5ce79ab9
  pengguangpu authored Feb 05, 2020
  
  5ce79ab9
- 增加gitigore规则 · 5ec20fe2
  gaodapeng authored Feb 05, 2020
  
  5ec20fe2
04 Feb, 2020 3 commits
- 增加了home/balance两部分的界面。封装部分自定义弹窗 · 32d589a1
  gaodapeng authored Feb 04, 2020
  
  32d589a1
- 扫商品页面布局 · 116e8c72
  jiangjiantao authored Feb 04, 2020
  
  116e8c72
- 扫商品页面布局 · 2ead6f2e
  jiangjiantao authored Feb 04, 2020
  
  2ead6f2e