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

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

# Conflicts:
#	lib/retrofit/min_api.dart
remove_uniapp
fmk 3 years ago
parent
b72cc3a851 f09145f731
commit
a5d3734727
6 changed files with 164 additions and 96 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. 97
      lib/community/community_view/community_dynamic.dart
  2. 9
      lib/main.dart
  3. 52
      lib/mine/mine_view/wallet_coupon_view.dart
  4. 2
      lib/mine/personal_page.dart
  5. 4
      lib/retrofit/min_api.dart
  6. 8
      lib/retrofit/retrofit_api.dart

97
lib/community/community_view/community_dynamic.dart
Unescape View File

@ -151,7 +151,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
margin: EdgeInsets.only(top: 2),
key: globalKey,
alignment: Alignment.topCenter,
padding: EdgeInsets.all(16),
padding: EdgeInsets.only(left: 16,top: 16,right: 16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
@ -333,11 +333,15 @@ class _CommunityDynamic extends State<CommunityDynamic> {
height: 5.h,
),
if (!widget.isDetails)
Row(
Container(
// padding: EdgeInsets.only(bottom: 16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Container(
padding: EdgeInsets.only(bottom: 16),
child:Row(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
@ -361,9 +365,11 @@ class _CommunityDynamic extends State<CommunityDynamic> {
),
),
],
),
)),
),
Expanded(
child:Container(
padding: EdgeInsets.only(bottom: 16),
child:Row(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
@ -385,8 +391,10 @@ class _CommunityDynamic extends State<CommunityDynamic> {
),
),
],
)),
))),
Expanded(
child:Container(
padding: EdgeInsets.only(bottom: 16),
child:Row(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
@ -408,7 +416,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
),
),
],
),
)),
),
if (widget?.article?.author != widget.userId ?? "")
Expanded(
@ -420,8 +428,9 @@ class _CommunityDynamic extends State<CommunityDynamic> {
});
},
child: Container(
padding: EdgeInsets.only(top:3),
padding: EdgeInsets.only(top:3,bottom: 16),
alignment: Alignment.center,
// color: Colors.red,
child: Text(
"...",
style: TextStyle(
@ -432,7 +441,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
),
))),
],
),
),),
],
),
),
@ -774,45 +783,45 @@ class _CommunityDynamic extends State<CommunityDynamic> {
SizedBox(
height: 10,
),
// GestureDetector(
// onTap: () {
// setState(() {
GestureDetector(
onTap: () {
setState(() {
// Navigator.of(context).pop();
// share();
// });
// },
// child: Container(
// child: Row(
// children: [
// SizedBox(
// width: 4,
// ),
// Image.asset(
// "assets/image/icon_share.webp",
// fit: BoxFit.cover,
// width: 25,
// height: 25,
// color: Color(0xff515151),
// ),
// SizedBox(
// width: 12,
// ),
// Text(
// "分享",
// style: TextStyle(
// fontSize: 17.sp,
// fontWeight: MyFontWeight.medium,
// color: Color(0xFF1A1A1A),
// ),
// ),
// ],
// ),
// )),
// Container(
// margin: EdgeInsets.symmetric(vertical: 12),
// height: 1.h,
// color: Color(0xFFF7F7F7),
// ),
});
},
child: Container(
child: Row(
children: [
SizedBox(
width: 4,
),
Image.asset(
"assets/image/icon_share.webp",
fit: BoxFit.cover,
width: 25,
height: 25,
color: Color(0xff515151),
),
SizedBox(
width: 12,
),
Text(
"分享",
style: TextStyle(
fontSize: 17.sp,
fontWeight: MyFontWeight.medium,
color: Color(0xFF1A1A1A),
),
),
],
),
)),
Container(
margin: EdgeInsets.symmetric(vertical: 12),
height: 1.h,
color: Color(0xFFF7F7F7),
),
GestureDetector(
onTap: () {
setState(() {

9
lib/main.dart
Unescape View File

@ -131,6 +131,8 @@ final XgFlutterPlugin xgFlutterPlugin = XgFlutterPlugin();
EventBus eventBus = EventBus(sync: true);
Route lastRoutePage;//记录最后一次启动的页面
class MyApp extends StatelessWidget {
final Locale appLocale;
final bool isFirst;
@ -186,6 +188,12 @@ class MyApp extends StatelessWidget {
),
onGenerateRoute: (settings) {
final String name = settings.name;
if(lastRoutePage?.settings?.name == name){//这次启动的页面是否和上一次启动的页面相同
if(lastRoutePage?.settings?.name == "/router/personal_page"//这次启动的是不是个人页面
&& lastRoutePage.navigator != null)//上一次启动的页面是否已经退出
lastRoutePage.navigator.pop();//如果上一次启动的页面还没退出就主动退出上一次的页面,并接着启动这次要启动的页面
}
final Function pageContentBuilder = routers[name];
if (pageContentBuilder != null) {
final Route route = CupertinoPageRoute(
@ -195,6 +203,7 @@ class MyApp extends StatelessWidget {
},
settings: settings,
);
lastRoutePage = route;
return route;
}
return MaterialPageRoute(

52
lib/mine/mine_view/wallet_coupon_view.dart
Unescape View File

@ -31,7 +31,59 @@ class _WalletCoupon extends State<WalletCoupon> {
),
],
),
child: (Theme.of(context).platform == TargetPlatform.android)
? GestureDetector(
onTap: () {
SharedPreferences.getInstance().then((value) {
if (value.getString("token") == null ||
value.getString("token") == "") {
LoginTipsDialog().show(context);
return;
}
Navigator.of(context).pushNamed('/router/roll_center_page');
});
},
child: Row(
children: [
Image.asset(
"assets/image/icon_mine_invoice_assistant.webp",
width: 48.h,
height: 48.h,
),
SizedBox(
width: 12.w,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
S.of(context).lingquanzhongxin,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 16.sp,
color: Color(0xFF353535),
),
),
SizedBox(
height: 3,
),
Text(
"联盟下单享不停、海量优惠券等你来领！",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 12.sp,
color: Color(0xFF7B7B7B),
),
),
],
),
)
],
))
: Row(
children: [
Expanded(
flex: 1,

2
lib/mine/personal_page.dart
Unescape View File

@ -4,7 +4,6 @@ import 'dart:io';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/community/community_view/community_dynamic.dart';
import 'package:huixiang/community/photo_view_gallery_screen.dart';
@ -14,7 +13,6 @@ import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/comunity_comment.dart';
import 'package:huixiang/retrofit/data/member_Infor.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/data/social_info.dart';
import 'package:huixiang/retrofit/data/upload_result.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';

4
lib/retrofit/min_api.dart
Unescape View File

@ -28,8 +28,8 @@ const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式
// const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
// const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
// const base_url = "http://192.168.10.236:8765/app/";///费韬
// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
// const base_url = "http://192.168.10.236:8775/app/";///费韬
// const baseUrl = "http://192.168.10.236:8775/app/";///费韬
// const base_url = "http://192.168.10.143:8765/app/";///詹云久

8
lib/retrofit/retrofit_api.dart
Unescape View File

@ -58,14 +58,14 @@ import 'data/vip_rule_details.dart';
part 'retrofit_api.g.dart';
// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
// const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
// const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
const base_url = "http://192.168.10.236:8776/app/"; ///费韬
const baseUrl = "http://192.168.10.236:8776/app/"; ///费韬
// const base_url = "http://192.168.10.236:8776/app/"; ///费韬
// const baseUrl = "http://192.168.10.236:8776/app/"; ///费韬
// const base_url = "http://192.168.10.37:8766/app/";
// const baseUrl = "http://192.168.10.37:8766/app/";

Write Preview
Loading…
Cancel
Save