Compare commits

...

864 Commits

Author SHA1 Message Date
wurong fb0ca0b2a6 新建商品规格修改。套餐修改。增加商品图片 12 months ago
zsw ab425fef79 商家端新版更改,代码合并,已发布一个测试版;(3.2.28) 1 year ago
wurong bfc6c59c52 新建商品-设置多规格商品详情数据交互完成; 1 year ago
wurong a5432bac6e 新建商品页面,商品设置套餐数据交互对接完成; 1 year ago
wurong 5b53c10436 新增添加商品实体类; 1 year ago
wurong f2e58e3e82 商品批量下架页面,新增选择商品功能; 1 year ago
wurong 0656f12c8e 首页接口请求报错优化提示更改; 1 year ago
wurong 475958179a 商品板块新增:新建商品; 1 year ago
wurong b82268fabe 会员列表新增会员详情跳转; 1 year ago
wurong 44e8bcf22f 收银台ui调整,流程调整,数据接口调试完成; 1 year ago
wurong 77eccd6f34 新版首页更改; 1 year ago
wurong 4723c789fa 新增会员页面数据接口对接调试完成; 1 year ago
wurong a256be9c79 新增会员充值页面(仅绘制了ui); 1 year ago
wurong b413b53eed 会员列表新增两个按钮选项; 1 year ago
zsw 8761e5e94c ios 会员管理板块列表bug更改; 1 year ago
wurong f35eec33ad Merge remote-tracking branch 'origin/wr_2023_business' into wr_2023_business 1 year ago
wurong d3ef38ee75 订单列表,扣款按钮弹窗更改; 1 year ago
zsw 3d7a3a81a8 Merge remote-tracking branch 'origin/wr_2023_business' into wr_2023_business 1 year ago
zsw 3dcfc4ce30 ios 更改 1 year ago
wurong 6828a3bb67 会员列表更改; 1 year ago
wurong 0adeea2e3f 会员列表,充值流水,余额变动列表更改; 1 year ago
zsw 83cee909fa ios商家端代码合并; 1 year ago
zsw aa54c46755 预约页面适配更改 1 year ago
wurong f294cd3e45 核销统计去除手机号显示 1 year ago
wurong dfbfce7ae1 Merge branch 'dev' into wr_2023_business 1 year ago
wurong cce6b0e1c7 app-我的-个人信息页面,更改用户信息时,接口请求失败新增失败提示; 1 year ago
wurong e840d1443e 会员余额变动页面时间选择优化,页面边距优化调整,键盘收起优化更改; 1 year ago
wurong da552bddbd 新增票券列表,票券核销记录,票券核销统计,会员列表,会员充值流水,会员余额变动接口; 1 year ago
wurong fbd30da851 Merge branch 'dev' into wr_2023_business 1 year ago
wurong 3767305782 兑换历史,门店充值列表,门店充值页面,会员卡详情页面,新增骨架屏; 1 year ago
wurong bd01bdfddb 兑换历史,门店充值列表,门店充值页面,会员卡详情页面,新增骨架屏; 1 year ago
wurong 34d7403a40 批量下架,商品排序,在售商品,商品列表接口更改,下拉加载数据优化; 1 year ago
wurong 4b8616259d Merge branch 'dev' into wr_2023_business 1 year ago
wurong 10de196448 兑换列表,福利兑换优化更改; 1 year ago
wurong f3eb8d0776 门店列表新,优惠券列表,订单列表增骨架屏; 1 year ago
zsw 4ac44475e6 商家端跳转更改 1 year ago
zsw 19b8475ba5 商家端跳转更改 1 year ago
zsw 83f5335a4a 商家端网络异常文本更改; 1 year ago
zsw 767910bf4f Merge branch 'dev' into wr_2023_business 1 year ago
wurong fb9e4da4c7 商家端新增切换用户端功能; 1 year ago
zsw 12d87dcc65 ios订单结算更改 1 year ago
wurong 32cb5cce40 Merge branch 'dev' into wr_2023_business 1 year ago
wurong 0ba7841499 app订单结算页面更改; 1 year ago
wurong b5e0d228d5 骨架屏网络请求异常显示更改; 1 year ago
wurong 2004ebbaa6 Merge branch 'dev' into wr_2023_business 1 year ago
wurong e959e4d2a6 门店列表-城市选择新增全部门店选择项; 1 year ago
wurong 7463ca70a4 网络请求异常时新增异常页面显示; 1 year ago
wurong 763cab5e2e Merge branch 'dev' into wr_2023_business 1 year ago
wurong 87f5e9b85c 订单列表ui适配更改; 1 year ago
zsw d938d9f05f ios端合并商家的端代码; 1 year ago
zsw 802c9eab75 ios更改 1 year ago
wurong 76f61e2525 订单列表返回状态更改; 1 year ago
wurong 7aa35e1515 Merge branch 'dev' into wr_2023_business 1 year ago
wurong 1faf237205 兑换历史页面优化更改; 1 year ago
wurong c81ae9bfdf Merge branch 'dev' into wr_2023_business 1 year ago
wurong 85be4f2f53 优化接口json=null或者""的情况下不显示报错文本问题; 1 year ago
wurong af34ee7897 新增票券详情接口; 1 year ago
wurong 289d108945 页面优化 1 year ago
wurong 5ad5f04975 商品一键置顶功能完成; 1 year ago
wurong 61e7dca70b 兑换券跳转类型更改; 1 year ago
wurong a3af43585b 兑换券跳转类型更改; 1 year ago
wurong 4734bb02b7 Merge branch 'dev' into wr_2023_business 1 year ago
zsw 8e39eb57a5 ios白名单更改 1 year ago
zsw 9443c5e63c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
zsw 68515476d5 11 1 year ago
wurong d68eef3851 ios应用logo更改 1 year ago
zsw 96a33fc353 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
zsw fc9818cd5d 11 1 year ago
wurong 97359c8a9c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
wurong ad674c76d7 ios应用logo更改 1 year ago
zsw e52bc55aed Merge remote-tracking branch 'origin/dev' into dev 1 year ago
zsw b16147db86 ios 1 year ago
wurong dfed68d331 ios应用logo更改 1 year ago
wurong f40b38c0d4 核销更改,ios图片更改 1 year ago
wurong c85039e851 Merge branch 'dev' into wr_2023_business 1 year ago
wurong 56f0a5b616 优惠券使用,未设置适用门店新增说明 1 year ago
wurong f3167cfcd4 app应用logo更改; 1 year ago
wurong 0d98c93d00 新增核销接口; 1 year ago
wurong 9fb7a49bd9 Merge branch 'dev' into wr_2023_business 1 year ago
wurong e284d48033 app图标更改; 1 year ago
wurong 67a4ad30a8 门店设置成功刷新数据 1 year ago
wurong ec0e677682 1 APP修改名称+图标: 海峡姐妹, 关于 改成 海峡姐妹 1 year ago
wurong 5bf3f6585e 添加分组页面新增提示; 1 year ago
wurong c90120432b 商品列表更改; 1 year ago
wurong f97a720d56 商品列表在售中更改; 1 year ago
wurong 9f6c5248df Merge branch 'dev' into wr_2023_business 1 year ago
wurong 6150798a21 店铺列表接口请求失败提示; 1 year ago
wurong 475936586d 商品管理分类,编辑,删除新增接口对接及更改; 1 year ago
wurong 8296149b67 修改手机密码接口对接完成; 1 year ago
wurong 49244f7cf5 生意总览-总览-订单-商品接口对接更改; 1 year ago
wurong 469b45b23b 生意总览更改改; 1 year ago
huixiang_app d634866a2f 流水详情更改; 1 year ago
wurong 08c09b18c7 生意总览-商品更改 1 year ago
wurong 9b6575017e Merge remote-tracking branch 'origin/wr_2023_business' into wr_2023_business 1 year ago
wurong 658a548520 Merge branch 'wu_2023_map' into wr_2023_business 1 year ago
wurong cd15b83e73 滑动高度更改; 1 year ago
huixiang_app 0542533a39 数据列表更改; 1 year ago
huixiang_app 0f923d40cb Merge branch 'wu_2023_map' into wr_2023_business 1 year ago
huixiang_app 2c64cf3965 文本更改; 1 year ago
huixiang_app cfe17babae 文本更改,合并map代码 1 year ago
wurong 7ac0204225 文本更改 1 year ago
wurong 8a77c7dbce 文本更改 1 year ago
huixiang_app 4ce421e93b Merge branch 'wu_2023_map' into wr_2023_business 1 year ago
wurong 5cb54f3240 文本更改 1 year ago
huixiang_app 6db12ef2d8 拼图更改; 1 year ago
huixiang_app 9e35d60145 商家管理系统登录; 1 year ago
huixiang_app 774f5516ec 新增print("软件当前运行的模式 kReleaseMode:"+(kReleaseMode ? "发布模式":"调试模式")); 1 year ago
huixiang_app 5ac0c3dae7 新增商家管理api 1 year ago
huixiang_app e408f8f017 Merge branch 'wu_2023_map' into wr_2023_business 1 year ago
huixiang_app 89f5f58acc 短信验证码更改 1 year ago
huixiang_app 505d2d2dd3 所有短信验证码更改流程,发送验证码前优先显示拼图验证,成功后再获取验证码;(首页验证码,注销验证码,平台密码验证码,更换手机号验证码) 1 year ago
huixiang_app 2a2bebe36f Merge branch 'wu_2023_map' into wr_2023_business 1 year ago
fmk 60a49a301f Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
fmk d62f0bf796 ios端权限适配更改; 1 year ago
huixiang_app b2d9062f93 1.商户充值次数限制更改; 1 year ago
huixiang_app 2b2dcd215b 前后台切换监听混淆解决; 1 year ago
fmk 30f3eb690f ios 1 year ago
huixiang_app 2e2dec149d Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
huixiang_app 9583968a56 路径不根据Padding属性更改,改为根据x轴和y轴的极值差计算出路径范围; 1 year ago
fmk bef572e35c Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
fmk f8ebb86abd ios 1 year ago
huixiang_app 99e5f8406e 门店地址点击事件的解决; 1 year ago
fmk 01ebd71412 Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
huixiang_app 0c0e76f018 缩放适配 1 year ago
fmk b498e8770d Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
huixiang_app a6e374c034 缩放适配 1 year ago
fmk f9e7b247a0 Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
fmk 63d9c00517 ios 百度地图跳转 1 year ago
huixiang_app ed2fa16409 缩放适配 1 year ago
huixiang_app b09e677281 Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
huixiang_app 1a0c6f7282 联盟列表更改; 1 year ago
fmk b99e7b03a9 Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
fmk 0e81aed07b ios 更改 1 year ago
huixiang_app 963b379081 11 1 year ago
huixiang_app 02c050d4d9 Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 1 year ago
huixiang_app ad8be1257e 11 1 year ago
wurong b6c99666cc 适配更改 1 year ago
huixiang_app 3457326fbb 地图路径更改; 1 year ago
huixiang_app a47fd28cbe 我的页面,推广banner更改; 1 year ago
fmk 228f416161 Merge remote-tracking branch 'origin/wr_2023_union' into wr_2023_union 1 year ago
fmk 742d5af096 输入框适配更改; 1 year ago
huixiang_app e483841a5c 会员卡详情新增判断,如果距离为0就不显示 1 year ago
fmk 6860635b3b Merge remote-tracking branch 'origin/wr_2023_union' into wr_2023_union 1 year ago
fmk 53a60fa408 ios 1 year ago
huixiang_app b351eded42 门店列表适配更改 1 year ago
huixiang_app b2d180cb0a 首页,积分,我的成就,我的页面-其他,会员卡列表,店铺充值,订单列表,充值,门店列表,福利中心等板块,整体优化更改; 1 year ago
huixiang_app 4b25a33858 联盟:更改曾是选择范围,暂定(武汉,北京,郑州); 1 year ago
huixiang_app d8157c49f8 Merge remote-tracking branch 'origin/wr_2023_activity' into wr_2023_union 1 year ago
huixiang_app 92100c224b 首页整体优化; 1 year ago
huixiang_app b82d328bb2 联盟板块新ui更改完成; 1 year ago
huixiang_app 2b21456b4a Merge branch 'dev' into wr_2023_union 1 year ago
wurong 9043354373 结算页微信支付方式间隔过大,更改; 1 year ago
wurong b63d5b53a0 服务地址更改:192.168.10.15 1 year ago
wurong 8a96220ccf 联盟板块ui更改,暂未更改完(待更改) 1 year ago
wurong 3b355b5425 店铺充值ui更改及新增;(ui已画完,缺接口数据) 1 year ago
fmk 59f8ab37a0 Merge remote-tracking branch 'origin/wr_2023_activity' into wr_2023_activity 1 year ago
fmk 52533217fd ios 1 year ago
wurong e49ed47173 活动自动选择后端处理部分有问题, 1 year ago
wurong 3d31eefb2e 活动自动选择更改; 1 year ago
fmk 00914ff92f ios 管理系统登录跳转更改 1 year ago
fmk f2714ed1e8 ios 编译报错-解决 1 year ago
wurong c2710fba94 点单页加载中优化 1 year ago
fmk 85448d6658 ios 编译报错 1 year ago
fmk cbdc089d7d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
fmk 95c4785b8f ios 1 year ago
wurong fbee0ab5ee 管理系统日期部分优化更改 1 year ago
wurong 11ad0e524a 新增另一个龙骨架依赖,对比效果; 1 year ago
wurong b14979eaba Merge branch 'dev' into wr_2023_business 1 year ago
wurong 17292fd9e5 管理系统 1 year ago
wurong 6994a6be6e 结算页:更改优惠券,活动,点开弹窗未选择时已选选项被取消的bug; 1 year ago
wurong 12c6256261 兑换历史: 2 years ago
fmk e8cb20d435 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
fmk 74114784c9 iOS 点单页点击范围更改 2 years ago
wurong c3ef37c8ae 日期选择更改; 2 years ago
wurong bbf7557359 Merge branch 'dev' into wr_2023_business 2 years ago
wurong aed73137f6 积分列表更改 2 years ago
fmk 1a39f7ef54 ios 2 years ago
wurong a76894820f 订单详情不需要显示订单支付成功的Toast; 2 years ago
wurong f9b3de06f6 1 2 years ago
wurong 913eab1d89 Merge branch 'dev' into wr_2023_business 2 years ago
wurong 06305b9ba2 扫码跳转店铺,链接名字更改,适应新规则,新增http://miniscan.lotus-wallet.com/placeorder?tenant_code=1194&table_id=1669609340031467520&store_id=1637659387134738432链接名字规则 2 years ago
wurong 568004e8cb 时间选择器更改 2 years ago
wurong 4440c71973 时间选择器更改 2 years ago
wurong e1b0200952 管理系统首页侧面弹窗更改 2 years ago
wurong f0485c1778 Merge remote-tracking branch 'origin/wr_2023_business' into wr_2023_business 2 years ago
fmk 6b59079b8e 编辑分类键盘更改 2 years ago
fmk 7c4a6dd1e3 Merge branch 'dev' into wr_2023_business 2 years ago
fmk 8a970b2c67 ios 2 years ago
wurong 56d0fc49f5 Merge branch 'dev' into wr_2023_business 2 years ago
wurong c713f8f581 新增日期选择器依赖 2 years ago
wurong f0dbee5666 新增龙骨架样式 2 years ago
wurong fd35f3efa6 积分兑换:兑换数量去掉; 2 years ago
wurong 72e5c3a709 更换绑定手机号-手机号间距更改 2 years ago
wurong 518728113e Merge branch 'dev' into wr_2023_business 2 years ago
wurong e7f2e2e198 时间选择器待改 2 years ago
wurong bbe21eae70 积分商品详情接口,新增buyTimes数量限制字段,(前端无调用) 2 years ago
wurong 17dcc7bca0 我的页面待改; 2 years ago
wurong dc78a93e57 Merge branch 'dev' into wr_2023_business 2 years ago
wurong ee3660cc1f 生意总览: 2 years ago
wurong 1bfe6fc475 查询店铺详情接口新增两个字段(usePlatformVip usePlatformPay); 2 years ago
wurong 0c12bc9b73 管理端app: 2 years ago
wurong 4119782100 结算页:更改会员权益,会员等级优惠样式; 2 years ago
wurong 2ddc581621 管理端app 2 years ago
wurong 1d5074c874 Merge branch 'dev' into wr_2023_business 2 years ago
wurong a69f95b004 海报跳转新增类型7:门店跳转; 2 years ago
wurong 126028b949 首页更改 2 years ago
wurong f181592ef4 App商家端 2 years ago
wurong a6aaa7d2b2 修复list无数据提示时显示灰色板块的bug; 2 years ago
wurong d1c963796b 推送跳转新增两个类型:COUPON(12)优惠券列表 CATE_BEAN(13)我的印章; 2 years ago
wurong 1a5f7a62de 集换卡文本改印章; 2 years ago
fmk e44eb36586 ios 兑换详情文本更改 2 years ago
fmk b795fff290 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
fmk 211f0d23cb ios 2 years ago
wurong f79e6759ee Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wurong 7826dcf477 集换卡改印章 2 years ago
fmk 1137a4545b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
fmk b886ad1a4a ios 2 years ago
wurong bb66a6d546 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wurong b91af0947d 视频详情页,简介显示更多图标修改; 2 years ago
fmk 976846763d Merge remote-tracking branch 'origin/dev' into dev 2 years ago
fmk 3d817729ff ios 2 years ago
wurong 8dbe3eedc0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wurong 968bc2bb4e 结算页支付方式选择修改; 2 years ago
fmk cc199f37e2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
fmk 02181b5dff ios 2 years ago
wurong 97088781d1 1.动态详情列表评论,高于一条评论才显示“以显示全部”; 2 years ago
wurong 1fedcb3e6a 1.动态详情,评论-已显示全部—修改; 2 years ago
wurong 9e327581fb 1.动态详情,评论-已显示全部—修改; 2 years ago
wurong 0309254ac5 1.动态详情,评论-已显示全部—修改; 2 years ago
wurong 5a7f7f6203 1.账号与安全页面,增加正在加载‘ 2 years ago
wurong 2cb7314688 1.新增更换手机号码绑定功能;(已完结) 2 years ago
wurong ce5551eb99 1.动态详情:增加下拉刷新; 2 years ago
wurong e60ceb5c7f 1.套餐样式更改; 2 years ago
fmk fb6610d387 ios,点单页名字长度限制 2 years ago
fmk 4c3a0bfde9 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
fmk 0b715ba06a ios 2 years ago
wurong 60844c080f 优惠选择优化; 2 years ago
wurong eeb853b6ce 增加推荐渠道弹窗; 2 years ago
wurong c9ebbe7db9 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wurong 37d72eaaf2 增加推荐渠道弹窗 2 years ago
fmk 3cf076bbb3 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
fmk b3e8c5a6d7 ios 2 years ago
wurong c6791cf9f5 更改结算页外卖,物流,堂食,根据对应字段显示隐藏对应按钮; 2 years ago
wurong a5d74631eb 更改结算页外卖,物流,堂食,根据对应字段显示隐藏对应按钮; 2 years ago
fmk e2069bb370 ios,结算页,预约门店弹窗高度更改; 2 years ago
wurong 4e16524bef 增加堂食,打包外带功能; 2 years ago
wurong 602642b0b2 更改文本 2 years ago
wurong d56a609850 登录页邀请来源根据接口开关显示隐藏; 2 years ago
wurong b61d416d9f 登录页邀请来源根据接口开关显示隐藏; 2 years ago
fmk 51b4654cd2 优惠显示更改; 2 years ago
wurong 546a2e849a 登录页邀请来源显示更改 2 years ago
wurong 2cfa9818f6 预约商品数量更改 2 years ago
wurong 64cbff8524 预约商品部分更改 2 years ago
wurong 214b76b7dd 弹窗点击空白处禁止退出 2 years ago
wurong 7e200541ff 普通商店,增加优惠类型;调试没问题; 2 years ago
wurong 473a06aa8f 更改getorderInfo接口,增加优惠类型,去掉(useVipPrice,useBenefit两个字段); 2 years ago
wurong 4c2af09111 Merge branch 'wr_202304' into dev 2 years ago
wurong 1273e233c3 登录页增加推荐门店注册来源; 2 years ago
wurong f9c2f9af6f 充值页增加推荐门店选择;(废弃原充值列表(rechargeAct),用新接口(rechargeActList),增加门店列表,推荐板块是否显示开关) 2 years ago
wurong 791cc21d1f 订单详情店铺选择更改 2 years ago
fmk 6ef8f4774b ios,更改优惠券选中标志 2 years ago
wurong 1d2340ec9d 增加预约时间; 2 years ago
wurong 424d578679 增加预约时间; 2 years ago
fmk 5f410bf273 ios 2 years ago
fmk e1c2f6d366 ios 2 years ago
wurong 6c89629059 登录页ui高度更改; 2 years ago
wurong b7dafc3d6d Merge branch 'dev' into new_revision_app 2 years ago
wurong 81dc9e3cb0 登录页ui高度更改; 2 years ago
fmk b6e922570b Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 90759bf202 ios 2 years ago
wurong 8587326e46 轮播时长更改 2 years ago
wurong ccac5f3938 轮播时长更改 2 years ago
fmk 0f5193f515 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk a485ed43d2 ios 2 years ago
wurong 94d285d05e 轮播更改为自动轮播; 2 years ago
wurong dea8f1993a 订单结算优惠券增加,不可使用券,不可使用说明 2 years ago
wurong 6ef29fad43 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong af8a18b6dc 订单结算优惠券增加,不可使用券,不可使用说明 2 years ago
fmk 521159c43c ios定位修改 2 years ago
fmk 5379349147 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 92916bd181 ios 2 years ago
wurong 1706cb00bb 优化店铺页面安卓手势返回事件; 2 years ago
wurong dfb4450575 Merge branch 'dev' into new_revision_app 2 years ago
wurong 6853a6928f 个人信息,去掉我的年龄改性别; 2 years ago
wurong 1bceb875f3 更改版本minSdkVersion 24改回21 2 years ago
wurong cae0fa30e5 更改版本minSdkVersion 24改回21 2 years ago
wurong cf0dafb64d 购物车接口+storeId请求 2 years ago
wurong 90656357c5 Merge branch 'new_revision_app' into dev 2 years ago
wurong eab02a046c 详情文本页面更改; 2 years ago
wurong fa275d8456 店铺增加店铺详情跳转; 2 years ago
wurong 464f1f2377 更改兑换券样式; 2 years ago
wurong f5510c46d0 Merge branch 'new_revision_app' into dev 2 years ago
wurong 2a226e156c 更改订单结算vip按钮事件; 2 years ago
wurong 5424d73c87 更改订单详情滑动; 2 years ago
fmk a580559f56 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 1b5a815a37 ios, 2 years ago
wurong 4d8108e83e Merge branch 'new_revision_app' into dev 2 years ago
wurong 93de462bfc 兼容推送类型; 2 years ago
wurong a3edc6b49f 消息ui更改 2 years ago
wurong 81837a2724 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong 00d657f991 消息更改ui; 2 years ago
fmk 6e4d05c043 ios,优惠券名字增长两行 2 years ago
fmk c39c133160 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 7d8a2851d3 ios,优惠券名字增长两行 2 years ago
wurong 056a493365 订单详情,订单列表:orderStatus增加-1(未付款 清桌)状态; 2 years ago
wurong 8332fdccb4 消息加正在加载 2 years ago
fmk a88bc627b2 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 3ca55db1fe ios,更改订单结算金额; 2 years ago
wurong e80baf14ea Merge branch 'new_revision_app' into dev 2 years ago
wurong 07654c9b42 1.定位权限更改,增加权限说明; 2 years ago
wurong ee6e0f9724 优化首页活动海报弹窗-新人弹窗顺序 2 years ago
wurong b17eba5f26 订单更改; 2 years ago
wurong 80177ee257 Merge branch 'new_revision_app' into dev 2 years ago
wurong ba718c6ecd 消息更改 2 years ago
fmk 1ed8f1fec8 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 105c0a7f88 ios,优化 2 years ago
wurong 772113ed15 消息ui更改 2 years ago
wurong 95343314f4 视频修改; 2 years ago
fmk a63a15f9e3 ios,优化 2 years ago
fmk 880f489a70 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk f82f61f338 ios 2 years ago
wurong 1d3851e80b 结算页VIP权益改成默认选中; 2 years ago
wurong 698bb28c8b vip规则弹窗更改 2 years ago
wurong db9c79b8b6 1.扫码增加根据http或者https跳转对应网页; 2 years ago
wurong a83981c51a Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong 1cc6aaf56e 1.优化错误提示; 2 years ago
boom 4ce745015f ios 2 years ago
wurong 90320b91fd dev提交 2 years ago
boom 41b5cd5b6b Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong da32b3c85f 1.助农支付时隐藏活动优惠券,vip价格选择; 2 years ago
boom 1126f8f813 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong ab87fcfb3d 视频详情更改 2 years ago
boom 92573a9250 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong 7c660a2270 更改ios结算支付vip价格样式; 2 years ago
boom e84e78887f Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
boom 738c1acabf ios 2 years ago
wurong fdcbc21046 1.助农积分支付选择更改; 2 years ago
boom 9ff6a8a237 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
boom d84af40494 ios,z 2 years ago
wurong 7ddc102b82 1.增加众筹金聚合页面; 2 years ago
wurong beed451496 英文更改 2 years ago
fmk b0cc8e48d2 ios更改 2 years ago
fmk 89bc19c4a6 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk b49f849406 ios 更改; 2 years ago
wurong d6f96af774 增加字体; 2 years ago
wurong b709c8996d Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong 8b13d81410 vip页面更改 2 years ago
fmk 4d13a46eb5 ios 更改; 2 years ago
fmk 5cdbe3fefc Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 20adc38490 ios更改 2 years ago
wurong 308fc65e0a 首页ui更改; 2 years ago
fmk ec18602e1c Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong ad8db00642 订单结算默认选择vip价格 2 years ago
wurong 8eb3784de3 vip页面优化, 2 years ago
wurong 862019e882 vip页面优化, 2 years ago
fmk 31e55c3e64 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 9f9b4d9095 ios更改 2 years ago
wurong c94ea72f2d 部分更改; 2 years ago
fmk 0a030ebe02 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 4a4c28d581 ios 2 years ago
wurong aa14a0f876 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong 04fbb48829 文章更改 2 years ago
哈哈哈 0266c826ae 更新百度api, 修改定位方法, 增加百度隐私协议统一方法调用 2 years ago
fmk f0ba191dcb Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk d23aa0a35f ios 2 years ago
wurong 953392e6e8 增加社群分享; 2 years ago
fmk b2be6b56b1 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk d006e135c0 ios 2 years ago
wurong 9fbb14f4d1 商店增加vip价格; 2 years ago
fmk f77bd3b5c9 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk 02abb634ab ios 2 years ago
wurong 4afd100341 增加VIP板块; 2 years ago
wurong 58cd9dbcab Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
wurong 27468af4de 类型更改 2 years ago
fmk 7b1d891879 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk f5a7c1b055 ios,增加支付宝充值 2 years ago
wurong e4cd9fd254 增加套餐内容选择; 2 years ago
wurong 1d0a51687c 充值支付宝支付 2 years ago
w-R f15de1e85b 部分增加更改 2 years ago
fmk f15510d0eb ios 2 years ago
fmk 7c883388bd Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk a3b787d075 ios 2 years ago
w-R cf739ee0a3 邀请新人更改 2 years ago
w-R e898c95701 邀请新人更改 2 years ago
w-R eedc574bf8 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
w-R 44c8b1c6e5 版本提交优化 2 years ago
fmk 8367bfb850 ios 2 years ago
w-R 975ce15eeb Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
w-R bd6d3a1a6e w1 2 years ago
fmk c9535df742 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 2 years ago
fmk b9ee7d2252 ios 2 years ago
哈哈哈 4d7d64cbbd 回鄉錢包,UI修改 2 years ago
Loki 04996ccda6 删除多余的地址 2 years ago
哈哈哈 7379a54ef7 回鄉錢包,UI修改 2 years ago
哈哈哈 93cee0cc97 回鄉錢包,UI修改 2 years ago
哈哈哈 381b40b572 回鄉錢包,UI修改 2 years ago
fmk 16a47aa683 Merge branch 'new_revision_app' of https://git.lotus-wallet.com/fmk/huixiang_app into new_revision_app 2 years ago
哈哈哈 6f721d3e15 回鄉錢包,UI修改 2 years ago
fmk e74b6c29c7 Merge branch 'new_revision_app' of https://git.lotus-wallet.com/fmk/huixiang_app into new_revision_app 2 years ago
fmk 0c04133b4c 删除一个link 2 years ago
哈哈哈 3c64142540 回鄉錢包,UI修改 2 years ago
哈哈哈 262b6425a6 回鄉錢包,UI修改 2 years ago
哈哈哈 d4e4e155a6 回鄉錢包,UI修改 2 years ago
哈哈哈 6738e0e2ac 回鄉錢包,UI修改 2 years ago
哈哈哈 eb78e90487 回鄉錢包,UI修改 2 years ago
哈哈哈 7aada77339 回鄉錢包,UI修改 2 years ago
哈哈哈 bc5f7a87eb 回鄉錢包,UI修改 2 years ago
Loki 3cf490b0f0 在flutter3.0可以运行项目。 discount_zone.dart discountItem高度超了 图片还webp的 2 years ago
Loki c776a4f336 在flutter3.0可以运行项目。 discount_zone.dart discountItem高度超了 2 years ago
Loki d9e4beb8d0 在flutter3.0可以运行项目。 2 years ago
fmk ca5f694d3c Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 0fa61fce7a ios 3 years ago
w-R 9591ced2f6 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R 4bb182bf4c 视频修改; 3 years ago
fmk 546fe43b76 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk c1a263aa26 ios 3 years ago
w-R 78b9bac436 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R d6a09fc7d6 点单例表滑动优化; 3 years ago
fmk 4654d3216e Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 6c42363502 ios 3 years ago
w-R 0ee9dc7c1d 订单结算修改 3 years ago
w-R 98704ce205 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R 2e432fe9ec 活动选择修改 3 years ago
fmk cf37267395 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk b0d16256b9 ios 3 years ago
w-R 6b6b79f211 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R ceec324c27 地图优化 3 years ago
fmk c3849d1fab Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk eddd94b51e ios 3 years ago
w-R 9c00f47d15 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R fcf8412900 地图列表改了字段存放列表数据,更改字段名即可; 3 years ago
fmk 2e0d0df43d Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 0030b3bbec ios 3 years ago
w-R e883630a2e 购物车底部按钮更改 3 years ago
w-R dc1862acd5 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R 53253302ee 布局文章,视频,部分按钮优化更改; 3 years ago
fmk dfb18906b8 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 40bba8c472 ios 3 years ago
w-R 5d098b939a 布局功能优化 3 years ago
w-R 9edf793395 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R 20ffd0d6fa 布局功能优化 3 years ago
fmk b4e5272988 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 32f3061b5d ios 3 years ago
w-R 04a55ecf9b 推送-增加类型9,福利中心; 3 years ago
w-R b09c747dc7 点单页列表更改; 3 years ago
w-R b13c65bf02 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R 6b3ebc36ca 优化 3 years ago
fmk 07ca6cf5ae ios更改 3 years ago
fmk 32902265dd Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 7553476f42 ios 3 years ago
w-R 210adf67ee 登录修改优化 3 years ago
w-R a399f08246 登录修改优化 3 years ago
w-R a600d0af5b + 3 years ago
w-R 9fd2e5a1cc Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R a257f53c13 平台余额密码优化; 3 years ago
fmk 2b3a04532b Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk d78ac46876 ios 3 years ago
w-R 21b9bed276 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R 0b0d1740f7 部分优化更改 3 years ago
fmk 115123c298 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 95c578a6e8 ios 3 years ago
w-R 7c3246598e 火锅店增加优惠券; 3 years ago
w-R c1adf43e70 课程更改 3 years ago
w-R f03e0d1309 火锅更改 3 years ago
fmk 02eccbd103 ios更改 3 years ago
fmk dd82f183fa Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk fb2c89d87e ios 3 years ago
w-R f13c9e0fe7 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R b8e0a467f6 优惠券增加已使用; 3 years ago
fmk f88b44758b Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 65b18e1b99 ios 3 years ago
w-R efdb7eca92 图片压缩优化; 3 years ago
w-R d6b64fb38b 更改 3 years ago
w-R abef6ab394 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R a8ca79ec99 更新ui更改; 3 years ago
fmk b540ff905a Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 3447b06ec4 IOS 3 years ago
w-R cd00775de0 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R bf8dd3d4d9 优惠券更改; 3 years ago
fmk dc3b76f320 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk c9bda80088 ios更新 3 years ago
w-R b901995bd3 布局更改; 3 years ago
w-R f7238a85f1 更新布局更改; 3 years ago
fmk 443c933daf Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 113edc9d49 1 3 years ago
w-R 1545acbf8b 尺寸更改 3 years ago
w-R e26fe495c1 我的更改 3 years ago
fmk 4e0806b656 ios更改 3 years ago
w-R 66cd88ac12 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 89f30f6d3e Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 0a63ff6fc9 ios更改 3 years ago
w-R db3029114a Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R bea49daca0 首页更改 3 years ago
w-R de4c0e34fc ui更改 3 years ago
fmk 4ed7d56725 ios更改 3 years ago
fmk 054c1513aa ios更改 3 years ago
w-R 96cddc48de 优惠券更改 3 years ago
w-R d52152d6b4 优惠券更改 3 years ago
w-R b35827a40a 更新,部分更改 3 years ago
fmk c0c62a1bde ios更改 3 years ago
fmk 97399ce718 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk d0539fe504 ios更改 3 years ago
w-R ee31644c58 部分ui更改; 3 years ago
w-R 3bbb720f62 价格更改; 3 years ago
w-R a913520b6d 火锅 3 years ago
fmk baf4b4facd ios更改 3 years ago
w-R fab0182c61 Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
w-R d467bf6058 首页更改, 3 years ago
fmk 253de6e63d Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 3 years ago
fmk 94bea66825 ios 3 years ago
w-R d7637e8550 联盟更新 3 years ago
w-R 046be46c5e 新版更新; 3 years ago
w-R d98dab82d0 新版更改 3 years ago
w-R cd5903ae8e 新版福利中心更改 3 years ago
w-R 6ef311c739 新版更改 3 years ago
w-R 13ffee3f3a Merge branch 'remove_uniapp' into new_revision_app 3 years ago
w-R 44993d2c2f 版本更新 3 years ago
w-R 8a47c0e102 規格更改 3 years ago
w-R 86009b58b3 新版跟新 3 years ago
w-R 9724f835ee 首页优惠券更改 3 years ago
w-R 36de0e8d9b Merge branch 'remove_uniapp' into new_revision_app 3 years ago
w-R fcd7f13b9d 版本更改 3 years ago
w-R db6ead0247 优惠券列表更改 3 years ago
w-R d9994dd364 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 8d5ea5ca1a 选规格样式更改 3 years ago
fmk e27e403779 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk eebed322a8 ios更新 3 years ago
w-R 93c7c0205a 优惠更改; 3 years ago
w-R 5e10d63e02 福利中心优惠券更改 3 years ago
w-R cdf598af65 地图选择位置null解决; 3 years ago
w-R 304e674902 福利中心更改;增加福利兑换更改 3 years ago
w-R 57897e9a08 更改 3 years ago
w-R 1b7dd38b22 更新改动 3 years ago
w-R 9cfac68c01 新版更改 3 years ago
w-R bb580cbaa7 Merge branch 'remove_uniapp' into new_revision_app 3 years ago
w-R a9fd2c4dec 更改 3 years ago
w-R 66763e0e6a app自动更新 3 years ago
w-R 8ac7f68ad3 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R e081231709 app自动更新 3 years ago
fmk 1baca8956f Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk b59a18e585 ios 更新 3 years ago
w-R da91143fde app自动更新 3 years ago
w-R 915eb948ea 订单详情更改 3 years ago
w-R 1b75135125 更改規格,ui 3 years ago
w-R 45146ba24a 更改1 3 years ago
w-R 79410fb3d8 1.0.1 3 years ago
w-R e2fb6c1e4c 个人中心修改 3 years ago
fmk 77c5ce9486 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk 329c498eb0 ios 更新 3 years ago
w-R 61bb9d7930 社群更改 3 years ago
w-R 8164222c67 充值优化; 3 years ago
w-R 362eb452cc 社群列表优化 3 years ago
w-R dccf1f73dc 订单详情更改; 3 years ago
w-R 8cc8fd4688 ui更改 3 years ago
w-R 8c42c34df6 订单结算信息接口更改,+传支付方式 3 years ago
w-R a78e04a28b 优惠券更改2 3 years ago
w-R 9139cc872e Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 117e5a7809 弹窗更改 3 years ago
fmk a1efd61980 ios 更新 3 years ago
w-R 140371a524 优惠券更改 3 years ago
w-R 76ba1f6388 结算优惠券更改 3 years ago
w-R 57897247d4 規格更改 3 years ago
w-R 5552abc52c 优惠券更改; 3 years ago
w-R 700652bd3d 充值更改 3 years ago
w-R eeea0d1740 更新社群视频上传时间,首页banner跳转; 3 years ago
w-R e7dc4bb119 新版本更改 3 years ago
fmk b5e7eff6cd ios 更新 3 years ago
fmk 1133013487 ios 更新 3 years ago
w-R 82a6a8e641 Merge branch 'dev' into new_revision_app 3 years ago
w-R 5d3f828dc1 更改 3 years ago
fmk 03f66febe5 ios 更新 3 years ago
fmk b52e2f01c8 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk 0283e85a23 ios 更新 3 years ago
w-R 59dacb4da7 社群列表更改 3 years ago
fmk 26407af56b Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk a06d7d7a1a ios 更新 3 years ago
w-R c9dbb25a52 社群内容更改 3 years ago
w-R abdfb23ad9 更改 3 years ago
fmk 226830eae1 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk 646a00d557 ios 更新 3 years ago
w-R 84a0ed103f 更改购物车,搜索 3 years ago
w-R 5f1d428ada 订单更新1 3 years ago
w-R 2bd3756aa1 订单更改 3 years ago
w-R faa65dc67b hw更改 3 years ago
w-R ec41eb8097 更改 3 years ago
w-R 06a6a65928 去掉声明 3 years ago
w-R b22fa5d615 更改 3 years ago
w-R 36606bf838 更改时间 3 years ago
w-R 91be0a76fb 更改 3 years ago
w-R 56c0a788c7 更改 3 years ago
w-R 846684671a 更改 3 years ago
w-R dbadc81980 更改实体类型 3 years ago
w-R 6bb0a8ae64 更改类型 3 years ago
w-R 508b3afd2f 更改mid 3 years ago
w-R 00d9d47662 1 3 years ago
w-R fef6d9fabb 11 3 years ago
w-R 141859f582 Merge branch 'remove_uniapp' into dev 3 years ago
w-R aec15cb48a 1 3 years ago
w-R 829244c9f5 图片更改 3 years ago
w-R ee720756d0 更1 3 years ago
w-R 23259b1174 111 3 years ago
w-R 0883b06c73 Merge branch 'remove_uniapp' into dev 3 years ago
w-R a9c909e9af bug更改; 3 years ago
w-R 5a43223f65 社群刷新更改; 3 years ago
w-R a84c63ecf6 商城更改 3 years ago
w-R f01670bd9b 搜索排序更改 3 years ago
w-R 426b18fa49 更改 3 years ago
w-R 236c3ab021 商城更改 3 years ago
w-R 6cf03e7a5f 社群更改 3 years ago
w-R 88bae575af 更改 3 years ago
w-R 5ab6129100 商城更改 3 years ago
fmk f92c5d952b ios更新合并 3 years ago
fmk a5d3734727 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R f09145f731 android 社群更改 3 years ago
fmk b72cc3a851 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk 573672144f ios,更改 3 years ago
w-R be9c1e8ce2 充值更改; 3 years ago
w-R 1683361f4c 购买流程更改 3 years ago
w-R a598480dbf 充值更改 3 years ago
w-R 4263e4ecaf 详情增加,普通购买待更改 3 years ago
w-R 24b64ab183 详情更改 3 years ago
w-R 7db39ef789 更改社群抬头,举报,首页净弼商城 3 years ago
w-R ca20451c38 砍价流程ok; 3 years ago
w-R 536a700930 j更改 3 years ago
w-R d75c11de83 优惠券更改 3 years ago
w-R 00e4664183 举报更改 3 years ago
w-R 885dbf1b8e 郑家动态/投诉接口 3 years ago
w-R 5ad4abd1fb 商品小标题更改 3 years ago
w-R 3877ed531c 增加联系人,更改审核需求 3 years ago
w-R 58ad6ddad4 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
w-R dab4e2d2c3 活动更改 3 years ago
w-R 1a91322ef1 砍价支付更改 3 years ago
w-R 30c95ca07f u更改 3 years ago
w-R 4a603df497 d更改 3 years ago
fmk ecf8f577a8 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk 645b44c879 ios,更改 3 years ago
w-R f370562480 列表更改3 3 years ago
w-R 70fd2c2e9d 列表更改2 3 years ago
w-R 1ed75cd257 列表更改 3 years ago
w-R 6510cf2925 更改 3 years ago
w-R a579be3074 拼团更改 3 years ago
w-R 0a7b832da4 首页协议修改 3 years ago
w-R 194c18f10b 协议更改 3 years ago
w-R ac5ac310e6 更改 3 years ago
w-R c9abd24426 协议更改 3 years ago
w-R 454a5be3be 活动支付 3 years ago
w-R 1f7a6e6bab 更改协议内容 3 years ago
w-R d7606ec1df 增加用户协议,更改协议内容 3 years ago
w-R 097b361882 增加联系客服 3 years ago
w-R 4f48b67a8f 我的,增加联系客服 3 years ago
w-R cebce5519a 适配12,瘦身包 3 years ago
w-R 2b7aeee830 dev更改 3 years ago
w-R 42f2385e1c 合并uniapp更改 3 years ago
w-R 9df91cabd3 Merge branch 'remove_uniapp' into dev 3 years ago
fmk 084fe08044 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk ea8c7d8c2e ios更新; 3 years ago
w-R 1e23235fba 增加注销功能 3 years ago
w-R 7ae6c09c87 d 3 years ago
w-R 6f6e6ec019 Merge branch 'remove_uniapp' into dev 3 years ago
w-R a20e5582d1 ui更改 3 years ago
fmk 0d97b4698c ios,更改1 3 years ago
fmk cda2bf0901 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 19209764f7 ui更改 3 years ago
fmk d16810d1cd Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk 01dd1bbadd ios,更改 3 years ago
w-R e6a11a6bb0 活动弹窗更改 3 years ago
w-R b209f5bcc6 增加社群分享举报,分享h5需要兼容动态,暂没时间兼容,暂保留 3 years ago
w-R 25184b5e88 社群新增更改; 3 years ago
w-R fc50c4d476 直接购买更改 3 years ago
w-R fe70237167 更改 3 years ago
w-R 8f2458a54d 进度条更改 3 years ago
w-R 10f6ea6244 券更改 3 years ago
w-R 7c95854af6 更改 3 years ago
w-R 933b0c3e60 跳转更改 3 years ago
w-R 2a7cbdd44e 更改 3 years ago
w-R 25e2d920b7 砍价更改 3 years ago
fmk 26761ca05e ios更新 3 years ago
fmk 4811678544 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 5187eb62b4 邀请码更改 3 years ago
w-R 19bf43902c 砍价; 3 years ago
w-R 8ad6a4895c 加更; 3 years ago
w-R 9d9ebe2f14 加更; 3 years ago
fmk 42c9de466f Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 3caf2f310f 订单更改; 3 years ago
w-R 5937cb0f2c 支付方式顺序更改 3 years ago
w-R 248550ae6f 1订单更改 3 years ago
w-R 0011135c91 砍价更改 3 years ago
w-R 9fbc9fcc35 Merge branch 'remove_uniapp' into dev 3 years ago
w-R 84c1279e30 更改; 3 years ago
w-R 87a88fd504 更改 3 years ago
fmk 3f94627e65 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R c0f548adf9 首页loading更改 3 years ago
w-R 794a4536c2 首页更改 3 years ago
fmk 0d43fde4f7 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R d0851ab24d 推送更改 3 years ago
fmk ced4355694 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 3dc3211a2e 邀请码功能更新; 3 years ago
Loki bc64d166dd 删除代码 改 3 years ago
fmk 90c0b99d45 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R e3351fedc5 更改 3 years ago
w-R 9b3019fb89 增加邀请记录; 3 years ago
w-R 07f751c8ee 邀请记录 3 years ago
w-R 74d7a8c753 拼团,直接购买流程,等后端更改,拼团页面_参与直接选规格结算,砍价选了規格跳转砍价详情,我的拼团/砍价跳转参与详情; 3 years ago
w-R 4c8072cea7 充值提示更改 3 years ago
fmk 2253f1f491 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 3ab8bca9a9 充值更改 3 years ago
w-R a1166e1fc5 充值更改 3 years ago
w-R 7509662de2 拼团砍价,修改 3 years ago
w-R 40719d3f88 Merge branch 'remove_uniapp' into dev 3 years ago
w-R 8ca78446f9 布局更改 3 years ago
fmk c8b9955550 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 475e2acc13 部分布局微调更改 3 years ago
fmk 9f58ce17b7 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R f7d2ec5b0a 下单,信息bug更改; 3 years ago
w-R cab48fa74d 更改合并u 3 years ago
w-R 462a15773e Merge branch 'remove_uniapp' into dev 3 years ago
w-R 8711f4fe5b 图片优化; 3 years ago
fmk 923cc9a31c Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 95baeeb134 动态列表视频优化 3 years ago
w-R 9628900765 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 277859f8ff 更改 3 years ago
Loki a631a134ed image pre cached |view controller inited 3 years ago
w-R 13f61ef139 商品选規格价格显示更改; 3 years ago
w-R 4959dd0626 图片更改 3 years ago
fmk 9b51dc6ad5 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 83b8b98098 +更改,規格更改,视频铺满 3 years ago
fmk b81bfaf993 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 6b48ff6a36 推送对应活动文章跳转 3 years ago
fmk e7d6fc3c8a Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R b4376dd793 图片优化更改 3 years ago
w-R 7ac70eedbe 图片优化更改 3 years ago
w-R 64172118c4 文章热门跳转更改 3 years ago
w-R 6f08050e3b 店铺滑动退出修改 3 years ago
fmk 93eaaae2d5 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 626d4f9a6c 活动优惠券更改 3 years ago
fmk 139abe7426 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R d49768b4a5 活动优惠券更改 3 years ago
fmk f04f6404ad Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R 3b6845c547 .sw,bug处理 3 years ago
w-R 96295c5041 消息部分,社群头条更改; 3 years ago
w-R c7a2dbbed3 钱包样式更改 3 years ago
fmk 6b7c48e600 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
w-R a9ae353e2f 消息bug更改 3 years ago
fmk b51bdae912 Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp 3 years ago
fmk 18c839705d 更改 3 years ago
w-R 0247ab84f3 消息推送,首页更改,社群专栏更改 3 years ago
w-R d2775ada04 修改信息动态通知 3 years ago
w-R e74e8bc03d 直接购买,流程有问题;直接购买会导致购物车所有商品直接全部购买; 3 years ago
w-R b4f56ce7fe 更新 3 years ago
fmk 18fc1ece47 解决上传120 秒视频限制 3 years ago
w-R 527c522442 我的_积分更改 3 years ago
w-R 30e82d1f5c ios视频播放更改 3 years ago
w-R 715caaa401 动态发布更新; 3 years ago
w-R 37c2ce7353 更新 3 years ago
w-R b92673e664 详情,参团列表; 3 years ago
w-R 2f815cc3e2 Merge branch 'remove_uniapp' into dev 3 years ago
w-R b2ec5d500b 社群图片优化; 3 years ago
w-R a908432320 社群多张图片优化 3 years ago
w-R 132033c083 图片优化 3 years ago
w-R ba35eb9c7d 更改 3 years ago
w-R e823db7b27 个人信息刷新 3 years ago
w-R 1e10ea6a35 参团流程 3 years ago
w-R b488cd0904 更改 3 years ago
fmk db275a94bc 动态列表按钮优化; 3 years ago
w-R 4e7e4cf898 文件上传更改 3 years ago
w-R c28ea9ce55 文件上传更改 3 years ago
w-R 7c4b4f7227 文件上传更改 3 years ago
w-R d6e62b179e 更改 3 years ago
w-R 16e7c313a5 购物车,秒杀bug处理 3 years ago
w-R 21969316eb 更改 3 years ago
w-R 714cc7d18b 更改 3 years ago
w-R b49eefb65e 更新 3 years ago
w-R 4a7a130675 购物车勾选; 3 years ago
w-R ed942f9b72 首页数据显示完成; 3 years ago
w-R 147f87f92c 文章html富文本点击跳转, 3 years ago
w-R 21a1c79d1d 文章html富文本点击跳转, 3 years ago
w-R 20901965d0 Merge branch 'new_yixin' into dev 3 years ago
w-R aed7869897 文章html富文本点击跳转, 3 years ago
w-R 8724cad0e4 秒杀专区更改 3 years ago
w-R 694e187acc 文章链接 3 years ago
fmk f9615219dc m—更改 3 years ago
w-R 6b86898654 一心回乡商城更改; 3 years ago
fmk 5744d7a69a Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 2fafa2b87c 店铺推荐样式更改,精彩活动右边加权重,新人奖励弹窗样式优化更改,头条合集:cover 3 years ago
fmk 2acdc40831 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R e523308502 优化头条列表; 3 years ago
fmk eeafdabd3f Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R abc34bfe15 优惠券更新,firstWhere; 3 years ago
w-R 977094a311 优惠券更新,firstWhere; 3 years ago
fmk 694344480b Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 0933f67a19 头条合集列表更改; 3 years ago
w-R d653842650 头条合集列表更改; 3 years ago
fmk 070bcc684c Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R a13802ec42 签到更改, 3 years ago
fmk 4f337061e2 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R e2b61d43a5 签到更改, 3 years ago
fmk 66473f1675 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 9bd7cb08a8 会员等级更改 3 years ago
fmk 8dc778acc1 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R cd49a53c83 会员更改 3 years ago
fmk a70c1177ae Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 817e6cce64 更改 3 years ago
fmk d5f7135a54 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R ead7899f27 更改 3 years ago
fmk b83d9c0cf7 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 81943e4302 更改 3 years ago
fmk be58697c4b Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 08fb264e20 更改 3 years ago
fmk 648f4621e8 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 785ca66e2b 首页邀请成功弹窗更改; 3 years ago
w-R 56d8b04cc1 首页邀请成功弹窗更改; 3 years ago
fmk 525812b1ce Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 43d001ad7f 邀请码分享更改; 3 years ago
w-R 81e035c640 邀请码分享更改; 3 years ago
fmk a4741f2699 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 6bcabaf14d 积分商城兑换成功显示更改, 3 years ago
fmk 4476c8fa62 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R b4fcf5b80a 文章合集增加; 3 years ago
w-R 2afde85a5a 文章合集增加; 3 years ago
w-R 2366783edb 积分商城:兑换后扣除对应积分金额, 3 years ago
w-R b88434f7fb 积分商城更改,会员体系更改; 3 years ago
fmk adfdb61203 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R c85d3f1c4a 会员体系更改,音频切换dispose; 3 years ago
w-R b693d9f8f3 会员更改,积分商城更改 3 years ago
fmk 0a0232e15d Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R c8960c7e92 课程banner刷新更改 3 years ago
fmk e35d5e05a5 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 4bef54a284 细节更改 3 years ago
fmk 8d407f9a7f Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 4fd5ecda7e 首页登陆优化 3 years ago
fmk d030f3d828 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 46dd3ed141 更改 3 years ago
w-R 25186188ac 点餐更改 3 years ago
fmk 887473838c Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 30adefafe6 视频缩放适配更改 3 years ago
w-R c5c9600a1e Merge remote-tracking branch 'origin/remove_uniapp' into dev 3 years ago
fmk b5ba6fa203 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 3fdf560a42 视频缩放适配更改 3 years ago
fmk e6f123a6ed Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R bbf1b4cbe2 视频缩放适配更改 3 years ago
fmk e502302d3c Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R fd04f86c50 视频缩放适配更改 3 years ago
w-R ca18b4a0fa 视频缩放适配更改 3 years ago
fmk d3c0fc2928 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R dff9102cb1 更改细节bug 3 years ago
fmk 3f0c2283ae 恢复 3 years ago
w-R 6fbfef91f5 Merge branch 'master' into dev 3 years ago
fmk e18da9d85c Revert "safety" 3 years ago
fmk 4c1a4eee0a Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R c85772009c 更改细节bug 3 years ago
fmk 50e08219ef Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
fmk ba3dc7382d 更改 3 years ago
w-R 9b82b67a9f 更改细节bug 3 years ago
w-R cd2b2b411d 课程更改 3 years ago
fmk 46e08466a3 Merge remote-tracking branch 'origin/dev' into remove_uniapp 3 years ago
w-R 6d4c575881 课程更改 3 years ago
w-R f94d241e93 更改 3 years ago
w-R 9a48477902 首页更改,课程更改;积分ui更改 3 years ago
w-R baf40d4927 课程更改 3 years ago
w-R 771e84804d 更改 3 years ago
fmk 947dfb0ebf safety 3 years ago
w-R 1788191d4d 更改 3 years ago
w-R cde9127a6a 选择规格样式更改 3 years ago
w-R 7a62ac4001 Merge branch 'master' into dev 3 years ago
  1. 3
      README.md
  2. 19
      android/app/build.gradle
  3. 8
      android/app/src/main/AndroidManifest.xml
  4. 2
      android/app/src/main/kotlin/com/zsw/huixiang/wxapi/WXPayEntryActivity.kt
  5. 16
      android/app/src/main/res/drawable-v21/launch_background.xml
  6. 14
      android/app/src/main/res/drawable/launch_background.xml
  7. BIN
      android/app/src/main/res/mipmap-hdpi/app_icon.png
  8. BIN
      android/app/src/main/res/mipmap-hdpi/ic_launcher.png
  9. BIN
      android/app/src/main/res/mipmap-hdpi/icon_splash.png
  10. BIN
      android/app/src/main/res/mipmap-hdpi/icon_splash1.png
  11. BIN
      android/app/src/main/res/mipmap-hdpi/icon_splash2.png
  12. BIN
      android/app/src/main/res/mipmap-hdpi/icon_splash_logo.png
  13. BIN
      android/app/src/main/res/mipmap-ldpi/ic_launcher.png
  14. BIN
      android/app/src/main/res/mipmap-mdpi/app_icon.png
  15. BIN
      android/app/src/main/res/mipmap-mdpi/ic_launcher.png
  16. BIN
      android/app/src/main/res/mipmap-mdpi/icon_splash.png
  17. BIN
      android/app/src/main/res/mipmap-mdpi/icon_splash1.png
  18. BIN
      android/app/src/main/res/mipmap-mdpi/icon_splash2.png
  19. BIN
      android/app/src/main/res/mipmap-mdpi/icon_splash_logo.png
  20. BIN
      android/app/src/main/res/mipmap-xhdpi/app_icon.png
  21. BIN
      android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
  22. BIN
      android/app/src/main/res/mipmap-xhdpi/icon_splash.png
  23. BIN
      android/app/src/main/res/mipmap-xhdpi/icon_splash1.png
  24. BIN
      android/app/src/main/res/mipmap-xhdpi/icon_splash2.png
  25. BIN
      android/app/src/main/res/mipmap-xhdpi/icon_splash_logo.png
  26. BIN
      android/app/src/main/res/mipmap-xxhdpi/app_icon.png
  27. BIN
      android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  28. BIN
      android/app/src/main/res/mipmap-xxhdpi/icon_splash.png
  29. BIN
      android/app/src/main/res/mipmap-xxhdpi/icon_splash1.png
  30. BIN
      android/app/src/main/res/mipmap-xxhdpi/icon_splash2.png
  31. BIN
      android/app/src/main/res/mipmap-xxhdpi/icon_splash_logo.png
  32. BIN
      android/app/src/main/res/mipmap-xxxhdpi/app_icon.png
  33. BIN
      android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  34. BIN
      android/app/src/main/res/mipmap-xxxhdpi/icon_splash.png
  35. BIN
      android/app/src/main/res/mipmap-xxxhdpi/icon_splash1.png
  36. BIN
      android/app/src/main/res/mipmap-xxxhdpi/icon_splash2.png
  37. BIN
      android/app/src/main/res/mipmap-xxxhdpi/icon_splash_logo.png
  38. 12
      android/build.gradle
  39. 1
      android/gradle.properties
  40. 2
      android/gradle/wrapper/gradle-wrapper.properties
  41. 1
      android/tmpmob/ShareSDK/assets/ShareSDK.xml
  42. BIN
      assets/fonts/APPHT.ttf
  43. BIN
      assets/fonts/JDZhengHT-Bold.ttf
  44. BIN
      assets/fonts/JDZhengHT-Light.ttf
  45. BIN
      assets/fonts/JDZhengHT-Regular.ttf
  46. BIN
      assets/image/2x/activity_hot.webp
  47. BIN
      assets/image/2x/activity_q.webp
  48. BIN
      assets/image/2x/add.png
  49. BIN
      assets/image/2x/add.webp
  50. BIN
      assets/image/2x/attainment_bj.webp
  51. BIN
      assets/image/2x/badge_img.webp
  52. BIN
      assets/image/2x/bargain.webp
  53. BIN
      assets/image/2x/bianhao.webp
  54. BIN
      assets/image/2x/bill_gl.webp
  55. BIN
      assets/image/2x/bj_badge.webp
  56. BIN
      assets/image/2x/browse.png
  57. BIN
      assets/image/2x/browse.webp
  58. BIN
      assets/image/2x/bs_calendar_logo.webp
  59. BIN
      assets/image/2x/bs_check.webp
  60. BIN
      assets/image/2x/bs_edit.webp
  61. BIN
      assets/image/2x/bs_goods_search.webp
  62. BIN
      assets/image/2x/bs_home_bill.webp
  63. BIN
      assets/image/2x/bs_mine_bg.webp
  64. BIN
      assets/image/2x/bs_mine_clerk.webp
  65. BIN
      assets/image/2x/bs_mine_code.webp
  66. BIN
      assets/image/2x/bs_mine_heading.webp
  67. BIN
      assets/image/2x/bs_more.webp
  68. BIN
      assets/image/2x/bs_no data_logo.webp
  69. BIN
      assets/image/2x/bs_px.webp
  70. BIN
      assets/image/2x/bs_refund.webp
  71. BIN
      assets/image/2x/bs_refund_num.webp
  72. BIN
      assets/image/2x/bs_right.webp
  73. BIN
      assets/image/2x/bs_secure.webp
  74. BIN
      assets/image/2x/bs_shop.webp
  75. BIN
      assets/image/2x/bs_shop_logo.webp
  76. BIN
      assets/image/2x/bs_switch.webp
  77. BIN
      assets/image/2x/bs_switch_shop.webp
  78. BIN
      assets/image/2x/bs_trade_num.webp
  79. BIN
      assets/image/2x/bs_uncheck.webp
  80. BIN
      assets/image/2x/bs_user.webp
  81. BIN
      assets/image/2x/bs_user_switch.webp
  82. BIN
      assets/image/2x/bs_user_switch_bg.webp
  83. BIN
      assets/image/2x/bs_xj.webp
  84. BIN
      assets/image/2x/bus_calculator_enter.webp
  85. BIN
      assets/image/2x/bus_calculator_plus.webp
  86. BIN
      assets/image/2x/bus_cashier_balance.webp
  87. BIN
      assets/image/2x/bus_cashier_pt.webp
  88. BIN
      assets/image/2x/bus_cashier_scan_code.webp
  89. BIN
      assets/image/2x/bus_cashier_switch.webp
  90. BIN
      assets/image/2x/bus_cashier_xj.webp
  91. BIN
      assets/image/2x/bus_close_circle.webp
  92. BIN
      assets/image/2x/bus_code_save.webp
  93. BIN
      assets/image/2x/bus_coupon.webp
  94. BIN
      assets/image/2x/bus_give_yue.webp
  95. BIN
      assets/image/2x/bus_goods_add.webp
  96. BIN
      assets/image/2x/bus_home_bhy.webp
  97. BIN
      assets/image/2x/bus_home_cz.webp
  98. BIN
      assets/image/2x/bus_home_czjl.webp
  99. BIN
      assets/image/2x/bus_home_goods.webp
  100. BIN
      assets/image/2x/bus_home_goods_ssfx.webp
  101. Some files were not shown because too many files have changed in this diff Show More

3
README.md

@ -85,6 +85,9 @@ samples, guidance on mobile development, and a full API reference.
推送:使用腾讯云推送 tpns 需扫码登录 (有问题同华为➕微信||或重新注册账号替换相关appKey)
友盟: wu_rong 密码:Zxc09876
https://pos.platform.lotus-wallet.com/app/ 生产环境
http://192.168.10.236:8765/app/ 测试环境
https://pos.platform.lotus-wallet.com/app/ 生产环境

19
android/app/build.gradle

@ -90,7 +90,7 @@ def mfph = [
]
android {
compileSdkVersion 30
compileSdkVersion 33
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@ -110,11 +110,6 @@ android {
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
ndk {
/// .so
abiFilters 'armeabi-v7a', 'arm64-v8a','x86'
}
manifestPlaceholders = mfph
}
@ -145,6 +140,11 @@ android {
minifyEnabled false
signingConfig signingConfigs.config
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
ndk {
/// .so
abiFilters 'armeabi-v7a','arm64-v8a','x86'
}
}
debug {
// debuggable true
@ -152,6 +152,11 @@ android {
minifyEnabled false
signingConfig signingConfigs.config
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
ndk {
/// .so
abiFilters 'armeabi-v7a', 'arm64-v8a','x86','x86_64'
}
}
}
@ -179,7 +184,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.6.5'
// implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.6.5'
implementation fileTree(include: ['*.aar'], dir: 'libs')
implementation 'androidx.legacy:legacy-support-v4:1.0.0'

8
android/app/src/main/AndroidManifest.xml

@ -1,11 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zsw.huixiang">
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<!-- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>-->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"></uses-permission>
<uses-permission android:name="android.permission.READ_LOGS"></uses-permission>
<!-- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />-->
<!-- <uses-permission android:name="android.permission.READ_LOGS" />-->
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<!--允许程序打开网络套接字-->
<uses-permission android:name="android.permission.INTERNET" />
@ -35,7 +35,7 @@
</queries>
<application
android:label="回乡"
android:label="海峡姐妹"
android:name=".HxApplication"
android:icon="@mipmap/ic_launcher">
<activity

2
android/app/src/main/kotlin/com/zsw/huixiang/wxapi/WXPayEntryActivity.kt

@ -22,7 +22,7 @@ class WXPayEntryActivity : AbsWXPayCallbackActivity() {
val wechatAppId = appInfo.metaData.getString("weChatAppId")
if (wechatAppId != null ){
WXAPiHandler.setupWxApi(wechatAppId, this)
WXAPiHandler.setCoolBool(true)
// WXAPiHandler.setCoolBool(true)
io.flutter.Log.d("fluwx", "weChatAppId:$wechatAppId")
}else {
io.flutter.Log.e("fluwx", "can't load meta-data weChatAppId")

16
android/app/src/main/res/drawable-v21/launch_background.xml

@ -4,22 +4,22 @@
<item android:drawable="?android:colorBackground" />
<!-- You can insert your own image assets here -->
<item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">
<bitmap
android:gravity="center"
android:src="@mipmap/icon_splash_logo" />
</item>
<!-- <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">-->
<!-- <bitmap-->
<!-- android:gravity="center"-->
<!-- android:src="@mipmap/icon_splash_logo" />-->
<!-- </item>-->
<item android:width="130dp" android:height="30dp" android:bottom="80dp" android:gravity="bottom|center">
<bitmap
android:gravity="center"
android:src="@mipmap/icon_splash_bottom" />
android:src="@mipmap/icon_splash2" />
</item>
<item android:bottom="222dp" android:gravity="center">
<item android:bottom="107dp" android:gravity="center">
<bitmap
android:gravity="center"
android:src="@mipmap/icon_splash_center" />
android:src="@mipmap/icon_splash1" />
</item>
</layer-list>

14
android/app/src/main/res/drawable/launch_background.xml

@ -4,22 +4,22 @@
<item android:drawable="@android:color/white" />
<!-- You can insert your own image assets here -->
<item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">
<bitmap
android:gravity="center"
android:src="@mipmap/icon_splash_logo" />
</item>
<!-- <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">-->
<!-- <bitmap-->
<!-- android:gravity="center"-->
<!-- android:src="@mipmap/icon_splash_logo" />-->
<!-- </item>-->
<item android:width="130dp" android:height="30dp" android:bottom="80dp" android:gravity="bottom|center">
<bitmap
android:gravity="center"
android:src="@mipmap/icon_splash_bottom" />
android:src="@mipmap/icon_splash2" />
</item>
<item android:bottom="107dp" android:gravity="center">
<bitmap
android:gravity="center"
android:src="@mipmap/icon_splash_center" />
android:src="@mipmap/icon_splash1" />
</item>
<!-- <item>-->

BIN
android/app/src/main/res/mipmap-hdpi/app_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
android/app/src/main/res/mipmap-hdpi/icon_splash.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

BIN
android/app/src/main/res/mipmap-hdpi/icon_splash1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

BIN
android/app/src/main/res/mipmap-hdpi/icon_splash2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

BIN
android/app/src/main/res/mipmap-hdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
android/app/src/main/res/mipmap-ldpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
android/app/src/main/res/mipmap-mdpi/app_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
android/app/src/main/res/mipmap-mdpi/icon_splash.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
android/app/src/main/res/mipmap-mdpi/icon_splash1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

BIN
android/app/src/main/res/mipmap-mdpi/icon_splash2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
android/app/src/main/res/mipmap-mdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/app_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/icon_splash.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/icon_splash1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/icon_splash2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/app_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/icon_splash.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/icon_splash1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/icon_splash2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/app_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/icon_splash.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/icon_splash1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/icon_splash2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 62 KiB

12
android/build.gradle

@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.4.10'
ext.kotlin_version = '1.6.0'
repositories {
maven {
url 'https://maven.aliyun.com/repository/google'
@ -12,14 +12,12 @@ buildscript {
}
// google()
// jcenter()
jcenter(){
url "http://jcenter.bintray.com/"
}
maven {
url "http://mvn.mob.com/android"
}
maven { url "https://www.jitpack.io" }
maven {url 'https://developer.huawei.com/repo/'}
maven { url 'https://repo1.maven.org/maven2/' }
}
dependencies {
@ -28,6 +26,11 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.huawei.agconnect:agcp:1.4.1.300'
classpath 'com.mob.sdk:MobSDK:+'
classpath 'com.android.tools.build:gradle:3.4.0'
classpath fileTree(include:['*.jar'], dir:'libs')
classpath 'com.umeng.umsdk:common:9.4.7'
classpath 'com.umeng.umsdk:asms:1.4.0'
classpath 'com.umeng.umsdk:abtest:1.0.0'
}
}
@ -49,6 +52,7 @@ allprojects {
}
maven { url "https://www.jitpack.io" }
maven { url 'https://developer.huawei.com/repo/'}
maven { url 'https://repo1.maven.org/maven2/' }
}
}

1
android/gradle.properties

@ -3,3 +3,4 @@ org.gradle.jvmargs=-Xmx4096m
android.useAndroidX=true
android.enableJetifier=true
MobSDK.mobEnv=x
MobSDK.spEdition=FP

2
android/gradle/wrapper/gradle-wrapper.properties vendored

@ -6,3 +6,5 @@ zipStorePath=wrapper/dists
#distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
systemProp.http.proxyHost=proxy.com
systemProp.http.proxyPort=8080

1
android/tmpmob/ShareSDK/assets/ShareSDK.xml

@ -55,4 +55,5 @@
<Littleredbook Enable="false" />
<Watermelonvideo Enable="false" />
<Tiktok Enable="false" />
<Taptap Enable="false" />
</DevInfor>

BIN
assets/fonts/APPHT.ttf

Binary file not shown.

BIN
assets/fonts/JDZhengHT-Bold.ttf

Binary file not shown.

BIN
assets/fonts/JDZhengHT-Light.ttf

Binary file not shown.

BIN
assets/fonts/JDZhengHT-Regular.ttf

Binary file not shown.

BIN
assets/image/2x/activity_hot.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 830 B

BIN
assets/image/2x/activity_q.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

BIN
assets/image/2x/add.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 482 B

BIN
assets/image/2x/add.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

BIN
assets/image/2x/attainment_bj.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

BIN
assets/image/2x/badge_img.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/image/2x/bargain.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/image/2x/bianhao.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

BIN
assets/image/2x/bill_gl.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 972 B

BIN
assets/image/2x/bj_badge.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
assets/image/2x/browse.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1003 B

BIN
assets/image/2x/browse.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 B

BIN
assets/image/2x/bs_calendar_logo.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 718 B

BIN
assets/image/2x/bs_check.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 876 B

BIN
assets/image/2x/bs_edit.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 726 B

BIN
assets/image/2x/bs_goods_search.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/image/2x/bs_home_bill.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 840 B

BIN
assets/image/2x/bs_mine_bg.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

BIN
assets/image/2x/bs_mine_clerk.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 890 B

BIN
assets/image/2x/bs_mine_code.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 B

BIN
assets/image/2x/bs_mine_heading.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
assets/image/2x/bs_more.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 662 B

BIN
assets/image/2x/bs_no data_logo.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
assets/image/2x/bs_px.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 808 B

BIN
assets/image/2x/bs_refund.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 880 B

BIN
assets/image/2x/bs_refund_num.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 768 B

BIN
assets/image/2x/bs_right.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 834 B

BIN
assets/image/2x/bs_secure.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 858 B

BIN
assets/image/2x/bs_shop.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

BIN
assets/image/2x/bs_shop_logo.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 692 B

BIN
assets/image/2x/bs_switch.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 758 B

BIN
assets/image/2x/bs_switch_shop.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/image/2x/bs_trade_num.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 742 B

BIN
assets/image/2x/bs_uncheck.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 668 B

BIN
assets/image/2x/bs_user.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 996 B

BIN
assets/image/2x/bs_user_switch.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
assets/image/2x/bs_user_switch_bg.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
assets/image/2x/bs_xj.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

BIN
assets/image/2x/bus_calculator_enter.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
assets/image/2x/bus_calculator_plus.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 B

BIN
assets/image/2x/bus_cashier_balance.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/image/2x/bus_cashier_pt.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/image/2x/bus_cashier_scan_code.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 896 B

BIN
assets/image/2x/bus_cashier_switch.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

BIN
assets/image/2x/bus_cashier_xj.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
assets/image/2x/bus_close_circle.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 860 B

BIN
assets/image/2x/bus_code_save.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 800 B

BIN
assets/image/2x/bus_coupon.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 776 B

BIN
assets/image/2x/bus_give_yue.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/image/2x/bus_goods_add.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 662 B

BIN
assets/image/2x/bus_home_bhy.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/image/2x/bus_home_cz.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 916 B

BIN
assets/image/2x/bus_home_czjl.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 B

BIN
assets/image/2x/bus_home_goods.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/image/2x/bus_home_goods_ssfx.webp

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save