Leon 1 rok pred
rodič
commit
8c7aea2bbc

+ 1 - 1
ios/hola.xcodeproj/project.pbxproj

@@ -602,7 +602,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				EXCLUDED_ARCHS = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;

+ 1 - 1
src/pages/account/Setting.tsx

@@ -65,7 +65,7 @@ export default function Page() {
 
     return <View style={{ color: '#fff', display: 'flex', flexDirection: 'column', flex: 1 }}>
         <View style={{ height: 20 }} />
-        <TableCell title={t('page.setting.version')} ><Text style={{ opacity: 0.8, color: '#fff' }}>{process.env.TARO_ENV == 'weapp'?Taro.getAccountInfoSync().miniProgram.version:'1.3.3'}</Text></TableCell>
+        <TableCell title={t('page.setting.version')} ><Text style={{ opacity: 0.8, color: '#fff' }}>{process.env.TARO_ENV == 'weapp'?'1.3.6':'1.3.3'}</Text></TableCell>
         {/* <Text style={{color:'#9E9E9E',textAlign:'center',fontSize:14}}>v1.2.2</Text> */}
         {
             process.env.TARO_ENV == 'rn' && <View style={{ flex: 1 }} />

+ 2 - 2
src/pages/clock/Clock.tsx

@@ -270,13 +270,13 @@ export default function Page() {
         clientInfo({
             client: {
                 client_type: process.env.TARO_ENV == 'weapp' ? 'MP' : 'APP',
-                client_version: process.env.TARO_ENV == 'weapp' ? Taro.getAccountInfoSync().miniProgram.version : '1.0',//'1.0'
+                client_version: process.env.TARO_ENV == 'weapp' ? '1.3.6':'1.0',//Taro.getAccountInfoSync().miniProgram.version : '1.0',//'1.0'
                 wx_version: process.env.TARO_ENV == 'weapp' ? systemInfo.version : '_'
             },
             meta: {
                 language: systemInfo.language,
                 time_zone: {
-                    id: Intl.DateTimeFormat().resolvedOptions().timeZone,
+                    // id: Intl.DateTimeFormat().resolvedOptions().timeZone,
                     name: timeZoneFormatted
                 },
             },

+ 2 - 2
src/services/http/request.ts

@@ -56,11 +56,11 @@ export async function request<T>(param: RequestParam): Promise<T> {
 
         var split = new Date().toString().split(' ');
         var timeZoneFormatted = split[split.length - 2];
-        var timeZoneLocation = Intl.DateTimeFormat().resolvedOptions().timeZone
+        // var timeZoneLocation = Intl.DateTimeFormat().resolvedOptions().timeZone
 
         header['content-type'] = 'application/json'
         header['X-Time-Zone'] = timeZoneFormatted; //new Date().getTimezoneOffset() / 60
-        header['X-Time-Zone-Id'] = timeZoneLocation;
+        // header['X-Time-Zone-Id'] = timeZoneLocation;
         header['X-Platform'] = Taro.getSystemInfoSync().platform == 'ios' ? 'IOS' : 'ANDROID'; //IOS ANDROID
         header['X-Lang'] = process.env.TARO_ENV == 'rn' ? 'en' : 'zh' //zh en
         header['X-Client-Type'] = process.env.TARO_ENV == 'rn' ? 'APP' : 'WX_APP' //WX_APP APP