Commits · 325a352878bf53a1db9486340bdc56caa794f598 · android / android_street

23 Aug, 2021 1 commit
- Merge branch 'vest_bag' of http://gitlab.mints-id.com/android/android_street into fry_dev · 325a3528
  fengruiyu authored Aug 23, 2021
  
  325a3528
20 Aug, 2021 2 commits
- 修改!!问题 · c656fecb
  张释方 authored Aug 20, 2021
  
  c656fecb
- 5G世界 · d104c88c
  fengruiyu authored Aug 20, 2021
```
自由世界
马甲包已完成
```
  d104c88c
19 Aug, 2021 1 commit
- 删除杭州灵隐寺街景数据 · ec9831dd
  张释方 authored Aug 19, 2021
  
  ec9831dd
18 Aug, 2021 17 commits
- 修改JS · ea45713b
  fengruiyu authored Aug 18, 2021
  
  ea45713b
- 修改JS · ff447866
  fengruiyu authored Aug 18, 2021
```
修改地图景点弹出框跳转问题已解决
```
  ff447866
- 修改JS · 68aac287
  fengruiyu authored Aug 18, 2021
```
配合JS添加 搜索地址返回到地图上标记功能已完成
```
  68aac287
- 修改第一次景点按钮问题 · 5cdb56e9
  fengruiyu authored Aug 18, 2021
  
  5cdb56e9
- 修改JS · 7b9acf59
  fengruiyu authored Aug 18, 2021
  
  7b9acf59
- Merge branch 'dev_1.1.0' of http://gitlab.mints-id.com/android/android_street into fry_dev · d1ed39e2
  fengruiyu authored Aug 18, 2021
  
  d1ed39e2
- 所有页面进入方式从右往左 · 240c5bc9
  fengruiyu authored Aug 18, 2021
```
问题已经解决
```
  240c5bc9
- 未登录时打开景点推荐，然后登陆，景点推荐全没了 · 039be24a
  fengruiyu authored Aug 18, 2021
```
问题已经解决
```
  039be24a
- 优化Ui1.2 · ac021b3b
  张释方 authored Aug 18, 2021
  
  ac021b3b
- 优化Ui1.1 · 4ed83465
  张释方 authored Aug 18, 2021
  
  4ed83465
- Merge branch 'dev_1.1.0' of http://gitlab.mints-id.com/android/android_street into branch_zsf_2 · f4d6a04f
  张释方 authored Aug 18, 2021
  
  f4d6a04f
- 消除水波纹效果 · 171f2da8
  张释方 authored Aug 18, 2021
  
  171f2da8
- Merge branch 'dev_1.1.0' of http://gitlab.mints-id.com/android/android_street into dev_1.1.0 · 843447bb
  fengruiyu authored Aug 18, 2021
  
  843447bb
- 修改初始JS方法 · 80128ec6
  fengruiyu authored Aug 18, 2021
  
  80128ec6
- 优化界面1.0 · 21cd4fac
  张释方 authored Aug 18, 2021
  
  21cd4fac
- Merge branch 'dev_1.1.0' of http://gitlab.mints-id.com/android/android_street into branch_zsf_2 · eb854880
  张释方 authored Aug 18, 2021
  
  eb854880
- 优化整体UI界面 · ac408c1d
  张释方 authored Aug 18, 2021
  
  ac408c1d
17 Aug, 2021 8 commits
- 未付费时，点击放大，会弹2层提示升级会员的界面问题已修改 · 605c95c3
  fengruiyu authored Aug 17, 2021
  
  605c95c3
- 修改homefragment · ca27660d
  张释方 authored Aug 17, 2021
  
  ca27660d
- Merge branch 'dev_1.0.1' of http://gitlab.mints-id.com/android/android_street into dev_1.1.0 · ce972108
  fengruiyu authored Aug 17, 2021
```
 Conflicts:
	app/src/main/java/com/mints/street/main/home/HomeFragment.kt
```
  ce972108
- 修改JS（z3map） · c29a8e87
  fengruiyu authored Aug 17, 2021
```
地图样式
```
  c29a8e87
- 修改homefragment · 9e568b02
  张释方 authored Aug 17, 2021
  
  9e568b02
- Merge branch 'dev_1.0.1' of http://gitlab.mints-id.com/android/android_street into branch_zsf_2 · ff7a96fc
  张释方 authored Aug 17, 2021
  
  ff7a96fc
- 修改首页热门景点和地图样式跳转逻辑； · a35a846e
  张释方 authored Aug 17, 2021
```
修改个人中心，开通会员，返回弹窗icon；
修改手机号登录界面UI
```
  a35a846e
- 完成返回开通会员提示弹窗可配置；更改首页地图样式icon · 660e040b
  张释方 authored Aug 17, 2021
  
  660e040b
16 Aug, 2021 8 commits
- 修改Openvp默认选中逻辑，更改升级vip弹窗以及手机登录UI · 3dd1e55f
  张释方 authored Aug 16, 2021
  
  3dd1e55f
- 修改JS（z3map） · 4d37bd73
  fengruiyu authored Aug 16, 2021
  
  4d37bd73
- 修改地图样式问题 · 044c435b
  fengruiyu authored Aug 16, 2021
  
  044c435b
- 修改 JS · b2358b00
  fengruiyu authored Aug 16, 2021
  
  b2358b00
- Merge branch 'dev_1.0.1' of http://gitlab.mints-id.com/android/android_street into fry_dev · ac1e13d0
  fengruiyu authored Aug 16, 2021
```
 Conflicts:
	app/src/main/assets/web/common/ap.js
	app/src/main/assets/web/common/zsc.js
	app/src/main/assets/web/zsmap.html
	app/src/main/assets/web/zsmap.js
```
  ac1e13d0
- 修改 JS · f583e484
  fengruiyu authored Aug 16, 2021
  
  f583e484
- 修改homefragment · 6c6bc60b
  张释方 authored Aug 16, 2021
  
  6c6bc60b
- 修改home_fragment · 29df3db0
  张释方 authored Aug 16, 2021
  
  29df3db0
13 Aug, 2021 3 commits
- Merge branch 'dev_1.0.1' of http://gitlab.mints-id.com/android/android_street into branch_zsf_2 · 05dc5871
  张释方 authored Aug 13, 2021
  
  05dc5871
- 地图样式的功能已完成 · 474f8297
  fengruiyu authored Aug 13, 2021
```
景点推荐的功能已完成
街景地图的功能已完成
js->android 的.弹出景点弹框已完成（展示页面已完成）
地图的小icon布局修改
```
  474f8297
- 上传hotbean类 · 075468f8
  张释方 authored Aug 13, 2021
  
  075468f8