Bläddra i källkod

上传一下代码

tags/0.0.3+3
2846432477@qq.com 3 år sedan
förälder
incheckning
e71b28de99
3 ändrade filer med 17 tillägg och 7 borttagningar
  1. +7
    -5
      .idea/workspace.xml
  2. +1
    -1
      lib/util/net_util.dart
  3. +9
    -1
      lib/util/turn_chain/turn_chain_util.dart

+ 7
- 5
.idea/workspace.xml Visa fil

@@ -4,8 +4,9 @@
<list default="true" id="0ff6f366-28dc-4efd-9bca-709f40bc6813" name="Default Changelist" comment="1、添加QQ登录">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/net_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/net_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/turn_chain/turn_chain_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/turn_chain/turn_chain_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/util/net_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util/net_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/util/turn_chain/turn_chain_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util/turn_chain/turn_chain_util.dart" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -582,17 +583,18 @@
<screen x="61" y="23" width="1859" height="1057" />
</state>
<state x="535" y="294" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/61.23.1859.1057@61.23.1859.1057" timestamp="1608813030553" />
<state x="662" y="308" width="946" height="518" key="find.popup" timestamp="1609725217291">
<screen x="66" y="23" width="1854" height="1057" />
<state x="661" y="308" width="947" height="490" key="find.popup" timestamp="1609740024490">
<screen x="64" y="23" width="1856" height="1057" />
</state>
<state x="199" y="457" width="955" height="548" key="find.popup/49.23.1871.1057@49.23.1871.1057" timestamp="1609315191575" />
<state x="654" y="308" width="952" height="490" key="find.popup/54.23.1866.1057@54.23.1866.1057" timestamp="1609298158956" />
<state x="205" y="457" width="951" height="548" key="find.popup/56.23.1864.1057@56.23.1864.1057" timestamp="1609312469166" />
<state x="656" y="308" width="950" height="486" key="find.popup/57.23.1863.1057@57.23.1863.1057" timestamp="1602831360271" />
<state x="659" y="308" width="1028" height="490" key="find.popup/61.23.1859.1057@61.23.1859.1057" timestamp="1609308448962" />
<state x="661" y="308" width="947" height="486" key="find.popup/64.23.1856.1057@64.23.1856.1057" timestamp="1606541582820" />
<state x="662" y="308" width="946" height="518" key="find.popup/66.23.1854.1057@66.23.1854.1057" timestamp="1609725217291" />
<state x="661" y="308" width="947" height="490" key="find.popup/64.23.1856.1057@64.23.1856.1057" timestamp="1609740024490" />
<state x="662" y="308" width="946" height="518" key="find.popup/66.23.1854.1057@66.23.1854.1057" timestamp="1609739298414" />
<state x="663" y="308" width="946" height="486" key="find.popup/67.23.1853.1057@67.23.1853.1057" timestamp="1605837561100" />
<state x="666" y="308" width="943" height="518" key="find.popup/72.23.1848.1057@72.23.1848.1057" timestamp="1609731068244" />
<state x="671" y="308" width="939" height="518" key="find.popup/80.23.1840.1057@80.23.1840.1057" timestamp="1609235735093" />
<state x="651" y="258" width="675" height="676" key="search.everywhere.popup" timestamp="1609310547512">
<screen x="56" y="23" width="1864" height="1057" />


+ 1
- 1
lib/util/net_util.dart Visa fil

@@ -55,7 +55,7 @@ class NetUtil {
if (_dio == null) {
var setting = await NativeUtil.getSetting();
String domain = setting['domain']; //'http://www.hairuyi.com/';
_config(domain, proxyUrl: '192.168.0.125:8888');// 192.168.0.66:8866
_config(domain, proxyUrl: '');// 192.168.0.66:8866
}
return _dio;
}


+ 9
- 1
lib/util/turn_chain/turn_chain_util.dart Visa fil

@@ -18,6 +18,7 @@ import 'package:zhiying_comm/util/turn_chain/turn_chain_style_model.dart';

import '../router_util.dart';
import 'turn_chain_dialog.dart';
import 'package:zhiying_comm/util/shared_prefe_util.dart';

class TurnChainUtil {
///
@@ -55,6 +56,8 @@ class TurnChainUtil {
/// 名片全能王: camcard://
///
static Future<void> openReceiveCoupon(BuildContext context, UserInfoModel userInfoModel, String goodsId, String provider, Map<String, dynamic> data) async {
///iOS 审核状态
String is_ios_review = await SharedPreferencesUtil.getStringValue(GlobalConfig.IS_IOS_REVIEW, defaultVal: '0');
/// 1、先判断是否登陆
if (EmptyUtil.isEmpty(userInfoModel) || EmptyUtil.isEmpty(userInfoModel?.token)) {
RouterUtil.goLogin(context);
@@ -83,7 +86,12 @@ class TurnChainUtil {
if (Platform.isAndroid) {
tradeResult = await FlutterAlibc.openByUrl(url: openAppUrl, backUrl: "alisdk://");
} else if (Platform.isIOS) {
tradeResult = await FlutterAlibc.openByUrl(url: openAppUrl);
if(is_ios_review=='1'){
print('iOS审核:'+is_ios_review);
RouterUtil.openWebview(webUrl, context);
}else{
tradeResult = await FlutterAlibc.openByUrl(url: openAppUrl);
}
}
Logger.debug('taobao result = ${tradeResult.errorCode} ${tradeResult.errorMessage} ');
} else if (!EmptyUtil.isEmpty(webUrl)) {


Laddar…
Avbryt
Spara