diff --git a/.env b/.env index f53bd29e3..c433749a1 100644 --- a/.env +++ b/.env @@ -1,16 +1,16 @@ APP_BASE_URL=https://demo-ecshopx.ishopex.cn/api/h5app/wxapp APP_WEBSOCKET=wss://demo-ecshopx.ishopex.cn/ws -APP_COMPANY_ID=38 -APP_PLATFORM=standard +APP_COMPANY_ID=5 +APP_PLATFORM=platform APP_CUSTOM_SERVER=https://ecshopx-h5.ex-sandbox.com/ APP_HOME_PAGE=/pages/index APP_TRACK=youshu APP_YOUSHU_TOKEN=bi281e87ab2424481a -APP_ID=wx1e25e45145b70faa -APP_MAP_KEY=PSPBZ-KQ5CW-CSGRF-ON2S4-K2HQJ-XEBQG +APP_ID=wxf7abee400d50e0d0 +APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_NAME=oneX新零售门店定位 APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop -APP_DIANWU_URL=https://demo-ecshopx-dianwu.shopex123.com +APP_DIANWU_URL= APP_MERCHANT_URL= APP_ADAPAY= diff --git a/src/components/sp-page/index.js b/src/components/sp-page/index.js index a7129aa22..d9ec25a8b 100644 --- a/src/components/sp-page/index.js +++ b/src/components/sp-page/index.js @@ -438,8 +438,7 @@ const SpPage = memo( {/* 没有页面自动义头部配置样式,自动生成自定义导航 */} {state.customNavigation && RenderCustomNavigation()} - - {!props.isDefault &&!props.loading&& ( + {!props.isDefault && ( )} {props.loading && } - {props.renderFooter && ( } > + + @@ -95,7 +101,7 @@ function SelectIdentity(props) { - {identity.map((item, index) => { + {[1,2,3,4,5,6,7,8,9,10].map((item, index) => { return ( handleItemClick(item)}> @@ -103,16 +109,16 @@ function SelectIdentity(props) { - {item.name} + {item?.name} - - {(item.is_employee == 1 && '员工') || (item.is_relative == 1 && '亲友')} + + {(item?.is_employee == 1 && '员工') || (item?.is_relative == 1 && '亲友')} - {item.login_account} + {item?.login_account} - {curEnterpriseId == item.enterprise_id && ( + {curEnterpriseId == item?.enterprise_id && ( 当前选中 )} @@ -143,6 +149,7 @@ function SelectIdentity(props) { )} */} + ) } diff --git a/src/subpages/purchase/select-identity.scss b/src/subpages/purchase/select-identity.scss index 1e59d72df..e21f90d7c 100644 --- a/src/subpages/purchase/select-identity.scss +++ b/src/subpages/purchase/select-identity.scss @@ -1,8 +1,12 @@ .select-identity{ font-family: PingFangSC-Regular, PingFang SC; - padding: 0 32px; - padding-top: 32px; + .identity-content{ + padding: 0 32px; + padding-top: 32px; + box-sizing: border-box; + height: 100%; + } .identity-item{ width: 686px; height: 154px;