Commits · 922c93bf82fd50490a7df817faab215e561d7f6b · pengguangpu / doublescreen-front

13 Feb, 2020 7 commits
- 修改了支付内容 · 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
- 添加支付成功页本地数据获取逻辑； · 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
- 修复语法错误 · 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 4 commits
- 增加了home/balance两部分的界面。封装部分自定义弹窗 · 32d589a1
  gaodapeng authored Feb 04, 2020
  
  32d589a1
- 扫商品页面布局 · 116e8c72
  jiangjiantao authored Feb 04, 2020
  
  116e8c72
- 扫商品页面布局 · 2ead6f2e
  jiangjiantao authored Feb 04, 2020
  
  2ead6f2e
- 自定义环形加载条控件；编写支付结果页；ui排版自测； · a5aec0d3
  pengguangpu authored Feb 04, 2020
  
  a5aec0d3
03 Feb, 2020 9 commits
- 添加登录页逻辑交互；自测通过 · 6a287b22
  pengguangpu authored Feb 03, 2020
  
  6a287b22
- 扫码枪工具类 · 3a05fea7
  jiangjiantao authored Feb 03, 2020
  
  3a05fea7
- 合并远程 · c48667ff
  pengguangpu authored Feb 03, 2020
  
  c48667ff
- 添加登录页；自测； · cb1c7d29
  pengguangpu authored Feb 03, 2020
  
  cb1c7d29
- 合并 · 6f3e5b3f
  gaodapeng authored Feb 03, 2020
  
  6f3e5b3f
- 增加gitignore，去掉.tea的编译文件 · 0ff7e93b
  gaodapeng authored Feb 03, 2020
  
  0ff7e93b
- 添加.gitignore文件，忽略.tea缓存文件夹 · a9fe80d2
  pengguangpu authored Feb 03, 2020
  
  a9fe80d2
- 打开工程测试正确性 · 7c799ba0
  pengguangpu authored Feb 03, 2020
  
  7c799ba0
- 规范化工程目录结构 · 0be3d73e
  pengguangpu authored Feb 03, 2020
  
  0be3d73e
16 Jan, 2020 2 commits
- 初始化 · 6e030516
  gaodapeng authored Jan 16, 2020
  
  6e030516
- Initial commit · f5c60ded
  pengguangpu authored Jan 16, 2020
  
  f5c60ded