From b66db06e429c36be51ccabbae2677ac610738168 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Tue, 12 Jan 2021 18:28:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/classify/goods_page.dart | 35 ++++++++++++++----------- lib/utils/share_tool.dart | 23 +++++++++------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/lib/pages/home/classify/goods_page.dart b/lib/pages/home/classify/goods_page.dart index 0636527..f509a62 100644 --- a/lib/pages/home/classify/goods_page.dart +++ b/lib/pages/home/classify/goods_page.dart @@ -305,18 +305,20 @@ class _GoodsPageState extends BaseStoreState { GoodPriceView( detailModel: widget.goodsDetail, shareCallback: () { - ShareTool().goodsShare(context, - goodsPrice: widget.goodsDetail.data.getPriceString(), - goodsName: widget.goodsDetail.data.goodsName, - goodsDescription: widget.goodsDetail.data.description, - miniPicurl: widget.goodsDetail.data.mainPhotos.length >= 1 - ? widget.goodsDetail.data.mainPhotos[1].url - : "", - miniTitle: - "¥${widget.goodsDetail.data.getPriceString()} | ${widget.goodsDetail.data.goodsName} | ${widget.goodsDetail.data.description}", - amount: - widget.goodsDetail.data.price.min.commission.toString(), - goodsId: widget.goodsDetail.data.id.toString()); + ShareTool().goodsShare( + context, + goodsPrice: widget.goodsDetail.data.getPriceString(), + goodsName: widget.goodsDetail.data.goodsName, + goodsDescription: widget.goodsDetail.data.description, + miniPicurl: widget.goodsDetail.data.mainPhotos.length >= 1 + ? widget.goodsDetail.data.mainPhotos[1].url + : "", + miniTitle: + "¥${widget.goodsDetail.data.getPriceString()} | ${widget.goodsDetail.data.goodsName} | ${widget.goodsDetail.data.description}", + amount: + widget.goodsDetail.data.price.min.commission.toString(), + goodsId: widget.goodsDetail.data.id.toString(), + ); }, ), ], @@ -328,7 +330,8 @@ class _GoodsPageState extends BaseStoreState { color: Colors.white, child: _discountContent(context), ), - widget.goodsDetail.data.storehouse==2||widget.goodsDetail.data.storehouse==3 + widget.goodsDetail.data.storehouse == 2 || + widget.goodsDetail.data.storehouse == 3 ? Container( margin: EdgeInsets.only(bottom: 13), padding: EdgeInsets.symmetric(vertical: 10, horizontal: 10), @@ -511,7 +514,8 @@ class _GoodsPageState extends BaseStoreState { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - (widget.goodsDetail.data.storehouse == 2 ||widget.goodsDetail.data.storehouse==3) + (widget.goodsDetail.data.storehouse == 2 || + widget.goodsDetail.data.storehouse == 3) ? Text( "跨境商品不支持开发票", style: AppTextStyle.generate( @@ -519,7 +523,8 @@ class _GoodsPageState extends BaseStoreState { color: Color(0xff373737)), ) : SizedBox(), - (widget.goodsDetail.data.storehouse == 2 ||widget.goodsDetail.data.storehouse==3) + (widget.goodsDetail.data.storehouse == 2 || + widget.goodsDetail.data.storehouse == 3) ? rHBox(rSize(4)) : SizedBox(), Text( diff --git a/lib/utils/share_tool.dart b/lib/utils/share_tool.dart index 0a7334b..3a15504 100644 --- a/lib/utils/share_tool.dart +++ b/lib/utils/share_tool.dart @@ -108,14 +108,17 @@ class ShareTool { ); } - goodsShare(BuildContext context, - {String goodsName = "", - String goodsDescription = "", - String goodsPrice = "", - String amount = "", - String miniTitle = "", - String miniPicurl = "", - String goodsId = ""}) { + goodsShare( + BuildContext context, { + String goodsName = "", + String goodsDescription = "", + String goodsPrice = "", + String amount = "", + String miniTitle = "", + String miniPicurl = "", + String goodsId = "", + String secondPic = "", + }) { // !!!! String goodsUrl = "${AppConfig.debug ? WebApi.testGoodsDetail : WebApi.goodsDetail}$goodsId/${UserManager.instance.user.info.invitationNo}"; @@ -257,7 +260,7 @@ class ShareTool { ); }); PlatformItem qrcode = PlatformItem( - "二维码海报", + "小程序海报", Image.asset( ShareToolIcon.poster, width: 36, @@ -287,11 +290,11 @@ class ShareTool { ); List itemList = [ // miniItem, + qrcode, wechatItem, // weiboItem, // qqItem, copyurl, - qrcode, ]; if (ShareTool.qqInstalled) { itemList.add(qqItem);