Skip to content

B
book-app
提交 5e74cffd authored 作者: 岳维路's avatar 岳维路
浏览文件
操作

合并分支 'test' 到 'sim'

Test 查看合并请求 kiwitap/zijing-app!15
上级 d8099178 958ccddd
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 366 行增加 和 329 行删除
assets/images/2.0x/zijing_icon.png
查看替换文件 @ d8099178 浏览文件 @ 5e74cffd
assets/images/2.0x/zijing_icon.png

22.5 KB | W: | H:

assets/images/2.0x/zijing_icon.png

13.8 KB | W: | H:

assets/images/2.0x/zijing_icon.png
assets/images/2.0x/zijing_icon.png
assets/images/2.0x/zijing_icon.png
assets/images/2.0x/zijing_icon.png
  • 2-up
  • Swipe
  • Onion skin
assets/images/3.0x/zijing_icon.png
查看替换文件 @ d8099178 浏览文件 @ 5e74cffd
assets/images/3.0x/zijing_icon.png

44.1 KB | W: | H:

assets/images/3.0x/zijing_icon.png

26.6 KB | W: | H:

assets/images/3.0x/zijing_icon.png
assets/images/3.0x/zijing_icon.png
assets/images/3.0x/zijing_icon.png
assets/images/3.0x/zijing_icon.png
  • 2-up
  • Swipe
  • Onion skin
assets/images/zijing_icon.png
查看替换文件 @ d8099178 浏览文件 @ 5e74cffd
assets/images/zijing_icon.png

8.6 KB | W: | H:

assets/images/zijing_icon.png

7.4 KB | W: | H:

assets/images/zijing_icon.png
assets/images/zijing_icon.png
assets/images/zijing_icon.png
assets/images/zijing_icon.png
  • 2-up
  • Swipe
  • Onion skin
lib/apis/common.dart
浏览文件 @ 5e74cffd
...@@ -174,5 +174,32 @@ abstract class CommonAPI { ...@@ -174,5 +174,32 @@ abstract class CommonAPI {
return OssModel.fromJson(result.data); return OssModel.fromJson(result.data);
} }
static Future<String?> refreshToken() async {
Console.log('--------refreshToken----------------');
final result = await HttpService.to.post(
'/v1/members/login/getToken',
params: {
'access_token':StorageService.to.getString(kLocalAccessToken)
}
);
if (result.data is Map) {
final String token = result.data['token'];
final String accessToken = result.data['access_token'];
if(token.isEmpty && accessToken.isEmpty){
UserStore.to.logout();
return null;
}
await Future.wait([
UserStore.to.setToken(result.data['token']),
UserStore.to.setAccessToken(result.data['access_token']),
]);
return result.data['token'];
}
// 在这里执行刷新token的逻辑
// 如果刷新成功，返回新的token；如果刷新失败，返回null
return null;
}
} }
\ No newline at end of file
lib/apis/index.dart
浏览文件 @ 5e74cffd
...@@ -8,6 +8,8 @@ import 'package:device_info_plus/device_info_plus.dart'; ...@@ -8,6 +8,8 @@ import 'package:device_info_plus/device_info_plus.dart';
import '../models/index.dart'; import '../models/index.dart';
import '../services/index.dart'; import '../services/index.dart';
import '../store/index.dart';
import '../utils/index.dart';
part 'account.dart'; part 'account.dart';
part 'mine.dart'; part 'mine.dart';
part 'course.dart'; part 'course.dart';
......
lib/models/mine.dart
浏览文件 @ 5e74cffd
...@@ -357,6 +357,7 @@ class NoteModel { ...@@ -357,6 +357,7 @@ class NoteModel {
this.color, this.color,
this.chapterName, this.chapterName,
this.isMy, this.isMy,
this.isOpen,
}); });
NoteModel.fromJson(dynamic json) { NoteModel.fromJson(dynamic json) {
...@@ -372,10 +373,12 @@ class NoteModel { ...@@ -372,10 +373,12 @@ class NoteModel {
color = json['color']; color = json['color'];
chapterName = json['chapter_name']; chapterName = json['chapter_name'];
isMy = json['is_my']; isMy = json['is_my'];
isOpen = json['is_open'];
} }
num? notesId; num? notesId;
num? types; num? types;
num? isMy; num? isMy;
num? isOpen;
num? chapterId; num? chapterId;
String? content; String? content;
String? positioning; String? positioning;
...@@ -388,6 +391,7 @@ class NoteModel { ...@@ -388,6 +391,7 @@ class NoteModel {
num? notesId, num? notesId,
num? types, num? types,
num? isMy, num? isMy,
num? isOpen,
num? chapterId, num? chapterId,
String? content, String? content,
String? positioning, String? positioning,
...@@ -399,6 +403,7 @@ class NoteModel { ...@@ -399,6 +403,7 @@ class NoteModel {
notesId: notesId ?? this.notesId, notesId: notesId ?? this.notesId,
types: types ?? this.types, types: types ?? this.types,
isMy: isMy ?? this.isMy, isMy: isMy ?? this.isMy,
isOpen: isOpen ?? this.isOpen,
chapterId: chapterId ?? this.chapterId, chapterId: chapterId ?? this.chapterId,
content: content ?? this.content, content: content ?? this.content,
positioning: positioning ?? this.positioning, positioning: positioning ?? this.positioning,
...@@ -412,6 +417,7 @@ class NoteModel { ...@@ -412,6 +417,7 @@ class NoteModel {
map['notes_id'] = notesId; map['notes_id'] = notesId;
map['types'] = types; map['types'] = types;
map['is_my'] = isMy; map['is_my'] = isMy;
map['is_open'] = isOpen;
map['chapter_id'] = chapterId; map['chapter_id'] = chapterId;
map['content'] = content; map['content'] = content;
map['positioning'] = positioning; map['positioning'] = positioning;
......
lib/pages/bai_dict/view.dart
浏览文件 @ 5e74cffd
...@@ -22,8 +22,11 @@ class _BaiKePageState extends State<BaiDictPage> { ...@@ -22,8 +22,11 @@ class _BaiKePageState extends State<BaiDictPage> {
), ),
body: InAppWebView( body: InAppWebView(
initialUrlRequest: URLRequest( initialUrlRequest: URLRequest(
// url: Uri.parse('https://hanyu.baidu.com/hanyu-page/zici/s?from=aladdin&query=${widget.keyword}&srcid=51368&wd=${widget.keyword}&ptype=zici'), url: WebUri.uri(Uri.parse('https://dict.baidu.com/s?wd=${widget.keyword}'))
url: WebUri.uri(Uri.parse('https://hanyu.baidu.com/hanyu-page/zici/s?from=aladdin&query=${widget.keyword}&srcid=51368&wd=${widget.keyword}&ptype=zici')) ),
initialSettings:InAppWebViewSettings(
// http的请求也不做限制
mixedContentMode:MixedContentMode.MIXED_CONTENT_ALWAYS_ALLOW
), ),
), ),
); );
......
lib/pages/bai_ke/view.dart
浏览文件 @ 5e74cffd
...@@ -24,6 +24,10 @@ class _BaiKePageState extends State<BaiKePage> { ...@@ -24,6 +24,10 @@ class _BaiKePageState extends State<BaiKePage> {
// url: Uri.parse('https://baike.baidu.com/item/${widget.keyword}?fromModule=lemma_search-box'), // url: Uri.parse('https://baike.baidu.com/item/${widget.keyword}?fromModule=lemma_search-box'),
url: WebUri.uri(Uri.parse('https://baike.baidu.com/item/${widget.keyword}?fromModule=lemma_search-box')) url: WebUri.uri(Uri.parse('https://baike.baidu.com/item/${widget.keyword}?fromModule=lemma_search-box'))
), ),
initialSettings:InAppWebViewSettings(
// http的请求也不做限制
mixedContentMode:MixedContentMode.MIXED_CONTENT_ALWAYS_ALLOW
),
), ),
); );
} }
......
lib/pages/book_shop/widgets/count.dart
浏览文件 @ 5e74cffd
...@@ -52,10 +52,9 @@ class BuildCounter extends StatelessWidget { ...@@ -52,10 +52,9 @@ class BuildCounter extends StatelessWidget {
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
if (controller.num > 0){ if (controller.num > 0){
final result = await context.pushNamed(Routes.bookPay,extra: controller.buy); context.pushNamed(Routes.bookPay,extra: controller.buy).then((value){
if (result == true) {
controller.onRefresh(); controller.onRefresh();
} });
} }
}, },
child: Container( child: Container(
......
lib/pages/change_pwd/view.dart
浏览文件 @ 5e74cffd
...@@ -115,7 +115,7 @@ class _ChangePwdPageState extends State<ChangePwdPage> { ...@@ -115,7 +115,7 @@ class _ChangePwdPageState extends State<ChangePwdPage> {
), ),
Container( Container(
margin: EdgeInsets.only(left: 5.w,top: 5.w), margin: EdgeInsets.only(left: 5.w,top: 5.w),
child: Text('密码必须是8-20个英文字母、数字或符号(除空格)',style: TextStyle(fontSize: 10.w,color: Colours.c9),), child: Text('密码必须是数字、字母、特殊符号两种及以上8-12位的组合',style: TextStyle(fontSize: 10.w,color: Colours.c9),),
), ),
Gaps.vGaps40, Gaps.vGaps40,
CustomGradientButton( CustomGradientButton(
......
lib/pages/course/view.dart
浏览文件 @ 5e74cffd
...@@ -38,10 +38,9 @@ class _CoursePageState extends State<CoursePage> { ...@@ -38,10 +38,9 @@ class _CoursePageState extends State<CoursePage> {
), ),
GestureDetector( GestureDetector(
onTap: () async{ onTap: () async{
final result = await context.pushNamed(Routes.msgs); context.pushNamed(Routes.msgs).then((value){
if (result == true) {
controller.getNums(); controller.getNums();
} });
}, },
child: badges.Badge( child: badges.Badge(
position: badges.BadgePosition.topEnd(top: -5.w, end: 0), position: badges.BadgePosition.topEnd(top: -5.w, end: 0),
...@@ -112,10 +111,9 @@ class _CoursePageState extends State<CoursePage> { ...@@ -112,10 +111,9 @@ class _CoursePageState extends State<CoursePage> {
onTapContinue: () async{ onTapContinue: () async{
BookDetailModel bookDetails = await controller.getBookDetails(model.bookId.toString()); BookDetailModel bookDetails = await controller.getBookDetails(model.bookId.toString());
if(context.mounted){ if(context.mounted){
final result = await context.pushNamed(Routes.web,queryParameters: {'book_id': bookDetails.bookId.toString(),'chapter_id': bookDetails.chapterId.toString(),'chapter_name':bookDetails.chapterName.toString()},extra:bookDetails); context.pushNamed(Routes.web,queryParameters: {'book_id': bookDetails.bookId.toString(),'chapter_id': bookDetails.chapterId.toString(),'chapter_name':bookDetails.chapterName.toString()},extra:bookDetails).then((value){
if (result == true){
controller.getNums(); controller.getNums();
} });
} }
}, },
), ),
......
lib/pages/login/controller.dart
浏览文件 @ 5e74cffd
...@@ -89,7 +89,7 @@ class LoginController extends GetxController { ...@@ -89,7 +89,7 @@ class LoginController extends GetxController {
/// 测试账号 /// 测试账号
if (kDebugMode) { if (kDebugMode) {
phoneInput.text = '18810760819'; phoneInput.text = '18810760819';
passwordInput.text = '12345678'; passwordInput.text = '1234567m';
// phoneInput.text = '17311837355'; // phoneInput.text = '17311837355';
// passwordInput.text = '12345678'; // passwordInput.text = '12345678';
} }
......
lib/pages/login/view.dart
浏览文件 @ 5e74cffd
...@@ -67,7 +67,7 @@ class _LoginPageState extends State<LoginPage> { ...@@ -67,7 +67,7 @@ class _LoginPageState extends State<LoginPage> {
SizedBox(height: 120.w,), SizedBox(height: 120.w,),
Container( Container(
width: 180.w, width: 180.w,
height: 50.w, height: 42.w,
// color: Colors.cyan, // color: Colors.cyan,
child: Image.asset( child: Image.asset(
'assets/images/zijing_icon.png', 'assets/images/zijing_icon.png',
......
lib/pages/mine/view.dart
浏览文件 @ 5e74cffd
...@@ -43,11 +43,9 @@ class _MinePageState extends State<MinePage> { ...@@ -43,11 +43,9 @@ class _MinePageState extends State<MinePage> {
), ),
GestureDetector( GestureDetector(
onTap: () async{ onTap: () async{
final result = await context.pushNamed(Routes.msgs); context.pushNamed(Routes.msgs).then((value) {
print('---------------------------------1111$result');
if (result == true){
controller.getNums(); controller.getNums();
} });
}, },
child: badges.Badge( child: badges.Badge(
position: badges.BadgePosition.topEnd(top: -5.w, end: 0), position: badges.BadgePosition.topEnd(top: -5.w, end: 0),
...@@ -78,20 +76,18 @@ class _MinePageState extends State<MinePage> { ...@@ -78,20 +76,18 @@ class _MinePageState extends State<MinePage> {
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 10.w), margin: EdgeInsets.symmetric(horizontal: 10.w),
child: BuildUser(userInfo:controller.userInfo,onTap: () async{ child: BuildUser(userInfo:controller.userInfo,onTap: () async{
final result = await context.pushNamed(Routes.userInfo,extra: controller.userInfo); context.pushNamed(Routes.userInfo,extra: controller.userInfo).then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
},), },),
), ),
Gaps.vGaps10, Gaps.vGaps10,
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 2.2.w), margin: EdgeInsets.symmetric(horizontal: 2.2.w),
child: BuildRead(items: controller.reads,onTap: (ReadModel model) async{ child: BuildRead(items: controller.reads,onTap: (ReadModel model) async{
final result = await context.pushNamed(model.link??''); context.pushNamed(model.link??'').then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
}), }),
), ),
controller.ads.isNotEmpty?Gaps.vGaps5:const SizedBox(), controller.ads.isNotEmpty?Gaps.vGaps5:const SizedBox(),
...@@ -106,12 +102,11 @@ class _MinePageState extends State<MinePage> { ...@@ -106,12 +102,11 @@ class _MinePageState extends State<MinePage> {
} , } ,
), ),
):const SizedBox(), ):const SizedBox(),
Gaps.vGaps15, controller.ads.isNotEmpty?Gaps.vGaps15:Gaps.vGaps5,
BuildAccount(items:controller.accounts,onTap: (ReadModel model) async{ BuildAccount(items:controller.accounts,onTap: (ReadModel model) async{
final result = await context.pushNamed(model.link??''); context.pushNamed(model.link??'').then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
},), },),
Gaps.vGaps10, Gaps.vGaps10,
Container( Container(
...@@ -134,10 +129,9 @@ class _MinePageState extends State<MinePage> { ...@@ -134,10 +129,9 @@ class _MinePageState extends State<MinePage> {
children: [ children: [
GestureDetector( GestureDetector(
onTap:() async { onTap:() async {
final result = await context.pushNamed(Routes.security,extra: controller.userInfo); context.pushNamed(Routes.security,extra: controller.userInfo).then((value){
if (result == true){
controller.getInfo(); controller.getInfo();
} });
}, child: _buildItem('账户安全') }, child: _buildItem('账户安全')
), ),
Container(color: Colours.cLine,margin: EdgeInsets.symmetric(horizontal: 15.w),height: 1.w,), Container(color: Colours.cLine,margin: EdgeInsets.symmetric(horizontal: 15.w),height: 1.w,),
......
lib/pages/mine/widgets/read.dart
浏览文件 @ 5e74cffd
...@@ -28,6 +28,8 @@ class BuildRead extends StatelessWidget { ...@@ -28,6 +28,8 @@ class BuildRead extends StatelessWidget {
// top: 10.w, // top: 10.w,
left: 0, left: 0,
right: 0, right: 0,
top: 0,
bottom: 0,
child: Container( child: Container(
padding: EdgeInsets.symmetric(vertical: 16.5.w,horizontal: 8), padding: EdgeInsets.symmetric(vertical: 16.5.w,horizontal: 8),
color: Colors.transparent, color: Colors.transparent,
...@@ -50,19 +52,13 @@ class BuildRead extends StatelessWidget { ...@@ -50,19 +52,13 @@ class BuildRead extends StatelessWidget {
child: GestureDetector( child: GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: (){ onTap: (){
if (model.link != null){ if (onTap !=null) onTap!(model);
if (model.link != Routes.love){
context.pushNamed(model.link!);
}
else{
if (onTap !=null) onTap!(model);
}
}
}, },
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text(model.value,style: TextStyle(fontSize: 18.w,height: 1.6.w,fontWeight: Fonts.medium,color: Colours.c3),), Text(model.value,style: TextStyle(fontSize: 18.w,height: 1.5.w,fontWeight: Fonts.medium,color: Colours.c3),),
Text(model.name,style: TextStyle(fontSize: 13.w,height:1.6.w,color: Colours.c6)) Text(model.name,style: TextStyle(fontSize: 13.w,height:1.5.w,color: Colours.c6))
], ],
), ),
), ),
......
lib/pages/read_web/controller.dart
浏览文件 @ 5e74cffd
...@@ -468,8 +468,8 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide ...@@ -468,8 +468,8 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide
else if(chatType == 1){ else if(chatType == 1){
if(contentInput.text.isEmpty && discussInputImages.isEmpty && discussInputAudios.isEmpty){ if(contentInput.text.isEmpty && discussInputImages.isEmpty && discussInputAudios.isEmpty){
Toast.show('笔记必须填写内容或选择图片或音频'); Toast.show('笔记必须填写内容或选择图片或音频');
return false;
} }
return false;
} }
// 有网情况下 先直传oss 获取到url // 有网情况下 先直传oss 获取到url
...@@ -852,7 +852,11 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide ...@@ -852,7 +852,11 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide
return directory!.path; return directory!.path;
} }
/// 刷新token
Future<String?> refreshToken() async {
final result = await CommonAPI.refreshToken();
return result;
}
/// 获取目录信息 /// 获取目录信息
void _getChapters() async { void _getChapters() async {
chapters = await LibraryAPI.chapters(bookId: bookId); chapters = await LibraryAPI.chapters(bookId: bookId);
...@@ -991,6 +995,7 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide ...@@ -991,6 +995,7 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide
// 当应用程序从后台切换到前台并变为活动状态时调用。这通常在用户从其他应用程序返回到你的应用程序时发生 // 当应用程序从后台切换到前台并变为活动状态时调用。这通常在用户从其他应用程序返回到你的应用程序时发生
void onResumed(){ void onResumed(){
Console.log('onResumed'); Console.log('onResumed');
webViewController.evaluateJavascript(source: 'activeState("1");');
// open // open
// 上报开始阅读时间 // 上报开始阅读时间
_addReadTime(type: 'open'); _addReadTime(type: 'open');
...@@ -999,12 +1004,14 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide ...@@ -999,12 +1004,14 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide
void onPaused(){ void onPaused(){
// close // close
Console.log('onPaused'); Console.log('onPaused');
webViewController.evaluateJavascript(source: 'activeState("0");');
// 上报阅读结束时间 // 上报阅读结束时间
_addReadTime(type: 'close'); _addReadTime(type: 'close');
} }
// 当应用程序失去焦点但仍然可见时调用。通常，在用户切换到另一个应用程序或显示系统对话框时，应用程序可能会处于非活动状态，但仍然是可见的 // 当应用程序失去焦点但仍然可见时调用。通常，在用户切换到另一个应用程序或显示系统对话框时，应用程序可能会处于非活动状态，但仍然是可见的
void onInactive(){ void onInactive(){
Console.log('onInactive'); Console.log('onInactive');
webViewController.evaluateJavascript(source: 'activeState("0");');
// close // close
// 上报阅读结束时间 // 上报阅读结束时间
_addReadTime(type: 'close'); _addReadTime(type: 'close');
...@@ -1012,6 +1019,7 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide ...@@ -1012,6 +1019,7 @@ class ReadController extends FullLifeCycleController with GetSingleTickerProvide
// 当应用程序被挂起，可能是由于用户关闭应用程序或系统资源不足时调用。在这个状态下，应用程序的代码将不再运行，并且可能被系统终止 // 当应用程序被挂起，可能是由于用户关闭应用程序或系统资源不足时调用。在这个状态下，应用程序的代码将不再运行，并且可能被系统终止
void onDetached(){ void onDetached(){
Console.log('onDetached'); Console.log('onDetached');
webViewController.evaluateJavascript(source: 'activeState("0");');
// close // close
// 上报阅读结束时间 // 上报阅读结束时间
_addReadTime(type: 'close'); _addReadTime(type: 'close');
......
lib/pages/read_web/view.dart
浏览文件 @ 5e74cffd
...@@ -78,6 +78,8 @@ class _ReadPageState extends State<ReadPage> { ...@@ -78,6 +78,8 @@ class _ReadPageState extends State<ReadPage> {
), ),
initialSettings:InAppWebViewSettings( initialSettings:InAppWebViewSettings(
clearCache:true, clearCache:true,
// http的请求也不做限制
mixedContentMode:MixedContentMode.MIXED_CONTENT_ALWAYS_ALLOW
), ),
// initialOptions: InAppWebViewGroupOptions( // initialOptions: InAppWebViewGroupOptions(
// crossPlatform: InAppWebViewOptions( // crossPlatform: InAppWebViewOptions(
...@@ -87,7 +89,8 @@ class _ReadPageState extends State<ReadPage> { ...@@ -87,7 +89,8 @@ class _ReadPageState extends State<ReadPage> {
contextMenu: ContextMenu( contextMenu: ContextMenu(
// options: ContextMenuOptions(hideDefaultSystemContextMenuItems: true), // options: ContextMenuOptions(hideDefaultSystemContextMenuItems: true),
settings: ContextMenuSettings( settings: ContextMenuSettings(
hideDefaultSystemContextMenuItems: true hideDefaultSystemContextMenuItems: true,
) )
), ),
onWebViewCreated: (InAppWebViewController controller){ onWebViewCreated: (InAppWebViewController controller){
...@@ -110,18 +113,18 @@ class _ReadPageState extends State<ReadPage> { ...@@ -110,18 +113,18 @@ class _ReadPageState extends State<ReadPage> {
Console.log('传给前端的参数--------------------------------$str'); Console.log('传给前端的参数--------------------------------$str');
controller.evaluateJavascript(source: 'callbackInFlutterComponent("$str");'); controller.evaluateJavascript(source: 'callbackInFlutterComponent("$str");');
// // 添加单击事件 // 添加单击事件
// controller.evaluateJavascript(source: ''' controller.evaluateJavascript(source: '''
// document.addEventListener('click', function() { document.addEventListener('click', function() {
// window.flutter_inappwebview.callHandler('onTap'); window.flutter_inappwebview.callHandler('onTap');
// }); });
// '''); ''');
//
// // 监听js单击回调 // 监听js单击回调
// controller.addJavaScriptHandler(handlerName: 'onTap', callback: (args){ controller.addJavaScriptHandler(handlerName: 'onTap', callback: (args){
// readController.setShow(readController.show); readController.setShow(readController.show);
//
// }); });
// 监听笔记回调 // 监听笔记回调
controller.addJavaScriptHandler(handlerName: 'noteCallBack', callback: (args){ controller.addJavaScriptHandler(handlerName: 'noteCallBack', callback: (args){
...@@ -140,7 +143,7 @@ class _ReadPageState extends State<ReadPage> { ...@@ -140,7 +143,7 @@ class _ReadPageState extends State<ReadPage> {
// 监听字典回调 // 监听字典回调
controller.addJavaScriptHandler(handlerName: 'dictCallBack', callback: (args){ controller.addJavaScriptHandler(handlerName: 'dictCallBack', callback: (args){
Console.log('监听百科回调------------------------------------------------$args'); Console.log('监听字典回调------------------------------------------------$args');
context.pushNamed(Routes.baiDict,queryParameters: {'keyword':args.first}); context.pushNamed(Routes.baiDict,queryParameters: {'keyword':args.first});
}); });
...@@ -206,10 +209,10 @@ class _ReadPageState extends State<ReadPage> { ...@@ -206,10 +209,10 @@ class _ReadPageState extends State<ReadPage> {
Console.log('监听 上一节 下一节------------------------------------------------$args'); Console.log('监听 上一节 下一节------------------------------------------------$args');
}); });
// 监听 双击回调 // // 监听 双击回调
controller.addJavaScriptHandler(handlerName: 'dbClickCallBack', callback: (args){ // controller.addJavaScriptHandler(handlerName: 'dbClickCallBack', callback: (args){
readController.setShow(readController.show); // readController.setShow(readController.show);
}); // });
// 阅读页内容中的 外部链接 // 阅读页内容中的 外部链接
controller.addJavaScriptHandler(handlerName: 'openLinkCallback', callback: (args){ controller.addJavaScriptHandler(handlerName: 'openLinkCallback', callback: (args){
...@@ -246,6 +249,16 @@ class _ReadPageState extends State<ReadPage> { ...@@ -246,6 +249,16 @@ class _ReadPageState extends State<ReadPage> {
context.pushNamed(Routes.scaleImage,queryParameters: params); context.pushNamed(Routes.scaleImage,queryParameters: params);
}); });
// 前端 token过去回调
controller.addJavaScriptHandler(handlerName: 'refreshTokenCallback', callback: (args) async {
final result = await readController.refreshToken();
Map<String, dynamic> param = {
'token': result,
};
String jsonStr = jsonEncode(param);
controller.evaluateJavascript(source: 'refreshTokenSuccess($jsonStr)');
});
/// 离线需要参数 /// 离线需要参数
// // // //
......
lib/pages/read_web/widgets/input_discuss.dart
浏览文件 @ 5e74cffd
...@@ -198,8 +198,13 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> { ...@@ -198,8 +198,13 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> {
); );
widget.controller.addDiscussInputImages(assets!.path); widget.controller.addDiscussInputImages(assets!.path);
}, },
child: Image.asset('assets/images/read_add_img.png')), child: Container(
Gaps.hGaps10, // color: Colors.red,
width: 25,
height: 25,
child: Image.asset('assets/images/read_add_img.png',fit: BoxFit.contain,)),
),
Gaps.hGaps15,
widget.controller.chatType ==0?const SizedBox():GestureDetector( widget.controller.chatType ==0?const SizedBox():GestureDetector(
onTap: () async { onTap: () async {
if(widget.controller.startRecording){ if(widget.controller.startRecording){
...@@ -210,7 +215,12 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> { ...@@ -210,7 +215,12 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> {
} }
}, },
child: Image.asset(widget.controller.startRecording?'assets/images/stop.png':'assets/images/read_add_audio.png') child: Container(
// color: Colors.red,
width: 23,
height: 23,
child: Image.asset(widget.controller.startRecording?'assets/images/stop.png':'assets/images/read_add_audio.png',fit: BoxFit.contain,),
)
), ),
widget.controller.chatType ==0?const SizedBox():GestureDetector( widget.controller.chatType ==0?const SizedBox():GestureDetector(
onTap: (){ onTap: (){
...@@ -219,10 +229,13 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> { ...@@ -219,10 +229,13 @@ class _ReadInputDiscussState extends State<ReadInputDiscuss> {
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Gaps.hGaps10, Gaps.hGaps15,
Image.asset(widget.controller.isPublic?'assets/images/pay_check.png':'assets/images/pay_uncheck.png'), SizedBox(
width: 15,
height: 15,
child: Image.asset(widget.controller.isPublic?'assets/images/pay_check.png':'assets/images/public.png',fit: BoxFit.contain,),),
SizedBox(width: 3.w,), SizedBox(width: 3.w,),
Text('公开',style: TextStyle(fontSize: 13.w,height: 1.3,color: Colours.c9),) Text('公开',style: TextStyle(fontSize: 15.w,height: 1.3,color: Colours.c9),)
], ],
), ),
) )
......
lib/pages/read_web/widgets/note.dart
浏览文件 @ 5e74cffd
...@@ -144,7 +144,7 @@ class _ReadNotePageState extends State<ReadNotePage> { ...@@ -144,7 +144,7 @@ class _ReadNotePageState extends State<ReadNotePage> {
controller.delNotes(noteModel: model, bookId:widget.bookDetailModel.bookId.toString()); controller.delNotes(noteModel: model, bookId:widget.bookDetailModel.bookId.toString());
}, },
onTapEdit: (){ onTapEdit: (){
context.pushNamed(Routes.editNote,extra: model,queryParameters: {'book_id':widget.bookDetailModel.bookId}); context.pushNamed(Routes.editNote,extra: model,queryParameters: {'book_id':widget.bookDetailModel.bookId.toString()});
}, },
); );
} }
......
lib/pages/reset_pwd/view.dart
浏览文件 @ 5e74cffd
...@@ -68,7 +68,7 @@ class _ResetPwdPageState extends State<ResetPwdPage> { ...@@ -68,7 +68,7 @@ class _ResetPwdPageState extends State<ResetPwdPage> {
), ),
Container( Container(
margin: EdgeInsets.only(left: 5.w,top: 5.w), margin: EdgeInsets.only(left: 5.w,top: 5.w),
child: Text('密码必须是8-20个英文字母、数字或符号(除空格)',style: TextStyle(fontSize: 10.w,color: Colours.c9),), child: Text('密码必须是数字、字母、特殊符号两种及以上8-12位的组合',style: TextStyle(fontSize: 10.w,color: Colours.c9),),
), ),
Gaps.vGaps40, Gaps.vGaps40,
CustomGradientButton( CustomGradientButton(
......
lib/pages/study_report/view.dart
浏览文件 @ 5e74cffd
...@@ -168,7 +168,7 @@ class _StudyReportPageState extends State<StudyReportPage> { ...@@ -168,7 +168,7 @@ class _StudyReportPageState extends State<StudyReportPage> {
RichText(text: TextSpan( RichText(text: TextSpan(
children: [ children: [
TextSpan(text: '测评总数',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),), TextSpan(text: '测评总数',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),),
WidgetSpan(child: SizedBox(width: 36.w),), WidgetSpan(child: SizedBox(width: 21.5.w),),
TextSpan(text:controller.model.questionAllNums !=null? controller.model.questionAllNums.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)), TextSpan(text:controller.model.questionAllNums !=null? controller.model.questionAllNums.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)),
TextSpan(text: '/条',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)), TextSpan(text: '/条',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)),
] ]
...@@ -180,7 +180,7 @@ class _StudyReportPageState extends State<StudyReportPage> { ...@@ -180,7 +180,7 @@ class _StudyReportPageState extends State<StudyReportPage> {
children: [ children: [
RichText(text: TextSpan( RichText(text: TextSpan(
children: [ children: [
TextSpan(text: '评论正确率',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),), TextSpan(text: '测评正确率',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),),
WidgetSpan(child: SizedBox(width: 8.w),), WidgetSpan(child: SizedBox(width: 8.w),),
TextSpan(text:controller.model.questionAccuracy!=null?controller.model.questionAccuracy.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)), TextSpan(text:controller.model.questionAccuracy!=null?controller.model.questionAccuracy.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)),
TextSpan(text: '%',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)), TextSpan(text: '%',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)),
......
lib/pages/user_coin/view.dart
浏览文件 @ 5e74cffd
...@@ -10,70 +10,64 @@ class UserCoinPage extends StatefulWidget { ...@@ -10,70 +10,64 @@ class UserCoinPage extends StatefulWidget {
class _UserCoinPageState extends State<UserCoinPage> { class _UserCoinPageState extends State<UserCoinPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserCoinController>(
onWillPop: () async { init: UserCoinController(),
context.pop(true); builder: (controller) => Scaffold(
return false; appBar: CustomAppBar(
}, title: const Text('紫荆币'),
child: GetBuilder<UserCoinController>( actions: [
init: UserCoinController(), GestureDetector(
builder: (controller) => Scaffold( onTap: (){
appBar: CustomAppBar( showModalBottomSheet(
title: const Text('紫荆币'), context: context,
actions: [ shape: RoundedRectangleBorder(
GestureDetector( borderRadius: BorderRadius.vertical(top: Radius.circular(8.w)),
onTap: (){
showModalBottomSheet(
context: context,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(8.w)),
),
builder: (BuildContext context) {
return const CoinRechargePage();
},
).then((value) {
controller.onRefresh();
});
},
child: Text('充值',style: TextStyle(color: Colours.c3,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),)
)
],
),
body: CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefresh,
onLoading: controller.onLoading,
child: controller.coins.isEmpty?Container(
padding: EdgeInsets.only(top: 110.w),
alignment: Alignment.center,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):Container(
margin: EdgeInsets.all(10.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
color: Colors.white,
boxShadow: [
BoxShadow(
color: const Color(0xFFC7C7C7).withOpacity(0.5),
offset: Offset(3.w, 0),
blurRadius: 10.w,
spreadRadius: 0.w,
), ),
], builder: (BuildContext context) {
), return const CoinRechargePage();
child: ListView.builder( },
itemBuilder: (BuildContext context, int index){ ).then((value) {
return BuildCell(model: controller.coins[index],); controller.onRefresh();
}, });
itemCount: controller.coins.length, },
), child: Text('充值',style: TextStyle(color: Colours.c3,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),)
)
],
),
body: CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefresh,
onLoading: controller.onLoading,
child: controller.coins.isEmpty?Container(
padding: EdgeInsets.only(top: 110.w),
alignment: Alignment.center,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):Container(
margin: EdgeInsets.all(10.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
color: Colors.white,
boxShadow: [
BoxShadow(
color: const Color(0xFFC7C7C7).withOpacity(0.5),
offset: Offset(3.w, 0),
blurRadius: 10.w,
spreadRadius: 0.w,
),
],
),
child: ListView.builder(
itemBuilder: (BuildContext context, int index){
return BuildCell(model: controller.coins[index],);
},
itemCount: controller.coins.length,
), ),
), ),
), ),
......
lib/pages/user_coupon/view.dart
浏览文件 @ 5e74cffd
...@@ -11,56 +11,50 @@ class UserCouponPage extends StatefulWidget { ...@@ -11,56 +11,50 @@ class UserCouponPage extends StatefulWidget {
class _UserCouponPageState extends State<UserCouponPage> { class _UserCouponPageState extends State<UserCouponPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserCouponController>(
onWillPop: () async { init: UserCouponController(),
context.pop(true); builder:(controller) => Scaffold(
return false; appBar: AppBar(
}, centerTitle: true,
child: GetBuilder<UserCouponController>( title: const Text('优惠券'),
init: UserCouponController(), ),
builder:(controller) => Scaffold( body: CustomPullScrollView(
appBar: AppBar( controller: controller.refreshController,
centerTitle: true, onRefresh: controller.onRefresh,
title: const Text('优惠券'), onLoading: controller.onLoading,
), child: controller.coupons.isEmpty?Container(
body: CustomPullScrollView( padding: EdgeInsets.only(top: 110.w),
controller: controller.refreshController, alignment: Alignment.center,
onRefresh: controller.onRefresh, child: Column(
onLoading: controller.onLoading, crossAxisAlignment: CrossAxisAlignment.center,
child: controller.coupons.isEmpty?Container( children: [
padding: EdgeInsets.only(top: 110.w), SizedBox(height: 152.w, width: 195.w,
alignment: Alignment.center, child: Image.asset( 'assets/images/none.png',),),
child: Column( SizedBox(height: 13.w,),
crossAxisAlignment: CrossAxisAlignment.center, ],
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
return BuildItem(model: controller.coupons[index],);
// if (index == controller.coupons.length){
// return GestureDetector(
// onTap: (){
// // controller.getOverCoupons();
// },
// child: Container(
// alignment: Alignment.center,
// height: 40.w,
// // color: Colors.cyan,
// child: Text('过期优惠券'),
// ),
// );
// }
// else {
// return BuildItem(model: controller.coupons[index],);
// }
},
// itemCount: controller.coupons.length +1,
itemCount: controller.coupons.length,
), ),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
return BuildItem(model: controller.coupons[index],);
// if (index == controller.coupons.length){
// return GestureDetector(
// onTap: (){
// // controller.getOverCoupons();
// },
// child: Container(
// alignment: Alignment.center,
// height: 40.w,
// // color: Colors.cyan,
// child: Text('过期优惠券'),
// ),
// );
// }
// else {
// return BuildItem(model: controller.coupons[index],);
// }
},
// itemCount: controller.coupons.length +1,
itemCount: controller.coupons.length,
), ),
), ),
), ),
......
lib/pages/user_edit_note/controller.dart
浏览文件 @ 5e74cffd
...@@ -26,6 +26,7 @@ class UserEditNoteController extends GetxController { ...@@ -26,6 +26,7 @@ class UserEditNoteController extends GetxController {
@override @override
void onInit() { void onInit() {
isPublic = model.isOpen ==1?true:false;
super.onInit(); super.onInit();
} }
...@@ -220,11 +221,17 @@ class UserEditNoteController extends GetxController { ...@@ -220,11 +221,17 @@ class UserEditNoteController extends GetxController {
'image':images 'image':images
}; };
String isOpen = '0';
if(isPublic){
isOpen = '1';
}
final result = MineAPI.editNotes( final result = MineAPI.editNotes(
content: model.content??'', content: model.content??'',
notesId: model.notesId.toString(), notesId: model.notesId.toString(),
bookId: bookId, bookId: bookId,
noteContent: jsonEncode(contentMap) noteContent: jsonEncode(contentMap),
isOpen: isOpen
); );
return result; return result;
} }
......
lib/pages/user_love/view.dart
浏览文件 @ 5e74cffd
...@@ -10,54 +10,48 @@ class UserLovePage extends StatefulWidget { ...@@ -10,54 +10,48 @@ class UserLovePage extends StatefulWidget {
class _UserLovePageState extends State<UserLovePage> { class _UserLovePageState extends State<UserLovePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return GetBuilder<UserLoveController>(
onWillPop: () async { init: UserLoveController(),
context.pop(true); builder:(controller) => Scaffold(
return false; appBar: AppBar(
}, centerTitle: true,
child: GetBuilder<UserLoveController>( title: const Text('我的收藏'),
init: UserLoveController(), ),
builder:(controller) => Scaffold( body: Container(
appBar: AppBar( color: Colours.cF9,
centerTitle: true, child: CustomPullScrollView(
title: const Text('我的收藏'), controller: controller.refreshController,
), onRefresh: controller.onRefresh,
body: Container( onLoading: controller.onLoading,
color: Colours.cF9, child: controller.loves.isEmpty?Container(
child: CustomPullScrollView( padding: EdgeInsets.only(top: 110.w),
controller: controller.refreshController, alignment: Alignment.center,
onRefresh: controller.onRefresh, child: Column(
onLoading: controller.onLoading, crossAxisAlignment: CrossAxisAlignment.center,
child: controller.loves.isEmpty?Container( children: [
padding: EdgeInsets.only(top: 110.w), SizedBox(height: 152.w, width: 195.w,
alignment: Alignment.center, child: Image.asset( 'assets/images/none.png',),),
child: Column( SizedBox(height: 13.w,),
crossAxisAlignment: CrossAxisAlignment.center, ],
children: [
SizedBox(height: 152.w, width: 195.w,
child: Image.asset( 'assets/images/none.png',),),
SizedBox(height: 13.w,),
],
),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
CourseModel model = controller.loves[index];
return GestureDetector(
onTap: (){
if(model.status == 0 && model.isHave == 0){
Toast.show('书籍已下架');
}
else{
context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()});
}
},
child: BuildItem(model: model,onTap: (){
controller.unLoved(bookId: model.bookId.toString());
},),
);
},
itemCount: controller.loves.length,
), ),
):ListView.builder(
itemBuilder: (BuildContext context, int index){
CourseModel model = controller.loves[index];
return GestureDetector(
onTap: (){
if(model.status == 0 && model.isHave == 0){
Toast.show('书籍已下架');
}
else{
context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()});
}
},
child: BuildItem(model: model,onTap: (){
controller.unLoved(bookId: model.bookId.toString());
},),
);
},
itemCount: controller.loves.length,
), ),
), ),
), ),
......
lib/pages/user_notes_des/view.dart
浏览文件 @ 5e74cffd
...@@ -22,57 +22,51 @@ class _UserNotesDesPageState extends State<UserNotesDesPage> { ...@@ -22,57 +22,51 @@ class _UserNotesDesPageState extends State<UserNotesDesPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return Scaffold(
onWillPop: () async { appBar: AppBar(
context.pop(true); centerTitle: true,
return false; title: const Text('笔记详情'),
}, ),
child: Scaffold( body: DefaultTabController(
appBar: AppBar( length: tabs.length,
centerTitle: true, child: Column(
title: const Text('笔记详情'), crossAxisAlignment: CrossAxisAlignment.start,
), children: [
body: DefaultTabController( BuildItem(model: widget.model),
length: tabs.length, ClipRRect(
child: Column( borderRadius:const BorderRadius.only(topLeft: Radius.circular(5),topRight: Radius.circular(5)),
crossAxisAlignment: CrossAxisAlignment.start, child: Container(
children: [ width: double.infinity,
BuildItem(model: widget.model), color: Colors.white,
ClipRRect( height: 35.w,
borderRadius:const BorderRadius.only(topLeft: Radius.circular(5),topRight: Radius.circular(5)), child: TabBar(
child: Container( indicator: UnderlineTabIndicator(
width: double.infinity, borderRadius: BorderRadius.circular(0.75),
color: Colors.white, borderSide: BorderSide(width: 1.5.w,color: AppTheme.primary),
height: 35.w, insets: EdgeInsets.symmetric(horizontal: 22.w), // 设置标签下面指示器的水平内边距
child: TabBar( ),
indicator: UnderlineTabIndicator( labelPadding: EdgeInsets.symmetric(horizontal: 20.w),
borderRadius: BorderRadius.circular(0.75), indicatorSize: TabBarIndicatorSize.label,
borderSide: BorderSide(width: 1.5.w,color: AppTheme.primary), indicatorColor: AppTheme.primary,
insets: EdgeInsets.symmetric(horizontal: 22.w), // 设置标签下面指示器的水平内边距 indicatorWeight: 1.5,
), labelStyle: TextStyle(color: AppTheme.primary,fontSize: 15.w,height: 1.5,fontWeight: Fonts.medium),
labelPadding: EdgeInsets.symmetric(horizontal: 20.w), unselectedLabelColor: Colours.c9,
indicatorSize: TabBarIndicatorSize.label, unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 15.w,height: 1.5),
indicatorColor: AppTheme.primary, isScrollable: true,
indicatorWeight: 1.5, tabs: tabs
labelStyle: TextStyle(color: AppTheme.primary,fontSize: 15.w,height: 1.5,fontWeight: Fonts.medium),
unselectedLabelColor: Colours.c9,
unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 15.w,height: 1.5),
isScrollable: true,
tabs: tabs
),
), ),
), ),
Expanded( ),
child: TabBarView( Expanded(
children: List.generate(tabs.length, (index){ child: TabBarView(
return BuildListPage(tag:'$index',model:widget.model); children: List.generate(tabs.length, (index){
}) return BuildListPage(tag:'$index',model:widget.model);
), })
) ),
], )
) ],
), )
), ),
); );
} }
} }
lib/pages/user_order/view.dart
浏览文件 @ 5e74cffd
...@@ -43,29 +43,23 @@ class _UserOrderState extends State<UserOrderPage> ...@@ -43,29 +43,23 @@ class _UserOrderState extends State<UserOrderPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return Scaffold(
onWillPop: () async { appBar: AppBar(
context.pop(true); title: Container(
return false; padding: EdgeInsets.only(right: 10.w),
}, child: CustomInputSearch(
child: Scaffold( controller: searchController,
appBar: AppBar( readOnly: true,
title: Container( hintText: '搜索我的订单',
padding: EdgeInsets.only(right: 10.w), onTap: () {
child: CustomInputSearch( context.pushNamed(Routes.orderSearch);
controller: searchController, },
readOnly: true,
hintText: '搜索我的订单',
onTap: () {
context.pushNamed(Routes.orderSearch);
},
),
), ),
titleSpacing: 0,
), ),
body: _buildBody(),
titleSpacing: 0,
), ),
body: _buildBody(),
); );
} }
......
lib/pages/user_order/widgets/awaiting.dart
浏览文件 @ 5e74cffd
...@@ -12,10 +12,10 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -12,10 +12,10 @@ class BuiltAwaiting extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
onTap: () async { onTap: () async {
final result = await context.pushNamed(Routes.orderAwaiting, context.pushNamed(Routes.orderAwaiting,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if (result == true) { controller.onRefresh();
controller.onRefresh(); } });
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w), margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w),
......
lib/pages/user_order/widgets/coin.dart
浏览文件 @ 5e74cffd
...@@ -18,25 +18,22 @@ class BuiltCoin extends StatelessWidget { ...@@ -18,25 +18,22 @@ class BuiltCoin extends StatelessWidget {
return GestureDetector( return GestureDetector(
onTap: () async { onTap: () async {
if(model.status == 1){ if(model.status == 1){
final result = await context.pushNamed(Routes.orderCoinAwaiting, context.pushNamed(Routes.orderCoinAwaiting,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if(result==true){
controller.onRefresh(); controller.onRefresh();
} });
} }
else if(model.status == 2){ else if(model.status == 2){
final result = await context.pushNamed(Routes.orderCoinCancel, context.pushNamed(Routes.orderCoinCancel,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if(result==true){
controller.onRefresh(); controller.onRefresh();
} });
} }
else if(model.status == 3){ else if(model.status == 3){
final result = await context.pushNamed(Routes.orderCoinCompleted, context.pushNamed(Routes.orderCoinCompleted,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if(result==true){
controller.onRefresh(); controller.onRefresh();
} });
} }
}, },
child: Container( child: Container(
......
lib/pages/user_order/widgets/completed.dart
浏览文件 @ 5e74cffd
...@@ -15,10 +15,10 @@ class BuiltCompleted extends StatelessWidget { ...@@ -15,10 +15,10 @@ class BuiltCompleted extends StatelessWidget {
return GestureDetector( return GestureDetector(
onTap: () onTap: ()
async { async {
final result = await context.pushNamed(Routes.orderCompleted, context.pushNamed(Routes.orderCompleted,
queryParameters: {'orderNum': model.ordersnum}); queryParameters: {'orderNum': model.ordersnum}).then((value){
if (result == true) { controller.onRefresh();
controller.onRefresh(); } });
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w), margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w),
...@@ -165,14 +165,13 @@ class BuiltCompleted extends StatelessWidget { ...@@ -165,14 +165,13 @@ class BuiltCompleted extends StatelessWidget {
child: Center( child: Center(
child: GestureDetector( child: GestureDetector(
onTap: () async { onTap: () async {
final result = await context.pushNamed(Routes.orderEvaluate, context.pushNamed(Routes.orderEvaluate,
extra: OrderInfoModel(), extra: OrderInfoModel(),
queryParameters: { queryParameters: {
'orderNum': model.ordersnum 'orderNum': model.ordersnum
}); }).then((value){
if (result == true) {
controller.onRefresh(); controller.onRefresh();
} });
}, },
child: Text( child: Text(
judgeComments() == 1 ? '去评价' : "继续评价", judgeComments() == 1 ? '去评价' : "继续评价",
...@@ -307,14 +306,14 @@ class BuiltCompleted extends StatelessWidget { ...@@ -307,14 +306,14 @@ class BuiltCompleted extends StatelessWidget {
child: Center( child: Center(
child: GestureDetector( child: GestureDetector(
onTap: () async { onTap: () async {
final result = await context.pushNamed(Routes.orderEvaluate, context.pushNamed(Routes.orderEvaluate,
extra: OrderInfoModel(), extra: OrderInfoModel(),
queryParameters: { queryParameters: {
'orderNum': model.ordersnum 'orderNum': model.ordersnum
}); }).then((value){
if (result == true) { controller.onRefresh();
controller.onRefresh(); });
}
}, },
child: Text( child: Text(
judgeComments() == 1 ? '去评价' : "继续评价", judgeComments() == 1 ? '去评价' : "继续评价",
......
lib/utils/constants.dart
浏览文件 @ 5e74cffd
差异被折叠。
lib/utils/validator.dart
浏览文件 @ 5e74cffd
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论