lilei 3 vuotta sitten
vanhempi
commit
ba928a0fd8
5 muutettua tiedostoa jossa 12 lisäystä ja 24 poistoa
  1. 2 2
      api/user.js
  2. 7 4
      libs/axios.js
  3. 2 2
      manifest.json
  4. 0 9
      pages.json
  5. 1 7
      pages/login/login.vue

+ 2 - 2
api/user.js

@@ -5,7 +5,7 @@ import axios from '@/libs/axios.js'
 // 登录
 export const login = params => {
   return axios.request({
-    url: `login`,
+    url: `auth/login`,
     method: 'post',
 	data: params
   },true)
@@ -13,7 +13,7 @@ export const login = params => {
 // 退出
 export const logout = params => {
   return axios.request({
-    url: `logout`,
+    url: `auth/logout`,
     data: params,
     method: 'get'
   })

+ 7 - 4
libs/axios.js

@@ -3,13 +3,16 @@ const baseUrl = getApp().globalData.baseUrl
 //带Token请求
 const request = (opts, hasToken) => {
 	const authorization = getApp().globalData.token
-	// console.log(authorization,'authorization')
+	const curVer = getApp().globalData.version
+	// console.log(authorization, 'authorization')
 	//  hasToken是否传入token,为true则不传token
 	const header = {
-			'content-Type': 'application/json;charset=UTF-8'
+			'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
+			'App-Type': 2,
+			'Version': curVer.version.replace(/\./g,'')
 		}
-	if(!hasToken&&authorization){
-		header['X-AUTH-TOKEN'] = authorization
+	if(!hasToken){
+		header.authorization = authorization
 	}	
 	//此token是登录成功后后台返回保存在storage中的
 	let DefaultOpts = {

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__D3A9765",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "2.1.0",
+    "versionCode" : 210,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 0 - 9
pages.json

@@ -21,13 +21,6 @@
 				"navigationBarTitleText": "忘记密码"
 			}
 		},
-		{
-			"path": "pages/cleared/index", // 扫码记录
-			"style": {
-				"navigationBarTitleText": "扫码记录",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/index/index", // 首页
 			"style": {
@@ -35,12 +28,10 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		
 		{
 			"path": "pages/userCenter/index",
 			"style": {
 				"navigationBarTitleText": "个人中心",
-				"navigationBarBackgroundColor": "#ed1c24",
 				"navigationBarTextStyle": "white"
 			}
 		},

+ 1 - 7
pages/login/login.vue

@@ -160,13 +160,7 @@ export default {
 		toMain() {
 			// 跳转到首页
 			uni.redirectTo({
-				url: '/pages/index'
-			});
-		},
-		//  申请试用
-		applyTrial() {
-			uni.navigateTo({
-				url: '/pages/login/apply-trial'
+				url: '/pages/index/index'
 			});
 		},
 		//  忘记密码