xt / Flutter-ReserveApp · Commits

Go to a project

Commit 10f7e362b9771f4ee721b4b48552678e92f81002

Authored by wdn127929
1 parent c0cb6b54
build: skipped

4.8.7排菜分享

Inline Side-by-side
Showing 6 changed files with 79 additions and 54 deletions
@@ -15,17 +15,17 @@ if (flutterRoot == null) { @@ -15,17 +15,17 @@ if (flutterRoot == null) {
15 15
16 16
17 17
18 -def flutterVersionCode = "486" 18 +def flutterVersionCode = "487"
19 if (flutterVersionCode == null) { 19 if (flutterVersionCode == null) {
20 - flutterVersionCode = '486' 20 + flutterVersionCode = '487'
21 } 21 }
22 22
23 23
24 24
25 25
26 -def flutterVersionName = "4.8.6" 26 +def flutterVersionName = "4.8.7"
27 if (flutterVersionName == null) { 27 if (flutterVersionName == null) {
28 - flutterVersionName = '4.8.6' 28 + flutterVersionName = '4.8.7'
29 } 29 }
30 30
31 31
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 50; 6 + objectVersion = 46;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -510,7 +510,7 @@ @@ -510,7 +510,7 @@
510 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 510 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
511 CODE_SIGN_IDENTITY = "Apple Development"; 511 CODE_SIGN_IDENTITY = "Apple Development";
512 CODE_SIGN_STYLE = Automatic; 512 CODE_SIGN_STYLE = Automatic;
513 - CURRENT_PROJECT_VERSION = 483; 513 + CURRENT_PROJECT_VERSION = 486;
514 DEVELOPMENT_TEAM = 8J59HM8B82; 514 DEVELOPMENT_TEAM = 8J59HM8B82;
515 ENABLE_BITCODE = NO; 515 ENABLE_BITCODE = NO;
516 FLUTTER_BUILD_MODE = release; 516 FLUTTER_BUILD_MODE = release;
@@ -525,7 +525,7 @@ @@ -525,7 +525,7 @@
525 "$(inherited)", 525 "$(inherited)",
526 "$(PROJECT_DIR)/Flutter", 526 "$(PROJECT_DIR)/Flutter",
527 ); 527 );
528 - MARKETING_VERSION = 4.8.3; 528 + MARKETING_VERSION = 4.8.6;
529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
530 PRODUCT_NAME = Runner; 530 PRODUCT_NAME = Runner;
531 PROVISIONING_PROFILE_SPECIFIER = ""; 531 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -656,10 +656,10 @@ @@ -656,10 +656,10 @@
656 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 656 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
657 CODE_SIGN_IDENTITY = "Apple Development"; 657 CODE_SIGN_IDENTITY = "Apple Development";
658 CODE_SIGN_STYLE = Automatic; 658 CODE_SIGN_STYLE = Automatic;
659 - CURRENT_PROJECT_VERSION = 483; 659 + CURRENT_PROJECT_VERSION = 486;
660 DEVELOPMENT_TEAM = 8J59HM8B82; 660 DEVELOPMENT_TEAM = 8J59HM8B82;
661 ENABLE_BITCODE = NO; 661 ENABLE_BITCODE = NO;
662 - FLUTTER_BUILD_MODE = debug; 662 + FLUTTER_BUILD_MODE = release;
663 FRAMEWORK_SEARCH_PATHS = ( 663 FRAMEWORK_SEARCH_PATHS = (
664 "$(inherited)", 664 "$(inherited)",
665 "$(PROJECT_DIR)/Flutter", 665 "$(PROJECT_DIR)/Flutter",
@@ -671,7 +671,7 @@ @@ -671,7 +671,7 @@
671 "$(inherited)", 671 "$(inherited)",
672 "$(PROJECT_DIR)/Flutter", 672 "$(PROJECT_DIR)/Flutter",
673 ); 673 );
674 - MARKETING_VERSION = 4.8.3; 674 + MARKETING_VERSION = 4.8.6;
675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
676 PRODUCT_NAME = Runner; 676 PRODUCT_NAME = Runner;
677 PROVISIONING_PROFILE_SPECIFIER = ""; 677 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -692,7 +692,7 @@ @@ -692,7 +692,7 @@
692 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 692 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
693 CODE_SIGN_IDENTITY = "Apple Development"; 693 CODE_SIGN_IDENTITY = "Apple Development";
694 CODE_SIGN_STYLE = Automatic; 694 CODE_SIGN_STYLE = Automatic;
695 - CURRENT_PROJECT_VERSION = 483; 695 + CURRENT_PROJECT_VERSION = 486;
696 DEVELOPMENT_TEAM = 8J59HM8B82; 696 DEVELOPMENT_TEAM = 8J59HM8B82;
697 ENABLE_BITCODE = NO; 697 ENABLE_BITCODE = NO;
698 FLUTTER_BUILD_MODE = release; 698 FLUTTER_BUILD_MODE = release;
@@ -707,7 +707,7 @@ @@ -707,7 +707,7 @@
707 "$(inherited)", 707 "$(inherited)",
708 "$(PROJECT_DIR)/Flutter", 708 "$(PROJECT_DIR)/Flutter",
709 ); 709 );
710 - MARKETING_VERSION = 4.8.3; 710 + MARKETING_VERSION = 4.8.6;
711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
712 PRODUCT_NAME = Runner; 712 PRODUCT_NAME = Runner;
713 PROVISIONING_PROFILE_SPECIFIER = ""; 713 PROVISIONING_PROFILE_SPECIFIER = "";
1 //基本常量 1 //基本常量
2 -class Constant{  
3 - static const int status_success = 200;//服务器返回成功  
4 -}  
  2 +import 'package:fluwx/fluwx.dart';
  3 +
  4 +class Constant {
  5 + static const int status_success = 200; //服务器返回成功
  6 + // static const WXMiniProgramType wxMiniProgramType =
  7 + // WXMiniProgramType.RELEASE; //正式版
  8 + static const WXMiniProgramType wxMiniProgramType =
  9 + WXMiniProgramType.PREVIEW; //体验版
  10 + // static const WXMiniProgramType wxMiniProgramType =
  11 + // WXMiniProgramType.TEST; //开发版
  12 +
  13 +}
@@ -2276,7 +2276,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> { @@ -2276,7 +2276,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
2276 borderSide: BorderSide.none), 2276 borderSide: BorderSide.none),
2277 contentPadding: EdgeInsets.zero, 2277 contentPadding: EdgeInsets.zero,
2278 ), 2278 ),
2279 - keyboardType: TextInputType.number, 2279 + keyboardType: TextInputType.text,
2280 textInputAction: TextInputAction.done, 2280 textInputAction: TextInputAction.done,
2281 2281
2282 onChanged: (value) { 2282 onChanged: (value) {
@@ -826,15 +826,22 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> { @@ -826,15 +826,22 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
826 fontSize: 36, 826 fontSize: 36,
827 isBold: false, 827 isBold: false,
828 onPressed: () { 828 onPressed: () {
829 - Utils.goShareOrderFoodToWeChatPaicai(  
830 - context,  
831 - data: widget.showList,  
832 - title: '菜品已点好，快来看看都点了什么～',  
833 - img:  
834 - 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',  
835 - rid: widget.rid,  
836 - // oid: oid,  
837 - ); 829 + Utils.goShareOrderFoodToWeChatPaicai(context,
  830 + data: widget.showList,
  831 + title: '菜品已点好，快来看看都点了什么～',
  832 + img:
  833 + 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
  834 + rid: widget.rid,
  835 + priceSum: widget.priceSum,
  836 + memberPriceSum: widget.memberPriceSum,
  837 + planPriceSum: widget.planDishText,
  838 + remark: widget.remark,
  839 + name: widget.name,
  840 + address: sellerAdr,
  841 + service: servicePerson
  842 +
  843 + // oid: oid,
  844 + );
838 845
839 // if (index != null) { 846 // if (index != null) {
840 // NavigatorUtil.goOrderSharePage(context, 847 // NavigatorUtil.goOrderSharePage(context,
@@ -5,6 +5,7 @@ import 'dart:typed_data'; @@ -5,6 +5,7 @@ import 'dart:typed_data';
5 5
6 import 'package:common_utils/common_utils.dart'; 6 import 'package:common_utils/common_utils.dart';
7 import 'package:connectivity/connectivity.dart'; 7 import 'package:connectivity/connectivity.dart';
  8 +import 'package:contacts_service/contacts_service.dart';
8 // import 'package:connectivity_plus/connectivity_plus.dart'; 9 // import 'package:connectivity_plus/connectivity_plus.dart';
9 import 'package:device_info/device_info.dart'; 10 import 'package:device_info/device_info.dart';
10 import 'package:dio/dio.dart'; 11 import 'package:dio/dio.dart';
@@ -36,6 +37,7 @@ import 'package:path_provider/path_provider.dart'; @@ -36,6 +37,7 @@ import 'package:path_provider/path_provider.dart';
36 import 'package:image_cropper/image_cropper.dart'; 37 import 'package:image_cropper/image_cropper.dart';
37 import 'dart:math'; 38 import 'dart:math';
38 39
  40 +import '../constant/constant.dart';
39 import '../models/cookbook_model.dart'; 41 import '../models/cookbook_model.dart';
40 import '../models/coupon_model.dart'; 42 import '../models/coupon_model.dart';
41 import '../models/recharge_list_model.dart'; 43 import '../models/recharge_list_model.dart';
@@ -1202,7 +1204,7 @@ class Utils { @@ -1202,7 +1204,7 @@ class Utils {
1202 username: "gh_487873d353b3", 1204 username: "gh_487873d353b3",
1203 path: 1205 path:
1204 "pack-book/pages/book/b_index?seller_id=${model.user.sellerid}&seller_openid=seller_openid&manager_id=&goPath=${subPath}", 1206 "pack-book/pages/book/b_index?seller_id=${model.user.sellerid}&seller_openid=seller_openid&manager_id=&goPath=${subPath}",
1205 - miniProgramType: WXMiniProgramType.RELEASE); 1207 + miniProgramType: Constant.wxMiniProgramType);
1206 } 1208 }
1207 1209
1208 //跳转小程序新建店铺页面 1210 //跳转小程序新建店铺页面
@@ -1211,7 +1213,7 @@ class Utils { @@ -1211,7 +1213,7 @@ class Utils {
1211 launchWeChatMiniProgram( 1213 launchWeChatMiniProgram(
1212 username: "gh_1007de739c65", 1214 username: "gh_1007de739c65",
1213 path: "pages/login/l_login", 1215 path: "pages/login/l_login",
1214 - miniProgramType: WXMiniProgramType.RELEASE); 1216 + miniProgramType: Constant.wxMiniProgramType);
1215 } 1217 }
1216 1218
1217 //分享排菜单 1219 //分享排菜单
@@ -1220,7 +1222,14 @@ class Utils { @@ -1220,7 +1222,14 @@ class Utils {
1220 String title, 1222 String title,
1221 String rid, 1223 String rid,
1222 String oid, 1224 String oid,
1223 - String img}) async { 1225 + String img,
  1226 + String priceSum,
  1227 + String memberPriceSum,
  1228 + String planPriceSum,
  1229 + String remark,
  1230 + String name,
  1231 + String address,
  1232 + String service}) async {
1224 Loading.showLoading(context); 1233 Loading.showLoading(context);
1225 String _webPageUrl = "http://colorcun.com/"; 1234 String _webPageUrl = "http://colorcun.com/";
1226 // String _thumbnail = img; 1235 // String _thumbnail = img;
@@ -1238,12 +1247,12 @@ class Utils { @@ -1238,12 +1247,12 @@ class Utils {
1238 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1"; 1247 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
1239 print(data); 1248 print(data);
1240 String _path = 1249 String _path =
1241 - "pack-cookbook/pages/success_new?cookbooklist=${json.encode(data)}&hasSuccess=1&oid=$oid&rid=$rid&identity=2&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=2"; 1250 + "pack-cookbook/pages/success_new?cookbooklist=${json.encode(data)}&hasSuccess=1&oid=$oid&rid=$rid&identity=2&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=2&priceSum=${priceSum}&memberPriceSum=${memberPriceSum}&planPriceSum=${planPriceSum}&remark=${remark}&name=${name}&address=${address}&service=${service}";
1242 String _description = "OneKey"; 1251 String _description = "OneKey";
1243 // Uint8List source = await testComporessList(context, _thumbnail); 1252 // Uint8List source = await testComporessList(context, _thumbnail);
1244 print(_path); 1253 print(_path);
1245 var model = new WeChatShareMiniProgramModel( 1254 var model = new WeChatShareMiniProgramModel(
1246 - miniProgramType: WXMiniProgramType.RELEASE, 1255 + miniProgramType: Constant.wxMiniProgramType,
1247 webPageUrl: _webPageUrl, 1256 webPageUrl: _webPageUrl,
1248 userName: _userName, 1257 userName: _userName,
1249 title: _title, 1258 title: _title,
@@ -1257,7 +1266,7 @@ class Utils { @@ -1257,7 +1266,7 @@ class Utils {
1257 Loading.hideLoading(context); 1266 Loading.hideLoading(context);
1258 } 1267 }
1259 1268
1260 - //分享已点菜品----跳转小程序提前点餐 1269 + //请客户点菜----跳转小程序提前点餐
1261 static goShareOrderPageToWeChat(BuildContext context, 1270 static goShareOrderPageToWeChat(BuildContext context,
1262 {String title, String rid, String img, String oid, String sid}) async { 1271 {String title, String rid, String img, String oid, String sid}) async {
1263 Loading.showLoading(context); 1272 Loading.showLoading(context);
@@ -1279,9 +1288,9 @@ class Utils { @@ -1279,9 +1288,9 @@ class Utils {
1279 String _description = "OneKey"; 1288 String _description = "OneKey";
1280 // Uint8List source = await testComporessList(context, _thumbnail); 1289 // Uint8List source = await testComporessList(context, _thumbnail);
1281 var model = new WeChatShareMiniProgramModel( 1290 var model = new WeChatShareMiniProgramModel(
1282 - // miniProgramType: WXMiniProgramType.PREVIEW, //体验版  
1283 - miniProgramType: WXMiniProgramType.RELEASE, //正式版  
1284 - // miniProgramType: WXMiniProgramType.TEST //开发版 1291 + // miniProgramType: , //体验版
  1292 + miniProgramType: Constant.wxMiniProgramType, //正式版
  1293 + // miniProgramType: //开发版
1285 webPageUrl: _webPageUrl, 1294 webPageUrl: _webPageUrl,
1286 userName: _userName, 1295 userName: _userName,
1287 title: _title, 1296 title: _title,
@@ -1320,7 +1329,7 @@ class Utils { @@ -1320,7 +1329,7 @@ class Utils {
1320 String _description = "OneKey"; 1329 String _description = "OneKey";
1321 // Uint8List source = await testComporessList(context, _thumbnail); 1330 // Uint8List source = await testComporessList(context, _thumbnail);
1322 var model = new WeChatShareMiniProgramModel( 1331 var model = new WeChatShareMiniProgramModel(
1323 - miniProgramType: WXMiniProgramType.RELEASE, 1332 + miniProgramType: Constant.wxMiniProgramType,
1324 webPageUrl: _webPageUrl, 1333 webPageUrl: _webPageUrl,
1325 userName: _userName, 1334 userName: _userName,
1326 title: _title, 1335 title: _title,
@@ -1335,12 +1344,12 @@ class Utils { @@ -1335,12 +1344,12 @@ class Utils {
1335 } 1344 }
1336 1345
1337 //拉起小程序已点菜品 1346 //拉起小程序已点菜品
1338 - static goMiniProgramOrderFood({String rid}) {  
1339 - launchWeChatMiniProgram(  
1340 - username: "gh_487873d353b3",  
1341 - path: "pack-cookbook/pages/success?rid=$rid&identity=2",  
1342 - miniProgramType: WXMiniProgramType.RELEASE);  
1343 - } 1347 + // static goMiniProgramOrderFood({String rid}) {
  1348 + // launchWeChatMiniProgram(
  1349 + // username: "gh_487873d353b3",
  1350 + // path: "pack-cookbook/pages/success?rid=$rid&identity=2",
  1351 + // miniProgramType: WXMiniProgramType.RELEASE);
  1352 + // }
1344 1353
1345 //跳转拨打电话页面 1354 //跳转拨打电话页面
1346 static goHelp(BuildContext context) async { 1355 static goHelp(BuildContext context) async {
@@ -1649,9 +1658,9 @@ class Utils { @@ -1649,9 +1658,9 @@ class Utils {
1649 title: _title, 1658 title: _title,
1650 path: _path, 1659 path: _path,
1651 description: _description, 1660 description: _description,
1652 - // miniProgramType: WXMiniProgramType.PREVIEW, //体验版  
1653 - miniProgramType: WXMiniProgramType.RELEASE, //正式版  
1654 - // miniProgramType: WXMiniProgramType.TEST //开发版 1661 + // miniProgramType: , //体验版
  1662 + miniProgramType:Constant.wxMiniProgramType, //正式版
  1663 + // miniProgramType: //开发版
1655 // thumbnail: WeChatImage.binary(source) 1664 // thumbnail: WeChatImage.binary(source)
1656 thumbnail: WeChatImage.network(_thumbnail) 1665 thumbnail: WeChatImage.network(_thumbnail)
1657 // thumbnail: WeChatImage.binary(image) 1666 // thumbnail: WeChatImage.binary(image)
@@ -1730,12 +1739,12 @@ class Utils { @@ -1730,12 +1739,12 @@ class Utils {
1730 var model = new WeChatShareMiniProgramModel( 1739 var model = new WeChatShareMiniProgramModel(
1731 webPageUrl: _webPageUrl, 1740 webPageUrl: _webPageUrl,
1732 userName: _userName, 1741 userName: _userName,
1733 - title: 'ff', 1742 + title: _title,
1734 path: _path, 1743 path: _path,
1735 - description: 'hhh',  
1736 - // miniProgramType: WXMiniProgramType.PREVIEW, //体验版  
1737 - miniProgramType: WXMiniProgramType.RELEASE, //正式版  
1738 - // miniProgramType: WXMiniProgramType.TEST //开发版 1744 + // description: 'hhh',
  1745 + // miniProgramType: , //体验版
  1746 + miniProgramType: Constant.wxMiniProgramType, //正式版
  1747 + // miniProgramType: //开发版
1739 // thumbnail: WeChatImage.binary(source) 1748 // thumbnail: WeChatImage.binary(source)
1740 thumbnail: WeChatImage.network(_thumbnail), 1749 thumbnail: WeChatImage.network(_thumbnail),
1741 // hdImagePath: WeChatImage.network(_thumbnail), thumbnail: null, 1750 // hdImagePath: WeChatImage.network(_thumbnail), thumbnail: null,
@@ -1788,9 +1797,9 @@ class Utils { @@ -1788,9 +1797,9 @@ class Utils {
1788 title: _title, 1797 title: _title,
1789 path: _path, 1798 path: _path,
1790 description: _description, 1799 description: _description,
1791 - // miniProgramType: WXMiniProgramType.PREVIEW, //体验版  
1792 - miniProgramType: WXMiniProgramType.RELEASE, //正式版  
1793 - // miniProgramType: WXMiniProgramType.TEST //开发版 1800 + // miniProgramType: , //体验版
  1801 + miniProgramType: Constant.wxMiniProgramType, //正式版
  1802 + // miniProgramType: //开发版
1794 // thumbnail: WeChatImage.binary(source) 1803 // thumbnail: WeChatImage.binary(source)
1795 thumbnail: WeChatImage.network(_thumbnail) 1804 thumbnail: WeChatImage.network(_thumbnail)
1796 // thumbnail: WeChatImage.binary(image) 1805 // thumbnail: WeChatImage.binary(image)
@@ -1842,9 +1851,9 @@ class Utils { @@ -1842,9 +1851,9 @@ class Utils {
1842 title: _title, 1851 title: _title,
1843 path: _path, 1852 path: _path,
1844 description: _description, 1853 description: _description,
1845 - miniProgramType: WXMiniProgramType.PREVIEW, //体验版 1854 + miniProgramType: Constant.wxMiniProgramType, //体验版
1846 // miniProgramType: WXMiniProgramType.RELEASE, //正式版 1855 // miniProgramType: WXMiniProgramType.RELEASE, //正式版
1847 - // miniProgramType: WXMiniProgramType.TEST //开发版 1856 + // miniProgramType: //开发版
1848 // thumbnail: WeChatImage.binary(source) 1857 // thumbnail: WeChatImage.binary(source)
1849 thumbnail: WeChatImage.network(_thumbnail) 1858 thumbnail: WeChatImage.network(_thumbnail)
1850 // thumbnail: WeChatImage.binary(image) 1859 // thumbnail: WeChatImage.binary(image)