1

api/api.js

@@ -66,188 +66,92 @@ export function loginApi(data)
 	return request.post("login/l",data,{ noAuth : true});
 }
 
-/**
- * 获取登录授权login
- * 
-*/
-export function getLogo()
+//用户信息
+export function getUserInfo()
 {
-  return request.get('wechat/get_logo', {}, { noAuth : true});
+	return request.get("user/init");
 }
 
-
-/**
- * 保存form_id
- * @param string formId 
- */
-export function setFormId(formId) {
-  return request.post("wechat/set_form_id", { formId: formId});
-}
-
-/**
- * 领取优惠卷
- * @param int couponId
- * 
-*/
-export function setCouponReceive(couponId){
-  return request.post('coupon/receive', { couponId: couponId});
-}
-/**
- * 优惠券列表
- * @param object data
-*/
-export function getCoupons(data){
-  return request.get('coupons',data,{noAuth:true})
-}
-
-/**
- * 我的优惠券
- * @param int types 0全部  1未使用 2已使用
-*/
-export function getUserCoupons(types){
-  return request.get('coupons/user/'+types)
-}
-
-/**
- * 文章分类列表
- * 
-*/
-export function getArticleCategoryList(){
-  return request.get('article/category/list',{},{noAuth:true})
-}
-
-/**
- * 文章列表
- * @param int cid
- * 
-*/
-export function getArticleList(cid,data){
-  return request.get('article/list/' + cid, data,{noAuth:true})
-}
-
-/**
- * 文章 热门列表
- * 
-*/
-export function getArticleHotList(){
-  return request.get('article/hot/list',{},{noAuth:true});
-}
-
-/**
- * 文章 轮播列表
- * 
-*/
-export function getArticleBannerList(){
-  return request.get('article/banner/list',{},{noAuth:true})
+//订单统计
+export function getOrder()
+{
+	return request.post("user/orderInit");
 }
 
-/**
- * 文章详情
- * @param int id 
- * 
-*/
-export function getArticleDetails(id){
-  return request.get('article/details/'+id,{},{noAuth:true});
+//订单列表
+export function getOrderList(data)
+{
+	return request.post("user/getOrderList",data);
 }
 
-/**
- * 手机号+验证码登录接口
- * @param object data
-*/
-export function loginMobile(data){
-  return request.post('login/mobile',data,{noAuth:true})
+//邀请链接
+export function spreadLink()
+{
+	return request.post("user/extension");
 }
 
-
-
-/**
- * 手机号注册
- * @param object data
- * 
-*/
-export function phoneRegister(data){
-  return request.post('register',data,{noAuth:true});
+//平台列表
+export function platformList()
+{
+	return request.post("platform/list");
 }
 
-/**
- * 手机号修改密码
- * @param object data
- * 
-*/
-export function phoneRegisterReset(data){
-  return request.post('register/reset',data,{noAuth:true})
+//购买页仓库
+export function ApiWarehouse()
+{
+	return request.get("user/warehouse");
 }
 
-/**
- * 手机号+密码登录
- * @param object data
- * 
-*/
-export function phoneLogin(data){
-  return request.post('login',data,{noAuth:true})
+//提交订单
+export function submitOrder(data)
+{
+	return request.post("user/subOrder",data);
 }
 
-/**
- * 切换H5登录
- * @param object data
-*/
-// #ifdef MP
-export function switchH5Login(){
-  return request.post('switch_h5', { 'from':'routine'});
+//支付订单
+export function payOrder(data)
+{
+	return request.post("user/getPayOrder",data);
 }
-// #endif
 
-/*
- * h5切换公众号登陆
- * */
-// #ifdef H5
-export function switchH5Login() {
-  return request.post("switch_h5", { 'from': "wechat" });
+//余额支付
+export function balancePay(data)
+{
+	return request.post("user/balancePay",data);
 }
-// #endif
 
-/**
- * 绑定手机号
- * 
-*/
-export function bindingPhone(data){
-  return request.post('binding',data);
+//微信支付
+export function wxPay(data)
+{
+	return request.post("weixin/wxPay",data);
 }
 
-/**
- * 退出登錄
- * 
-*/
-export function logout(){
-  return request.get('logout');
+//取消订单
+export function cancelOrder(data)
+{
+	return request.post("user/cancelOrder",data);
 }
 
-/**
- * 获取订阅消息id
- */
-export function getTemlIds()
+//充值金额列表
+export function rechargeInit()
 {
-  return request.get('wechat/teml_ids', {}, { noAuth:true});
+	return request.post("user/rechargeXinit");
 }
 
-/**
- * 首页拼团数据
- */
-export function pink()
+//微信充值
+export function wxRecharge(data)
 {
-  return request.get('pink', {}, { noAuth:true});
+	return request.post("user/wxRecharge",data);
 }
 
-/**
- * 获取城市信息
- */
-export function getCity() {
-  return request.get('city_list', { }, { noAuth: true });
+//账单明细
+export function recordList(data)
+{
+	return request.post("user/detailList",data);
 }
 
-/**
- * 获取小程序直播列表
- */
-export function getLiveList(page,limit) {
-  return request.get('wechat/live', { page, limit}, { noAuth: true });
-}
+//账户余额
+export function account()
+{
+	return request.post("user/rechargeInit");
+}

components/payment/index.vue

@@ -25,8 +25,9 @@
 
 <script>
 	import {
-		orderPay
-	} from '@/api/order.js';
+		balancePay,
+		wxPay
+	} from '@/api/api.js';
 	export default {
 		props: {
 			payMode: {
@@ -70,128 +71,101 @@
 				uni.showLoading({
 					title: '支付中'
 				});
-				orderPay({
-					uni: that.order_id,
-					paytype: paytype,
-					// #ifdef MP 
-					'from': 'routine',
-					// #endif
-					// #ifdef H5 || APP-PLUS
-					'from': this.$wechat.isWeixin() ? 'weixin' : 'weixinh5',
-					// #endif
-				}).then(res => {
-					switch (paytype) {
-						case 'weixin':
-							if (res.data.result === undefined) return that.$util.Tips({
-								title: '缺少支付参数'
+				if(paytype == 'yue'){
+					balancePay({'order_id':that.order_id}).then(res => {
+						uni.hideLoading();
+						return that.$util.Tips({
+							title: res.data.msg,
+							icon: 'success'
+						}, () => {
+							that.$emit('onChangeFun', {
+								action: 'pay_complete'
 							});
-							// #ifdef MP || APP-PLUS
-							let jsConfig = res.data.result.jsConfig;
-							uni.requestPayment({
-								timeStamp: jsConfig.timestamp,
-								nonceStr: jsConfig.nonceStr,
-								package: jsConfig.package,
-								signType: jsConfig.signType,
-								paySign: jsConfig.paySign,
-								success: function(res) {
-									uni.hideLoading();
-									return that.$util.Tips({
-										title: res.msg,
-										icon: 'success'
-									}, () => {
-										that.$emit('onChangeFun', {
-											action: 'pay_complete'
-										});
-									});
-								},
-								fail: function(e) {
-									uni.hideLoading();
-									return that.$util.Tips({
-										title: '取消支付'
-									}, () => {
-										that.$emit('onChangeFun', {
-											action: 'pay_fail'
-										});
-									});
-								},
-								complete: function(e) {
-									uni.hideLoading();
-									if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
-										title: '取消支付'
-									}, () => {
-										that.$emit('onChangeFun', {
-											action: 'pay_fail'
-										});
-									});
-								},
+						});
+					}).catch(err => {
+						uni.hideLoading();
+						return that.$util.Tips({
+							title: err
+						}, () => {
+							that.$emit('onChangeFun', {
+								action: 'pay_fail'
 							});
-							// #endif
-							// #ifdef H5
-							let data = res.data;
-							if (data.status == "WECHAT_H5_PAY") {
-								uni.hideLoading();
-								location.replace(data.result.jsConfig.mweb_url);
-								return that.$util.Tips({
-									title: "支付成功",
-									icon: 'success'
-								}, () => {
-									that.$emit('onChangeFun', {
-										action: 'pay_complete'
-									});
-								});
-							} else {
-								that.$wechat.pay(data.result.jsConfig)
-									.finally(() => {
-										return that.$util.Tips({
-											title: "支付成功",
-											icon: 'success'
-										}, () => {
-											that.$emit('onChangeFun', {
-												action: 'pay_complete'
-											});
-										});
-									})
-									.catch(function() {
-										return that.$util.Tips({
-											title: '支付失败'
-										});
-									});
-							}
-							// #endif
-							break;
-						case 'yue':
+						});
+					})
+				}else{
+					wxPay({
+						order_id: that.order_id,
+						from: this.$wechat.isWeixin() ? 'weixin' : 'h5'
+					}).then(res => {
+						if (res.data.result === undefined) return that.$util.Tips({
+							title: '缺少支付参数'
+						});
+						if (res.data.type == "WECHAT_H5_PAY") {
 							uni.hideLoading();
+							location.replace(res.data.result.mweb_url);
 							return that.$util.Tips({
-								title: res.msg,
+								title: "支付成功",
 								icon: 'success'
 							}, () => {
 								that.$emit('onChangeFun', {
 									action: 'pay_complete'
 								});
 							});
-							break;
-						case 'offline':
+						} else {
+							let response = res.data.result;
+							if (typeof WeixinJSBridge == "undefined") {
+								if (document.addEventListener) {
+									document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady(response), false);
+								} else if (document.attachEvent) {
+									document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady(response));
+									document.attachEvent('onWeixinJSBridgeReady', this.onBridgeReady(response));
+								}
+							} else {
+								this.onBridgeReady(response);
+							}
+						}
+					}).catch(err => {
+						uni.hideLoading();
+						return that.$util.Tips({
+							title: err
+						}, () => {
+							that.$emit('onChangeFun', {
+								action: 'pay_fail'
+							});
+						});
+					})
+				}
+			},
+			onBridgeReady: function(response) {
+				WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', {
+						"appId": response.appId, //公众号名称，由商户传入
+						"timeStamp": response.timeStamp, //时间戳，自1970年以来的秒数
+						"nonceStr": response.nonceStr, //随机串
+						"package": response.package,
+						"signType": response.signType, //微信签名方式
+						"paySign": response.paySign //微信签名
+					},
+					function(res) {
+						if (res.err_msg == "get_brand_wcpay_request:ok") {
 							uni.hideLoading();
 							return that.$util.Tips({
-								title: res.msg,
+								title: "支付成功",
 								icon: 'success'
 							}, () => {
 								that.$emit('onChangeFun', {
 									action: 'pay_complete'
 								});
 							});
-							break;
+						} else {
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: '支付失败'
+							});
+						}
+						WeixinJSBridge.log(res.err_msg);
 					}
-				}).catch(err => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: err
-					}, () => {
-						that.$emit('onChangeFun', {
-							action: 'pay_fail'
-						});
-					});
-				})
+				);
 			}
 		}
 	}

config/app.js

@@ -13,7 +13,7 @@ module.exports = {
 		'secret-key': 'b1bd7a4b8da3e47ce58e73b9e5f656c4'
 	},
 	// 回话密钥名称 请勿修改此配置
-	TOKENNAME: 'Authori-zation',
+	TOKENNAME: 'token',
 	// 缓存时间 0 永久
 	EXPIRE:0,
 };

manifest.json

@@ -85,7 +85,7 @@
         },
         "router" : {
             "mode" : "history",
-            "base" : "h5"
+            "base" : "/h5/"
         },
         "domain" : "lipinwawa.com",
         "sdkConfigs" : {

pages.json

@@ -45,7 +45,44 @@
 			"style": {
 				"navigationBarTitleText": "我的"
 			}
+		},
+		{
+			"path": "pages/users/order/index",
+			"style": {
+				"navigationBarTitleText": "我的订单"
+			}
+		},
+		{
+			"path": "pages/users/spread/index",
+			"style": {
+				"navigationBarTitleText": "邀请好友"
+			}
+		},
+		{
+			"path": "pages/users/purchase/index",
+			"style": {
+				"navigationBarTitleText": "立即发货"
+			}
+		},
+		{
+			"path": "pages/users/recharge/index",
+			"style": {
+				"navigationBarTitleText": "余额充值"
+			}
+		},
+		{
+			"path": "pages/users/record/index",
+			"style": {
+				"navigationBarTitleText": "账单明细"
+			}
+		},
+		{
+			"path": "pages/users/commission/index",
+			"style": {
+				"navigationBarTitleText": "邀请奖励"
+			}
 		}
+		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -73,10 +110,10 @@
 		        "text": "商品"
 		      },
 			  {
-			    "pagePath": "pages/news/index",
+			    "pagePath": "pages/users/purchase/index",
 			    "iconPath": "static/images/3-001.png",
 			    "selectedIconPath": "static/images/3-002.png",
-			    "text": "订单"
+			    "text": "立即发货"
 			  },
 		      {
 		        "pagePath": "pages/my/index",

pages/index/index.vue

@@ -33,7 +33,9 @@
 			
 			<view class="nav">
 				<view><image src="../../static/images/nav1.png"></image><view>开启分站</view></view>
-				<view><image src="../../static/images/nav2.png"></image><view>邀请好友</view></view>
+				<navigator class="item" url="/pages/users/spread/index" hover-class="none">
+					<image src="../../static/images/nav2.png"></image><view>邀请好友</view>
+				</navigator>
 				<view><image src="../../static/images/nav3.png"></image><view>品质保证</view></view>
 				<view><image src="../../static/images/nav4.png"></image><view>降低成本</view></view>
 			</view>

pages/my/index.vue

@@ -1,6 +1,63 @@
 <template>
 	<view>
-
+		<view class="header">
+			<view class="info">
+				<view class="avatar">
+					<image :src="userInfo.avatar"></image>
+				</view>
+				<view class="text">
+					<view class="name">{{userInfo.nickname}}<text>{{userInfo.levelname}}</text></view>
+					<view>{{userInfo.mobile}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="money">
+			<view class="balance">
+				账户余额(元)
+				<view>{{userInfo.money}}</view>
+			</view>
+			<view>
+				<navigator class="recharge" hover-class="none" url="/pages/users/recharge/index">充值</navigator>
+				<navigator class="detail" hover-class="none" url="/pages/users/record/index?type=recharge">明细</navigator>
+			</view>
+		</view>
+		<view class="order-wrapper">
+			<view class="order-hd flex">
+				<view class="left">我的订单</view>
+				<navigator class="right flex" hover-class="none" url="/pages/users/order/index" open-type="navigate">
+					查看全部
+					<text class="iconfont icon-xiangyou"></text>
+				</navigator>
+			</view>
+			<view class="order-bd">
+				<block v-for="(item,index) in orderMenu" :key="index">
+					<navigator class="order-item" hover-class="none" :url="item.url">
+						<view class="pic">
+							<image :src="item.img" mode=""></image>
+							<text class="order-status-num" v-if="item.num > 0">{{ item.num }}</text>
+						</view>
+						<view class="txt">{{item.title}}</view>
+					</navigator>
+				</block>
+			</view>
+		</view>
+		<view class="menu">
+			<view class="title">我的服务</view>
+			<view class="list">
+				<navigator class="item" url="/pages/users/spread/index" hover-class="none">
+					<text class="iconfont icon-iconfontzhizuobiaozhun49"></text>
+					<text>邀请好友</text>
+				</navigator>
+				<navigator class="item" url="/pages/users/record/index?type=consumption" hover-class="none">
+					<text class="iconfont icon-xiaofeimingxi"></text>
+					<text>消费明细</text>
+				</navigator>
+				<navigator class="item" url="/pages/users/commission/index" hover-class="none">
+					<text class="iconfont icon-yongjinmingxi"></text>
+					<text>佣金明细</text>
+				</navigator>
+			</view>
+		</view>		
 	</view>
 </template>
 
@@ -11,16 +68,48 @@
 	import {
 		toLogin
 	} from '@/libs/login.js';
+	import {		
+		getUserInfo,
+		getOrder
+	} from '@/api/api.js';
 	export default {
 		data() {
 			return {
-				userInfo: {}
+				userInfo: {},
+				orderMenu: [
+					{
+						title: '未支付',
+						img: '../../static/images/order1.png',						
+						url: '/pages/users/order/index?status=0'
+					},
+					{
+						title: '打单中',
+						img: '../../static/images/order2.png',						
+						url: '/pages/users/order/index?status=1'
+					},
+					{
+						title: '已出单',
+						img: '../../static/images/order3.png',						
+						url: '/pages/users/order/index?status=2'
+					},
+					{
+						title: '异常',
+						img: '../../static/images/order4.png',						
+						url: '/pages/users/order/index?status=9'
+					},
+					{
+						title: '取消',
+						img: '../../static/images/order5.png',						
+						url: '/pages/users/order/index?status=-1'
+					}
+				],
 			}
 		},
 		computed: mapGetters(['isLogin']),
 		onLoad() {
 		    if (this.isLogin) {
 		    	this.getUserInfo();
+				this.getOrderData();
 		    }else{
 				toLogin();
 			}
@@ -30,13 +119,212 @@
 				let that = this;
 				getUserInfo().then(res => {
 					that.userInfo = res.data;
-					that.$store.commit("SETUID", res.data.uid);
 				});
+			},
+			//获取订单统计数据
+			getOrderData: function() {
+				let that = this;
+				getOrder().then(res => {
+					that.orderMenu.forEach((item, index) => {
+						switch (item.title) {
+							case '未支付':
+								item.num = res.data.unpaid
+								break
+							case '打单中':
+								item.num = res.data.inorder
+								break
+							case '已出单':
+								item.num = res.data.sendOrder
+								break
+							case '异常':
+								item.num = res.data.abnormalOrder
+								break
+							case '取消':
+								item.num = res.data.cancelOrder
+								break
+						}
+					})
+				})
 			}
 		}
 	}
 </script>
 
-<style lang="scss">
-	
+<style scoped lang="scss">
+	.header{
+		height:360rpx;
+		background: linear-gradient(90deg,#ff5c00 0,#FF464E);
+		.info{
+			display: flex;
+			padding-top: 80rpx;
+			padding-left: 25rpx;
+			.avatar{
+				width: 125rpx;
+				height: 125rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border-radius: 50%;
+				border: 1px solid hsla(0,0%,100%,.5);
+				image{
+					width:110rpx;
+					height:110rpx;
+					border-radius: 50%;
+				}
+			}
+			.text{
+				color:#fff;
+				padding-left: 20rpx;
+				padding-top: 10rpx;
+				.name{
+					font-size: 36rpx;
+					font-weight: bolder;
+					margin-bottom: 10rpx;
+					text{
+						color: #fff;
+						opacity: 0.8;
+						font-size: 24rpx;
+						border: 1px solid hsla(0,0%,100%,.6);
+						border-radius: 30rpx;
+						padding: 2rpx 15rpx;
+						margin-left: 15rpx;
+					}
+				}
+			}
+		}
+	}
+	.money{
+		width:700rpx;
+		margin-left: 25rpx;
+		margin-top: -100rpx;
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		display: flex;
+		justify-content:space-between;
+		.balance{
+			font-size: 30rpx;
+			view{
+				font-size: 50rpx;
+				font-weight: 600;
+				color: #ff5c00;
+				margin-top: 20rpx;
+			}
+		}
+		.recharge{
+			background: #ff5c00;
+			color:#fff;
+			font-size: 28rpx;
+			text-align: center;
+			border-radius: 30rpx;
+			width:150rpx;
+			height:60rpx;
+			line-height: 60rpx;
+			margin-bottom: 20rpx;
+		}
+		.detail{
+			width:150rpx;
+			height:60rpx;
+			line-height: 60rpx;
+			border: 1rpx solid #ebedf0;
+			border-radius: 30rpx;
+			font-size: 28rpx;
+			text-align: center;
+		}
+	}
+	.order-wrapper {
+		width:700rpx;
+		margin-left: 25rpx;
+		background: #fff;
+		border-radius: 15rpx;
+		.order-hd {
+			justify-content: space-between;
+			padding: 25rpx 20rpx;
+			margin-top: 25rpx;
+			font-size: 30rpx;
+			color: #282828;
+
+			.right {
+				align-items: center;
+				color: #666666;
+				font-size: 26rpx;
+
+				.icon-xiangyou {
+					margin-left: 5rpx;
+					margin-top: 6rpx;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.order-bd {
+			display: flex;
+			.order-item {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				width: 20%;
+				height: 160rpx;
+
+				.pic {
+					position: relative;
+					text-align: center;
+
+					image {
+						width: 70rpx;
+						height: 70rpx;
+					}
+				}
+
+				.txt {
+					font-size: 26rpx;
+					color: #454545;
+				}
+			}
+		}
+	}
+	.menu{
+		width:700rpx;
+		margin: 25rpx;
+		padding: 25rpx 20rpx;
+		border-radius: 15rpx;
+		background: #fff;
+		.title{
+			font-size: 30rpx;
+		}
+		.list{
+			width:660rpx;
+			overflow: hidden;
+			.item{
+				width:25%;
+				float:left;
+				text-align: center;
+				margin-top: 30rpx;
+				image{
+					width:70rpx;
+					height:70rpx;
+				}
+				text{
+					display: block;
+					color:#636363;
+				}
+				.iconfont{
+					font-size: 70rpx;
+				}
+			}
+		}
+	}
+	.order-status-num {		
+		min-width:12rpx;
+		background-color: #fff;
+		color: #ee5a52;
+		border-radius: 15px;
+		position: absolute;
+		right:-12rpx;
+		top: -10rpx;
+		font-size: 20rpx;
+		padding: 0 8rpx;
+		border: 1px solid #ee5a52;
+	}
 </style>

pages/product/detail.vue

@@ -40,7 +40,7 @@
 			<view class='title'>商品详情</view>
 			<rich-text :nodes="product.desc" class="conter"></rich-text>
 		</view>
-		<view class="buy">立即购买</view>
+		<navigator class='buy' hover-class='none' url="/pages/users/purchase/index" open-type='switchTab'>立即购买</navigator>
 	</view>
 </template>
 

pages/product/index.vue

@@ -24,7 +24,7 @@
 									<view>{{item.wget}}kg/件</view>
 									<view>库存{{item.count}}</view>
 								</view>
-							</view>					
+							</view>
 						</navigator>
 					</block>					
 					<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>

pages/users/login/index.vue

@@ -69,15 +69,25 @@
 				loginApi({
 					check: true,
 					userName: that.userName,
-					password: that.password
+					passWord: that.password
 				}).then(res => {
 					that.$store.commit("LOGIN", {
 						'token': res.data.token,
-						'time': 30
+						'time': 300000
 					});
 					that.$store.commit("UPDATE_USERINFO", res.data.user_info);
 					const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
 					that.$Cache.clear(BACK_URL);
+					if (backUrl === '/pages/index/index' || backUrl === '/pages/users/purchase/index' || backUrl ===
+						'/pages/my/index') {					
+						uni.switchTab({
+							url: backUrl
+						});					
+					} else {
+						uni.switchTab({
+							url: '/pages/index/index'
+						});
+					}
 				}).catch(err => {
 					that.$util.Tips({
 						title: err

pages/users/login/index111.vue

@@ -1,320 +0,0 @@
-<template>
-	<view class="register">
-		<view class="shading">
-			<view class="pictrue acea-row row-center-wrapper">
-				<image :src="logoUrl" v-if="logoUrl"></image>
-				<image src="/static/images/logo2.png" v-else></image>
-			</view>
-		</view>
-		<view class="whiteBg" v-if="formItem === 1">
-			<view class="title acea-row row-center-wrapper">
-				<view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)"
-				 :key="index">
-					{{ item }}
-				</view>
-			</view>
-			<view class="list" :hidden="current !== 0">
-				<form @submit.prevent="submit">
-					<view class="item">
-						<view class="acea-row row-middle">
-							<image src="/static/images/phone_1.png"></image>
-							<input type="text" placeholder="输入手机号码" v-model="account" placeholder-class="placeholder" class="input" />
-						</view>
-					</view>
-					<view class="item">
-						<view class="acea-row row-middle">
-							<image src="/static/images/code_2.png"></image>
-							<input type="password" placeholder="填写登录密码" v-model="password" placeholder-class="placeholder" class="input" />
-						</view>
-					</view>
-				</form>
-				<navigator url="/pages/retrieve_password/index" class="forgetPwd">
-					<text class="iconfont icon-wenti"></text>忘记密码
-				</navigator>
-			</view>
-			<view class="list" :hidden="current !== 1">
-				<view class="item">
-					<view class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
-						<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" class="input" v-model="account" />
-					</view>
-				</view>
-				<view class="item">
-					<view class="align-left acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" placeholder-class="placeholder" />
-						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
-							{{ text }}
-						</button>
-					</view>
-				</view>
-			</view>
-			<view class="logon" @click="loginMobile" :hidden="current !== 1">登录</view>
-			<view class="logon" @click="submit" :hidden="current === 1">登录</view>
-			<view class="tip">
-				没有账号?
-				<text @click="formItem = 2" class="font-color">立即注册</text>
-			</view>
-		</view>
-		<view class="whiteBg" v-else>
-			<view class="title">注册账号</view>
-			<view class="list">
-				<view class="item">
-					<view class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
-						<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" class="input" v-model="account" />
-					</view>
-				</view>
-				<view class="item">
-					<view class="align-left acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" placeholder-class="placeholder" />
-						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
-							{{ text }}
-						</button>
-					</view>
-				</view>
-				<view class="item">
-					<view class="acea-row row-middle">
-						<image src="/static/images/code_1.png"></image>
-						<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" class="input" v-model="password" />
-					</view>
-				</view>
-			</view>
-			<view class="logon" @click="register">注册</view>
-			<view class="tip">
-				已有账号?
-				<text @click="formItem = 1" class="font-color">立即登录</text>
-			</view>
-		</view>
-		<view class="bottom"></view>
-	</view>
-</template>
-<script>
-	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import {
-		loginH5,
-		loginMobile,
-		registerVerify,
-		register,
-		getCodeApi,
-		getUserInfo
-	} from '@/api/user.js';
-	import {
-		getLogo
-	} from "@/api/public";
-	import dayjs from "dayjs";
-	import {
-		BACK_URL
-	} from '@/config/cache';
-	export default {
-		mixins: [sendVerifyCode],
-		data() {
-			return {
-				navList: ["账号登录", "快速登录"],
-				current: 1,
-				account: "",
-				password: "",
-				captcha: "",
-				formItem: 1,
-				type: "login",
-				logoUrl: "",
-				keyCode: "",
-			}
-		},
-		onLoad() {
-			this.getLogoImage();
-			this.getCode();
-		},
-		methods: {
-			// 获取keyCode
-			getCode() {
-				let that = this
-				getCodeApi()
-					.then(res => {
-						this.keyCode = res.data.key;
-					})
-					.catch(res => {
-						that.$util.Tips({title: res});
-					});
-			},
-			getLogoImage() {
-				let that = this;
-				getLogo(2).then(res => {
-					that.logoUrl = res.data.logo_url;
-				});
-			},
-			loginMobile() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: '请填写验证码'
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: '请输入正确的验证码'
-				});
-				loginMobile({
-						phone: that.account,
-						captcha: that.captcha,
-						spread: that.$Cache.get("spread")
-					})
-					.then(res => {
-						let data = res.data;
-						let newTime = Math.round(new Date() / 1000);
-						that.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': dayjs(data.expires_time) - newTime
-						});
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						getUserInfo().then(res=>{
-							that.$store.commit("SETUID", res.data.uid);
-							if (backUrl === '/pages/index/index' || backUrl === '/pages/order_addcart/order_addcart' || backUrl ===
-								'/pages/user/index' || backUrl === '/pages/goods_cate/goods_cate') {
-							
-								uni.switchTab({
-									url: backUrl
-								});
-							
-							} else {
-								uni.redirectTo({
-									url: backUrl
-								});
-							}
-						})
-						
-						
-						
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			register() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: '请填写验证码'
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: '请输入正确的验证码'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请填写密码'
-				});
-				if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
-					title: '您输入的密码过于简单'
-				});
-				register({
-						account: that.account,
-						captcha: that.captcha,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(res => {
-						that.$util.Tips({
-							title: res.msg
-						});
-						that.formItem = 1;
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res.msg
-						});
-					});
-			},
-			async code() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (that.formItem == 2) that.type = "register";
-				await registerVerify({
-						phone: that.account,
-						type: that.type,
-						key:that.keyCode,
-						code:that.captcha
-					})
-					.then(res => {
-						that.$util.Tips({
-							title: res.msg
-						});
-						that.sendCode();
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			navTap: function(index) {
-				this.current = index;
-			},
-			submit() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写账号'
-				});
-				if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的账号'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请填写密码'
-				});
-				// if (!/^[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
-				// 	title: '请输入正确的密码'
-				// });
-				loginH5({
-						account: that.account,
-						password: that.password
-					})
-					.then(({data}) => {
-						let newTime = Math.round(new Date() / 1000);
-						that.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': dayjs(data.expires_time) - newTime
-						});
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						getUserInfo().then(res=>{
-							that.$store.commit("SETUID", res.data.uid);
-							if (backUrl === '/pages/index/index' || backUrl === '/pages/order_addcart/order_addcart' || backUrl ===
-								'/pages/user/index' || backUrl === '/pages/goods_cate/goods_cate') {
-								uni.switchTab({
-									url: backUrl
-								});
-							} else {
-								uni.redirectTo({
-									url: backUrl
-								});
-							}
-						})
-					})
-					.catch(e => {
-						that.$util.Tips({
-							title: e
-						});
-					});
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-
-</style>

pages/users/register/index.vue

@@ -79,7 +79,8 @@
 				nickname: '',
 				password: '',
 				qrPassword: '',
-				weixin_name: ''
+				weixin_name: '',
+				tjUid: ''
 			}
 		},
 		mounted() {
@@ -90,6 +91,9 @@
 				}
 		    })
 		},
+		onLoad(options) {
+			this.tjUid = options.uid || '';
+		},
 		methods: {
 			async code() {
 				let that = this;
@@ -165,13 +169,17 @@
 				if (that.qrPassword !== that.password) return that.$util.Tips({
 					title: '二次密码不相等'
 				});
+				if (!that.weixin_name) return that.$util.Tips({
+					title: '请输入您的微信号'
+				});
 			    ApiReg2({
 					token: that.token,
 			    	avatar: that.avatar,
 			    	nickname: that.nickname,
 			    	password: that.password,
 			    	qrPassword: that.qrPassword,
-			    	weixin_name: that.weixin_name
+			    	weixin_name: that.weixin_name,
+					tjUid: that.tjUid
 			    }).then(res => {
 			    	that.$store.commit("LOGIN", {
 			    		'token': res.data.token,

store/modules/app.js

@@ -42,6 +42,7 @@ const mutations = {
 	},
 	UPDATE_USERINFO(state, userInfo) {
 		state.userInfo = userInfo;
+		Cache.set(USER_INFO, userInfo);
 	},
 	OPEN_HOME(state) {
 		state.homeActive = true;

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>巴巴礼品网</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.b0ff4c21.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.3ca1603a.js></script><script src=/h5/static/js/index.3df6d1f8.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.f37b29dd.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.60852841.js></script><script src=/h5/static/js/index.df99d2fc.js></script></body></html>

unpackage/dist/dev/mp-weixin/app.json

@@ -5,7 +5,11 @@
     "pages/product/detail",
     "pages/news/index",
     "pages/users/login/index",
-    "pages/users/register/index"
+    "pages/users/register/index",
+    "pages/my/index",
+    "pages/users/order/index",
+    "pages/users/spread/index",
+    "pages/users/purchase/index"
   ],
   "subPackages": [],
   "window": {
@@ -34,7 +38,7 @@
         "text": "商品"
       },
       {
-        "pagePath": "pages/my/index",
+        "pagePath": "pages/news/index",
         "iconPath": "static/images/3-001.png",
         "selectedIconPath": "static/images/3-002.png",
         "text": "订单"

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -55,6 +55,11 @@
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
 /******/
+/******/ 	// object to store loaded CSS chunks
+/******/ 	var installedCssChunks = {
+/******/ 		"common/runtime": 0
+/******/ 	}
+/******/
 /******/ 	// object to store loaded and loading chunks
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
@@ -64,6 +69,11 @@
 /******/
 /******/ 	var deferredModules = [];
 /******/
+/******/ 	// script path function
+/******/ 	function jsonpScriptSrc(chunkId) {
+/******/ 		return __webpack_require__.p + "" + chunkId + ".js"
+/******/ 	}
+/******/
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
 /******/
@@ -88,6 +98,108 @@
 /******/ 		return module.exports;
 /******/ 	}
 /******/
+/******/ 	// This file contains only the entry chunk.
+/******/ 	// The chunk loading function for additional chunks
+/******/ 	__webpack_require__.e = function requireEnsure(chunkId) {
+/******/ 		var promises = [];
+/******/
+/******/
+/******/ 		// mini-css-extract-plugin CSS loading
+/******/ 		var cssChunks = {"components/emptyPage":1,"components/wyb-popup/wyb-popup":1};
+/******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
+/******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
+/******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
+/******/ 				var href = "" + ({"components/emptyPage":"components/emptyPage","components/wyb-popup/wyb-popup":"components/wyb-popup/wyb-popup","components/wyb-transition/wyb-transition":"components/wyb-transition/wyb-transition"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var fullhref = __webpack_require__.p + href;
+/******/ 				var existingLinkTags = document.getElementsByTagName("link");
+/******/ 				for(var i = 0; i < existingLinkTags.length; i++) {
+/******/ 					var tag = existingLinkTags[i];
+/******/ 					var dataHref = tag.getAttribute("data-href") || tag.getAttribute("href");
+/******/ 					if(tag.rel === "stylesheet" && (dataHref === href || dataHref === fullhref)) return resolve();
+/******/ 				}
+/******/ 				var existingStyleTags = document.getElementsByTagName("style");
+/******/ 				for(var i = 0; i < existingStyleTags.length; i++) {
+/******/ 					var tag = existingStyleTags[i];
+/******/ 					var dataHref = tag.getAttribute("data-href");
+/******/ 					if(dataHref === href || dataHref === fullhref) return resolve();
+/******/ 				}
+/******/ 				var linkTag = document.createElement("link");
+/******/ 				linkTag.rel = "stylesheet";
+/******/ 				linkTag.type = "text/css";
+/******/ 				linkTag.onload = resolve;
+/******/ 				linkTag.onerror = function(event) {
+/******/ 					var request = event && event.target && event.target.src || fullhref;
+/******/ 					var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
+/******/ 					err.code = "CSS_CHUNK_LOAD_FAILED";
+/******/ 					err.request = request;
+/******/ 					delete installedCssChunks[chunkId]
+/******/ 					linkTag.parentNode.removeChild(linkTag)
+/******/ 					reject(err);
+/******/ 				};
+/******/ 				linkTag.href = fullhref;
+/******/
+/******/ 				var head = document.getElementsByTagName("head")[0];
+/******/ 				head.appendChild(linkTag);
+/******/ 			}).then(function() {
+/******/ 				installedCssChunks[chunkId] = 0;
+/******/ 			}));
+/******/ 		}
+/******/
+/******/ 		// JSONP chunk loading for javascript
+/******/
+/******/ 		var installedChunkData = installedChunks[chunkId];
+/******/ 		if(installedChunkData !== 0) { // 0 means "already installed".
+/******/
+/******/ 			// a Promise means "currently loading".
+/******/ 			if(installedChunkData) {
+/******/ 				promises.push(installedChunkData[2]);
+/******/ 			} else {
+/******/ 				// setup Promise in chunk cache
+/******/ 				var promise = new Promise(function(resolve, reject) {
+/******/ 					installedChunkData = installedChunks[chunkId] = [resolve, reject];
+/******/ 				});
+/******/ 				promises.push(installedChunkData[2] = promise);
+/******/
+/******/ 				// start chunk loading
+/******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
+/******/
+/******/ 				script.charset = 'utf-8';
+/******/ 				script.timeout = 120;
+/******/ 				if (__webpack_require__.nc) {
+/******/ 					script.setAttribute("nonce", __webpack_require__.nc);
+/******/ 				}
+/******/ 				script.src = jsonpScriptSrc(chunkId);
+/******/
+/******/ 				// create error before stack unwound to get useful stacktrace later
+/******/ 				var error = new Error();
+/******/ 				onScriptComplete = function (event) {
+/******/ 					// avoid mem leaks in IE.
+/******/ 					script.onerror = script.onload = null;
+/******/ 					clearTimeout(timeout);
+/******/ 					var chunk = installedChunks[chunkId];
+/******/ 					if(chunk !== 0) {
+/******/ 						if(chunk) {
+/******/ 							var errorType = event && (event.type === 'load' ? 'missing' : event.type);
+/******/ 							var realSrc = event && event.target && event.target.src;
+/******/ 							error.message = 'Loading chunk ' + chunkId + ' failed.\n(' + errorType + ': ' + realSrc + ')';
+/******/ 							error.name = 'ChunkLoadError';
+/******/ 							error.type = errorType;
+/******/ 							error.request = realSrc;
+/******/ 							chunk[1](error);
+/******/ 						}
+/******/ 						installedChunks[chunkId] = undefined;
+/******/ 					}
+/******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
+/******/ 				document.head.appendChild(script);
+/******/ 			}
+/******/ 		}
+/******/ 		return Promise.all(promises);
+/******/ 	};
 /******/
 /******/ 	// expose the modules object (__webpack_modules__)
 /******/ 	__webpack_require__.m = modules;
@@ -141,6 +253,9 @@
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "/";
 /******/
+/******/ 	// on error function for async loading
+/******/ 	__webpack_require__.oe = function(err) { console.error(err); throw err; };
+/******/
 /******/ 	var jsonpArray = global["webpackJsonp"] = global["webpackJsonp"] || [];
 /******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
 /******/ 	jsonpArray.push = webpackJsonpCallback;

unpackage/dist/dev/mp-weixin/pages/users/login/index.wxml

@@ -1 +1 @@
-<view class="login data-v-3ae7937c" style="{{'height:'+(setHeight+'px')+';'}}"><view class="logo data-v-3ae7937c"><image src="../../../static/images/logo.png" class="data-v-3ae7937c"></image><view class="data-v-3ae7937c">登录巴巴礼品网</view></view><view class="form _div data-v-3ae7937c"><form data-event-opts="{{[['submit',[['submit',['$event']]]]]}}" bindsubmit="__e" class="data-v-3ae7937c"><view class="item _div data-v-3ae7937c"><view class="acea-row row-middle _div data-v-3ae7937c"><image src="../../../static/images/phone_1.png" class="data-v-3ae7937c"></image><input type="text" placeholder="请输入绑定的手机号" placeholder-class="placeholder" required="{{true}}" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" value="{{account}}" bindinput="__e" class="data-v-3ae7937c"/></view></view><view class="item _div data-v-3ae7937c"><view class="acea-row row-middle _div data-v-3ae7937c"><image src="../../../static/images/code_2.png" class="data-v-3ae7937c"></image><input type="password" placeholder="请输入登录密码" placeholder-class="placeholder" required="{{true}}" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindinput="__e" class="data-v-3ae7937c"/></view></view></form><view class="goto data-v-3ae7937c"><navigator hover-class="none" url="/pages/users/retrievePassword/index" class="data-v-3ae7937c">忘记密码?</navigator><navigator class="zhuce data-v-3ae7937c" hover-class="none" url="/pages/users/retrievePassword/index">注册账号</navigator></view><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn data-v-3ae7937c" bindtap="__e">登录</view><navigator class="return data-v-3ae7937c" hover-class="none" url="/pages/index/index" open-type="switchTab">继续浏览<text class="iconfont icon-jiantou data-v-3ae7937c"></text></navigator></view></view>
+<view class="login data-v-3ae7937c" style="{{'height:'+(setHeight+'px')+';'}}"><view class="logo data-v-3ae7937c"><image src="../../../static/images/logo.png" class="data-v-3ae7937c"></image><view class="data-v-3ae7937c">登录巴巴礼品网</view></view><view class="form _div data-v-3ae7937c"><form data-event-opts="{{[['submit',[['submit',['$event']]]]]}}" bindsubmit="__e" class="data-v-3ae7937c"><view class="item _div data-v-3ae7937c"><view class="acea-row row-middle _div data-v-3ae7937c"><image src="../../../static/images/phone_1.png" class="data-v-3ae7937c"></image><input type="text" placeholder="请输入绑定的手机号" placeholder-class="placeholder" required="{{true}}" data-event-opts="{{[['input',[['__set_model',['','userName','$event',[]]]]]]}}" value="{{userName}}" bindinput="__e" class="data-v-3ae7937c"/></view></view><view class="item _div data-v-3ae7937c"><view class="acea-row row-middle _div data-v-3ae7937c"><image src="../../../static/images/code_2.png" class="data-v-3ae7937c"></image><input type="password" placeholder="请输入登录密码" placeholder-class="placeholder" required="{{true}}" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindinput="__e" class="data-v-3ae7937c"/></view></view></form><view class="goto data-v-3ae7937c"><navigator hover-class="none" url="/pages/users/retrievePassword/index" class="data-v-3ae7937c">忘记密码?</navigator><navigator class="zhuce data-v-3ae7937c" hover-class="none" url="/pages/users/register/index">注册账号</navigator></view><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn data-v-3ae7937c" bindtap="__e">登录</view><navigator class="return data-v-3ae7937c" hover-class="none" url="/pages/index/index" open-type="switchTab">继续浏览<text class="iconfont icon-jiantou data-v-3ae7937c"></text></navigator></view></view>

unpackage/dist/dev/mp-weixin/pages/users/register/index.wxss

@@ -88,4 +88,77 @@
 .form .login navigator.data-v-3c9da274 {
   color: #ff5c00;
 }
+.form2.data-v-3c9da274 {
+  padding: 40rpx;
+}
+.form2 .avatar.data-v-3c9da274 {
+  width: 140rpx;
+  height: 140rpx;
+  font-size: 22rpx;
+  color: #bbb;
+  border: 1rpx dashed #ddd;
+  margin: 20rpx auto;
+  text-align: center;
+}
+.form2 .avatar .iconfont.data-v-3c9da274 {
+  font-size: 50rpx;
+}
+.form2 .avatar image.data-v-3c9da274 {
+  width: 140rpx;
+  height: 140rpx;
+}
+.form2 .item.data-v-3c9da274 {
+  border-bottom: 1rpx solid #ededed;
+  padding: 45rpx 0 20rpx 0;
+}
+.form2 .item image.data-v-3c9da274 {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 20rpx;
+}
+.form2 .item input.data-v-3c9da274 {
+  -webkit-box-flex: 1;
+  -webkit-flex-grow: 1;
+          flex-grow: 1;
+  font-size: 28rpx;
+}
+.form2 .item .placeholder.data-v-3c9da274 {
+  color: #ccc;
+}
+.form2 .btn.data-v-3c9da274 {
+  font-size: 32rpx;
+  width: 580rpx;
+  height: 85rpx;
+  -webkit-border-radius: 45rpx;
+          border-radius: 45rpx;
+  color: #fff;
+  margin: 80rpx auto 0 auto;
+  text-align: center;
+  line-height: 85rpx;
+  background: #ff5c00;
+}
+.form2 .back.data-v-3c9da274 {
+  font-size: 32rpx;
+  width: 580rpx;
+  height: 85rpx;
+  -webkit-border-radius: 45rpx;
+          border-radius: 45rpx;
+  margin: 20rpx auto 0 auto;
+  text-align: center;
+  line-height: 85rpx;
+  border: 1rpx solid #dcdee2;
+  color: #515a6e;
+}
+.form2 .login.data-v-3c9da274 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+          justify-content: center;
+  margin-top: 30rpx;
+}
+.form2 .login navigator.data-v-3c9da274 {
+  color: #ff5c00;
+}
 

utils/request.js

@@ -18,7 +18,7 @@ function baseRequest(url, method, data, {noAuth = false, noVerify = false})
 	}
   }
   
-  if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
+  if (store.state.app.token) header[TOKENNAME] = store.state.app.token;
 
   return new Promise((reslove, reject) => {
     uni.request({