Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

android / dayu

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Files
  • Commits
  • Branches
  • Tags
  • Contributors
  • Graph
  • Compare
  • Charts
Commit 01383107 authored a year ago by wukun's avatar wukun
Browse files
Options
  • Browse Files
  • Download
  • Plain Diff

Merge remote-tracking branch 'origin/dev' into dev

parents c731c043 281b439a dev_xx_web … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_250414_sop
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
  • baseSDK/src/main/java/com/dayu/common/Constants.java
  • orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @ 01383107
......@@ -88,7 +88,7 @@ public class Constants {
// public static String ENVIROMENT = "release";
// public static String PHOTO = "online";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.serviceupup.com";
// public static String BASE_URL = "https://mobile.dayuspm.com";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
......
This diff is collapsed. Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
View file @ 01383107
......@@ -475,7 +475,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (item.getIsCheck() == 2) {
ToastUtils.showShortToast("请等待商家验收");
} else {
ToastUtils.showShortToast("等待验收");
// ToastUtils.showShortToast("等待验收");
UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
......
This diff is collapsed. Click to expand it.
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment