头条合集列表更改;

积分商城更改;

lib/integral/intergra_view/in_for_points.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/sign_info.dart';
 import 'package:huixiang/utils/font_weight.dart';
@@ -164,8 +165,8 @@ class _InForPoints extends State<InForPoints> {
               alignment: Alignment.center,
               child: Image.asset(
                 "assets/image/icon_gold_blessing.png",
-                width: 59.w,
+                width: 59,
-                height: 59.h,
+                height: 59,
               ),
             ),
           ],
@@ -200,10 +201,10 @@ class _InForPoints extends State<InForPoints> {
             ),
             Container(
               alignment: Alignment.center,
-              child: Image.asset(
+              child:  SvgPicture.asset(
-                "assets/image/icon_gold_coin.png",
+                "assets/svg/qiandao.svg",
-                width: 30.w,
+                width: 30,
-                height: 30.h,
+                height: 30,
               ),
             ),
             Container(

lib/integral/intergra_view/integral_task.dart

@@ -106,20 +106,20 @@ class _IntegralTask extends State<IntegralTask> {
 
   taskImg(String taskType) {
     switch (taskType) {
-      case "bill_type_point_login":
+      case "bill_type_point_order":
         return "assets/image/icon_integral_login.png";
         break;
       case "bill_type_point_share":
         return "assets/image/icon_integral_share.png";
         break;
-      case "bill_type_point_order":
+      case "bill_type_point_login":
         return "assets/image/icon_integral_order.png";
         break;
       case "bill_type_point_signin":
         return "assets/image/icon_integral_sign.png";
         break;
     }
-    return "assets/image/icon_integral_share.png";
+    return "assets/image/icon_integral_login.png";
   }
 
   Widget taskItem(Task task) {
@@ -202,7 +202,7 @@ class _IntegralTask extends State<IntegralTask> {
                   ),
                 )
               : RoundButton(
-                  text: "x10",
+                  text: "x${double.tryParse(task.rewardValue).toInt()}",
                   textColor:
                       task.limitDay == (task.complateNum ?? task.conplateNum)
                           ? Color(0xFF808080)

lib/integral/intergra_view/integral_vip.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/sign_info.dart';
 import 'package:huixiang/retrofit/data/user_info.dart';
@@ -76,8 +77,8 @@ class _IntegralVip extends State<IntegralVip> {
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
-                Image.asset(
+                SvgPicture.asset(
-                  "assets/image/icon_gold_coin.png",
+                  "assets/svg/qiandao.svg",
                   width: 20,
                   height: 20,
                 ),

lib/retrofit/retrofit_api.dart

@@ -53,11 +53,11 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
-// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
+const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
 
-const base_url = "http://192.168.10.236:8766/app/";   ///费韬
+// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
+// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.37:8766/app/";
 // const baseUrl = "http://192.168.10.37:8766/app/";

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
 class _ApiService implements ApiService {
   _ApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8766/app/';
+    baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/';
   }
 
   final Dio _dio;