xt / Flutter-ReserveApp · Commits

Go to a project

Commit ce6ede7fa491a9a32c7333c73519a62eaf0360f9

Authored by wdn127929
1 parent b2582dd3
build: skipped

录入预订

Inline Side-by-side
Showing 2 changed files with 76 additions and 74 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "226" 14 +def flutterVersionCode = "230"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '226' 16 + flutterVersionCode = '230'
17 } 17 }
18 18
19 -def flutterVersionName = "2.2.6" 19 +def flutterVersionName = "2.3.0"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.2.6' 21 + flutterVersionName = '2.3.0'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -87,81 +87,83 @@ class _MyIntegralPageState extends State<MyIntegralPage> { @@ -87,81 +87,83 @@ class _MyIntegralPageState extends State<MyIntegralPage> {
87 ), 87 ),
88 ), 88 ),
89 Positioned( 89 Positioned(
90 - bottom: ScreenUtil().setWidth(-205 * 2 + 18 * 2), 90 + top: ScreenUtil().setWidth(145 * 2 - 18 * 2),
91 left: ScreenUtil().setWidth(20), 91 left: ScreenUtil().setWidth(20),
92 right: ScreenUtil().setWidth(20), 92 right: ScreenUtil().setWidth(20),
93 - child: Container(  
94 - padding: EdgeInsets.symmetric(  
95 - vertical: ScreenUtil().setWidth(20)),  
96 - // height: ScreenUtil().setWidth(205 * 2),  
97 - decoration: BoxDecoration(  
98 - borderRadius:  
99 - BorderRadius.circular(ScreenUtil().setWidth(40)),  
100 - color: Colors.white),  
101 - child: Column(  
102 - children: [  
103 - MyItem(  
104 - title: '已兑换积分',  
105 - content: widget.sunModel?.converted != null  
106 - ? widget.sunModel.converted  
107 - : '0',  
108 - needRadius: true,  
109 - ),  
110 - Padding(  
111 - padding: EdgeInsets.symmetric(  
112 - horizontal: ScreenUtil().setWidth(40)),  
113 - child: MyDivider(  
114 - double.infinity,  
115 - ScreenUtil().setWidth(2),  
116 - color: MyColours.color_f3f3f3,  
117 - )),  
118 - MyItem(  
119 - title: '累计积分',  
120 - content: widget.sunModel?.cumulative != null  
121 - ? widget.sunModel.cumulative  
122 - : '0',  
123 - needRadius: true,  
124 - ),  
125 - Padding(  
126 - padding: EdgeInsets.symmetric(  
127 - horizontal: ScreenUtil().setWidth(40)),  
128 - child: MyDivider(  
129 - double.infinity,  
130 - ScreenUtil().setWidth(2),  
131 - color: MyColours.color_f3f3f3,  
132 - )),  
133 - MyItem(  
134 - title: '待审核积分',  
135 - content: widget.sunModel?.reviewed != null  
136 - ? widget.sunModel.reviewed  
137 - : '0',  
138 - needRadius: true,  
139 - )  
140 - ], 93 + child: Column(children: [
  94 + Container(
  95 + padding: EdgeInsets.symmetric(
  96 + vertical: ScreenUtil().setWidth(20)),
  97 + // height: ScreenUtil().setWidth(205 * 2),
  98 + decoration: BoxDecoration(
  99 + borderRadius: BorderRadius.circular(
  100 + ScreenUtil().setWidth(40)),
  101 + color: Colors.white),
  102 + child: Column(
  103 + children: [
  104 + MyItem(
  105 + title: '已兑换积分',
  106 + content: widget.sunModel?.converted != null
  107 + ? widget.sunModel.converted
  108 + : '0',
  109 + needRadius: true,
  110 + ),
  111 + Padding(
  112 + padding: EdgeInsets.symmetric(
  113 + horizontal: ScreenUtil().setWidth(40)),
  114 + child: MyDivider(
  115 + double.infinity,
  116 + ScreenUtil().setWidth(2),
  117 + color: MyColours.color_f3f3f3,
  118 + )),
  119 + MyItem(
  120 + title: '累计积分',
  121 + content: widget.sunModel?.cumulative != null
  122 + ? widget.sunModel.cumulative
  123 + : '0',
  124 + needRadius: true,
  125 + ),
  126 + Padding(
  127 + padding: EdgeInsets.symmetric(
  128 + horizontal: ScreenUtil().setWidth(40)),
  129 + child: MyDivider(
  130 + double.infinity,
  131 + ScreenUtil().setWidth(2),
  132 + color: MyColours.color_f3f3f3,
  133 + )),
  134 + MyItem(
  135 + title: '待审核积分',
  136 + content: widget.sunModel?.reviewed != null
  137 + ? widget.sunModel.reviewed
  138 + : '0',
  139 + needRadius: true,
  140 + )
  141 + ],
  142 + ),
  143 + ),
  144 + VEmptyView(60),
  145 + RoundButton(
  146 + onPressed: () async {},
  147 + text: '兑换',
  148 + fontSize: 34,
  149 + isBold: false,
  150 + height: ScreenUtil().setWidth(84),
  151 + width: ScreenUtil().setWidth(155 * 2),
  152 + radius: ScreenUtil().setWidth(10),
141 ), 153 ),
142 - )) 154 + VEmptyView(100),
  155 + Padding(
  156 + padding: EdgeInsets.symmetric(
  157 + horizontal: ScreenUtil().setWidth(40)),
  158 + child: Text(
  159 + '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效。',
  160 + style: TextStyle(
  161 + fontSize: ScreenUtil().setSp(24),
  162 + color: MyColours.color_999999,
  163 + height: 1.3)))
  164 + ])),
143 ], 165 ],
144 ), 166 ),
145 - VEmptyView(434),  
146 - RoundButton(  
147 - onPressed: () async {},  
148 - text: '兑换',  
149 - fontSize: 34,  
150 - isBold: false,  
151 - height: ScreenUtil().setWidth(84),  
152 - width: ScreenUtil().setWidth(155 * 2),  
153 - radius: ScreenUtil().setWidth(10),  
154 - ),  
155 - VEmptyView(100),  
156 - Padding(  
157 - padding:  
158 - EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),  
159 - child: Text(  
160 - '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效。',  
161 - style: TextStyle(  
162 - fontSize: ScreenUtil().setSp(24),  
163 - color: MyColours.color_999999,  
164 - height: 1.3)))  
165 ], 167 ],
166 )))); 168 ))));
167 } 169 }