HW il y a 3 ans
Parent
commit
77b9b635ab

+ 3 - 3
src/pages/applyDepart/result.jsx

@@ -21,7 +21,7 @@ class Result extends Component{
           {
             this.props.resultState === 0 ?
               <Icon size='80' type='success' /> :
-              this.props.resultState === 40037 ?
+              this.props.resultState === 43101 ?
                 <Icon size='80' type='info' /> :
                 <Icon size='80' type='warn' />
           }
@@ -30,12 +30,12 @@ class Result extends Component{
           {
             this.props.resultState === 0 ?
               '申请成功' :
-              this.props.resultState === 40037 ?
+              this.props.resultState === 43101 ?
                 '申请成功,但您的上级未打开订阅消息通知,请与上级联系,否则审批可能会不及时' :
                 '申请成功,消息发送错误,请联系管理员'
           }
           {
-            this.props.resultState !== 0 && this.props.resultState !== 40037 ?
+            this.props.resultState !== 0 && this.props.resultState !== 43101 ?
               <View className='resultError'>错误编码:{this.props.resultState}</View>:null
           }
         </View>

+ 3 - 3
src/pages/login/index.jsx

@@ -143,10 +143,10 @@ class Login extends Component {
             }).then(v=>{
               if(v.error.length === 0){
                 Taro.switchTab({
-                  url: '/pages/examine/index',
+                  url: '/pages/punchClock/index',
                 })
               }else{
-                Taro.showToast({title:v.error[0].message})
+                Taro.showToast({title:v.error[0].message,icon:'none'})
               }
             })
           },
@@ -156,7 +156,7 @@ class Login extends Component {
         });
       }else{
         Taro.switchTab({
-          url: '/pages/applyDepart/index',
+          url: '/pages/punchClock/index',
         })
       }
     }).catch((err)=>{

+ 6 - 3
src/pages/punchClock/index.jsx

@@ -77,7 +77,6 @@ class PunchClock extends Component {
       Taro.startLocationUpdate({
         success:()=>{
           Taro.onLocationChange((v)=>{
-            console.log(1111111)
             this.getSpacing(v.latitude,v.longitude)
           })
         }
@@ -175,7 +174,8 @@ class PunchClock extends Component {
               }
             }else{
               Taro.showToast({
-                title:v.error[0].message
+                title:v.error[0].message,
+                icon:'none'
               })
             }
           }).catch(()=>{
@@ -189,11 +189,14 @@ class PunchClock extends Component {
             dtails:v.data.list[0],
             addressLatitude:v.data.list[0].latitude,
             addressLongitude:v.data.list[0].longitude,
+          },()=>{
+            fn();
           })
         }
       }else{
         Taro.showToast({
-          title:v.error[0].message
+          title:v.error[0].message,
+          icon:'none'
         })
       }
     }).catch(()=>{

+ 2 - 2
src/utils/servers/baseUrl.js

@@ -2,10 +2,10 @@ const getBaseUrl = (url) => {
   let BASE_URL = '';
   if (process.env.NODE_ENV === 'development') {
     //开发环境 - 根据请求不同返回不同的BASE_URL
-    BASE_URL = 'http://172.16.0.188:8080'
+    BASE_URL = 'https://uat.jishutao.com'
   } else {
     // 生产环境
-    BASE_URL = 'http://172.16.0.188:8080'
+    BASE_URL = 'https://uat.jishutao.com'
   }
   return BASE_URL
 }

+ 1 - 1
yarn-error.log

@@ -1,5 +1,5 @@
 Arguments: 
-  C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js add moment
+  C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js add taro-skeleton
 
 PATH: 
   F:\HWFiles\kede-tool-weapp\node_modules\.bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd;C:\Windows\System32;C:\Program Files\TortoiseGit\bin;C:\Program Files (x86)\Yarn\bin\;C:\Program Files\nodejs\;D:\Microsoft VS Code\bin;C:\Users\Administrator\AppData\Local\Yarn\bin;C:\Users\Administrator\AppData\Roaming\npm