Commit 10f7e362b9771f4ee721b4b48552678e92f81002

Authored by wdn127929
1 parent c0cb6b54

4.8.7排菜分享

... ... @@ -15,17 +15,17 @@ if (flutterRoot == null) {
def flutterVersionCode = "486"
def flutterVersionCode = "487"
if (flutterVersionCode == null) {
flutterVersionCode = '486'
flutterVersionCode = '487'
}
def flutterVersionName = "4.8.6"
def flutterVersionName = "4.8.7"
if (flutterVersionName == null) {
flutterVersionName = '4.8.6'
flutterVersionName = '4.8.7'
}
... ...
... ... @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
... ... @@ -510,7 +510,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 483;
CURRENT_PROJECT_VERSION = 486;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -525,7 +525,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.8.3;
MARKETING_VERSION = 4.8.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -656,10 +656,10 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 483;
CURRENT_PROJECT_VERSION = 486;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
FLUTTER_BUILD_MODE = release;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -671,7 +671,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.8.3;
MARKETING_VERSION = 4.8.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -692,7 +692,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 483;
CURRENT_PROJECT_VERSION = 486;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -707,7 +707,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.8.3;
MARKETING_VERSION = 4.8.6;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
//基本常量
class Constant{
static const int status_success = 200;//服务器返回成功
}
\ No newline at end of file
import 'package:fluwx/fluwx.dart';
class Constant {
static const int status_success = 200; //服务器返回成功
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.RELEASE; //正式版
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.PREVIEW; //体验版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.TEST; //开发版
}
... ...
... ... @@ -2276,7 +2276,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
borderSide: BorderSide.none),
contentPadding: EdgeInsets.zero,
),
keyboardType: TextInputType.number,
keyboardType: TextInputType.text,
textInputAction: TextInputAction.done,
onChanged: (value) {
... ...
... ... @@ -826,15 +826,22 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
fontSize: 36,
isBold: false,
onPressed: () {
Utils.goShareOrderFoodToWeChatPaicai(
context,
data: widget.showList,
title: '菜品已点好,快来看看都点了什么~',
img:
'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
rid: widget.rid,
// oid: oid,
);
Utils.goShareOrderFoodToWeChatPaicai(context,
data: widget.showList,
title: '菜品已点好,快来看看都点了什么~',
img:
'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
rid: widget.rid,
priceSum: widget.priceSum,
memberPriceSum: widget.memberPriceSum,
planPriceSum: widget.planDishText,
remark: widget.remark,
name: widget.name,
address: sellerAdr,
service: servicePerson
// oid: oid,
);
// if (index != null) {
// NavigatorUtil.goOrderSharePage(context,
... ...
... ... @@ -5,6 +5,7 @@ import 'dart:typed_data';
import 'package:common_utils/common_utils.dart';
import 'package:connectivity/connectivity.dart';
import 'package:contacts_service/contacts_service.dart';
// import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:device_info/device_info.dart';
import 'package:dio/dio.dart';
... ... @@ -36,6 +37,7 @@ import 'package:path_provider/path_provider.dart';
import 'package:image_cropper/image_cropper.dart';
import 'dart:math';
import '../constant/constant.dart';
import '../models/cookbook_model.dart';
import '../models/coupon_model.dart';
import '../models/recharge_list_model.dart';
... ... @@ -1202,7 +1204,7 @@ class Utils {
username: "gh_487873d353b3",
path:
"pack-book/pages/book/b_index?seller_id=${model.user.sellerid}&seller_openid=seller_openid&manager_id=&goPath=${subPath}",
miniProgramType: WXMiniProgramType.RELEASE);
miniProgramType: Constant.wxMiniProgramType);
}
//跳转小程序新建店铺页面
... ... @@ -1211,7 +1213,7 @@ class Utils {
launchWeChatMiniProgram(
username: "gh_1007de739c65",
path: "pages/login/l_login",
miniProgramType: WXMiniProgramType.RELEASE);
miniProgramType: Constant.wxMiniProgramType);
}
//分享排菜单
... ... @@ -1220,7 +1222,14 @@ class Utils {
String title,
String rid,
String oid,
String img}) async {
String img,
String priceSum,
String memberPriceSum,
String planPriceSum,
String remark,
String name,
String address,
String service}) async {
Loading.showLoading(context);
String _webPageUrl = "http://colorcun.com/";
// String _thumbnail = img;
... ... @@ -1238,12 +1247,12 @@ class Utils {
// "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
print(data);
String _path =
"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";
"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}";
String _description = "OneKey";
// Uint8List source = await testComporessList(context, _thumbnail);
print(_path);
var model = new WeChatShareMiniProgramModel(
miniProgramType: WXMiniProgramType.RELEASE,
miniProgramType: Constant.wxMiniProgramType,
webPageUrl: _webPageUrl,
userName: _userName,
title: _title,
... ... @@ -1257,7 +1266,7 @@ class Utils {
Loading.hideLoading(context);
}
//分享已点菜品----跳转小程序提前点餐
//请客户点菜----跳转小程序提前点餐
static goShareOrderPageToWeChat(BuildContext context,
{String title, String rid, String img, String oid, String sid}) async {
Loading.showLoading(context);
... ... @@ -1279,9 +1288,9 @@ class Utils {
String _description = "OneKey";
// Uint8List source = await testComporessList(context, _thumbnail);
var model = new WeChatShareMiniProgramModel(
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// miniProgramType: , //体验版
miniProgramType: Constant.wxMiniProgramType, //正式版
// miniProgramType: //开发版
webPageUrl: _webPageUrl,
userName: _userName,
title: _title,
... ... @@ -1320,7 +1329,7 @@ class Utils {
String _description = "OneKey";
// Uint8List source = await testComporessList(context, _thumbnail);
var model = new WeChatShareMiniProgramModel(
miniProgramType: WXMiniProgramType.RELEASE,
miniProgramType: Constant.wxMiniProgramType,
webPageUrl: _webPageUrl,
userName: _userName,
title: _title,
... ... @@ -1335,12 +1344,12 @@ class Utils {
}
//拉起小程序已点菜品
static goMiniProgramOrderFood({String rid}) {
launchWeChatMiniProgram(
username: "gh_487873d353b3",
path: "pack-cookbook/pages/success?rid=$rid&identity=2",
miniProgramType: WXMiniProgramType.RELEASE);
}
// static goMiniProgramOrderFood({String rid}) {
// launchWeChatMiniProgram(
// username: "gh_487873d353b3",
// path: "pack-cookbook/pages/success?rid=$rid&identity=2",
// miniProgramType: WXMiniProgramType.RELEASE);
// }
//跳转拨打电话页面
static goHelp(BuildContext context) async {
... ... @@ -1649,9 +1658,9 @@ class Utils {
title: _title,
path: _path,
description: _description,
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// miniProgramType: , //体验版
miniProgramType:Constant.wxMiniProgramType, //正式版
// miniProgramType: //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
// thumbnail: WeChatImage.binary(image)
... ... @@ -1730,12 +1739,12 @@ class Utils {
var model = new WeChatShareMiniProgramModel(
webPageUrl: _webPageUrl,
userName: _userName,
title: 'ff',
title: _title,
path: _path,
description: 'hhh',
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// description: 'hhh',
// miniProgramType: , //体验版
miniProgramType: Constant.wxMiniProgramType, //正式版
// miniProgramType: //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail),
// hdImagePath: WeChatImage.network(_thumbnail), thumbnail: null,
... ... @@ -1788,9 +1797,9 @@ class Utils {
title: _title,
path: _path,
description: _description,
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// miniProgramType: , //体验版
miniProgramType: Constant.wxMiniProgramType, //正式版
// miniProgramType: //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
// thumbnail: WeChatImage.binary(image)
... ... @@ -1842,9 +1851,9 @@ class Utils {
title: _title,
path: _path,
description: _description,
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: Constant.wxMiniProgramType, //体验版
// miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// miniProgramType: //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
// thumbnail: WeChatImage.binary(image)
... ...