Browse Source

复制共有接口

mr-zhou-zhou 2 years ago
parent
commit
3d06370f1f
6 changed files with 43 additions and 140 deletions
  1. 1 0
      App.vue
  2. 2 2
      common/config.js
  3. 30 131
      common/request/api.js
  4. 1 1
      manifest.json
  5. 4 1
      pages/login/login.vue
  6. 5 5
      store/modules/userInfo.js

+ 1 - 0
App.vue

@@ -3,6 +3,7 @@
 	export default {
 		onLaunch: function() {
 			// this.$store.dispatch('userInfo/getinfo');
+			// this.$store.dispatch('userInfo/getopenid');
 			uni.getSystemInfo({
 				success: function(e) {
 					// #ifndef MP

+ 2 - 2
common/config.js

@@ -3,8 +3,8 @@ export default{
 	// consoleBaseUrl:"https://api.icookj.cn/",
 	// uploadImgUrl:'https://api.icookj.cn/api/common/upload'
 	
-	consoleBaseUrl:"https://icool.lanmaonet.com/",
-	uploadImgUrl:'https://icool.lanmaonet.com/api/common/upload'
+	consoleBaseUrl:"http://manggo.huxiukeji.com/",
+	uploadImgUrl:'http://manggo.huxiukeji.com/api/common/upload'
 }
 export const STATUS = {
 	NOR:0,

+ 30 - 131
common/request/api.js

@@ -4,167 +4,66 @@
  * name:Request内做判断,url,auth,method,cacheType: local,session,isNprogress
  */
 export default {
-    /**  用户 ↓ **/
-	user:{
-		userInfo:{
-			url:'api/user/userInfo',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		getUserOpenid:{
-			url:'api/user/getUserOpenid',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		wxMiniProgramLogin:{
-			url:'api/user/wxMiniProgramLogin',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		area_list:{
-			url:'api/area/area_list',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		profile:{
-			url:'api/user/profile',
+	/**  用户 ↓ **/
+	login:{
+		login:{
+			url:'api/user/login',
 			auth:false,
 			method:'POST',
-			isNprogress:true,
-		},
-		getuserinfo:{
-			url:'api/usercenter/getuserinfo',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		likeone:{
-			url:'api/Usercenter/likeone',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
+			isNprogress:true
 		},
-	    signin:{
-			url:'api/Usersign/signin',
+		mobilelogin:{
+			url:'api/user/mobilelogin',
 			auth:false,
 			method:'POST',
-			isNprogress:true,
+			isNprogress:true
 		},
-		voteshare:{
-			url:'api/wechatshare/voteshare',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		}
-	},
-	vip:{
-		vip_config:{
-			url:'api/pay/vip_config',
+		register:{
+			url:'api/user/register',
 			auth:false,
 			method:'POST',
-			isNprogress:true,
+			isNprogress:true
 		},
-		vip_recharge:{
-			url:'api/pay/vip_recharge',
+		registerAdd:{
+			url:'api/user/register',
 			auth:false,
 			method:'POST',
-			isNprogress:true,
+			isNprogress:true
 		},
 		
-	},
-	baseconfig:{
-		userinfo_enum:{
-			url:'api/baseconfig/userinfo_enum',
+		resetpwd:{
+			url:'api/user/resetpwd',
 			auth:false,
 			method:'POST',
-			isNprogress:true,
-			cacheType: 'session'
+			isNprogress:true
 		},
-		index:{
-			url:'api/baseconfig/index',
+		logout:{
+			url:'api/user/resetpwd',
 			auth:false,
 			method:'POST',
 			isNprogress:true
-		}
-	},
-	usercenter: {
-		samecity:{
-			url:'api/usercenter/samecity',
-			auth:false,
-			method:'POST',
-			isNprogress:false,
 		},
-		newpeople:{
-			url:'api/usercenter/newpeople',
+		sms:{
+			url:'api/sms/send',
 			auth:false,
 			method:'POST',
-			isNprogress:false,
-		},
+			isNprogress:true
+		}
 	},
-    newvote: {
-		lists:{
-			url:'api/newvote/subject/lists',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		// info:{
-		// 	url:'api/newvote/subject/info',
-		// 	auth:false,
-		// 	method:'POST',
-		// 	isNprogress:true,
-		// },
-		//选手列表
-		playerlist:{
-			url:'api/newvote/subject/playerlist',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		//投票
-		record:{
-			url:'api/newvote/player/record',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		//排行榜
-		playerlist_votes:{
-			url:'api/newvote/subject/playerlist_votes',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		//人气榜
-		playerlist_renqi:{
-			url:'api/newvote/subject/playerlist_renqi',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		},
-		//选手详情
-		playerinfo:{
-			url:'api/newvote/subject/playerinfo',
+    /**  用户 ↓ **/
+	user:{
+		userInfo:{
+			url:'api/user/userInfo',
 			auth:false,
 			method:'POST',
 			isNprogress:true,
 		},
-		join:{
-			url:'api/newvote/Player/join',
+		getUserOpenid:{
+			url:'api/user/getopenid',
 			auth:false,
 			method:'POST',
 			isNprogress:true,
 		},
-		rule:{
-			url:'api/newvote/subject/info',
-			auth:false,
-			method:'POST',
-			isNprogress:true,
-		}
-	},
+	}
 	
 };

+ 1 - 1
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "client",
+    "name" : "盲go",
     "appid" : "__UNI__F901EC6",
     "description" : "",
     "versionName" : "1.0.0",

+ 4 - 1
pages/login/login.vue

@@ -15,7 +15,10 @@
 			return {
 				
 			};
-		}
+		},
+	    async onLoad() {
+	    	
+	    },
 	}
 </script>
 

+ 5 - 5
store/modules/userInfo.js

@@ -13,14 +13,14 @@ const userInfo = {
 	actions: {
 		getopenid(){
 			return new Promise(async (resolve,reject)=>{
-				let loginRes = await uni.login({
+				let [lErr,lRes] = await uni.login({
 					provider: 'weixin'
 				});
-				// console.log('openid loginRes===',loginRes)
-				if (loginRes.hasOwnProperty('code')) {
-					let codeRes=await Request('user.getUserOpenid',{ code: loginRes.code});
+				console.log('openid loginRes===',lRes)
+				if (lRes.hasOwnProperty('code')) {
+					// let codeRes=await Request('user.getUserOpenid',{ code: lRes.code});
 					// console.log('openid codeRes===',codeRes.data)
-					resolve(codeRes.data.openid)
+					// resolve(codeRes.data.openid)
 				} else {
 					Tools.msg('登录失败,请重启应用');
 					reject(false);