已完成登录，注册，修改信息部分

fore-end/API/appraise.js

@@ -1,4 +1,4 @@
-const { useParamsEaseFuncs } = require('XrFrame/xrFrameSystem');
+// const { useParamsEaseFuncs } = require('XrFrame/xrFrameSystem');
 const { http } = require('../utils/util')
 
 const API = {
@@ -47,7 +47,8 @@ function login(params) {
 		API.loginURL,
 		{
 			method:'POST',
-			params: params,
+			header: params.header,
+			data: params.data,
 		}
 	);
 }
@@ -57,9 +58,10 @@ function getUserInfo(params) {
 		API.getUserInfoURL,
 		{
 			method: 'GET',
-			params: params,
+			header: params.header,
+			data: params.data,
 		}
-	)
+	);
 }
 
 function register(params) {
@@ -67,9 +69,9 @@ function register(params) {
 		API.registerURL,
 		{
 			method: 'POST',
-			params:params,
+			data: params.data,
 		}
-	)
+	);
 }
 
 function modify(params) {
@@ -77,9 +79,9 @@ function modify(params) {
 		API.modifyURL,
 		{
 			method: 'POST',
-			params: params,
+			data: params.data,
 		}
-	)
+	);
 }
 
 module.exports = {

fore-end/app.js

@@ -22,13 +22,12 @@ var clientWidth = wx.getSystemInfoSync().windowWidth;
 var loginOption = {
 	
 	header :{
-		"content-type": 'application/x-www-form-urlencoded',
+		"Content-Type": 'application/x-www-form-urlencoded',
 	},
 	data:{
 		vid: wx.getStorageSync('vid')
 	},
 }
-
 var infoOption = {
 	header:{
 		"Authorization": wx.getStorageSync('token')
@@ -54,14 +53,18 @@ var infoOption = {
 					console.log(res.data.openid);
 					wx.setStorageSync('vid', res.data.openid);
 					console.log(wx.getStorageSync('vid'));
-					
+					loginOption.data = {
+						vid: wx.getStorageSync('vid'),
+					}
+					console.log(loginOption.data);
 					login(loginOption).then(res => {
 						console.log(res);
-						wx.setStorageSync('token', res.token);
-						wx.setStorageSync('uid', res.uid);
-						wx.setStorageSync('avatarUrl', res.user_info.avatar);
-						wx.setStorageSync('nickName', res.user_info.name);
+						wx.setStorageSync('token', res.data.data.token);
+						wx.setStorageSync('uid', res.data.data.user_info.uid);
+						wx.setStorageSync('avatarUrl', res.data.data.user_info.avatar);
+						wx.setStorageSync('nickName', res.data.data.user_info.name);
 					}).catch(err => {
+						console.log(err);
 						wx.navigateTo({
 							url: '/pages/register/register',
 						})
@@ -74,9 +77,12 @@ var infoOption = {
 		getUserInfo(infoOption).then(res => {
 			console.log(res);
 			console.log('token有效');
-			wx.setStorageSync('uid', res.uid);
+			wx.setStorageSync('uid', res.data.data.uid);
+			wx.setStorageSync('avatarUrl', res.data.data.avatar);
+			wx.setStorageSync('nickName', res.data.data.name);
+			wx.setStorageSync('personalSignatrue', res.data.data.sign);
+			console.log(wx.getStorageSync('uid'));
 		}).catch(err => {
-			console.log(err);
 			console.log('token已失效，请重新登录');
 			wx.login({
 				success: (res) => {
@@ -90,13 +96,17 @@ var infoOption = {
 						console.log(res.data.openid);
 						wx.setStorageSync('vid', res.data.openid);
 						console.log(wx.getStorageSync('vid'));
+						loginOption.data = {
+							vid: wx.getStorageSync('vid'),
+						}
 						login(loginOption).then(res => {
 							console.log(res);
-							wx.setStorageSync('token', res.token);
-							wx.setStorageSync('uid', res.user_info.uid);
-							wx.setStorageSync('avatarUrl', res.user_info.avatar);
-							wx.setStorageSync('nickName', res.user_info.name);
+							wx.setStorageSync('token', res.data.data.token);
+							wx.setStorageSync('uid', res.data.data.user_info.uid);
+							wx.setStorageSync('avatarUrl', res.data.data.user_info.avatar);
+							wx.setStorageSync('nickName', res.data.data.user_info.name);
 						}).catch(err => {
+							console.log(err);
 							wx.navigateTo({
 								url: '/pages/register/register',
 							})

fore-end/app.json

@@ -10,7 +10,8 @@
         "van-loading": "@vant/weapp/loading/index",
         "van-icon": "@vant/weapp/icon/index",
         "van-field": "@vant/weapp/field/index",
-        "van-toast": "@vant/weapp/toast/index"
+		"van-toast": "@vant/weapp/toast/index",
+		"van-card": "@vant/weapp/card/index"
     },
     "pages": [
         "pages/home/home",
@@ -52,7 +53,7 @@
                 "selectedIconPath": "/assets/tabBar_img/append-active.png"
             },
             {
-                "pagePath": "pages/message/message",
+                "pagePath": "pages/myOrder/myOrder",
                 "iconPath": "/assets/tabBar_img/message.png",
                 "selectedIconPath": "/assets/tabBar_img/message-active.png"
             },

fore-end/components/commodity_card/commodity_card.js

@@ -0,0 +1,26 @@
+// components/commodity_card/commodity_card.js
+Component({
+		options:{
+			multipleSlots:true
+		},
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

fore-end/components/commodity_card/commodity_card.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

fore-end/components/commodity_card/commodity_card.wxml

@@ -0,0 +1,2 @@
+<!--components/commodity_card/commodity_card.wxml-->
+<text>components/commodity_card/commodity_card.wxml</text>

fore-end/components/commodity_card/commodity_card.wxss

@@ -0,0 +1 @@
+/* components/commodity_card/commodity_card.wxss */

fore-end/pages/myOrder/myOrder.js

@@ -5,7 +5,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-
+		imageURL: wx.getStorageSync('avatarUrl'),
     },
 
     /**
@@ -63,4 +63,4 @@ Page({
     onShareAppMessage() {
 
     }
-})
+})

fore-end/pages/myOrder/myOrder.json

@@ -1,3 +1,6 @@
 {
-    "usingComponents": {}
+	"component":true,
+	"usingComponents": {
+		"commodity_card": "/components/commodity_card/commodity_card"
+	}
 }

fore-end/pages/myOrder/myOrder.wxml

@@ -1,2 +1,6 @@
 <!--pages/myOrder.wxml-->
-<text>pages/myOrder.wxml</text>
+<van-cell-group>
+	<van-cell inset>
+		<van-cell title=""></van-cell>
+	</van-cell>
+</van-cell-group>

fore-end/pages/register/register.js

@@ -2,28 +2,11 @@
 const app = getApp()
 
 const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
-const {upLoad} = require('../../utils/util');
-const {chooseImage} = require('../../utils/util');
+const {upLoad,chooseImage} = require('../../utils/util');
 const {register, login} = require('../../API/appraise');
+// import Api from '../../API/appraise'
 var clientWidth = wx.getSystemInfoSync().windowWidth;
-var registerOption = {
-	data: {
-		avatar: avatar,
-		name: name,
-		vid: wx.getStorageSync('vid'),
-		phone: '',
-		sign: '',
-	},
-}
-var loginOption = {
-	
-	header :{
-		"content-type": 'application/x-www-form-urlencoded',
-	},
-	data:{
-		vid: wx.getStorageSync('vid')
-	},
-}
+
 Page({
 
     /**
@@ -110,14 +93,6 @@ Page({
 	// 	})
 	//   },
 	onChooseAvatar1(){
-		// wx.chooseImage({
-		// 	count: 1,//可选择图片数量
-		// 	sizeType: ['compressed'],//压缩图片
-		// 	sourceType: ['album','camera'],//来源
-		// 	success: (res) => {
-		// 		this.uploadImage(res.tempFilePaths[0]);
-		// 	}
-		//   })
 		chooseImage().then((res)=>{
 			this.uploadImage(res.tempFilePaths[0]);
 		})
@@ -136,50 +111,28 @@ Page({
 		wx.setStorageSync('nickName', e.detail.value);
 	},
 	  register(){
-		var avatar = wx.getStorageSync('avatarUrl');
-		var name = wx.getStorageSync('nickName');
-		console.log(avatar);
-		console.log(name);
-		// 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(res);
-
-		// 	  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){
-		// 			console.log(res);
-		// 			console.log(res.data.data.user_info.uid);
-		// 			wx.setStorageSync('token', res.data.data.token);
-		// 			wx.setStorageSync('uid', res.data.data.user_info.uid);
-		// 			wx.setStorageSync('avatarUrl', res.data.data.user_info.avatar);
-		// 			wx.setStorageSync('nickName', res.data.data.user_info.name);
-		// 			wx.switchTab({
-		// 			  url: '/pages/home/home',
-		// 			})
-		// 		}
-		// 	  })
-		// 	}
-		//   })
-		register(registerOption).then((res)=>{
+		var registerOption = {
+			data: {
+				avatar: wx.getStorageSync('avatarUrl'),
+				name: wx.getStorageSync('nickName'),
+				vid: wx.getStorageSync('vid'),
+				phone: '',
+				sign: '',
+			},
+		}
+		var loginOption = {
+	
+			header :{
+				"content-type": 'application/x-www-form-urlencoded',
+			},
+			data:{
+				vid: wx.getStorageSync('vid')
+			},
+		}
+		console.log(registerOption);
+		register(registerOption).then(res=>{
 			console.log(res);
-			login(loginOption).then((res)=>{
+			login(loginOption).then(res=>{
 				console.log(res);
 				wx.setStorageSync('token', res.data.data.token);
 				wx.setStorageSync('uid', res.data.data.user_info.uid);
@@ -189,6 +142,8 @@ Page({
 				  url: '/pages/home/home',
 				})
 			})
+		}).catch(err => {
+			console.log(err);
 		})
 	  }
 	})

fore-end/pages/user/user.js

@@ -21,10 +21,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-		this.setData({
-			avatarUrl: wx.getStorageSync('avatarUrl'),
-			nickName: wx.getStorageSync('nickName'),
-		})
+		
 		// http('/user/info',infoOption).then(res => {
 		// 	console.log(res);
 		// 	this.setData({
@@ -47,7 +44,11 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow() {
-
+		this.setData({
+			avatarUrl: wx.getStorageSync('avatarUrl'),
+			nickName: wx.getStorageSync('nickName'),
+			personalSignatrue: wx.getStorageSync('personalSignatrue'),
+		})
     },
 
     /**

fore-end/pages/user/user.wxml

@@ -5,7 +5,7 @@
 			<image class="pages-user-profile-1" src="{{avatarUrl}}" style="width: 236rpx; height: 232rpx; display: inline-block; box-sizing: border-box; left: 13rpx; top: 15rpx; position: relative"></image>
 		</view>
 		<view class="pages-user-username">
-			<view class="pages-user-username-1" style="font-size: {{fontSize}};">{{nickName}}</view>
+			<view class="pages-user-username-1" style=" display: block; box-sizing: border-box; left: 63rpx; top: 3rpx">{{nickName}}</view>
 			<!-- <view class="pages-user-username-2">wxID:{{userWxID}}</view> -->
 			<view class="pages-user-username-4">
 				<!-- <van-icon name="/assets/tabBar_img/修改.png"></van-icon> -->

fore-end/pages/user/user.wxss

@@ -39,7 +39,7 @@ page{
 	position: relative;
 	left: 30px;
 	top: 1px;
-	width: 180px;
+	width: 160px;
 	opacity: 1;
 	color: rgba(0, 0, 0, 0.62);
 	font-size: 20px;

fore-end/pages/userchange/userchange.js

@@ -1,20 +1,8 @@
 // pages/userchange/userchange.js
+import Toast from '@vant/weapp/toast/toast';
 const {upLoad,chooseImage} = require('../../utils/util');
 const {modify} = require('../../API/appraise');
-var avatar = wx.getStorageSync('changeAvatarUrl');
-var nickName = wx.getStorageSync('changeNickName');
-var phoneNumber = wx.getStorageSync('phoneNumber');
-var personalSignatrue = wx.getStorageSync('personalSignatrue');
-var uid = wx.getStorageSync('uid');
-var modifyOption = {
-	data: {
-		"avatar": avatar,
-		"name": nickName,
-		"phone": phoneNumber,
-		"sign": personalSignatrue,
-		"uid": uid,
-	},
-}
+
 Page({
 
     /**
@@ -23,9 +11,8 @@ Page({
     data: {
 		changeAvatarUrl:'',
 		changeNickName:'',
-		phoneNumber:'',
-		password:'',
-		personalSignatrue:''
+		changePhoneNumber:'',
+		changePersonalSignatrue:''
     },
 
     /**
@@ -85,14 +72,6 @@ Page({
 	},
 	
 	chooseImage() {
-		// wx.chooseImage({
-		// 	count: 1,//可选择图片数量
-		// 	sizeType: ['compressed'],//压缩图片
-		// 	sourceType: ['album','camera'],//来源
-		// 	success: (res) => {
-		// 		this.uploadImage(res.tempFilePaths[0]);
-		// 	}
-		//   })
 		chooseImage().then((res)=>{
 			this.uploadImage(res.tempFilePaths[0]);
 		})
@@ -112,19 +91,60 @@ Page({
 	},
 
 	onChangePhonenumber:function(e){
-		wx.setStorageSync('phoneNumber', e.detail);
+		wx.setStorageSync('changePhoneNumber', e.detail);
 	},
 
-	onChangePassword: function(e) {
-		wx.setStorageSync('password', e.detail);
-	},
+	// onChangePassword: function(e) {
+	// 	wx.setStorageSync('password', e.detail);
+	// },
 
 	onChangePersonalSignatrue: function(e) {
-		wx.setStorageSync('personalSignatrue', e.detail);
+		wx.setStorageSync('changePersonalSignatrue', e.detail);
 	},
 	
 	changeInfo:function(){
-		console.log(uid);
+		console.log(wx.getStorageSync('uid'));
+		console.log(wx.getStorageSync('changePersonalSignatrue'));
+		// modifyOption.data = {
+		// 	avatar: wx.getStorageSync('changeAvatarUrl'),
+		// 	name: wx.getStorageSync('changeNickName'),
+		// 	phone: wx.getStorageSync('changePhoneNumber'),
+		// 	sign: wx.getStorageSync('changePersonalSignatrue'),
+		// 	uid: wx.getStorageSync('uid'),
+		// }
+		var modifyOption = {
+			data: {
+				avatar: wx.getStorageSync('changeAvatarUrl'),
+				name: wx.getStorageSync('changeNickName'),
+				phone: wx.getStorageSync('changePhoneNumber'),
+				sign: wx.getStorageSync('changePersonalSignatrue'),
+				uid: wx.getStorageSync('uid'),
+			},
+		}
+		console.log(wx.getStorageSync('changeAvatarUrl'));
+		console.log(wx.getStorageSync('changePersonalSignatrue'));
+		console.log(modifyOption.data);
+		modify(modifyOption).then((res)=>{
+			console.log(res);
+			console.log(res.data);
+			console.log(res.data.data);
+			wx.setStorageSync('avatarUrl', res.data.data.avatar);
+			wx.setStorageSync('nickName', res.data.data.name);
+			wx.setStorageSync('personalSignatrue', res.data.data.sign);
+			wx.switchTab({
+			  url: '/pages/user/user',
+			})
+		}).catch((err) => {
+			if(err.data.message == "fail to update"){
+				Toast.fail('无效修改');
+			}else if(err.data.message == "phone number already be used"){
+				Toast.fail('手机号已被占用');
+			}
+		})
+		wx.setStorageSync('changeAvatarUrl', '');
+		wx.setStorageSync('changeNickName', '');
+		wx.setStorageSync('changePhoneNumber', '');
+		wx.setStorageSync('changePersonalSignatrue', '');
 		// wx.request({
 		//   url: 'http://192.168.31.28:8084',
 		//   method: 'POST',
@@ -143,15 +163,5 @@ Page({
 		// 	  })
 		//   }
 		// }),
-		modify(modifyOption).then((res)=>{
-			console.log(res);
-			wx.switchTab({
-			  url: '/pages/user/user',
-			})
-		})
-		wx.setStorageSync('changeAvatarUrl', '');
-		wx.setStorageSync('changeNickName', '');
-		wx.setStorageSync('phoneNumber', '');
-		wx.setStorageSync('personalSignatrue', '');
 	}
 })

fore-end/pages/userchange/userchange.wxml

@@ -3,9 +3,10 @@
 	<van-image round fit="cover" src="{{changeAvatarUrl}}" 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="{{changeNickName}}" 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>
+		<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="{{changePhoneNumber}}" placeholder="请输入电话号码" adjust-position bindinput="onChangePhonenumber"></van-field>
 		<!-- <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="{{password}}" placeholder="请输入密码" adjust-position password="{{true}}" bindinput="onChangePassword"></van-field> -->
-		<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="{{personalSignatrue}}" placeholder="请输入个性签名" adjust-position bindinput="onChangePersonalSignatrue"></van-field>
+		<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="{{changePersonalSignatrue}}" placeholder="请输入个性签名" adjust-position bindinput="onChangePersonalSignatrue"></van-field>
 	</van-cell-group>
 	<van-button round color="rgba(16, 128, 227, 1)" custom-style="width:150px;height:45px;transform: translate(75%, 0%);" bindtap="changeInfo">提交修改</van-button>
+	<van-toast id="van-toast" />
 </view>

fore-end/utils/util.js

@@ -33,7 +33,7 @@ function http(url, option) {
 				resolve(res);
 			  }else{
 				Toast.fail(message);
-				reject();
+				reject(res);
 			  }
           },
           fail(err) {
@@ -77,7 +77,7 @@ function chooseImage(){
 	return new Promise((resolve,reject) => {
 		wx.chooseImage({
 			count: 1,//可选择图片数量
-			sizeType: ['compressed'],//压缩图片
+			sizeType: ['original'],//原图
 			sourceType: ['album','camera'],//来源
 			success: (res)=>{
 				resolve(res);