Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

lib/constants/saas_api.dart

@@ -263,11 +263,19 @@ class _Pay {
   ///app商品 向支付宝发起订单查询请求
   String get jcookOrderCheckAlipay => '/app/user/alipay/jcookOrderCheckAlipay';
 
-  ///创建缴费订单
+  ///创建预缴费订单
   String get createPrepaymentOrder => '/app/user/alipay/createPrepaymentOrder';
 
-  ///app商品 向支付宝发起订单查询请求
+  ///创建预缴费订单 向支付宝发起订单查询请求
   String get prepaymentOrderCheckAlipay => '/app/user/alipay/prepaymentOrderCheckAlipay';
+
+  ///创建缴费订单
+  String get createLivingExpensesOrder => '/app/user/alipay/createLivingExpensesOrder';
+
+  ///创建缴费订单 向支付宝发起订单查询请求
+  String get livingExpensesOrderCheckAlipay => '/app/user/alipay/livingExpensesOrderCheckAlipay';
+
+
 }
 
 
@@ -282,5 +290,4 @@ class _LifePay{
   String get findEstateBalance => '/app/user/livingExpenses/findEstateBalance';
 
 
-
 }

lib/pages/life_pay/life_pay_page_new.dart

@@ -308,21 +308,24 @@ class _LifePayPageNewState extends State<LifePayPageNew> {
       color: kPrimaryColor,
       padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w),
       onPressed: () async {
-        // Function cancel = BotToast.showLoading();
+        Function cancel = BotToast.showLoading();
-        // BaseModel baseModel =
+        BaseModel baseModel =
-        //     await NetUtil().post('/user/alipay/dailyPaymentAlipay', params: {
+            await NetUtil().post(SAASAPI.pay.createLivingExpensesOrder, params: {
-        //   "ids": total.ids,
+          "chargesBillId": total.ids,
-        //   "payType": 1, //暂时写死 等待后续补充
+          "paymentAmount": total.payTotal
-        //   "payPrice": total.payTotal.toDoubleStringAsFixed()
+        });
-        // });
+        if (baseModel.success) {
-        // if (baseModel.success) {
+          bool result = await PayUtil().callAliPay(
-        //   bool result = await PayUtil()
+              (baseModel.data as String),
-        //       .callAliPay(baseModel.msg, API.pay.dailPayMentCheck);
+              SAASAPI.pay.livingExpensesOrderCheckAlipay);
-        //   if (result) {
+          if (result) {
-        //     Get.off(() => PayFinishPage());
+            Get.off(() => PayFinishPage());
-        //   }
+          } else {
-        // }
+            ///跳到待付款页面
-        // cancel();
+            BotToast.showText(text: '缴费失败');
+          }
+        }
+        cancel();
       },
       child: '去缴费'.text.black.size(32.sp).bold.make(),
     );

lib/ui/community/community_views/widgets/chat_card_detail.dart

@@ -201,14 +201,19 @@ class _ChatCardDetailState extends State<ChatCardDetail> {
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    32.hb,
+                    Column(
-                    if (!widget.model.content!.isEmptyOrNull)
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                      widget.model.content!.text
+                      children: [
-                          .size(28.sp)
+                        32.hb,
-                          .color(ktextSubColor)
+                        if (!widget.model.content!.isEmptyOrNull)
-                          .make(),
+                          widget.model.content!.text
-                    32.hb,
+                              .size(28.sp)
-                    _renderImage(),
+                              .color(ktextSubColor)
+                              .make(),
+                        32.hb,
+                        _renderImage(),
+                      ],
+                    ).paddingOnly(left: 115.w),
                     20.hb,
                     TopicWidgets(
                       topicTags: widget.model.topicTags,