Revert "修改登录默认url为欣惠康"

This reverts commit 2004213e.

android/app/src/main/assets/index.android.bundle

@@ -407,7 +407,7 @@ __d(function(g,r,i,a,m,e,d){'use strict';e.__esModule=!0;var o="function"==typeo
 __d(function(g,r,i,a,m,e,d){'use strict';e.__esModule=!0;var t=Object.assign||function(t){for(var n=1;n<arguments.length;n++){var s=arguments[n];for(var o in s)Object.prototype.hasOwnProperty.call(s,o)&&(t[o]=s[o])}return t};e.default=function(n,o,u){var f=u||!1,l=(0,s.createStore)(y,p,o?o.enhancer:void 0),h=function(t){l.dispatch({type:c.REGISTER,key:t})},v=function(t,s,o){var u={type:c.REHYDRATE,payload:s,err:o,key:t};n.dispatch(u),l.dispatch(u),f&&E.getState().bootstrapped&&(f(),f=!1)},E=t({},l,{purge:function(){var t=[];return n.dispatch({type:c.PURGE,result:function(n){t.push(n)}}),Promise.all(t)},flush:function(){var t=[];return n.dispatch({type:c.FLUSH,result:function(n){t.push(n)}}),Promise.all(t)},pause:function(){n.dispatch({type:c.PAUSE})},persist:function(){n.dispatch({type:c.PERSIST,register:h,rehydrate:v})}});return E.persist(),E};var n,s=r(d[0]),o=r(d[1]),c=((n=o)&&n.__esModule,r(d[2]));function u(t){if(Array.isArray(t)){for(var n=0,s=Array(t.length);n<t.length;n++)s[n]=t[n];return s}return Array.from(t)}var p={registry:[],bootstrapped:!1},y=function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:p,s=arguments[1];switch(s.type){case c.REGISTER:return t({},n,{registry:[].concat(u(n.registry),[s.key])});case c.REHYDRATE:var o=n.registry.indexOf(s.key),y=[].concat(u(n.registry));return y.splice(o,1),t({},n,{registry:y,bootstrapped:0===y.length});default:return n}}},396,[367,388,389]);
 __d(function(g,r,i,a,m,e,d){'use strict';e.__esModule=!0,e.default=function(n,s){(s||{}).debug;return function(s,o){if(!s)return Promise.resolve(void 0);var u=s._persist&&void 0!==s._persist.version?s._persist.version:t.DEFAULT_VERSION;if(u===o)return Promise.resolve(s);if(u>o)return Promise.resolve(s);var c=Object.keys(n).map(function(t){return parseInt(t)}).filter(function(t){return o>=t&&t>u}).sort(function(t,n){return t-n});try{var f=c.reduce(function(t,s){return n[s](t)},s);return Promise.resolve(f)}catch(t){return Promise.reject(t)}}};var t=r(d[0])},397,[389]);
 __d(function(g,r,i,a,m,e,d){"use strict";e.__esModule=!0,e.default=function(n,t){var u=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},l=u.whitelist||null,f=u.blacklist||null;function o(n){return!(!l||-1!==l.indexOf(n))||!(!f||-1===f.indexOf(n))}return{in:function(t,u,l){return!o(u)&&n?n(t,u,l):t},out:function(n,u,l){return!o(u)&&t?t(n,u,l):n}}}},398,[]);
-__d(function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n=t(r(d[1])),o=r(d[2]),l={loginState:o.LOGIN_NO,userInfo:{},token:null,username:'',password:'',global_domain_config:'https://obs.xhk.orth.tech',local_version_apk:''},_=login=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:l,_=arguments.length>1?arguments[1]:void 0;switch(_.type){case o.LOGIN_DOING:return(0,n.default)({},t,{loginState:o.LOGIN_DOING});case o.LOGIN_SUCCESS:return(0,n.default)({},t,{loginState:o.LOGIN_SUCCESS,userInfo:_.rawData,token:_.rawData.access_token,username:_.username,password:_.password});case o.LOGIN_FAILURE:return(0,n.default)({},t,{loginState:o.LOGIN_FAILURE});case o.EXIT_LOGIN:return(0,n.default)({},t,{token:null,loginState:o.LOGIN_NO,userInfo:{}});case o.AUTO_LOGIN_SUCCESS:return(0,n.default)({},t,{loginState:o.LOGIN_SUCCESS,userInfo:_.rawData,token:_.rawData.access_token});case o.AUTO_LOGIN_FAILURE:return(0,n.default)({},t,{loginState:o.LOGIN_FAILURE});case o.SET_DOMAIN_CONFIGURATE:return(0,n.default)({},t,{global_domain_config:_.global_domain_config});case o.SET_VERSION_APK:return(0,n.default)({},t,{local_version_apk:_.local_version_apk});default:return t}};e.default=_},399,[1,11,400]);
+__d(function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n=t(r(d[1])),o=r(d[2]),l={loginState:o.LOGIN_NO,userInfo:{},token:null,username:'',password:'',global_domain_config:'https://obs.uat.guke.tech',local_version_apk:''},_=login=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:l,_=arguments.length>1?arguments[1]:void 0;switch(_.type){case o.LOGIN_DOING:return(0,n.default)({},t,{loginState:o.LOGIN_DOING});case o.LOGIN_SUCCESS:return(0,n.default)({},t,{loginState:o.LOGIN_SUCCESS,userInfo:_.rawData,token:_.rawData.access_token,username:_.username,password:_.password});case o.LOGIN_FAILURE:return(0,n.default)({},t,{loginState:o.LOGIN_FAILURE});case o.EXIT_LOGIN:return(0,n.default)({},t,{token:null,loginState:o.LOGIN_NO,userInfo:{}});case o.AUTO_LOGIN_SUCCESS:return(0,n.default)({},t,{loginState:o.LOGIN_SUCCESS,userInfo:_.rawData,token:_.rawData.access_token});case o.AUTO_LOGIN_FAILURE:return(0,n.default)({},t,{loginState:o.LOGIN_FAILURE});case o.SET_DOMAIN_CONFIGURATE:return(0,n.default)({},t,{global_domain_config:_.global_domain_config});case o.SET_VERSION_APK:return(0,n.default)({},t,{local_version_apk:_.local_version_apk});default:return t}};e.default=_},399,[1,11,400]);
 __d(function(g,r,i,a,m,e,d){Object.defineProperty(e,"__esModule",{value:!0}),e.DEVICE_INFORMATION_UPDATE_FAILURE=e.DEVICE_INFORMATION_UPDATE_SUCCESS=e.DEVICE_INFORMATION_UPDATE_DOING=e.DEVICE_INFORMATION_UPDATE_NO=e.SET_TRANS_SEARCH_FORM=e.SET_TRANS_DETAIL_OPTION=e.TRANS_INIT_DATA=e.TRANS_SUBMIT_FAILURE=e.TRANS_SUBMIT_SUCCESS=e.TRANS_SUBMIT_DOING=e.TRANS_SUBMIT_NO=e.TRANS_ORDER_LIST_FAILURE=e.TRANS_ORDER_LIST_SUCCESS=e.TRANS_ORDER_LIST_DOING=e.TRANS_ORDER_LIST_NO=e.HISTOR_ORDER_SEARCH_FAILURE=e.HISTOR_ORDER_SEARCH_SUCCESS=e.HISTOR_ORDER_SEARCH_DOING=e.HISTOR_ORDER_SEARCH_NO=e.SET_CHARGE_DETAILS_OPTION=e.SET_SUB_DETAIL_OPTION=e.EQUIP_INIT_DATA=e.EQUIP_SUBMIT_FAILURE=e.EQUIP_SUBMIT_SUCCESS=e.EQUIP_SUBMIT_DOING=e.EQUIP_SUBMIT_NO=e.EQUIP_CONSU_LIST_FAILURE=e.EQUIP_CONSU_LIST_SUCCESS=e.EQUIP_CONSU_LIST_DOING=e.EQUIP_CONSU_LIST_NO=e.QUICK_INIT_DATA=e.QUICK_SUBMIT_FAILURE=e.QUICK_SUBMIT_SUCCESS=e.QUICK_SUBMIT_DOING=e.QUICK_SUBMIT_NO=e.QUICK_ORDER_LIST_FAILURE=e.QUICK_ORDER_LIST_SUCCESS=e.QUICK_ORDER_LIST_DOING=e.QUICK_ORDER_LIST_NO=e.SET_SELECT_PRODUCT_OPTS=e.SELF_INIT_DATA=e.SELF_SUBMIT_FAILURE=e.SELF_SUBMIT_SUCCESS=e.SELF_SUBMIT_DOING=e.SELF_SUBMIT_NO=e.SELF_ORDER_LIST_FAILURE=e.SELF_ORDER_LIST_SUCCESS=e.SELF_ORDER_LIST_DOING=e.SELF_ORDER_LIST_NO=e.SET_VERSION_APK=e.SET_DOMAIN_CONFIGURATE=e.AUTO_LOGIN_FAILURE=e.AUTO_LOGIN_SUCCESS=e.EXIT_LOGIN=e.LOGIN_FAILURE=e.LOGIN_SUCCESS=e.LOGIN_DOING=e.LOGIN_NO=void 0;e.LOGIN_NO="LOGIN_NO";e.LOGIN_DOING="LOGIN_DOING";e.LOGIN_SUCCESS="LOGIN_SUCCESS";e.LOGIN_FAILURE="LOGIN_FAILURE";e.EXIT_LOGIN="EXIT_LOGIN";e.AUTO_LOGIN_SUCCESS="AUTO_LOGIN_SUCCESS";e.AUTO_LOGIN_FAILURE="AUTO_LOGIN_FAILURE";e.SET_DOMAIN_CONFIGURATE="SET_DOMAIN_CONFIGURATE";e.SET_VERSION_APK="SET_VERSION_APK";e.SELF_ORDER_LIST_NO="SELF_ORDER_LIST_NO";e.SELF_ORDER_LIST_DOING="SELF_ORDER_LIST_DOING";e.SELF_ORDER_LIST_SUCCESS="SELF_ORDER_LIST_SUCCESS";e.SELF_ORDER_LIST_FAILURE="SELF_ORDER_LIST_FAILURE";e.SELF_SUBMIT_NO="SELF_SUBMIT_NO";e.SELF_SUBMIT_DOING="SELF_SUBMIT_DOING";e.SELF_SUBMIT_SUCCESS="SELF_SUBMIT_SUCCESS";e.SELF_SUBMIT_FAILURE="SELF_SUBMIT_FAILURE";e.SELF_INIT_DATA="SELF_INIT_DATA";e.SET_SELECT_PRODUCT_OPTS="SET_SELECT_PRODUCT_OPTS";e.QUICK_ORDER_LIST_NO="QUICK_ORDER_LIST_NO";e.QUICK_ORDER_LIST_DOING="QUICK_ORDER_LIST_DOING";e.QUICK_ORDER_LIST_SUCCESS="QUICK_ORDER_LIST_SUCCESS";e.QUICK_ORDER_LIST_FAILURE="QUICK_ORDER_LIST_FAILURE";e.QUICK_SUBMIT_NO="QUICK_SUBMIT_NO";e.QUICK_SUBMIT_DOING="QUICK_SUBMIT_DOING";e.QUICK_SUBMIT_SUCCESS="QUICK_SUBMIT_SUCCESS";e.QUICK_SUBMIT_FAILURE="QUICK_SUBMIT_FAILURE";e.QUICK_INIT_DATA="QUICK_INIT_DATA";e.EQUIP_CONSU_LIST_NO="EQUIP_CONSU_LIST_NO";e.EQUIP_CONSU_LIST_DOING="EQUIP_CONSU_LIST_DOING";e.EQUIP_CONSU_LIST_SUCCESS="EQUIP_CONSU_LIST_SUCCESS";e.EQUIP_CONSU_LIST_FAILURE="EQUIP_CONSU_LIST_FAILURE";e.EQUIP_SUBMIT_NO="EQUIP_SUBMIT_NO";e.EQUIP_SUBMIT_DOING="EQUIP_SUBMIT_DOING";e.EQUIP_SUBMIT_SUCCESS="EQUIP_SUBMIT_SUCCESS";e.EQUIP_SUBMIT_FAILURE="EQUIP_SUBMIT_FAILURE";e.EQUIP_INIT_DATA="EQUIP_INIT_DATA";e.SET_SUB_DETAIL_OPTION="SET_SUB_DETAIL_OPTION";e.SET_CHARGE_DETAILS_OPTION="SET_CHARGE_DETAILS_OPTION";e.HISTOR_ORDER_SEARCH_NO="HISTOR_ORDER_SEARCH_NO";e.HISTOR_ORDER_SEARCH_DOING="HISTOR_ORDER_SEARCH_DOING";e.HISTOR_ORDER_SEARCH_SUCCESS="HISTOR_ORDER_SEARCH_SUCCESS";e.HISTOR_ORDER_SEARCH_FAILURE="HISTOR_ORDER_SEARCH_FAILURE";e.TRANS_ORDER_LIST_NO="TRANS_ORDER_LIST_NO";e.TRANS_ORDER_LIST_DOING="TRANS_ORDER_LIST_DOING";e.TRANS_ORDER_LIST_SUCCESS="TRANS_ORDER_LIST_SUCCESS";e.TRANS_ORDER_LIST_FAILURE="TRANS_ORDER_LIST_FAILURE";e.TRANS_SUBMIT_NO="TRANS_SUBMIT_NO";e.TRANS_SUBMIT_DOING="TRANS_SUBMIT_DOING";e.TRANS_SUBMIT_SUCCESS="TRANS_SUBMIT_SUCCESS";e.TRANS_SUBMIT_FAILURE="TRANS_SUBMIT_FAILURE";e.TRANS_INIT_DATA="TRANS_INIT_DATA";e.SET_TRANS_DETAIL_OPTION="SET_TRANS_DETAIL_OPTION";e.SET_TRANS_SEARCH_FORM="SET_TRANS_SEARCH_FORM";e.DEVICE_INFORMATION_UPDATE_NO="DEVICE_INFORMATION_UPDATE_NO";e.DEVICE_INFORMATION_UPDATE_DOING="DEVICE_INFORMATION_UPDATE_DOING";e.DEVICE_INFORMATION_UPDATE_SUCCESS="DEVICE_INFORMATION_UPDATE_SUCCESS";e.DEVICE_INFORMATION_UPDATE_FAILURE="DEVICE_INFORMATION_UPDATE_FAILURE"},400,[]);
 __d(function(g,r,i,a,m,e,d){var _=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t=_(r(d[1])),u=r(d[2]),I={quick_list_status:u.QUICK_ORDER_LIST_NO,submit_quick_order_status:u.QUICK_SUBMIT_NO,quickOrderOption:{}},s=quick=function(){var _=arguments.length>0&&void 0!==arguments[0]?arguments[0]:I,s=arguments.length>1?arguments[1]:void 0;switch(s.type){case u.QUICK_ORDER_LIST_DOING:return(0,t.default)({},_,{quick_list_status:u.QUICK_ORDER_LIST_DOING});case u.QUICK_ORDER_LIST_SUCCESS:return(0,t.default)({},_,{quick_list_status:u.QUICK_ORDER_LIST_SUCCESS,quickOrderOption:s.rawData});case u.QUICK_ORDER_LIST_FAILURE:return(0,t.default)({},_,{quick_list_status:u.QUICK_ORDER_LIST_FAILURE});case u.QUICK_SUBMIT_DOING:return(0,t.default)({},_,{submit_quick_order_status:u.QUICK_SUBMIT_DOING});case u.QUICK_SUBMIT_SUCCESS:return(0,t.default)({},_,{submit_quick_order_status:u.QUICK_SUBMIT_SUCCESS,quickOrderOption:s.rawData});case u.QUICK_SUBMIT_FAILURE:return(0,t.default)({},_,{submit_quick_order_status:u.QUICK_SUBMIT_FAILURE});case u.QUICK_INIT_DATA:return(0,t.default)({},_,{quick_list_status:u.QUICK_ORDER_LIST_NO,submit_quick_order_status:u.QUICK_SUBMIT_NO,quickOrderOption:{}});default:return _}};e.default=s},401,[1,11,400]);
 __d(function(g,r,i,a,m,e,d){var _=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t=_(r(d[1])),s=r(d[2]),S={self_list_status:s.SELF_ORDER_LIST_NO,submit_self_order_status:s.SELF_SUBMIT_NO,selfOrderOption:{},local_sele_pro_options:{}},l=selfOrder=function(){var _=arguments.length>0&&void 0!==arguments[0]?arguments[0]:S,l=arguments.length>1?arguments[1]:void 0;switch(l.type){case s.SELF_ORDER_LIST_DOING:return(0,t.default)({},_,{self_list_status:s.SELF_ORDER_LIST_DOING});case s.SELF_ORDER_LIST_SUCCESS:return(0,t.default)({},_,{self_list_status:s.SELF_ORDER_LIST_SUCCESS,selfOrderOption:l.rawData});case s.SELF_ORDER_LIST_FAILURE:return(0,t.default)({},_,{self_list_status:s.SELF_ORDER_LIST_FAILURE});case s.SELF_SUBMIT_DOING:return(0,t.default)({},_,{submit_self_order_status:s.SELF_SUBMIT_DOING});case s.SELF_SUBMIT_SUCCESS:return(0,t.default)({},_,{submit_self_order_status:s.SELF_SUBMIT_SUCCESS,selfOrderOption:l.rawData});case s.SELF_SUBMIT_FAILURE:return(0,t.default)({},_,{submit_self_order_status:s.SELF_SUBMIT_FAILURE});case s.SELF_INIT_DATA:return(0,t.default)({},_,{self_list_status:s.SELF_ORDER_LIST_NO,submit_self_order_status:s.SELF_SUBMIT_NO,selfOrderOption:{},local_sele_pro_options:{}});case s.SET_SELECT_PRODUCT_OPTS:return(0,t.default)({},_,{local_sele_pro_options:l.rawData});default:return _}};e.default=l},402,[1,11,400]);

app/containers/selfOrder/module/ChooseProductPage.js

@@ -798,7 +798,7 @@ class ChooseProductPage extends Component {
                 })
                 cur_sel_options[cur_sel_options.length - 1][LocalVariable.SELECTED_DATA_ARR] = cur_hc_arr
             }
-        }
+        }        
 
         return (
             <View style={list_common_item.sub_box}>
@@ -1032,4 +1032,4 @@ const mapDispatchToProps = (dispatch) => {
     }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(ChooseProductPage);
+export default connect(mapStateToProps, mapDispatchToProps)(ChooseProductPage);
\ No newline at end of file

app/reducers/module/login.js

@@ -17,8 +17,7 @@ const defaultState = {
     token:null,
     username:'',
     password:'',
-    // global_domain_config: 'https://obs.uat.guke.tech',
-    global_domain_config: 'https://obs.xhk.orth.tech',
+    global_domain_config: 'https://obs.uat.guke.tech',
     local_version_apk: '',
     // 默认【深圳仓】https://obs.uat.guke.tech；【十方uat】https://obs.uat.sfrx.guke.tech；【十方pro】https://obs.sfrx.orth.tech
     // 【国药dev】https://obs.dev.guke.tech；【国药pro】https://obs-pro.gyjtsx.com
@@ -27,7 +26,7 @@ const defaultState = {
 
 export default login = (state = defaultState, action) => {
     switch (action.type) {
-        case LOGIN_DOING:
+        case LOGIN_DOING: 
             return Object.assign({}, state, {
                 loginState: LOGIN_DOING
             });
@@ -60,7 +59,7 @@ export default login = (state = defaultState, action) => {
             return Object.assign({}, state, {
                 loginState: LOGIN_FAILURE
             });
-        case SET_DOMAIN_CONFIGURATE:
+        case SET_DOMAIN_CONFIGURATE: 
             return Object.assign({}, state, {
                 global_domain_config: action.global_domain_config
             })
@@ -69,6 +68,6 @@ export default login = (state = defaultState, action) => {
                 local_version_apk: action.local_version_apk
             })
         default: // need this for default case
-            return state
+            return state 
     }
-}
+}
\ No newline at end of file

ios/BoneHouse_Business_APP/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.4</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>