From 75f0f5c6bfbf5037370a68d3c59267b2f3d47ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”>
Date: Wed, 3 Mar 2021 14:37:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=B2=97=E7=BB=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/android/app/build.gradle                              | 4 ++--
 .../cn/zhios/zhiying_base_widget_example/MainActivity.java    | 2 +-
 example/lib/main.dart                                         | 2 ++
 example/pubspec.yaml                                          | 2 ++
 lib/widgets/home/home_goods/home_goods_item_single.dart       | 2 +-
 .../home/home_goods/models/home_goods_list_style_model.dart   | 2 ++
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index bc44f9c..2a75064 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -113,9 +113,9 @@ android {
         // 智夜生活
         zhiying {
             applicationId "cn.zhios.zhiying"
-            versionCode 47
+            versionCode 48
             dimension "app"
-            versionName '1.3.5'
+            versionName '1.3.6'
             // 签名信息
             signingConfig signingConfigs.zhiying
         }
diff --git a/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java b/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java
index 836a75d..82e5a81 100644
--- a/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java
+++ b/example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java
@@ -168,7 +168,7 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN
     public Map getSetting() {
         Map map = new HashMap();
         map.put("domain", "http://inapi.izhyin.cn/"); //"http://120.76.175.204:8989");
-//    map.put("domain", "http://192.168.0.113:5000");45678910，
+//    map.put("domain", "http://api.zhios.cn/");45678910，
         map.put("master_id", "123456");
         map.put("secret_key", "123456");
 //    map.put("token", "123465");
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 53aafa4..0a1fb93 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -20,6 +20,7 @@ import 'package:zhiying_new_user_free/register.dart';
 import 'package:zhiying_wechat_teacher/register.dart';
 import 'package:zhiying_moments/register.dart';
 import 'package:zhiying_member_upgrade/register.dart';
+import 'package:zhiying_equity_card/zhiying_equity_card.dart';
 
 void main() {
   FlutterError.onError = (FlutterErrorDetails details) {
@@ -65,6 +66,7 @@ class _MyAppState extends State<MyApp> {
     WeChatTeachRegister.init();
     FriendCircleRegister.init();
     MemberUpgradeRegister.init();
+    EquityCardRegister.init();
     print('初始化百川');
     FlutterAlibc.initAlibc(version: "", appName: "").then((result) {
       print("白川" + '${result.errorCode}  ${result.errorMessage}');
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index e5ae860..7eaacb0 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -28,6 +28,8 @@ dev_dependencies:
     path: ../../zhiying_new_user_free
   zhiying_business_college:
     path: ../../zhiying_business_college
+  zhiying_equity_card:
+    path: ../../zhiying_equity_card
   #微信导师
   zhiying_wechat_teacher:
     #path: ../zhiying_wechat_teacher
diff --git a/lib/widgets/home/home_goods/home_goods_item_single.dart b/lib/widgets/home/home_goods/home_goods_item_single.dart
index 2a6a620..204b84d 100644
--- a/lib/widgets/home/home_goods/home_goods_item_single.dart
+++ b/lib/widgets/home/home_goods/home_goods_item_single.dart
@@ -142,7 +142,7 @@ class HomeGoodsItemSingle extends StatelessWidget {
     }
     list.add(TextSpan(
       text: goods.goodTitle,
-      style: TextStyle(fontSize: 15, color: HexColor.fromHex('#333333'), fontWeight: FontWeight.bold),
+      style: TextStyle(fontSize: 15, color: HexColor.fromHex('#333333'), fontWeight: style?.listStyle?.isTitleBold=="1"? FontWeight.bold:FontWeight.w500),
     ));
     return RichText(
       maxLines: 2,
diff --git a/lib/widgets/home/home_goods/models/home_goods_list_style_model.dart b/lib/widgets/home/home_goods/models/home_goods_list_style_model.dart
index 97fe612..af660f6 100644
--- a/lib/widgets/home/home_goods/models/home_goods_list_style_model.dart
+++ b/lib/widgets/home/home_goods/models/home_goods_list_style_model.dart
@@ -13,6 +13,7 @@ class HomeGoodsListStyleModel {
   HomeGoodsStyleModelCouponCommission couponCommission;
   HomeGoodsStyleModelHotRank hotRank;
   String listColumn;
+  String isTitleBold;
 
   HomeGoodsListStyleModel(
       {this.hotRankIconList,
@@ -56,6 +57,7 @@ class HomeGoodsListStyleModel {
     hotRank = json['hot_rank'] != null
         ? new HomeGoodsStyleModelHotRank.fromJson(json['hot_rank'])
         : null;
+    isTitleBold=json['is_title_bold'];
   }
 
   Map<String, dynamic> toJson() {