|
|
@@ -30,10 +30,9 @@ import 'package:url_launcher/url_launcher.dart';
|
|
|
|
|
|
import 'gang_information_page/gang_information_page.dart';
|
|
|
import 'initiate_collection_page/initiate_collection_page.dart';
|
|
|
-import 'package:qrscan/qrscan.dart' as scanner;
|
|
|
-
|
|
|
+import 'scan_page/scan_page.dart';
|
|
|
class GangInPage extends StatefulWidget {
|
|
|
- MyShopBeanDataData data;
|
|
|
+ MyShopBeanDataData data;
|
|
|
NewOrderBeanContent order;
|
|
|
|
|
|
GangInPage(this.data, this.order);
|
|
|
@@ -99,20 +98,24 @@ class _GangInPageState extends State<GangInPage> {
|
|
|
child: IconButton(
|
|
|
icon: Icon(Icons.qr_code_scanner),
|
|
|
onPressed: () async {
|
|
|
- String cameraScanResult = await scanner.scan();
|
|
|
- if (cameraScanResult.isNotEmpty &&
|
|
|
- cameraScanResult != null &&
|
|
|
- cameraScanResult.length == 8) {
|
|
|
- Timer(Duration(milliseconds: 200), () {
|
|
|
- StoreBeanDataData store = StoreBeanDataData();
|
|
|
- store.ownerUid = widget.data.ownerUid;
|
|
|
- store.ownerName = widget.data.ownerName;
|
|
|
- store.uid = widget.data.shopUid;
|
|
|
- MyTools().toPage(context, AddMemberPage(store: store,qrUID: cameraScanResult,), (then){});
|
|
|
- MyTools().hideKeyboard(context);
|
|
|
- controller.requestRefresh();
|
|
|
- });
|
|
|
- }
|
|
|
+ MyTools().toPage(context, ScanPage(), (then){
|
|
|
+ if(then is String){
|
|
|
+ if (then.isNotEmpty &&
|
|
|
+ then != null &&
|
|
|
+ then.length == 8) {
|
|
|
+ Timer(Duration(milliseconds: 200), () {
|
|
|
+ StoreBeanDataData store = StoreBeanDataData();
|
|
|
+ store.ownerUid = widget.data.ownerUid;
|
|
|
+ store.ownerName = widget.data.ownerName;
|
|
|
+ store.uid = widget.data.shopUid;
|
|
|
+ MyTools().toPage(context, AddMemberPage(store: store,qrUID: then,), (then){});
|
|
|
+ MyTools().hideKeyboard(context);
|
|
|
+ controller.requestRefresh();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
}),
|
|
|
),
|
|
|
Visibility(
|