fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

safety

master
fmk 3 years ago
parent
58437ca219
commit
00b4c810da
17 changed files with 79 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      android/app/src/main/assets/data/dcloud_control.xml
  2. 3
      lib/generated/intl/messages_en.dart
  3. 3
      lib/generated/intl/messages_zh_CN.dart
  4. 3
      lib/generated/intl/messages_zh_Hans_CN.dart
  5. 3
      lib/generated/intl/messages_zh_Hant_CN.dart
  6. 3
      lib/generated/intl/messages_zh_TW.dart
  7. 30
      lib/generated/l10n.dart
  8. 3
      lib/integral/integral_page.dart
  9. 3
      lib/l10n/intl_en.arb
  10. 3
      lib/l10n/intl_zh_CN.arb
  11. 3
      lib/l10n/intl_zh_Hans_CN.arb
  12. 3
      lib/l10n/intl_zh_Hant_CN.arb
  13. 3
      lib/l10n/intl_zh_TW.arb
  14. 3
      lib/mine/mine_page.dart
  15. 8
      lib/view_widget/coupon_widget.dart
  16. 6
      lib/view_widget/receive_success.dart
  17. 12
      lib/web/web_view/comment_list.dart

2
android/app/src/main/assets/data/dcloud_control.xml
Unescape View File

@ -1,4 +1,4 @@
<hbuilder version="1.9.9.80110" debug="false" syncDebug="true">
<hbuilder version="1.9.9.80110" debug="false" syncDebug="false">
<apps>
<app appid="__UNI__ACD00DA" appver="1.0"/>
<app appid="__UNI__E60E056" appver="1.0"/>

3
lib/generated/intl/messages_en.dart
Unescape View File

@ -267,6 +267,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -317,6 +318,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录，请点击去登录"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
@ -585,6 +587,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_CN.dart
Unescape View File

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录，请点击去登录"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
@ -583,6 +585,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_Hans_CN.dart
Unescape View File

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录，请点击去登录"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
@ -583,6 +585,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_Hant_CN.dart
Unescape View File

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登錄，請點擊去登錄"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券，請在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
@ -584,6 +586,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊會員"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("製作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

3
lib/generated/intl/messages_zh_TW.dart
Unescape View File

@ -266,6 +266,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"),
"jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
"kaitongriqi" : m15,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
@ -316,6 +317,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登錄，請點擊去登錄"),
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券，請在"),
"ninyilianxuqiandaotian" : m20,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
@ -584,6 +586,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊會員"),
"zhizuowancheng" : MessageLookupByLibrary.simpleMessage("製作完成"),
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"),

30
lib/generated/l10n.dart
Unescape View File

@ -4955,6 +4955,36 @@ class S {
);
}
/// `您已成功领取优惠劵，请在`
String get ninyichenggonglingquyouhuiquan {
return Intl.message(
'您已成功领取优惠劵，请在',
name: 'ninyichenggonglingquyouhuiquan',
desc: '',
args: [],
);
}
/// `卡包-可使用`
String get kabaokeshiyong {
return Intl.message(
'卡包-可使用',
name: 'kabaokeshiyong',
desc: '',
args: [],
);
}
/// `中查看`
String get zhongchakan {
return Intl.message(
'中查看',
name: 'zhongchakan',
desc: '',
args: [],
);
}
/// `并使用本机号码登录`
String get privacy_policy4 {
return Intl.message(

3
lib/integral/integral_page.dart
Unescape View File

@ -12,6 +12,7 @@ import 'package:huixiang/retrofit/data/rank.dart';
import 'package:huixiang/retrofit/data/sign_info.dart';
import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/sign_in_widget.dart';
import 'package:shared_preferences/shared_preferences.dart';
@ -110,7 +111,7 @@ class _IntegralPage extends State<IntegralPage> {
style: TextStyle(
color: Colors.white,
fontSize: 16.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
),
),
),

3
lib/l10n/intl_en.arb
Unescape View File

@ -513,6 +513,9 @@
"saomashibieguanzhugongzonghao": "扫码识别，关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",
"ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵，请在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_CN.arb
Unescape View File

@ -515,6 +515,9 @@
"saomashibieguanzhugongzonghao": "扫码识别，关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",
"ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵，请在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_Hans_CN.arb
Unescape View File

@ -515,6 +515,9 @@
"saomashibieguanzhugongzonghao": "扫码识别，关注公众号",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "还没有优惠券可以领取~",
"ninyichenggonglingquyouhuiquan": "您已成功领取优惠劵，请在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_Hant_CN.arb
Unescape View File

@ -508,6 +508,9 @@
"saomashibieguanzhugongzonghao": "掃碼識別，關注公眾號",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "還沒有優惠券可以領取~",
"ninyichenggonglingquyouhuiquan": "您已成功領取優惠券，請在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/l10n/intl_zh_TW.arb
Unescape View File

@ -507,6 +507,9 @@
"saomashibieguanzhugongzonghao": "掃碼識別，關注公眾號",
"fenxiangzhiweixin": "分享至微信",
"haimeiyouyouhuiquankeyilingqu": "還沒有優惠券可以領取~",
"ninyichenggonglingquyouhuiquan": "您已成功領取優惠券，請在",
"kabaokeshiyong": "卡包-可使用",
"zhongchakan": "中查看",

3
lib/mine/mine_page.dart
Unescape View File

@ -11,6 +11,7 @@ import 'package:huixiang/retrofit/data/rank.dart';
import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/event_type.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/login_tips_dialog.dart';
import 'package:huixiang/view_widget/mine_vip_view.dart';
@ -237,7 +238,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
Text(
S.of(context).ninyouyigedingdanyaolingqu,
style: TextStyle(
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
fontSize: 12.sp,
color: Colors.black,
),

8
lib/view_widget/coupon_widget.dart
Unescape View File

@ -254,7 +254,7 @@ class CouponWidget extends StatelessWidget {
Padding(
padding: EdgeInsets.only(top: 50, bottom: 19),
child: Text(
"领取成功",
S.of(context).lingquchenggong,
style: TextStyle(
color: Color(0xff353535),
fontSize: 16.sp,
@ -262,7 +262,7 @@ class CouponWidget extends StatelessWidget {
),
),
Text(
"您已成功领取优惠劵，请在",
S.of(context).ninyichenggonglingquyouhuiquan,
style: TextStyle(
color: Color(0xff353535), fontSize: 14.sp),
),
@ -271,7 +271,7 @@ class CouponWidget extends StatelessWidget {
children: [
GestureDetector(
child: Text(
"卡包-可使用",
S.of(context).kabaokeshiyong,
style: TextStyle(
color: Color(0xffFF7A1A),
fontSize: 14.sp,
@ -280,7 +280,7 @@ class CouponWidget extends StatelessWidget {
onTap: callback,
),
Text(
"中查看",
S.of(context).zhongchakan,
style: TextStyle(
color: Color(0xff353535), fontSize: 14.sp),
),

6
lib/view_widget/receive_success.dart
Unescape View File

@ -31,7 +31,7 @@ class ReceiveSuccess extends StatelessWidget {
Padding(
padding: EdgeInsets.only(top: 50.h, bottom: 19.h),
child: Text(
"领取成功",
S.of(context).lingquchenggong,
style: TextStyle(
color: Color(0xff353535),
fontSize: 16.sp,
@ -40,7 +40,7 @@ class ReceiveSuccess extends StatelessWidget {
),
),
Text(
"您已成功领取优惠劵，请在",
S.of(context).ninyichenggonglingquyouhuiquan,
style: TextStyle(
color: Color(0xff353535),
fontSize: 14.sp,
@ -64,7 +64,7 @@ class ReceiveSuccess extends StatelessWidget {
},
),
Text(
"中查看",
S.of(context).zhongchakan,
style: TextStyle(
color: Color(0xff353535),
fontSize: 14.sp,

12
lib/web/web_view/comment_list.dart
Unescape View File

@ -9,6 +9,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/member_comment_list.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/comment_menu.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/login_tips_dialog.dart';
@ -70,6 +71,7 @@ class _CommentList extends State<CommentList> {
@override
void initState() {
super.initState();
queryMemberCommentList();
}
@ -101,7 +103,7 @@ class _CommentList extends State<CommentList> {
S.of(context).pinglun_(commentTotal.toString()),
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
color: Color(0xff1A1A1A),
),
),
@ -110,10 +112,10 @@ class _CommentList extends State<CommentList> {
),
Text(
S.of(context).xihuan_(
"${widget.article?.likes ?? widget.activity?.likes ?? "0"}"),
"${(widget.article?.likes ?? widget.activity?.likes) ?? "0"}"),
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
color: Color(0xff1A1A1A),
),
),
@ -178,7 +180,7 @@ class _CommentList extends State<CommentList> {
S.of(context).zanwupinglun,
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
color: Color(0xFFA0A0A0),
),
),
@ -286,7 +288,7 @@ class _CommentList extends State<CommentList> {
TextSpan(
text: memberList.username,
style: TextStyle(
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.bold,
fontSize: 14.sp,
color: Colors.black,
),

Write Preview
Loading…
Cancel
Save