10.24commit

fore-end/app.js

@@ -53,7 +53,7 @@ var clientWidth = wx.getSystemInfoSync().windowWidth;
 					});
 				  //登录
 				  wx.request({
-					  url: 'http://192.168.31.28:8084/user/login',
+					  url: 'http://192.168.31.29:8084/user/login',
 					  method:'POST',
 					  header: {
 						  'content-type': 'application/x-www-form-urlencoded'
@@ -64,46 +64,17 @@ var clientWidth = wx.getSystemInfoSync().windowWidth;
 					  
 					  success(res){
 						  console.log(res);
-						  wx.setStorageSync('token', res.data.data.token);
-						  var avatar = wx.getStorageSync('avatarUrl');
-						  var name = wx.getStorageSync('nickName');
+						  
 						  // console.log(vid);
 						  console.log('vid: '+ wx.getStorageSync('vid'));
 						  if(res.data.code == 403){
-							  
-								  wx.request({
-									  url: 'http://192.168.31.28:8084/user/register',
-									  method: 'POST',
-									  data: {
-										  avatar: avatar,
-										  name: name,
-										  vid: wx.getStorageSync('vid'),
-										  phone: '',
-										  sign: '',
-									  },
-									  success(res){
-										console.log('注册成功');
-										console.log(res);
-										wx.navigateTo({
-										  url: '/pages/register/register',
-										})
-										wx.request({
-										  url: 'http://192.168.31.28:8084/user/login',
-										  method: 'POST',
-										  header: {
-											  'content-type': 'application/x-www-form-urlencoded'
-										  },
-										  data:{
-											  vid: wx.getStorageSync('vid')
-										  },
-										  
-										  success(res){
-											  wx.setStorageSync('token', res.data.data.token);
-										  }
-										})
-									  }
-									})
-					  }
+							  wx.navigateTo({
+								url: '/pages/register/register',
+							  })
+					  	}else if(res.data.code == 200){
+							wx.setStorageSync('token', res.data.data.token);
+							wx.setStorageSync('uid', res.data.data.Uid);
+						  }
 							  
 					  }
 				  })
@@ -115,14 +86,15 @@ var clientWidth = wx.getSystemInfoSync().windowWidth;
 		  })
 	}else{
 		wx.request({
-		  url: 'http://192.168.31.28:8084/user/info',
+		  url: 'http://192.168.31.29:8084/user/info',
 		  header:{
 			  "Authorization": wx.getStorageSync('token')
 		  },
 		  success(res){
 			  console.log(res);
-			  if(res.code == 200){
+			  if(res.data.code == 200){
 				  console.log('token有效');
+				  wx.setStorageSync('uid', res.data.data.Uid);
 			  }
 		  }
 		})

fore-end/app.json

@@ -1,4 +1,7 @@
 {
+	"useExtendedLib": {
+		"weui": true
+	},
     "usingComponents": {
         "van-button": "@vant/weapp/button/index",
         "van-cell": "@vant/weapp/cell/index",
@@ -49,7 +52,7 @@
                 "selectedIconPath": "/assets/tabBar_img/append-active.png"
             },
             {
-                "pagePath": "pages/register/register",
+                "pagePath": "pages/message/message",
                 "iconPath": "/assets/tabBar_img/message.png",
                 "selectedIconPath": "/assets/tabBar_img/message-active.png"
             },

fore-end/pages/register/register.js

@@ -2,6 +2,8 @@
 const app = getApp()
 
 const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
+const {upLoad} = require('../../utils/util');
+var clientWidth = wx.getSystemInfoSync().windowWidth;
 Page({
 
     /**
@@ -71,16 +73,100 @@ Page({
 	
 	 
 	  onLoad() {
+		this.setData({
+			left:clientWidth/2-40+'px'
+		})
 		wx.onThemeChange((result) => {
 		  this.setData({
 			theme: result.theme
 		  })
 		})
 	  },
-	  onChooseAvatar(e) {
-		const { avatarUrl } = e.detail 
-		this.setData({
-		  avatarUrl,
+	//   onChooseAvatar(e) {
+	// 	const { avatarUrl } = e.detail 
+	// 	this.setData({
+	// 	  avatarUrl,
+	// 	})
+	//   },
+	onChooseAvatar1(){
+		wx.chooseImage({
+			count: 1,//可选择图片数量
+			sizeType: ['compressed'],//压缩图片
+			sourceType: ['album','camera'],//来源
+			success: (res) => {
+				this.uploadImage(res.tempFilePaths[0]);
+			}
+		  })
+	},
+	uploadImage(imagePath){
+		upLoad( imagePath ).then((res) => {
+			console.log(res);
+			this.setData({
+				avatarUrl: res.Url
+			});
+			wx.setStorage({
+				key: 'avatarUrl',
+				data: res.Url,
+				success: function() {
+					console.log('写入avatarUrl缓存成功')
+				},
+				fail:function() {
+					console.log('写入avatarUrl发生错误')
+				}
+			});
 		})
+	},
+	onInputUsername:function(e){
+		console.log(e);
+		wx.setStorage({
+			key: 'nickName',
+			data: e.detail.value,
+			success: function() {
+				console.log('写入nickName缓存成功')
+			},
+			fail:function() {
+				console.log('写入nickName发生错误')
+			}
+		})
+	},
+	  register(){
+		var avatar = wx.getStorageSync('avatarUrl');
+		var name = wx.getStorageSync('nickName');
+		console.log(avatar);
+		console.log(name);
+		wx.request({
+			url: 'http://192.168.31.29:8084/user/register',
+			method: 'POST',
+			data: {
+				avatar: avatar,
+				name: name,
+				vid: wx.getStorageSync('vid'),
+				phone: '',
+				sign: '',
+			},
+			success(res){
+			  console.log(res);
+
+			  wx.request({
+				url: 'http://192.168.31.29:8084/user/login',
+				method: 'POST',
+				header: {
+					'content-type': 'application/x-www-form-urlencoded'
+				},
+				data:{
+					vid: wx.getStorageSync('vid')
+				},
+				
+				success(res){
+					console.log(res);
+					wx.setStorageSync('token', res.data.data.token);
+					wx.setStorageSync('uid', res.data.data.Uid);
+					wx.switchTab({
+					  url: '/pages/home/home',
+					})
+				}
+			  })
+			}
+		  })
 	  }
-	})
+	})

fore-end/pages/register/register.json

@@ -1,4 +1,9 @@
 {
 	"usingComponents": {
-	}
+	  "mp-form-page": "weui-miniprogram/form-page/form-page",
+	  "mp-form": "weui-miniprogram/form/form",
+	  "mp-cells": "weui-miniprogram/cells/cells",
+	  "mp-cell": "weui-miniprogram/cell/cell"
+	},
+	"pageOrientation": "auto"
   }

fore-end/pages/register/register.wxml

@@ -1,13 +1,14 @@
 <!--pages/register.wxml-->
 <view data-weui-theme="{{theme}}">
-  <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+  <button class="avatar-wrapper" open-type="chooseAvatar"  bindtap="onChooseAvatar1">
     <image class="avatar" src="{{avatarUrl}}"></image>
   </button> 
   <mp-form>
     <mp-cells>
       <mp-cell title="昵称">
-        <input type="nickname" class="weui-input" placeholder="请输入昵称"/>
+        <input  class="weui-input" placeholder="请输入昵称" bindinput="onInputUsername"/>
       </mp-cell>
     </mp-cells>
   </mp-form>
+  <van-button type="default" round color="linear-gradient(to right, #4bb0ff, #6149f6)" custom-style="width:80px;position:relative;left:{{left}};margin-top:15px;" bindtap="register">注册</van-button>
 </view>

fore-end/pages/register/register.wxss

@@ -1,4 +1,4 @@
-/* pages/register.wxss */
+/* pages/register.wxss
 .avatar-wrapper {
 	padding: 0;
 	width: 56px !important;
@@ -16,4 +16,26 @@
   .container {
 	display: flex;
   }
+  
+  .register-input{
+	  width: 200px;
+	  border-radius: 12px;
+  } */
+  .avatar-wrapper {
+	padding: 0;
+	width: 56px !important;
+	border-radius: 8px;
+	margin-top: 40px;
+	margin-bottom: 40px;
+  }
+  
+  .avatar {
+	display: block;
+	width: 56px;
+	height: 56px;
+  }
+  
+  .container {
+	display: flex;
+  }
   

fore-end/pages/userchange/userchange.js

@@ -6,7 +6,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-		avatarUrl:'',
+		avatar:'',
 		nickName:'',
 		phoneNumber:'',
 		password:'',
@@ -99,16 +99,16 @@ Page({
 		upLoad( imagePath ).then((res) => {
 			console.log(res);
 			this.setData({
-				avatarUrl: res.Url
+				avatar: res.Url
 			});
 			wx.setStorage({
-				key: 'avatarUrl',
+				key: 'avatar',
 				data: res.Url,
 				success: function() {
-					console.log('写入avatarUrl缓存成功')
+					console.log('写入avatar缓存成功')
 				},
 				fail:function() {
-					console.log('写入avatarUrl发生错误')
+					console.log('写入avatar发生错误')
 				}
 			});
 		})
@@ -167,23 +167,27 @@ Page({
 	},
 	
 	changeInfo:function(){
-		var avatarUrl = wx.getStorageSync('avatarUrl');
+
+		var avatar = wx.getStorageSync('avatar');
 		var nickName = wx.getStorageSync('nickName');
 		var phoneNumber = wx.getStorageSync('phoneNumber');
 		var personalSignatrue = wx.getStorageSync('personalSignatrue');
+		var uid = wx.getStorageSync('uid');
+		console.log(uid);
 		
 		wx.request({
-		  url: 'http://192.168.31.28:8084/user/modify',
+		  url: 'http://192.168.31.29:8084/user/modify',
 		  method: 'POST',
 		  data: {
-			  "avatar": avatarUrl,
+			  "avatar": avatar,
 			  "name": nickName,
 			  "phone": phoneNumber,
-			  "uid": 1,
+			  "uid": uid,
 		  },
 		  success (res) {
 			  console.log(res)
 		  }
-		})
+		}),
+		wx.setStorageSync('avatar', '');
 	}
 })

fore-end/pages/userchange/userchange.wxml

@@ -1,6 +1,6 @@
 <!--pages/userchange/index.wxml-->
 <view class="pages">
-	<van-image round fit="cover" src="{{avatarUrl}}" class="pages-userchange-profile" bindtap="chooseImage" bindinput="onChangePhoto"></van-image>
+	<van-image round fit="cover" src="{{avatar}}" class="pages-userchange-profile" bindtap="chooseImage" bindinput="onChangePhoto"></van-image>
 	<van-cell-group>
 		<van-field label="昵称"  class="pages-userchange-username" custom-style="background: rgba(56, 56, 56, 0.17);border-radius: 15px;width:320px;margin-bottom:33px;" title-width="60px" value="{{nickName}}" placeholder="请输入昵称" adjust-position bindinput="onChangeUsername"></van-field>
 		<van-field label="电话" type="number" class="pages-userchange-username" custom-style="background: rgba(56, 56, 56, 0.17);border-radius: 15px;width:320px;margin-bottom:33px;" title-width="60px" value="{{phoneNumber}}" placeholder="请输入电话号码" adjust-position bindinput="onChangePhonenumber"></van-field>

fore-end/utils/util.js

@@ -1,5 +1,5 @@
 import Toast from '@vant/weapp/toast/toast';
-const baseURL = "http://192.168.31.28:8084";//后台服务提供的地址
+const baseURL = "http://192.168.31.29:8084";//后台服务提供的地址
 const uploadUrl = "/pic/upload";
 const formatTime = date => {
   const year = date.getFullYear()