瀏覽代碼

add Loading EasyLoading

[baozhangchao] 3 年之前
父節點
當前提交
9ec004d2f4
共有 1 個文件被更改,包括 2 次插入12 次删除
  1. 2
    12
      lib/pages/feedback/index.dart

+ 2
- 12
lib/pages/feedback/index.dart 查看文件

@@ -48,36 +48,26 @@ class Feedback extends BasicPage {
48 48
             ),
49 49
           ),
50 50
           Obx(
51
-            () => Visibility(
51
+                () => Visibility(
52 52
               visible: !isEdit(),
53 53
               child: Positioned(
54 54
                 left: 20.w,
55 55
                 top: 5.w,
56 56
                 child: Row(
57 57
                   children: [
58
-<<<<<<< HEAD
59
-                    Image.asset(
60
-                      'images/icons/feedbackIcon.png',
61
-                      width: 15.w,
62
-=======
63 58
                     Container(
64 59
                       margin: EdgeInsets.only(right: 8.w),
65 60
                       child: Image.asset(
66 61
                         'images/icons/feedbackIcon.png',
67 62
                         width: 15.w,
68 63
                       ),
69
->>>>>>> b052c991e6c96dc1b28c3fa153d55d36d0e0272a
70 64
                     ),
71 65
                     Text(
72 66
                       '请留下您宝贵的意见和建议!',
73 67
                       style: TextStyle(
74 68
                           fontSize: 17.sp,
75 69
                           letterSpacing: 2,
76
-<<<<<<< HEAD
77
-                          color: Color(0xFFBEBDBD)),
78
-=======
79 70
                           color: const Color(0xFFBEBDBD)),
80
->>>>>>> b052c991e6c96dc1b28c3fa153d55d36d0e0272a
81 71
                     ),
82 72
                   ],
83 73
                 ),
@@ -111,4 +101,4 @@ class Feedback extends BasicPage {
111 101
       ),
112 102
     );
113 103
   }
114
-}
104
+}