Merge branch 'master' of https://git.oa00.com/austin_dai/project_telephony

# Conflicts:
#	lib/ui/widget/appdialog.dart

lib/ui/widget/appdialog.dart

@@ -8,40 +8,40 @@ import '../../utils/toast/cloud_toast.dart';
 class AppDialog extends Dialog {
   final String title;
   final String confirm; //按钮文字
-  // final String content; //内容
-  // final bool? showCancel;
-  // final OnDialogClickListener? clickListener;
 
-  const AppDialog( // this.showCancel,
-      // this.clickListener,
-      {
+  const AppDialog({
     Key? key,
     this.title = "恭喜您获得会员体验卡",
     this.confirm = "立即领取",
-    // this.content = "内容",
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      margin: EdgeInsets.symmetric(horizontal: 95.w, vertical: 452.w),
+    return Center(
+      child: Container(
+        margin: EdgeInsets.only(
+          left: 100.w,
+          right: 100.w,
+        ),
         decoration: BoxDecoration(
           image: DecorationImage(
             image: AssetImage(
               Assets.images.bouncedbg.path,
-      ))),
+            ),
+          ),
+        ),
         child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
           children: [
-          32.hb,
             Text(
               title,
               style: TextStyle(
                 fontSize: 36.sp,
               ),
             ),
-          80.hb,
+            60.hb,
             _getVip(),
-          218.hb,
+            200.hb,
             Row(
               children: [
                 72.wb,
@@ -56,42 +56,8 @@ class AppDialog extends Dialog {
             _getBotton(confirm, context),
           ],
         ),
+      ),
     );
-/**/
-    //
-    // Stack(
-    //   children: [
-    //     Align(
-    //       child: Image.asset(
-    //         Assets.images.bouncedbg.path,
-    //         width: 560.w,
-    //         height: 720.w,
-    //         fit: BoxFit.fill,
-    //       ),
-    //     ),
-    //     Positioned(
-    //         top: 64.w,
-    //         left: 100.w,
-    //         child: Text(
-    //           title,
-    //           style: TextStyle(
-    //             fontSize: 36.sp,
-    //           ),
-    //         )),
-    //     Positioned(top: 108.w, left: 96.w, child: _getVip()),
-    //     Positioned(
-    //         child: Row(
-    //           children: [
-    //             _getText("接听发送"),
-    //             64.wb,
-    //             _getText("拒接发送"),
-    //             64.wb,
-    //             _getText("提升形象"),
-    //           ],
-    //         )),
-    //     Positioned(child: _getBotton(confirm, context)),
-    //   ],
-    // );
   }
 }
 
@@ -100,11 +66,7 @@ _getBotton(String bContent, context) {
     onTap: () async {
       var res = await apiClient.request(API.app.trialVip);
       if (res.code == 0) {
-        // showDialog(context: context, builder: (context){
-        //   return const AppDialog();
-        // });
         CloudToast.show(res.msg);
-        // BoxShadow.show(res.msg);
       } else {
         CloudToast.show(res.msg);
         Navigator.pop(context);
@@ -112,14 +74,17 @@ _getBotton(String bContent, context) {
     },
     child: Container(
       margin: EdgeInsets.symmetric(horizontal: 64.w),
-      padding: EdgeInsets.symmetric(horizontal: 155.w, vertical: 28.w),
+      width: 500.w,
       height: 88.w,
+      alignment: Alignment.center,
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(12.w),
         gradient: const LinearGradient(
           colors: [Color(0xFFFFEAB0), Color(0xFFFFF6D8)],
           end: Alignment.centerLeft,
-              begin: Alignment.centerRight)),
+          begin: Alignment.centerRight,
+        ),
+      ),
       child: Text(
         bContent,
         style: TextStyle(fontSize: 28.sp, fontWeight: FontWeight.bold),
@@ -138,14 +103,16 @@ _getText(String content) {
 _getVip() {
   return SizedBox(
     width: 370.w,
-    height: 100.w,
+    height: 110.w,
     child: Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            Text.rich(TextSpan(children: [
+            Text.rich(
+              TextSpan(
+                children: [
                   TextSpan(
                       text: "03",
                       style: TextStyle(
@@ -158,9 +125,11 @@ _getVip() {
                     style: TextStyle(
                       color: const Color(0xFFFFEAB0),
                       fontSize: 24.sp,
-                    // height: 1.0,
-                  ))
-            ])),
+                    ),
+                  ),
+                ],
+              ),
+            ),
             const Spacer(),
             Column(
               children: [
@@ -170,10 +139,11 @@ _getVip() {
                     color: const Color(0xFFE7F3FF),
                     fontSize: 32.sp,
                     fontFamily: "BlackItalic",
-                      fontWeight: FontWeight.bold),
-                )
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
               ],
-            )
+            ),
           ],
         ),
         Text(
@@ -182,14 +152,8 @@ _getVip() {
             color: const Color(0xFFFFEAB0),
             fontSize: 24.sp,
           ),
-        )
+        ),
       ],
     ),
   );
 }
-
-// abstract class OnDialogClickListener {
-//   void onConfirm();
-//
-//   void onCancel();
-// }