eason 1 жил өмнө
parent
commit
fdd5e0485c

+ 8 - 1
fore-end/app.json

@@ -6,7 +6,8 @@
 	"van-image": "@vant/weapp/image/index",
 	"van-loading": "@vant/weapp/loading/index",
 	"van-icon": "@vant/weapp/icon/index",
-	"van-field": "@vant/weapp/field/index"
+	"van-field": "@vant/weapp/field/index",
+	"van-toast": "@vant/weapp/toast/index"
   },
   "pages": [
     "pages/home/home",
@@ -22,6 +23,12 @@
     "navigationBarTitleText": "Weixin",
     "navigationBarTextStyle": "black"
   },
+  "networkTimeout": {
+    "request": 1000000,
+    "connectSocket": 100000,
+    "uploadFile": 100000,
+    "downloadFile": 100000
+  },
   "tabBar": {
     "list": [
       {

+ 36 - 1
fore-end/pages/user/user.js

@@ -5,7 +5,10 @@ Page({
      * 页面的初始数据
      */
     data: {
-      
+	  avatarUrl:"https://img.js.design/assets/smartFill/img313164da746310.jpg",
+	  nickName:"Username",
+	  userWxID:"UserWxID",
+	  personalSignatrue:"编辑个性签名,展示我的独特态度"
     },
 
     /**
@@ -68,5 +71,37 @@ Page({
 		wx.navigateTo({
 		  url: '/pages/userchange/userchange',
 		})
+	},
+
+	getUserProfile(){
+		wx.getUserProfile({
+		  desc: '登录',
+		  success: (res) => {
+			  this.setData({
+				  nickName: res.userInfo.nickName,
+				  avatarUrl: res.userInfo.avatarUrl
+			  })
+			  wx.setStorage({
+				  key: 'nickname',
+				  data: res.userInfo.nickName,
+				  success: function() {
+					  console.log('写入nickname缓存成功')
+				  },
+				  fail: function() {
+					  console.log('写入nickname发生错误')
+				  }
+			  })
+			  wx.setStorage({
+				key: 'avatarUrl',
+				data: res.userInfo.avatarUrl,
+				success: function() {
+					console.log('写入avatarUrl缓存成功')
+				},
+				fail: function() {
+					console.log('写入avatarUrl发生错误')
+				}
+			})
+		  }
+		})
 	}
 })

+ 7 - 6
fore-end/pages/user/user.wxml

@@ -1,15 +1,16 @@
 <!--pages/user/user.wxml-->
 <van-cell-group inset>
 	<view class="pages-user">
-		<view class="pages-user-profile" >
-			<view class="pages-user-profile-1"></view>
+		<view class="pages-user-profile" bindtap="userName">
+			<image class="pages-user-profile-1" src="{{avatarUrl}}"></image>
 		</view>
 		<view class="pages-user-username">
-			<view class="pages-user-username-1">deter</view>
-			<view class="pages-user-username-2">wxID:a3426d3e8</view>
+			<view class="pages-user-username-1">{{userName}}</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>
-				<view class="pages-user-username-4-text">编辑个性签名,展示我的独特态度。</view>
+				<!-- <van-icon name="/assets/tabBar_img/修改.png"></van-icon> -->
+				<view class="pages-user-username-4-title">个性签名:</view>
+				<view class="pages-user-username-4-text">{{personalSignatrue}}</view>
 			</view>
 			<van-cell bindtap="changeBtn" value="编辑个人信息" is-link  class="pages-user-username-3" value-class="font-size:12px;"></van-cell>
 		</view>

+ 15 - 5
fore-end/pages/user/user.wxss

@@ -28,7 +28,6 @@ page{
 	width: 106px;
 	height: 106px;
 	border-radius: 20px;
-	background: url(https://img.js.design/assets/smartFill/img313164da746310.jpg);
 }
 
 .pages-user-username{
@@ -38,20 +37,20 @@ page{
 
 .pages-user-username-1{
 	position: relative;
-	left: 39px;
+	left: 65px;
 	top: 1px;
 	width: 100px;
 	height: 37px;
 	opacity: 1;
 	color: rgba(0, 0, 0, 0.62);
-	font-size: 40px;
+	font-size: 20px;
 	font-weight: 1000;
 
 }
 
 .pages-user-username-2{
 	position: relative;
-	left: 44px;
+	left: 70px;
 	top: 10px;
 	width: 104px;
 	height: 20px;
@@ -70,7 +69,7 @@ page{
 .pages-user-username-3{
 	position: relative;
 	top: 10px;
-	left: 70px;
+	left: 35px;
 }
 
 .pages-user-username-3>.van-cell:after{
@@ -88,7 +87,18 @@ page{
 	left: 35px;
 }
 
+.pages-user-username-4-title{
+	position: relative;
+	left: -10px;
+	margin-top: 5px;
+	width: 55px;
+	font-size: 11px;
+	opacity: 0.7;
+}
+
 .pages-user-username-4-text{
+	position: relative;
+	left: -15px;
 	margin-top: 5px;
 	width: 130px;
 	font-size: 12px;

+ 25 - 2
fore-end/pages/userchange/userchange.js

@@ -1,11 +1,12 @@
 // pages/userchange/userchange.js
+const {upLoad} = require('../../utils/util');
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-
+		imageUrl:''
     },
 
     /**
@@ -62,5 +63,27 @@ Page({
      */
     onShareAppMessage() {
 
-    }
+	},
+	
+	chooseImage() {
+		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({
+				imageUrl: res.Url
+			});
+		})
+	},
+	changeInfo:function(){
+		
+	}
 })

+ 2 - 2
fore-end/pages/userchange/userchange.wxml

@@ -1,11 +1,11 @@
 <!--pages/userchange/index.wxml-->
 <view class="pages">
-	<van-image round fit="cover" src="https://img.js.design/assets/smartFill/img308164da746310.jpeg" class="pages-userchange-profile"></van-image>
+	<van-image round fit="cover" src="{{imageUrl}}" class="pages-userchange-profile" bindtap="chooseImage"></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="deter" placeholder="请输入昵称" adjust-position ></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="{{photonumber}}" placeholder="请输入电话号码" adjust-position ></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="{{username}}" placeholder="请输入密码" adjust-position password="{{true}}" ></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="{{username}}" placeholder="请输入个性签名" adjust-position password="{{true}}" ></van-field>
 	</van-cell-group>
-	<van-button disabled round color="rgba(16, 128, 227, 1)" custom-style="width:150px;height:45px;transform: translate(75%, 0%);">提交修改</van-button>
+	<van-button round color="rgba(16, 128, 227, 1)" custom-style="width:150px;height:45px;transform: translate(75%, 0%);" bindtap="changeInfo">提交修改</van-button>
 </view>

+ 2 - 1
fore-end/project.private.config.json

@@ -2,6 +2,7 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "WeChatUse",
     "setting": {
-        "compileHotReLoad": false
+        "compileHotReLoad": false,
+        "urlCheck": false
     }
 }

+ 45 - 5
fore-end/utils/util.js

@@ -1,3 +1,6 @@
+import Toast from '@vant/weapp/toast/toast';
+const baseURL = "http://192.168.31.28:8084";//后台服务提供的地址
+const uploadUrl = "/pic/upload";
 const formatTime = date => {
   const year = date.getFullYear()
   const month = date.getMonth() + 1
@@ -14,17 +17,25 @@ const formatNumber = n => {
   return n[1] ? n : `0${n}`
 }
 
+
+
 function http(url, option) {
-    const baseURL = "http://192.168.31.28:8084";//后台服务提供的地址
     return new Promise ((resolve, reject) => {
         wx.request({
           url: baseURL + url,
-          ...option,
+		  ...option,
+		  
           success(res) {
-              console.log(res);
-              resolve(res.data);
+			  const {data,code,message} = JSON.parse(res.data);
+			  if(code == 200){
+				resolve(data);
+			  }else{
+				Toast.fail(message);
+				reject();
+			  }
           },
           fail(err) {
+			Toast.fail('系统异常');
             console.log(err);
             reject(err);
           }
@@ -32,7 +43,36 @@ function http(url, option) {
     })
 }
 
+function upLoad(filePath) {
+	return new Promise((resolve,reject) => {
+		wx.uploadFile({
+		  filePath: filePath,
+		  name: 'pic',
+		  url: baseURL+uploadUrl,
+
+		  success: (res) => {
+			const {data,code,message} = JSON.parse(res.data);
+			if(code == 200){
+				resolve(data);
+			}else{
+				Toast.fail(message);
+				reject();
+			}
+		  },
+		  fail: (err) => {
+			console.log();
+			Toast.fail('上传失败');
+			console.log(err);
+        	reject(err);
+		  }
+		})
+	}
+
+	)
+}
+
 module.exports = {
     formatTime,
-    http
+	http,
+	upLoad
   }