瀏覽代碼

版本更新

panhui 6 年之前
父節點
當前提交
1f49d5eb42

二進制
images/2x/icon_zhifu_yunshanfu.png


二進制
images/3x/icon_zhifu_yunshanfu.png


二進制
images/icon_zhifu_yunshanfu.png


+ 1 - 1
lib/pages/ChoosePay.dart

@@ -110,7 +110,7 @@ class _ChoosePayState extends State<ChoosePay> with WidgetsBindingObserver {
                   })
                   })
                 : Container(),
                 : Container(),
             isCloud_flash
             isCloud_flash
-                ? PayContent('云闪付', '支持各大银联银行支付', 'images/pay1.png', 'cloud_flash', chooseKey, () {
+                ? PayContent('云闪付APP支付', '支持各大银联银行支付', 'images/icon_zhifu_yunshanfu.png', 'cloud_flash', chooseKey, () {
                     setState(() {
                     setState(() {
                       chooseKey = 'cloud_flash';
                       chooseKey = 'cloud_flash';
                     });
                     });

+ 3 - 3
lib/pages/MyCode.dart

@@ -175,7 +175,7 @@ class MyCodeState extends State<MyCode> {
                                   );
                                   );
                                 },
                                 },
                                 pageBuilder: (BuildContext context, _, __) {
                                 pageBuilder: (BuildContext context, _, __) {
-                                  return Rule(1*10*channelInfo.ratio,1*10*channelInfo.ratio2);
+                                  return Rule(0.1*channelInfo.ratio,0.1*channelInfo.ratio2);
                                 }));
                                 }));
                           },
                           },
                           child: Row(
                           child: Row(
@@ -205,8 +205,8 @@ class MyCodeState extends State<MyCode> {
 }
 }
 class Rule extends Dialog {
 class Rule extends Dialog {
   Rule(this.ratio,this.ratio2);
   Rule(this.ratio,this.ratio2);
-  int ratio;
-  int ratio2;
+  double ratio;
+  double ratio2;
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     return WillPopScope(
     return WillPopScope(

+ 1 - 1
lib/pages/SecondRoomInfo.dart

@@ -90,7 +90,7 @@ class SecondPageState extends State<SecondPage> {
           controller: _perController,
           controller: _perController,
           itemCount: joinList.length + 2,
           itemCount: joinList.length + 2,
           itemBuilder: (BuildContext context, int index) {
           itemBuilder: (BuildContext context, int index) {
-            if (index == 0) {
+            if (index == 0 && widget.houseInfo.customerService!=null) {
               return Container(
               return Container(
                   width: double.infinity,
                   width: double.infinity,
                   height: 60,
                   height: 60,

+ 8 - 8
lib/pages/Setting.dart

@@ -115,14 +115,14 @@ class SettingState extends State<Setting> {
                     ),
                     ),
                   ),
                   ),
                 ),
                 ),
-                floatingActionButton: Container(
-                  height: 100,
-                  padding: EdgeInsets.symmetric(vertical: 30),
-                  child: Column(
-                    children: <Widget>[Text('Copyright©2019',style:TextStyle(color: Colors.white30,fontSize: 12)), Text('盛世明越(海南)科技有限公',style:TextStyle(color: Colors.white30,fontSize: 12))],
-                  ),
-                ),
-                floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
+                // floatingActionButton: Container(
+                //   height: 100,
+                //   padding: EdgeInsets.symmetric(vertical: 30),
+                //   child: Column(
+                //     children: <Widget>[Text('Copyright©2019',style:TextStyle(color: Colors.white30,fontSize: 12)), Text('盛世明越(海南)科技有限公',style:TextStyle(color: Colors.white30,fontSize: 12))],
+                //   ),
+                // ),
+                // floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
               ),
               ),
               onWillPop: () {
               onWillPop: () {
                 Toast.hide();
                 Toast.hide();