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

lib/home/home_page.dart

@@ -326,6 +326,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                         totalMsg = 0;
                       });
                     });
+                    // Navigator.of(context).pushNamed('/router/web_turntable_activity');
                   },
                   child: Container(
                     height: 24,

lib/main.dart

@@ -62,6 +62,7 @@ import 'package:huixiang/union/union_details_page.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/utils/flutter_utils.dart';
+import 'package:huixiang/web/web_turntable_activity.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sharesdk_plugin/sharesdk_interface.dart';
 import 'package:sharesdk_plugin/sharesdk_register.dart';
@@ -301,6 +302,7 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
   '/router/store_selector_page': (context, {arguments}) => StoreSelectorPage(),
   '/router/video_playback_page': (context, {arguments}) => VideoPlaybackPage(),
   '/router/web_page': (context, {arguments}) => WebPage(arguments: arguments),
+  '/router/web_turntable_activity': (context, {arguments}) => WebTurntableActivity(),
   '/router/help_feedback_page': (context, {arguments}) => HelpFeedbackPage(),
   '/router/founder_story_page': (context, {arguments}) => FounderStoryPage(),
   '/router/system_msg_page': (context, {arguments}) => SystemMessagePage(),

lib/qr/qr_share.dart

@@ -81,7 +81,7 @@ class _QrSharePage extends State<QrSharePage> {
             children: [
               Positioned(
                 child: Image.asset(
-                  "assets/image/qr_share_bg_yq.png",
+                  "assets/image/qr_share_bg.png",
                   fit: BoxFit.fill,
                 ),
                 top: 0,
@@ -153,25 +153,26 @@ class _QrSharePage extends State<QrSharePage> {
                               S.of(context).fenxiangyaoqingma,
                               textAlign: TextAlign.center,
                               style: TextStyle(
+                                height: 1.5,
                                 color: Color(0xFF2E3552),
                                 fontSize: 16.sp,
                                 fontWeight: MyFontWeight.regular,
                               ),
                             ),
                           ),
-                          Container(
+                          // Container(
-                            margin: EdgeInsets.only(left: 16.w, right: 24.w),
+                          //   margin: EdgeInsets.only(left: 16.w, right: 24.w),
-                            child: Text(
+                          //   child: Text(
-                              // S.of(context).fenxiangyaoqing,
+                          //     // S.of(context).fenxiangyaoqing,
-                              S.of(context).beiyaoqingdejiangli,
+                          //     S.of(context).beiyaoqingdejiangli,
-                              textAlign: TextAlign.center,
+                          //     textAlign: TextAlign.center,
-                              style: TextStyle(
+                          //     style: TextStyle(
-                                color: Color(0xFF2E3552),
+                          //       color: Color(0xFF2E3552),
-                                fontSize: 16.sp,
+                          //       fontSize: 16.sp,
-                                fontWeight: MyFontWeight.regular,
+                          //       fontWeight: MyFontWeight.regular,
-                              ),
+                          //     ),
-                            ),
+                          //   ),
-                          ),
+                          // ),
                           SizedBox(
                             height: 1.h,
                           ),

lib/web/web_turntable_activity.dart

@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+import 'package:huixiang/view_widget/my_appbar.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+class WebTurntableActivity extends StatelessWidget {
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: MyAppBar(
+        action: Container(
+          margin: EdgeInsets.only(right: 10),
+          child: GestureDetector(
+            onTap: () {
+              // share();
+            },
+            child: Icon(
+              Icons.share,
+              size: 24,
+              color: Colors.black,
+            ),
+          ),
+        ),
+        title: "",
+        background: Color(0xFFFFFFFFF),
+        leadingColor: Colors.black,
+      ),
+      body: Container(
+          width: MediaQuery.of(context).size.width,
+          height: MediaQuery.of(context).size.height,
+        child:
+        WebView(
+          initialUrl: "http://192.168.10.90:5500/lottery.html",
+        )),
+    );
+  }
+}

pubspec.lock

@@ -255,7 +255,7 @@ packages:
       name: flutter_screenutil
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.3.0"
+    version: "5.3.1"
   flutter_smart_dialog:
     dependency: "direct main"
     description: