Merge branch 'develop' into product

a5c65353 · peii · 9406d2da · 28295252 · a5c65353 · a5c65353
Commit a5c65353 authored May 26, 2022 by peii
Showing with 2 additions and 2 deletions
android/keystores/key.jks
app/Router.js
app/action/SelfAction.js
app/base/BaseStyle.js
app/containers/common/listDataComponent/PicTitDetaiCalcu.js
app/containers/selfOrder/SelfOrderPage.js
app/containers/selfOrder/module/ChooseProductPage.js
app/containers/selfOrder/module/SearchPage.js
package.json
src/pages/settlement/index.tsx
--- a/android/keystores/key.jks
+++ b/android/keystores/key.jks
--- a/app/Router.js
+++ b/app/Router.js
--- a/app/action/SelfAction.js
+++ b/app/action/SelfAction.js
--- a/app/base/BaseStyle.js
+++ b/app/base/BaseStyle.js
--- a/app/containers/common/listDataComponent/PicTitDetaiCalcu.js
+++ b/app/containers/common/listDataComponent/PicTitDetaiCalcu.js
--- a/app/containers/selfOrder/SelfOrderPage.js
+++ b/app/containers/selfOrder/SelfOrderPage.js
--- a/app/containers/selfOrder/module/ChooseProductPage.js
+++ b/app/containers/selfOrder/module/ChooseProductPage.js
--- a/app/containers/selfOrder/module/SearchPage.js
+++ b/app/containers/selfOrder/module/SearchPage.js
--- a/package.json
+++ b/package.json
 {
  "name": "BoneHouse_Business_APP",
-  "version": "1.2.7",
+  "version": "1.2.8",
  "private": true,
  "scripts": {
    "postinstall": "npx jetify",

--- a/src/pages/settlement/index.tsx
+++ b/src/pages/settlement/index.tsx
@@ -83,7 +83,7 @@ class Settlement extends React.Component<IProps, IState> {
      args = filterData
    }

-    args.header_status = 'ENTERED'
+    args.header_status = 'SETTLING'
    const params = R.filter(isNotBlank)({
      ...args,
      ...pagination,