Merge branch 'master' of http://git.qniao.cn/dating-agency/dating_touchme_app

* 'master' of http://git.qniao.cn/dating-agency/dating_touchme_app:
  优化玫瑰记录
  增加枚举类型
  增加枚举类型

lib/pages/mine/my_wallet_page.dart

@@ -357,6 +357,7 @@ class _InfoItemState extends State<InfoItem> {
                 widget.item.tradeType == 113 ? "邀请分成" :
                 widget.item.tradeType == 114 ? "1V1语音" :
                 widget.item.tradeType == 115 ? "1V1视频" :
+                widget.item.tradeType == 116 ? "连麦收益" :
                 widget.item.tradeType == 201 ? "平台服务费" :
                 widget.item.tradeType == 202 ? "提现" : ""}",
                 style: TextStyle(

lib/pages/mine/rose_history_page.dart

@@ -237,8 +237,8 @@ class ChatCouponItem extends StatefulWidget {
 class _ChatCouponItemState extends State<ChatCouponItem> {
   @override
   Widget build(BuildContext context) {
-    return SizedBox(
-      height: 70.w,
+    return Container(
+      padding: EdgeInsets.symmetric(vertical: 15.w),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
@@ -272,25 +272,28 @@ class _ChatCouponItemState extends State<ChatCouponItem> {
               )
             ],
           ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.end,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Text(
-                widget.item.type == 1 ? "主动发起聊天" : "主动发起连麦",
-                style: TextStyle(
-                  fontSize: 13.w,
-                  color: const Color.fromRGBO(144, 144, 144, 1)
+          SizedBox(width: 10.w,),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Text(
+                  widget.item.remark ?? "",
+                  style: TextStyle(
+                      fontSize: 13.w,
+                      color: const Color.fromRGBO(144, 144, 144, 1)
+                  ),
                 ),
-              ),
-              Text(
-                "-${widget.item.num}张",
-                style: TextStyle(
-                    fontSize: 13.w,
-                    color: const Color.fromRGBO(227, 84, 84, 1)
+                Text(
+                  "-${widget.item.num}张",
+                  style: TextStyle(
+                      fontSize: 13.w,
+                      color: const Color.fromRGBO(227, 84, 84, 1)
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ],
       ),