分享

pages/user/order/order-list.vue

@@ -492,6 +492,7 @@
 		onShow() {
 			this.isModalLayer = false;
 			this.GetOrderDatainit(this.currentTab)
+			// console.log(this.orderTabBar)
 		}
 	}
 </script>

pages/user/order/order-sharedetails.vue

@@ -2,10 +2,10 @@
 	<view class="container details clearfix">
 		<!-- 地址选择 -->
 		<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData" ></order-address>
-		<!-- 订单信息 -->
-		<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 		<!-- 商品 -->
 		<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn"></goods-list>
+		<!-- 订单信息 -->
+		<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 		<!-- 发票信息 -->
 		<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
 		<!-- 转账记录 -->
@@ -48,7 +48,7 @@
 			return {
 				status:'',
 				userID:'',
-				orderID:'',
+				orderId:'',
 				cellPhone:'',				//客服电话
 				btnStatus:0,				//按钮组件状态
 				isRequest:false,			//是否加载完成渲染子组件
@@ -72,13 +72,13 @@
 			}
 		},
 		onLoad(option){
-			this.orderID = option.orderID
-			// this.orderID = 11315
+			this.orderId = option.orderId
+			// this.orderId = 11315
 			this.initOrderDetaileData()
 		},
 		methods: {
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
+				this.OrderService.QueryOrderDetails({ orderId : this.orderId }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
 					this.userID = resData.order.userID
@@ -107,7 +107,7 @@
 				this.handlerPros = data
 			},
 			queryLogistics(){//跳转查询物流页面
-				this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
+				this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+this.orderId)
 			},
 		},
 		onShow() {

pages/user/order/orderShareLogin.vue

@@ -1,187 +1,190 @@
- <template>
+<template>
 	<view class="container login">
 		<!-- logo区域 -->
-		<view class="login-main">
-			<image class="logo" :src="imagePath" mode=""></image>
-		</view>
+		<view class="login-main"> <image class="logo" :src="imagePath" mode=""></image> </view>
 		<!-- 输入框 -->
 		<view class="login-input">
-			<input type="number" 
-				   v-model="shareCode"
-				   maxlength="6" 
-				   class="input" 
-				   placeholder="请输入分享码"
+			<input
+				type="number"
+				v-model="shareCode"
+				maxlength="6"
+				class="input"
+				placeholder="请输入分享码"
 			/>
 		</view>
 		<!-- 提示信息 -->
-		<view class="logo-message" v-if="false"><text>分享码错误，请联系对方获取分享码</text> </view>
+		<view class="logo-message" v-if="false"
+			><text>分享码错误，请联系对方获取分享码</text>
+		</view>
 		<!-- 登录按钮 -->
 		<button class="login-btn" :disabled="!canSubmit" @click="goLogin">查看订单</button>
 	</view>
 </template>
 <script>
-	import authorize from '@/common/config/authorize.js' 
-	export default{
-		data() {
-			return{
-				imagePath:'/static/ws/logo.png',
-				shareCode:'',  		//获取用户登录的邀请码
-				isUserInfo:false,	//控制显示授权弹窗
-				nickName:'',		//存储用户名
-				userInfo:'',		//存储微信用户授权信息
-				orderID:0,			//订单ID
-				userID:0			,//分享人的用户ID
-				isShareStatus:false,
+import authorize from '@/common/config/authorize.js'
+export default {
+	data() {
+		return {
+			imagePath: '/static/ws/logo.png',
+			shareCode: '', //获取用户登录的邀请码
+			isUserInfo: false, //控制显示授权弹窗
+			nickName: '', //存储用户名
+			userInfo: '', //存储微信用户授权信息
+			orderId: 0, //订单ID
+			userId: 0, //分享人的用户ID
+			isShareStatus: false
+		}
+	},
+	onLoad(e) {
+		// this.orderId = e.orderId || '13140'
+		// this.userId = e.userId || '13914'
+		this.orderId = e.orderId
+		this.userId = e.userId
+	},
+	computed: {
+		canSubmit() {
+			return this.shareCode.trim().length > 0
+		}
+	},
+	methods: {
+		goLogin() {
+			if (this.shareCode == '') {
+				this.$util.msg('请联系分享人获取分享码', 2000)
+				return
 			}
-		},
-		onLoad(e) {
-			console.log(e)
-			this.orderID = e.orderID
-			this.userID = e.userID
-		},
-		computed:{
-			canSubmit(){
-				return this.shareCode.trim().length>=6
+			if (!this.$api.isNumber(this.shareCode)) {
+				this.$util.msg('分享码格式不正确', 2000)
+				return
 			}
-		},
-		methods:{
-			goLogin() {
-				if(this.shareCode == ''){
-					this.$util.msg('请联系分享人获取分享码',2000);
-					return
-				}
-				if(!this.$api.isNumber(this.shareCode)){
-					this.$util.msg('分享码格式不正确',2000);
-					return
+			authorize.getCode('weixin').then(wechatcode => {
+				let params = {
+					code: wechatcode,
+					orderId: this.orderId,
+					userId: this.userId,
+					shareCode: this.shareCode
 				}
-				authorize.getCode('weixin').then(wechatcode =>{
-					let params ={
-							code:wechatcode,
-							orderID:this.orderID,
-							userID:this.userID,
-							shareCode:this.shareCode
-						}
-					this.OrderService.OrderShareCode(params).then(response =>{
-						if (response.code === 0) {//游客第一次查看订单详情
-							this.$api.redirectTo('/pages/user/order/order-sharedetails?orderID='+this.orderID)
-						}else{
-							this.$util.msg(response.msg,2000);
-						}
-					})
+				this.OrderService.OrderShareCode(params).then(response => {
+					if (response.code === 0) {
+						//游客第一次查看订单详情
+						this.$api.redirectTo(
+							'/pages/user/order/order-sharedetails?orderId=' + this.orderId
+						)
+					} else {
+						this.$util.msg(response.msg, 2000)
+					}
 				})
-			},
-		},
-		onShow() {
-			
+			})
 		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	.login{
+.login {
+	width: 100%;
+	height: 100%;
+	background: #ffffff;
+	.model-warp.none {
+		display: none;
+	}
+	.model-warp.show {
+		display: block;
+	}
+	.login-main {
 		width: 100%;
-		height:100%;
-		background: #FFFFFF;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 178rpx 0 140rpx;
+		.logo {
+			width: 152rpx;
+			height: 152rpx;
 			display: block;
 		}
-		.login-main{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			padding: 178rpx 0 140rpx;
-			.logo{
-				width: 152rpx;
-				height: 152rpx;
-				display: block;
-			}
-		}
-		.login-input{
-			width: 550rpx;
-			height: 40rpx;
-			padding: 24rpx 0;
-			margin: 0 auto;
-			margin-bottom: 30rpx;
-			background: #FFFFFF;
-			border-bottom: 1px solid #E1E1E1;
-			.input{
-				width: 100%;
-				height: 100%;
-				background: #FFFFFF;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #333333;
-			}
-		}
-		.login-btn{
-			width: 600rpx;
-			height: 90rpx;
-			font-size: $font-size-30;
-			line-height: 90rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			margin-top: 64rpx;
-			text-align: center;
-			background: $btn-confirm;
-			border-radius: 44rpx;
-		}
-		.model-authorization{
+	}
+	.login-input {
+		width: 550rpx;
+		height: 40rpx;
+		padding: 24rpx 0;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+		background: #ffffff;
+		border-bottom: 1px solid #e1e1e1;
+		.input {
 			width: 100%;
 			height: 100%;
-			position: fixed;
-			top: 0;
+			background: #ffffff;
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #333333;
+		}
+	}
+	.login-btn {
+		width: 600rpx;
+		height: 90rpx;
+		font-size: $font-size-30;
+		line-height: 90rpx;
+		color: #ffffff;
+		margin: 0 auto;
+		margin-top: 64rpx;
+		text-align: center;
+		background: $btn-confirm;
+		border-radius: 44rpx;
+	}
+	.model-authorization {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		.authorization {
+			width: 518rpx;
+			height: 320rpx;
+			position: absolute;
+			background: rgba(255, 255, 255, 0.7);
 			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
+			right: 0;
+			bottom: 0;
+			top: 0;
+			margin: auto;
+			.to-btn {
 				position: absolute;
-				background: rgba(255,255,255,.7);
+				top: 0;
 				left: 0;
 				right: 0;
 				bottom: 0;
-				top: 0;
 				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
+				width: 70%;
+				height: 88rpx;
+				font-size: $font-size-28;
+				line-height: 88rpx;
+				color: #ffffff;
+				text-align: center;
+				border-radius: 44rpx;
 			}
 		}
-		.logo-message {
-			font-size: 24rpx;
-			line-height: 33rpx;
+	}
+	.logo-message {
+		font-size: 24rpx;
+		line-height: 33rpx;
+		color: #ff2a2a;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		&::before {
+			content: '!';
+			display: block;
+			width: 22rpx;
+			height: 22rpx;
+			border: 1px solid #ff2a2a;
+			border-radius: 50%;
 			color: #ff2a2a;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			&::before {
-				content: '!';
-				display: block;
-				width: 22rpx;
-				height: 22rpx;
-				border: 1px solid #ff2a2a;
-				border-radius: 50%;
-				color: #ff2a2a;
-				text-align: center;
-				line-height: 22rpx;
-				margin-right: 6rpx;
-			}
+			text-align: center;
+			line-height: 22rpx;
+			margin-right: 6rpx;
 		}
 	}
-</style>
+}
+</style>