bug(custom): eCX-7344

.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=
 

src/components/sp-page/index.js

@@ -438,8 +438,7 @@ const SpPage = memo(
 
         {/* 没有页面自动义头部配置样式，自动生成自定义导航 */}
         {state.customNavigation && RenderCustomNavigation()}
-
-        {!props.isDefault &&!props.loading&& (
+        {!props.isDefault && (
           <View
             className='sp-page__body'
             style={styleNames({
@@ -456,7 +455,6 @@ const SpPage = memo(
           </View>
         )}
         {props.loading && <SpLoading />}
-
         {props.renderFooter && (
           <View
             key={lang}

src/ext.json

@@ -1,9 +1,9 @@
 {
   "extEnable": true,
-  "extAppid": "wx1e25e45145b70faa",
+  "extAppid": "wxf7abee400d50e0d0",
   "ext": {
-    "company_id": "38",
-    "appid": "wx1e25e45145b70faa",
+    "company_id": "5",
+    "appid": "wxf7abee400d50e0d0",
     "wxa_name": "通用小程序",
     "ali_isvid":""
   },

src/pages/purchase/comps/comp-tabbar.scss

@@ -1,3 +1,7 @@
 .at-badge__num {
     background-color: var(--color-dianwu-primary);
+}
+.at-tab-bar{
+    height: 100%;
+    position: absolute;
 }

src/subpages/purchase/select-identity.js

@@ -1,7 +1,7 @@
 import Taro, { useDidShow, useRouter } from '@tarojs/taro'
 import React, { useEffect } from 'react'
 import { useImmer } from 'use-immer'
-import { View, Text, Image } from '@tarojs/components'
+import { View, Text, Image, ScrollView } from '@tarojs/components'
 import api from '@/api'
 import { classNames, getDistributorId, VERSION_IN_PURCHASE } from '@/utils'
 import CompTabbarActivity from '@/pages/purchase/comps/comp-tabbar'
@@ -87,6 +87,12 @@ function SelectIdentity(props) {
       loading={loading}
       renderFooter={!loading && <CompTabbarActivity />}
     >
+      <ScrollView
+        className='identity-content'
+        scrollY
+        scrollWithAnimation
+      >
+
       <View className='identity-item' onClick={onAddIdentityChange}>
         <View className='identity-item-avatar'>
           <Text className='iconfont icon-tianjia1 add-icon avatar'></Text>
@@ -95,7 +101,7 @@ function SelectIdentity(props) {
       </View>
       <View className='content'>
         <View className='identity'>
-          {identity.map((item, index) => {
+          {[1,2,3,4,5,6,7,8,9,10].map((item, index) => {
             return (
               <View key={index} className='identity-item' onClick={() => handleItemClick(item)}>
                 <View className='identity-item-avatar'>
@@ -103,16 +109,16 @@ function SelectIdentity(props) {
                 </View>
                 <View className='identity-item-content'>
                   <View className='content-top'>
-                    <View className='company'>{item.name}</View>
+                    <View className='company'>{item?.name}</View>
                   </View>
                   <View className='content-bottom'>
-                    <View className={classNames('role', item.is_relative == 1 ? 'friend' : '')}>
-                      {(item.is_employee == 1 && '员工') || (item.is_relative == 1 && '亲友')}
+                    <View className={classNames('role', item?.is_relative == 1 ? 'friend' : '')}>
+                      {(item?.is_employee == 1 && '员工') || (item?.is_relative == 1 && '亲友')}
                     </View>
-                    <View className='account'>{item.login_account}</View>
+                    <View className='account'>{item?.login_account}</View>
                   </View>
                 </View>
-                {curEnterpriseId == item.enterprise_id && (
+                {curEnterpriseId == item?.enterprise_id && (
                   <View className='identity-item-right'>当前选中</View>
                 )}
               </View>
@@ -143,6 +149,7 @@ function SelectIdentity(props) {
           </View>
         )} */}
       </View>
+      </ScrollView>
     </SpPage>
   )
 }

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;