上传体验版本

fore-end/app.js

@@ -1,5 +1,6 @@
 // app.js
 const {login,getUserInfo} = require('./API/appraise')
+const {wxLogin} = require('./utils/util')
 
 App({
   onLaunch() {
@@ -37,39 +38,24 @@ var infoOption = {
 	if(wx.getStorageSync('token') == ''){
 		// console.log('token不存在');
 		// 登录
-		wx.login({
-			success: (res) => {
-				//获取用户昵称和头像
-				//和微信接口服务校验
-			//   console.log("code: "+res.code);
-			  var url = 'https://api.weixin.qq.com/sns/jscode2session?appid=' + wxInfo.appid + '&secret=' + wxInfo.appSecret + '&js_code=' + res.code + '&grant_type=authorization_code'
-			  wx.request({
-				url:url,
-				success: (res) => {
-					// console.log(res);
-					// 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.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',
-						})
-					})
-				}
-			  })
+		wxLogin().then((res)=>{
+			console.log(res);
+			loginOption.data = {
+				code:res.code
 			}
-		  })
+			login(loginOption).then(res => {
+				console.log(res);
+				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',
+				})
+			})
+		})
 	}else{
 		getUserInfo(infoOption).then(res => {
 			// console.log(res);
@@ -80,38 +66,25 @@ var infoOption = {
 			wx.setStorageSync('personalSignatrue', res.data.data.sign);
 			// console.log(wx.getStorageSync('uid'));
 		}).catch(err => {
-			// console.log('token已失效，请重新登录');
-			wx.login({
-				success: (res) => {
-					//和微信接口服务校验
-				//   console.log("code: "+res.code);
-				  var url = 'https://api.weixin.qq.com/sns/jscode2session?appid=' + wxInfo.appid + '&secret=' + wxInfo.appSecret + '&js_code=' + res.code + '&grant_type=authorization_code'
-				  wx.request({
-					url:url,
-					success: (res) => {
-						// console.log(res);
-						// 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.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',
-							})
-						})
-					}
-				  })
+			console.log('token已失效，请重新登录');
+			wxLogin().then((res)=>{
+				console.log(res);
+				loginOption.data = {
+					code: res.code,
 				}
-			  })
+				login(loginOption).then(res => {
+					// console.log(res);
+					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

@@ -77,5 +77,6 @@
 		"scope.userLocation": {
 			"desc": "你的位置信息将用于小程序位置接口的效果展示"
 		}
-	}
+	},
+	"lazyCodeLoading": "requiredComponents"
 }

fore-end/pages/register/register.js

@@ -1,8 +1,9 @@
 // pages/register.js
 const app = getApp()
+import Toast from '../../miniprogram_npm/@vant/weapp/toast/toast'
 
 const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
-const {upLoad,chooseImage} = require('../../utils/util');
+const {upLoad,chooseImage,wxLogin} = require('../../utils/util');
 const {register, login} = require('../../API/appraise');
 // import Api from '../../API/appraise'
 var clientWidth = wx.getSystemInfoSync().windowWidth;
@@ -111,38 +112,64 @@ Page({
 		wx.setStorageSync('nickName', e.detail.value);
 	},
 	  register(){
-		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=>{
+		wxLogin().then((res)=>{
 			console.log(res);
-			login(loginOption).then(res=>{
+			var registerOption = {
+				data: {
+					avatar: wx.getStorageSync('avatarUrl'),
+					name: wx.getStorageSync('nickName'),
+					code: res.code,
+					phone: '',
+					sign: '',
+				},
+			}
+			console.log(registerOption);
+			register(registerOption).then(res=>{
 				console.log(res);
-				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',
+				Toast({
+					type:'success',
+					message:'注册成功',
+					onClose:()=>{
+						wxLogin().then((res)=>{
+							console.log(res);
+							var loginOption = {
+				
+								header :{
+									"content-type": 'application/x-www-form-urlencoded',
+								},
+								data:{
+									code: res.code
+								},
+							}
+							login(loginOption).then(res=>{
+								console.log(res);
+								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);
+								Toast({
+									type: 'success',
+									message: '登陆成功',
+									context:this,
+									onClose: () => {
+										wx.switchTab({
+											url: '/pages/home/home',
+										  })
+									},
+								  });
+							})
+						}).catch((err)=>{
+							console.log(err);
+							Toast.fail('登陆失败');
+						})
+					}
 				})
+				
+			}).catch(err => {
+				console.log(err);
+				Toast.fail('注册失败');
 			})
-		}).catch(err => {
+		}).catch((err)=>{
 			console.log(err);
 		})
 	  }

fore-end/pages/register/register.wxml

@@ -11,4 +11,5 @@
     </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>
+  <van-toast id="van-toast"></van-toast>
 </view>

fore-end/project.config.json

@@ -12,7 +12,7 @@
 		"enhance": true,
 		"showShadowRootInWxmlPanel": false,
 		"packNpmRelationList": [],
-		"ignoreUploadUnusedFiles": false,
+		"ignoreUploadUnusedFiles": true,
 		"setting": {
 			"packNpmManually": true,
 			"packNpmRelationList": [
@@ -23,7 +23,7 @@
 			]
 		},
 		"es6": true,
-		"condition": true,
+		"condition": false,
 		"uglifyFileName": false
 	},
 	"editorSetting": {

fore-end/project.private.config.json

@@ -5,7 +5,7 @@
 		"compileHotReLoad": false,
 		"urlCheck": false,
 		"autoAudits": false,
-		"bigPackageSizeSupport": false,
+		"bigPackageSizeSupport": true,
 		"preloadBackgroundData": false
 	},
 	"condition": {

fore-end/utils/util.js

@@ -1,7 +1,7 @@
 import Toast from '@vant/weapp/toast/toast';
 const { loginURL, registerURL } = require('../API/appraise')
-const baseURL = "http://192.168.31.27:8084";//后台服务提供的地址
-const wsConnectURL = "ws://192.168.31.27:8084";//websocket连接地址
+const baseURL = "https://trade.may1145.xyz";//后台服务提供的地址
+const wsConnectURL = "ws://trade.may1145.xyz";//websocket连接地址
 const uploadUrl = "/pic/upload";
 const formatTime = timestamp => {
 	let date = new Date(timestamp);
@@ -118,11 +118,27 @@ function chooseImage(){
 	})
 }
 
+function wxLogin(){
+	return new Promise((resolve,reject)=>{
+		wx.login({
+		  success: (res) => {
+			console.log(res);
+			resolve(res);
+		  },
+		  fail: (err) => {
+			  console.log(err);
+			  reject(err);
+		  }
+		})
+	})
+}
+
 module.exports = {
     formatTime: formatTime,
 	http,
 	ws,
 	upLoad,
 	chooseImage,
-	messageMap
+	messageMap,
+	wxLogin
   }