no message

api/login.js

@@ -6,3 +6,4 @@ const newsUrl = '/utility/'
 export const login = (data) => request('/auth/oauth2/token', 'post', { ...data },false)
 export const forgetPassword = (data) => request(newsUrl + 'forget_password', 'post', { ...data },false)
 export const register = (data) => request(newsUrl + 'register', 'post', { ...data },true)
+export const filUserInfo = (data) => request(newsUrl + 'fill_user_info', 'post', { ...data },true)

pages/login/localPhoneLogin.vue

@@ -149,21 +149,18 @@ export default {
     oneClickLogin(mobile){
       mobile='13900139001'
       login({'mobile':mobile,'grant_type':'mobile','scope':'server'}).then((res)=>{
-        if(res.code===0){
-          if(res.data.isNewUser){
+        tools.setLoginData(res)
+        if(res.isNewUser){
+          uni.navigateTo({
+            'url':'/pages/perfect/sexAndAge'
+          })
+        }else {
+          tools.setLoginData(res.data)
+          setTimeout(()=>{
             uni.navigateTo({
               'url':'/pages/perfect/sexAndAge'
             })
-          }else {
-            tools.setLoginData(res.data)
-            setTimeout(()=>{
-              uni.navigateTo({
-                'url':'/pages/perfect/sexAndAge'
-              })
-            },1500)
-          }
-        }else{
-          tools.error(res.msg)
+          },1500)
         }
       }).catch((e)=>{
         console.log(e)

pages/perfect/nickname.vue

@@ -34,7 +34,7 @@
 <script>
 import EnNav from "@/components/en-utils/en-nav/en-nav";
 import tools from "@/service/tools";
-import {register} from "@/api/login";
+import {filUserInfo, register} from "@/api/login";
 export default {
   components: {EnNav},
   data() {
@@ -62,7 +62,7 @@ export default {
         let mobile=uni.getStorageSync('mobile')
         let dateOfBirth=uni.getStorageSync('dateOfBirth')
         let gender=uni.getStorageSync('gender')
-        register({'mobile':mobile,'dateOfBirth':dateOfBirth,'gender':gender,'nickname':this.nickname,'password':this.password}).then((res)=>{
+        filUserInfo({'mobile':mobile,'dateOfBirth':dateOfBirth,'gender':gender,'nickname':this.nickname,'password':this.password}).then((res)=>{
           if(res.code===0){
             tools.setLoginData(res.data)
             uni.navigateTo({

pages/perfect/sexAndAge.vue

@@ -137,6 +137,7 @@ export default {
     setNextStep(){
       if(this.isOK){
         uni.setStorageSync('dateOfBirth', this.ageObj.year+'-'+this.ageObj.month+'-'+this.ageObj.day)
+        uni.setStorageSync('gender', this.sex)
         uni.navigateTo({
           'url':'/pages/perfect/nickname'
         })

service/ajax.js

@@ -16,13 +16,16 @@ export const request = (url, method, data, show = false) => {
     'content-type': 'application/json',
     'hversion': '1.0',
     'Authorization': '',
+    'CLIENT-TOC': 'Y',
   }
   if(url==='/auth/oauth2/token'){
-    token='YXBwOmFwcA=='
-    header['CLIENT-TOC']='Y'
+    token='Basic YXBwOmFwcA=='
+    // header['CLIENT-TOC']='Y'
     url=url+tools.addQueryString(data)
+  }else {
+    token= 'Bearer '+token
   }
-  header.Authorization= 'Basic '+token
+  header.Authorization=token
   console.log(header)
   // data.token = token;
   // data.m_id = uni.getStorageSync('m_id')

service/tools.js

@@ -354,10 +354,10 @@ tools.getDateYM = ()=>{
  * @param type
  */
 tools.setLoginData = function (data) {
-    uni.setStorageSync('token', data.accessToken)
-    uni.setStorageSync('tokenType', data.tokenType)
-    uni.setStorageSync('refreshToken', data.refreshToken)
-    uni.setStorageSync('mobile', data.mobile)
+    uni.setStorageSync('token', data.access_token)
+    uni.setStorageSync('tokenType', data.token_type)
+    uni.setStorageSync('refreshToken', data.access_token)
+    uni.setStorageSync('mobile', data.username)
     tools.success('登陆成功')
     // setTimeout(() => {
     //     if (data.status * 1 === 0) {
@@ -374,14 +374,6 @@ tools.setLoginData = function (data) {
 
 
 }
-
-tools.setCosToken=function (data){
-    uni.setStorageSync('cosToken',data)
-}
-tools.delCosToken=function (data){
-    uni.removeStorageSync('cosToken')
-}
-
 tools.addQueryString=function (params) {
     let str = '';
     for (let Key in params) {
@@ -390,6 +382,14 @@ tools.addQueryString=function (params) {
     return '?' + str;
     //return '?' + str.substr(0, str.length -1); 严谨一些
 }
+tools.setCosToken=function (data){
+    uni.setStorageSync('cosToken',data)
+}
+tools.delCosToken=function (data){
+    uni.removeStorageSync('cosToken')
+}
+
+
 
 
 

service/txOssSts.js

@@ -127,7 +127,6 @@ cosServe.getSignUrl=function (url){
         Bucket: Bucket,
         Region: Region,
         Key: url, /* 存储在桶里的对象键（例如1.jpg，a/b/test.txt），支持中文，必须字段 */
-        Sign: true,
     })
     console.log('签名完成----------------------------'+newUrl)
     console.log(newUrl)