修改未登录

lib/util.js

@@ -20,6 +20,17 @@ const formatNumber = n => {
 const imgName = (imgNameWithExt = 'no.jpg') => {
   return `${config.imgPath}${imgNameWithExt}`
 }
+
+function noAuthNav() {
+  wx.clearStorageSync()
+  const pages = getCurrentPages();
+  const ctx = pages[pages.length - 1];
+  if (ctx.route !== 'pages/register2/register2') {
+    wx.navigateTo({
+      url: '/pages/register2/register2'
+    })
+  }
+}
 //api  param:根路径后面的路由
 const api = {
   get: (url, query, notShowLoad) => {
@@ -28,7 +39,9 @@ const api = {
         mask: true,
       })
     }
-    let sessionHead = { "Accept-Language": "zh-CN"}
+    let sessionHead = {
+      "Accept-Language": "zh-CN"
+    }
     sessionHead['content-type'] = 'application/x-www-form-urlencoded'
     sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
     return new Promise((resolve, reject) => {
@@ -49,8 +62,7 @@ const api = {
           }
           if (res.statusCode == 401) {
             reject('请登录')
-            wx.clearStorageSync()
-            wx.redirectTo({ url: '/pages/register2/register2' })
+            noAuthNav()
             return
           }
           reject(res.data, '请求成功')
@@ -73,7 +85,10 @@ const api = {
         mask: true,
       })
     }
-    let sessionHead = { 'content-type': 'application/x-www-form-urlencoded', "Accept-Language": "zh-CN" }
+    let sessionHead = {
+      'content-type': 'application/x-www-form-urlencoded',
+      "Accept-Language": "zh-CN"
+    }
     sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
     if (head) {
       sessionHead = Object.assign(sessionHead, head)
@@ -96,8 +111,7 @@ const api = {
           }
           if (res.statusCode == 401) {
             reject('请登录')
-            wx.clearStorageSync()
-            wx.redirectTo({ url: '/pages/register2/register2' })
+            noAuthNav()
             return
           }
           reject(res.data, '请求成功')
@@ -123,7 +137,9 @@ const mockApi = {
         mask: true,
       })
     }
-    let sessionHead = { "Accept-Language": "zh-CN"}
+    let sessionHead = {
+      "Accept-Language": "zh-CN"
+    }
     sessionHead['content-type'] = 'application/x-www-form-urlencoded'
     sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
     return new Promise((resolve, reject) => {
@@ -144,8 +160,7 @@ const mockApi = {
           }
           if (res.statusCode == 401) {
             reject('请登录')
-            wx.removeStorageSync('user')
-            wx.redirectTo({ url: '/pages/register2/register2' })
+            noAuthNav()
             return
           }
           reject(res.data, '请求成功')
@@ -171,7 +186,9 @@ const rapi = {
         mask: true,
       })
     }
-    let sessionHead = { "Accept-Language": "zh-CN"}
+    let sessionHead = {
+      "Accept-Language": "zh-CN"
+    }
     sessionHead['content-type'] = 'application/x-www-form-urlencoded'
     sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
     return new Promise((resolve, reject) => {
@@ -192,8 +209,7 @@ const rapi = {
           }
           if (res.statusCode == 401) {
             reject('请登录')
-            wx.removeStorageSync('user')
-            wx.redirectTo({ url: '/pages/register2/register2' })
+            noAuthNav()
             return
           }
           reject(res.data, '请求成功')
@@ -216,7 +232,10 @@ const rapi = {
         mask: true,
       })
     }
-    let sessionHead = { 'content-type': 'application/x-www-form-urlencoded', "Accept-Language": "zh-CN" }
+    let sessionHead = {
+      'content-type': 'application/x-www-form-urlencoded',
+      "Accept-Language": "zh-CN"
+    }
     sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
     if (head) {
       sessionHead = Object.assign(sessionHead, head)
@@ -240,8 +259,7 @@ const rapi = {
           }
           if (res.statusCode == 401) {
             reject('请登录')
-            wx.removeStorageSync('user')
-            wx.redirectTo({ url: '/pages/register2/register2' })
+            noAuthNav()
             return
           }
           reject(res.data, '请求成功')
@@ -267,7 +285,9 @@ const payApi = {
         mask: true,
       })
     }
-    let sessionHead = { "Accept-Language": "zh-CN"}
+    let sessionHead = {
+      "Accept-Language": "zh-CN"
+    }
     sessionHead['content-type'] = 'application/x-www-form-urlencoded'
     sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
     return new Promise((resolve, reject) => {
@@ -279,7 +299,7 @@ const payApi = {
         header: sessionHead,
         success(res) {
           if (res.statusCode == 200) {
-            if (res.data.success && res.data.message =='SUCCESS') {
+            if (res.data.success && res.data.message == 'SUCCESS') {
               resolve(res.data.data)
             } else {
               reject(res.data.data)
@@ -288,8 +308,7 @@ const payApi = {
           }
           if (res.statusCode == 401) {
             reject('请登录')
-            wx.removeStorageSync('user')
-            wx.redirectTo({ url: '/pages/register2/register2' })
+            noAuthNav()
             return
           }
           reject(res.data, '请求成功')
@@ -312,7 +331,10 @@ const payApi = {
         mask: true,
       })
     }
-    let sessionHead = { 'content-type': 'application/x-www-form-urlencoded', "Accept-Language": "zh-CN" }
+    let sessionHead = {
+      'content-type': 'application/x-www-form-urlencoded',
+      "Accept-Language": "zh-CN"
+    }
     sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
     if (head) {
       sessionHead = Object.assign(sessionHead, head)
@@ -335,8 +357,7 @@ const payApi = {
           }
           if (res.statusCode == 401) {
             reject('请登录')
-            wx.removeStorageSync('user')
-            wx.redirectTo({ url: '/pages/register2/register2' })
+            noAuthNav()
             return
           }
           reject(res.data, '请求成功')
@@ -458,10 +479,10 @@ const userLocation = () => {
           wx.showModal({
             title: '提示',
             content: '你拒绝了用户定位，请打开',
-            success(res){
+            success(res) {
               wx.openSetting({
                 success: (res) => {
-                    if (res.authSetting["scope.userLocation"]){
+                  if (res.authSetting["scope.userLocation"]) {
                     wx.getLocation({
                       type: 'gcj02',
                       success: (location) => {
@@ -473,7 +494,7 @@ const userLocation = () => {
                     })
                   }
                 },
-                  fail(err){
+                fail(err) {
                   reject('用户没有授权')
                 }
               })
@@ -504,9 +525,9 @@ const msgTip = {
   'timeout': '超时了,请重试！'
 }
 //错误提示 用于不常见错误定位 param：错误信息
-const alertTip = (msg,cb) => {
-  if(msg){
-    if(getType(msg)=='object'){
+const alertTip = (msg, cb) => {
+  if (msg) {
+    if (getType(msg) == 'object') {
       msg = JSON.stringify(msg)
     }
   }
@@ -514,14 +535,14 @@ const alertTip = (msg,cb) => {
     title: '提示',
     content: msg,
     showCancel: false,
-    success(){
-      cb&&cb()
+    success() {
+      cb && cb()
     }
   })
 }
-const toastTip=(op)=>{
+const toastTip = (op) => {
   wx.showToast({
-    title:'成功',
+    title: '成功',
     icon: 'warn',
     ...op
   })
@@ -539,18 +560,22 @@ const confirmTip = (msg, cb) => {
     }
   })
 }
-const wxscan = function () {
+const wxscan = function() {
   return new Promise((resolve, reject) => {
     wx.scanCode({
       onlyFromCamera: true,
-      success: function (res) { resolve(res.result) },
-      fail: function (res) { reject('扫码失败，重试') }
+      success: function(res) {
+        resolve(res.result)
+      },
+      fail: function(res) {
+        reject('扫码失败，重试')
+      }
     })
   })
 }
 const getProtocol = (id) => {
   function download(url) {
-    url=encodeURI(url)
+    url = encodeURI(url)
     let file = wx.getStorageSync('file')
     if (!file) {
       file = []
@@ -561,7 +586,7 @@ const getProtocol = (id) => {
       })
       wx.downloadFile({
         url,
-        success: function (res) {
+        success: function(res) {
           console.log(res)
           let filePath = res.tempFilePath;
           file[+id] = filePath
@@ -570,7 +595,7 @@ const getProtocol = (id) => {
           wx.hideLoading()
           wx.openDocument({
             filePath: filePath,
-            success: function (res) {
+            success: function(res) {
               resolve('打开文档成功')
             },
             fail(err) {
@@ -578,7 +603,8 @@ const getProtocol = (id) => {
               reject(err)
             }
           })
-        }, fail(err) {
+        },
+        fail(err) {
           console.error('2', err)
           wx.hideLoading()
           file[+id] = null
@@ -598,8 +624,12 @@ const getProtocol = (id) => {
           resolve('打开文档成功')
         },
         fail(err) {
-          api.get('agreement/getById', { id })
-            .then(({ data }) => {
+          api.get('agreement/getById', {
+              id
+            })
+            .then(({
+              data
+            }) => {
               download(data.url, file).then(res => {
                   resolve(res)
                 })
@@ -615,8 +645,12 @@ const getProtocol = (id) => {
         }
       })
     } else {
-      api.get('agreement/getById', { id })
-        .then(({ data }) => {
+      api.get('agreement/getById', {
+          id
+        })
+        .then(({
+          data
+        }) => {
           return download(data.url).then(res => {
               resolve(res)
             })
@@ -648,7 +682,7 @@ const getType = function(o) {
   })
 }
 //上传图片
-const uploadResource = function(r,t) {
+const uploadResource = function(r, t) {
   wx.showLoading({
     title: `上传${t||'图片'}中`,
     mask: true,
@@ -673,7 +707,7 @@ const uploadResource = function(r,t) {
         })
       })
     }))
-  }else{
+  } else {
     // 单个资源
     return new Promise((resolve, reject) => {
       wx.uploadFile({
@@ -694,12 +728,14 @@ const uploadResource = function(r,t) {
   }
 }
 //上传图片
-const uploadFile = function(r,t) {
+const uploadFile = function(r, t) {
   wx.showLoading({
     title: `上传${t||'图片'}中`,
     mask: true,
   })
-  let sessionHead = { "Accept-Language": "zh-CN" }
+  let sessionHead = {
+    "Accept-Language": "zh-CN"
+  }
   sessionHead['content-type'] = 'application/x-www-form-urlencoded'
   sessionHead.token = wx.getStorageSync('user') ? wx.getStorageSync('user').token : ''
   // 数组型 资源
@@ -724,11 +760,11 @@ const uploadFile = function(r,t) {
         })
       })
     }))
-  }else{
+  } else {
     // 单个资源
     return new Promise((resolve, reject) => {
       wx.uploadFile({
-        url: config.api +'user/updateAvatar',
+        url: config.api + 'user/updateAvatar',
         filePath: r,
         name: 'file',
         header: sessionHead,
@@ -745,19 +781,19 @@ const uploadFile = function(r,t) {
     })
   }
 }
-const changeTime = (mss)=>{
+const changeTime = (mss) => {
   var days = parseInt(mss / (1000 * 60 * 60 * 24));
   var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
   var minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
   var seconds = (mss % (1000 * 60)) / 1000;
   return `${days ? days + '天' : ''}${hours ? hours + '小时' : ''}${minutes ? minutes + '分钟' : ''}${seconds ? seconds + '秒' : ''}`
 }
-const getRgbColor = (sRgb,eRgb,rate)=>{
-  let rRgb=[]
+const getRgbColor = (sRgb, eRgb, rate) => {
+  let rRgb = []
   sRgb = sRgb.split(',')
   eRgb = eRgb.split(',')
-  eRgb.forEach((elt,i)=>{
-    rRgb[i] = parseInt(parseInt(sRgb[i])+((parseInt(elt)-parseInt(sRgb[i]))*Number(rate)))
+  eRgb.forEach((elt, i) => {
+    rRgb[i] = parseInt(parseInt(sRgb[i]) + ((parseInt(elt) - parseInt(sRgb[i])) * Number(rate)))
   })
   return rRgb.join(',')
 }
@@ -773,6 +809,7 @@ function getPx(rpx) {
 function getRpx(px) {
   return px * 750 / windowWidth
 }
+
 function arrTarrs(num, arr) { // 一维数组转换为二维数组
   const iconsArr = []; // 声明数组
   arr.forEach((item, index) => {