Browse Source

Merge remote-tracking branch 'origin/dev' into remove_uniapp

ff_new
fmk 3 years ago
parent
commit
e35d5e05a5
  1. 3
      lib/community/community_view/class_details.dart
  2. 7
      lib/community/community_view/home_class.dart
  3. 1
      lib/store/store_order.dart

3
lib/community/community_view/class_details.dart

@ -9,6 +9,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/chapter.dart'; import 'package:huixiang/retrofit/data/chapter.dart';
import 'package:huixiang/retrofit/data/course_details.dart'; import 'package:huixiang/retrofit/data/course_details.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/flutter_utils.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/tips_dialog.dart'; import 'package:huixiang/view_widget/tips_dialog.dart';
import 'package:huixiang/web/web_view/comment_list.dart'; import 'package:huixiang/web/web_view/comment_list.dart';
@ -198,7 +199,7 @@ class _ClassDetails extends State<ClassDetails> with WidgetsBindingObserver {
children: [ children: [
Container( Container(
height: 22.h, height: 22.h,
width: 40.w, padding:EdgeInsets.only(left:2,right:2),
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2), borderRadius: BorderRadius.circular(2),

7
lib/community/community_view/home_class.dart

@ -202,10 +202,13 @@ class _HomeClass extends State<HomeClass> {
), ),
], ],
), ),
Row(
children: [
Spacer(),
Container( Container(
margin: EdgeInsets.only(top: 8,right: 8), margin: EdgeInsets.only(top: 8,right: 8),
padding:EdgeInsets.only(left:2,right:2),
height: 16.h, height: 16.h,
width: 30.w,
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius:
@ -221,6 +224,8 @@ class _HomeClass extends State<HomeClass> {
), ),
), ),
), ),
],),
], ],
), ),
Expanded(child: Expanded(child:

1
lib/store/store_order.dart

@ -82,6 +82,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
SharedPreferences.getInstance().then((value) { SharedPreferences.getInstance().then((value) {
minLogin(value); minLogin(value);
queryStoreInfo();
}); });
} }

Loading…
Cancel
Save