用户订单分页接口初始化

api/home.js

@@ -84,3 +84,8 @@ export function postUserAddressRemove(data) {
 	let url = "ids="+data.ids
 	return request.post("v1/userAddress-remove?"+url,data);
 }
+
+// 查询用户订单接口
+export function getUserOrderPage(data) {
+	return request.get("v1/finance/order-page",data);
+}

components/productWindow/index.vue

@@ -1,10 +1,10 @@
 <template>
 	<view :style="colorStyle">
 		<view class="product-window"
-			:class="(attr.cartAttr === true ? 'on' : '') + ' ' + (iSbnt?'join':'') + ' ' + (iScart?'joinCart':'')">
+			:class="(attr.cartAttr === true ? 'on' : '') + ' ' + (iSbnt ? 'join' : '') + ' ' + (iScart ? 'joinCart' : '')">
 			<view class="textpic acea-row row-between-wrapper">
 				<view class="pictrue" @click="showImg()">
-					<image :src="attr.productSelect.goodsCover" ></image>
+					<image :src="attr.productSelect.goodsCover"></image>
 				</view>
 				<view class="text">
 					<view class="line1">
@@ -12,15 +12,16 @@
 					</view>
 					<view class="money font-color">
 						<view class="acea-row row-middle">
-							{{$t(`￥`)}}<text class="num">{{ attr.productSelect.salePrice }}</text>
+							{{ $t(`￥`) }}<text class="num">{{ attr.productSelect.salePrice }}</text>
 							<text class='vip-money'
-								v-if="is_vip>0 && attr.productSelect.vip_price">{{$t(`￥`)}}{{attr.productSelect.vip_price}}</text>
-							<view class="vipImg" v-if="is_vip>0 && attr.productSelect.vip_price">
+								v-if="is_vip > 0 && attr.productSelect.vip_price">{{ $t(`￥`) }}{{ attr.productSelect.vip_price }}</text>
+							<view class="vipImg" v-if="is_vip > 0 && attr.productSelect.vip_price">
 								<image src="../../static/images/svip.gif"></image>
 							</view>
 						</view>
-						<text class="stock" v-if='isShow'>{{$t(`库存`)}}: {{ attr.productSelect.totalStock }}</text>
-						<text class='stock' v-if="limitNum">{{type ? $t(`库存`) : $t(`限量`)}}: {{attr.productSelect.quota}}</text>
+						<text class="stock" v-if='isShow'>{{ $t(`库存`) }}: {{ attr.productSelect.totalStock }}</text>
+						<text class='stock' v-if="limitNum">{{ type ? $t(`库存`) : $t(`限量`) }}:
+							{{ attr.productSelect.quota }}</text>
 					</view>
 				</view>
 				<view class="iconfont icon-guanbi" @click="closeAttr"></view>
@@ -38,8 +39,8 @@
 						</view>
 					</view>
 				</view>
-				<view class="cart acea-row row-between-wrapper" v-if="!is_virtual">
-					<view class="title">{{$t(`数量`)}}</view>
+				<view class="cart acea-row row-between-wrapper" v-if="!is_virtual == 0">
+					<view class="title">{{ $t(`数量`) }}</view>
 					<view class="carnum acea-row row-left">
 						<view class="item reduce acea-row row-center-wrapper"
 							:class="attr.productSelect.cart_num <= 1 ? 'on' : ''"
@@ -51,337 +52,353 @@
 							<text class="iconfont icon-shangpinshuliang-jian"></text>
 						</view>
 						<view class='item num acea-row row-middle'>
-							<input type="number" v-model="attr.productSelect.cart_num"
-								data-name="productSelect.cart_num"
-								@input="bindCode(attr.productSelect.cart_num)"/>
+							<input type="number" v-model="new_cart_num"
+								data-name="productSelect.cart_num" @input="bindCode(attr.productSelect.cart_num)" />
 						</view>
 						<view v-if="iSplus" class="item plus acea-row row-center-wrapper" :class="
-				      attr.productSelect.cart_num >= attr.productSelect.totalStock
-				        ? 'on'
-				        : ''
-				    " @click="CartNumAdd">
+							attr.productSelect.cart_num >= attr.productSelect.totalStock
+								? 'on'
+								: ''
+						" @click="CartNumAdd">
 							<text class="iconfont icon-shangpinshuliang-jia"></text>
 						</view>
 						<view v-else class='item plus'
-							:class='(attr.productSelect.cart_num >= attr.productSelect.quota) || (attr.productSelect.cart_num >= attr.productSelect.product_stock) || (attr.productSelect.cart_num >= attr.productSelect.num) || (type=="seckill" && attr.productSelect.cart_num >= attr.productSelect.once_num)? "on":""'
+							:class='attr.productSelect.cart_num >= attr.productSelect.totalStock ? "on" : ""'
 							@click='CartNumAdd'>+</view>
 					</view>
 				</view>
 			</view>
 			<view class="joinBnt bg-color"
-				v-if="iSbnt && attr.productSelect.product_stock>0 &&attr.productSelect.quota>0" @click="goCat">{{$t(`我要参团`)}}
+				v-if="iSbnt && attr.productSelect.product_stock > 0 && attr.productSelect.quota > 0" @click="goCat">
+				{{ $t(`我要参团`) }}
 			</view>
 			<view class="joinBnt on"
-				v-else-if="(iSbnt && attr.productSelect.quota<=0)||(iSbnt &&attr.productSelect.product_stock<=0)">{{$t(`已售罄`)}}
+				v-else-if="(iSbnt && attr.productSelect.quota <= 0) || (iSbnt && attr.productSelect.product_stock <= 0)">
+				{{ $t(`已售罄`) }}
 			</view>
-			<view class="joinBnt bg-color" v-if="iScart && attr.productSelect.stock" @click="goCat">{{$t(`确定`)}}</view>
-			<view class="joinBnt on" v-else-if="iScart && !attr.productSelect.stock">{{$t(`已售罄`)}}</view>
+			<view class="joinBnt bg-color" v-if="iScart && attr.productSelect.stock" @click="goCat">{{ $t(`确定`) }}</view>
+			<view class="joinBnt on" v-else-if="iScart && !attr.productSelect.stock">{{ $t(`已售罄`) }}</view>
 		</view>
 		<view class="mask" @touchmove.prevent :hidden="attr.cartAttr === false" @click="closeAttr"></view>
 	</view>
 </template>
 
 <script>
-	import colors from "@/mixins/color";
-	export default {
-		mixins: [colors],
-		props: {
-			attr: {
-				type: Object,
-				default: () => {}
-			},
-			limitNum: {
-				type: Number,
-				value: 0
-			},
-			isShow: {
-				type: Number,
-				value: 0
-			},
-			iSbnt: {
-				type: Number,
-				value: 0
-			},
-			iSplus: {
-				type: Number,
-				value: 0
-			},
-			iScart: {
-				type: Number,
-				value: 0
-			},
-			is_vip: {
-				type: Number,
-				value: 0
-			},
-			is_virtual: {
-				type: Number,
-				value: 0
-			},
-			type: {
-				type: String,
-				default: ''
-			},
+import colors from "@/mixins/color";
+export default {
+	mixins: [colors],
+	props: {
+		attr: {
+			type: Object,
+			default: () => { }
 		},
-		data() {
-			return {};
+		limitNum: {
+			type: Number,
+			value: 0
 		},
-		mounted() {
-			
+		isShow: {
+			type: Number,
+			value: 0
 		},
-		methods: {
-			getpreviewImage: function() {
-				uni.previewImage({
-					urls: this.attr.productSelect.slideshowList,
-					current: this.attr.productSelect.slideshowList[0]
+		iSbnt: {
+			type: Number,
+			value: 0
+		},
+		iSplus: {
+			type: Number,
+			value: 0
+		},
+		iScart: {
+			type: Number,
+			value: 0
+		},
+		is_vip: {
+			type: Number,
+			value: 0
+		},
+		is_virtual: {
+			type: Number,
+			value: 0
+		},
+		type: {
+			type: String,
+			default: ''
+		},
+	},
+	data() {
+		return {
+			new_cart_num: 1
+		};
+	},
+	mounted() {
+
+	},
+	methods: {
+		getpreviewImage: function () {
+			uni.previewImage({
+				urls: this.attr.productSelect.slideshowList,
+				current: this.attr.productSelect.slideshowList[0]
+			});
+		},
+		goCat: function () {
+			this.$emit('goCat');
+		},
+		/**
+		 * 购物车手动输入数量
+		 * 
+		 */
+		bindCode: function (e) {
+			console.log(this.attr.productSelect.cart_num);
+			if (e > this.attr.productSelect.totalStock){
+				this.$util.Tips({
+					title: this.$t(`数量大于库存，请重新输入`),
+					success: () => {
+
+					},
 				});
-			},
-			goCat: function() {
-				this.$emit('goCat');
-			},
-			/**
-			 * 购物车手动输入数量
-			 * 
-			 */
-			bindCode: function(e) {
-				this.$emit('iptCartNum', this.attr.productSelect.cart_num);
-			},
-			closeAttr: function() {
-				this.$emit('myevent');
-			},
-			CartNumDes: function() {
-				this.$emit('ChangeCartNum', false);
-			},
-			CartNumAdd: function() {
-				this.$emit('ChangeCartNum', true);
-			},
-			tapAttr: function(item, indexn) {
-				let that = this;
-				that.$emit("ChangeAttr", item);
-			},
-			//获取被选中属性；
-			getCheckedValue: function() {
-				let productAttr = this.attr.productAttr;
-				let value = [];
-				for (let i = 0; i < productAttr.length; i++) {
-					for (let j = 0; j < productAttr[i].attr_values.length; j++) {
-						if (productAttr[i].index === productAttr[i].attr_values[j]) {
-							value.push(productAttr[i].attr_values[j]);
-						}
+				this.new_cart_num = this.attr.productSelect.cart_num
+			}else{
+				this.$emit('iptCartNum', this.attr.productSelect.cart_num - this.new_cart_num);
+			}
+		},
+		closeAttr: function () {
+			this.$emit('myevent');
+		},
+		CartNumDes: function () {
+			new_cart_num --
+			this.$emit('ChangeCartNum', false);
+		},
+		CartNumAdd: function () {
+			new_cart_num ++
+			this.$emit('ChangeCartNum', true);
+		},
+		tapAttr: function (item, indexn) {
+			let that = this;
+			that.$emit("ChangeAttr", item);
+		},
+		//获取被选中属性；
+		getCheckedValue: function () {
+			let productAttr = this.attr.productAttr;
+			let value = [];
+			for (let i = 0; i < productAttr.length; i++) {
+				for (let j = 0; j < productAttr[i].attr_values.length; j++) {
+					if (productAttr[i].index === productAttr[i].attr_values[j]) {
+						value.push(productAttr[i].attr_values[j]);
 					}
 				}
-				return value;
-			},
-			showImg() {
-				this.$emit('getImg');
-			},
-		}
+			}
+			return value;
+		},
+		showImg() {
+			this.$emit('getImg');
+		},
 	}
+}
 </script>
 
 <style scoped lang="scss">
-	.vip-money {
-		color: #282828;
-		font-size: 28rpx;
-		font-weight: 700;
-		margin-left: 6rpx;
-	}
-
-	.vipImg {
-		width: 68rpx;
-		height: 27rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.product-window {
-		position: fixed;
-		bottom: 0;
+.vip-money {
+	color: #282828;
+	font-size: 28rpx;
+	font-weight: 700;
+	margin-left: 6rpx;
+}
+
+.vipImg {
+	width: 68rpx;
+	height: 27rpx;
+
+	image {
 		width: 100%;
-		left: 0;
-		background-color: #fff;
-		z-index: 100;
-		border-radius: 16rpx 16rpx 0 0;
-		transform: translate3d(0, 100%, 0);
-		transition: all .3s cubic-bezier(.25, .5, .5, .9);
-		padding-bottom: 140rpx;
-		padding-bottom: calc(140rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	}
-
-	.product-window.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.product-window.join {
-		padding-bottom: 30rpx;
-	}
-
-	.product-window.joinCart {
-		padding-bottom: 30rpx;
-		z-index: 10000;
-	}
-
-	.product-window .textpic {
-		padding: 0 130rpx 0 30rpx;
-		margin-top: 29rpx;
-		position: relative;
-	}
-
-	.product-window .textpic .pictrue {
-		width: 150rpx;
-		height: 150rpx;
-	}
-
-	.product-window .textpic .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 10rpx;
-	}
-
-	.product-window .textpic .text {
-		width: 410rpx;
-		font-size: 32rpx;
-		color: #202020;
-	}
-
-	.product-window .textpic .text .money {
-		font-size: 24rpx;
-		margin-top: 40rpx;
-	}
-
-	.product-window .textpic .text .money .num {
-		font-size: 36rpx;
-	}
-
-	.product-window .textpic .text .money .stock {
-		color: #999;
-		margin-left: 6rpx;
-	}
-
-	.product-window .textpic .iconfont {
-		position: absolute;
-		right: 30rpx;
-		top: -5rpx;
-		font-size: 35rpx;
-		color: #8a8a8a;
-	}
-
-	.product-window .rollTop {
-		max-height: 500rpx;
-		overflow: auto;
-		margin-top: 36rpx;
-	}
-
-	.product-window .productWinList .item~.item {
-		margin-top: 36rpx;
-	}
-
-	.product-window .productWinList .item .title {
-		font-size: 30rpx;
-		color: #999;
-		padding: 0 30rpx;
-	}
-
-	.product-window .productWinList .item .listn {
-		padding: 0 30rpx 0 16rpx;
-	}
-
-	.product-window .productWinList .item .listn .itemn {
-		border: 1px solid #F2F2F2;
-		font-size: 26rpx;
-		color: #282828;
-		padding: 7rpx 33rpx;
-		border-radius: 25rpx;
-		margin: 20rpx 0 0 14rpx;
-		background-color: #F2F2F2;
-	}
-
-	.product-window .productWinList .item .listn .itemn.on {
-		color: var(--view-theme);
-		background: var(--view-minorColorT);
-		border-color: var(--view-theme);
-	}
-
-	.product-window .productWinList .item .listn .itemn.limit {
-		color: #999;
-		text-decoration: line-through;
-	}
-
-	.product-window .cart {
-		margin-top: 36rpx;
-		padding: 0 30rpx;
-	}
-
-	.product-window .cart .title {
-		font-size: 30rpx;
-		color: #999;
-	}
-
-	.product-window .cart .carnum {
-		height: 54rpx;
-		margin-top: 24rpx;
-	}
-
-	.product-window .cart .carnum .iconfont {
-		font-size: 25rpx;
-	}
-
-	.product-window .cart .carnum view {
-		// border: 1px solid #a4a4a4;
-		width: 84rpx;
-		text-align: center;
 		height: 100%;
-		line-height: 54rpx;
-		color: #282828;
-		font-size: 45rpx;
-	}
-
-	.product-window .cart .carnum .reduce {
-		border-right: 0;
-		border-radius: 6rpx 0 0 6rpx;
-		line-height: 48rpx;
-		font-size: 60rpx;
-	}
-
-	.product-window .cart .carnum .reduce.on {
-		// border-color: #e3e3e3;
-		color: #DEDEDE;
-	}
-
-	.product-window .cart .carnum .plus {
-		border-left: 0;
-		border-radius: 0 6rpx 6rpx 0;
-		line-height: 46rpx;
-	}
-
-	.product-window .cart .carnum .plus.on {
-		// border-color: #e3e3e3;
-		color: #dedede;
-	}
-
-	.product-window .cart .carnum .num {
-		background: rgba(242, 242, 242, 1);
-		color: #282828;
-		font-size: 28rpx;
-	}
-
-	.product-window .joinBnt {
-		font-size: 30rpx;
-		width: 620rpx;
-		height: 86rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 86rpx;
-		color: #fff;
-		margin: 21rpx auto 0 auto;
-	}
-
-	.product-window .joinBnt.on {
-		background-color: #bbb;
-		color: #fff;
 	}
+}
+
+.product-window {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	left: 0;
+	background-color: #fff;
+	z-index: 100;
+	border-radius: 16rpx 16rpx 0 0;
+	transform: translate3d(0, 100%, 0);
+	transition: all .3s cubic-bezier(.25, .5, .5, .9);
+	padding-bottom: 140rpx;
+	padding-bottom: calc(140rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+	padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+}
+
+.product-window.on {
+	transform: translate3d(0, 0, 0);
+}
+
+.product-window.join {
+	padding-bottom: 30rpx;
+}
+
+.product-window.joinCart {
+	padding-bottom: 30rpx;
+	z-index: 10000;
+}
+
+.product-window .textpic {
+	padding: 0 130rpx 0 30rpx;
+	margin-top: 29rpx;
+	position: relative;
+}
+
+.product-window .textpic .pictrue {
+	width: 150rpx;
+	height: 150rpx;
+}
+
+.product-window .textpic .pictrue image {
+	width: 100%;
+	height: 100%;
+	border-radius: 10rpx;
+}
+
+.product-window .textpic .text {
+	width: 410rpx;
+	font-size: 32rpx;
+	color: #202020;
+}
+
+.product-window .textpic .text .money {
+	font-size: 24rpx;
+	margin-top: 40rpx;
+}
+
+.product-window .textpic .text .money .num {
+	font-size: 36rpx;
+}
+
+.product-window .textpic .text .money .stock {
+	color: #999;
+	margin-left: 6rpx;
+}
+
+.product-window .textpic .iconfont {
+	position: absolute;
+	right: 30rpx;
+	top: -5rpx;
+	font-size: 35rpx;
+	color: #8a8a8a;
+}
+
+.product-window .rollTop {
+	max-height: 500rpx;
+	overflow: auto;
+	margin-top: 36rpx;
+}
+
+.product-window .productWinList .item~.item {
+	margin-top: 36rpx;
+}
+
+.product-window .productWinList .item .title {
+	font-size: 30rpx;
+	color: #999;
+	padding: 0 30rpx;
+}
+
+.product-window .productWinList .item .listn {
+	padding: 0 30rpx 0 16rpx;
+}
+
+.product-window .productWinList .item .listn .itemn {
+	border: 1px solid #F2F2F2;
+	font-size: 26rpx;
+	color: #282828;
+	padding: 7rpx 33rpx;
+	border-radius: 25rpx;
+	margin: 20rpx 0 0 14rpx;
+	background-color: #F2F2F2;
+}
+
+.product-window .productWinList .item .listn .itemn.on {
+	color: var(--view-theme);
+	background: var(--view-minorColorT);
+	border-color: var(--view-theme);
+}
+
+.product-window .productWinList .item .listn .itemn.limit {
+	color: #999;
+	text-decoration: line-through;
+}
+
+.product-window .cart {
+	margin-top: 36rpx;
+	padding: 0 30rpx;
+}
+
+.product-window .cart .title {
+	font-size: 30rpx;
+	color: #999;
+}
+
+.product-window .cart .carnum {
+	height: 54rpx;
+	margin-top: 24rpx;
+}
+
+.product-window .cart .carnum .iconfont {
+	font-size: 25rpx;
+}
+
+.product-window .cart .carnum view {
+	// border: 1px solid #a4a4a4;
+	width: 84rpx;
+	text-align: center;
+	height: 100%;
+	line-height: 54rpx;
+	color: #282828;
+	font-size: 45rpx;
+}
+
+.product-window .cart .carnum .reduce {
+	border-right: 0;
+	border-radius: 6rpx 0 0 6rpx;
+	line-height: 48rpx;
+	font-size: 60rpx;
+}
+
+.product-window .cart .carnum .reduce.on {
+	// border-color: #e3e3e3;
+	color: #DEDEDE;
+}
+
+.product-window .cart .carnum .plus {
+	border-left: 0;
+	border-radius: 0 6rpx 6rpx 0;
+	line-height: 46rpx;
+}
+
+.product-window .cart .carnum .plus.on {
+	// border-color: #e3e3e3;
+	color: #dedede;
+}
+
+.product-window .cart .carnum .num {
+	background: rgba(242, 242, 242, 1);
+	color: #282828;
+	font-size: 28rpx;
+}
+
+.product-window .joinBnt {
+	font-size: 30rpx;
+	width: 620rpx;
+	height: 86rpx;
+	border-radius: 50rpx;
+	text-align: center;
+	line-height: 86rpx;
+	color: #fff;
+	margin: 21rpx auto 0 auto;
+}
+
+.product-window .joinBnt.on {
+	background-color: #bbb;
+	color: #fff;
+}
 </style>

pages/admin/order/index.vue

@@ -16,11 +16,11 @@
 				</navigator>
 				<navigator class="item" url="/pages/admin/orderList/index?types=3" hover-class="none">
 					<view class="num">{{ census.evaluated_count }}</view>
-					<view>{{$t(`待评价`)}}</view>
+					<view>{{$t(`已完成`)}}</view>
 				</navigator>
 				<navigator class="item" url="/pages/admin/orderList/index?types=-3" hover-class="none">
 					<view class="num">{{ census.refund_count }}</view>
-					<view>{{$t(`退款`)}}</view>
+					<view>{{$t(`售后`)}}</view>
 				</navigator>
 			</view>
 			<view class="wrapper">

pages/admin/orderList/index.vue

@@ -17,7 +17,7 @@
 				{{$t(`已完成`)}}
 			</view>
 			<view class="item" :class="where.status == -3 ? 'on' : ''" @click="changeStatus(-3)">
-				{{$t(`退款`)}}
+				{{$t(`售后`)}}
 			</view>
 		</view>
 		<view class="list" v-if="list.length">

pages/goods/order_list/index.vue

@@ -4,8 +4,8 @@
 			<view class="header bg-color">
 				<view class="picTxt acea-row row-between-wrapper">
 					<view class="text">
-						<view class="name">{{$t(`订单信息`)}}</view>
-						<view>{{$t(`消费订单`)}}：{{ orderData.order_count || 0 }} {{$t(`总消费`)}}：{{$t(`￥`)}}{{ orderData.sum_price || 0 }}</view>
+						<view class="name">{{ $t(`订单信息`) }}</view>
+						<!-- <view>{{$t(`消费订单`)}}：{{ orderData.order_count || 0 }} {{$t(`总消费`)}}：{{$t(`￥`)}}{{ orderData.sum_price || 0 }}</view> -->
 					</view>
 					<view class="pictrue">
 						<image src="../static/orderTime.png"></image>
@@ -14,103 +14,99 @@
 			</view>
 			<view class="nav acea-row row-around">
 				<view class="item" :class="orderStatus == 0 ? 'on' : ''" @click="statusClick(0)">
-					<view>{{$t(`待付款`)}}</view>
-					<view class="num">{{ orderData.unpaid_count || 0 }}</view>
+					<view>{{ $t(`全部`) }}</view>
+					<!-- <view class="num">{{ orderData.evaluated_count || 0 }}</view> -->
 				</view>
 				<view class="item" :class="orderStatus == 1 ? 'on' : ''" @click="statusClick(1)">
-					<view>{{$t(`待发货`)}}</view>
-					<view class="num">{{ orderData.unshipped_count || 0 }}</view>
+					<view>{{ $t(`待付款`) }}</view>
+					<!-- <view class="num">{{ orderData.unpaid_count || 0 }}</view> -->
 				</view>
 				<view class="item" :class="orderStatus == 2 ? 'on' : ''" @click="statusClick(2)">
-					<view>{{$t(`待收货`)}}</view>
-					<view class="num ">{{ orderData.received_count || 0 }}</view>
+					<view>{{ $t(`待发货`) }}</view>
+					<!-- <view class="num">{{ orderData.unshipped_count || 0 }}</view> -->
 				</view>
 				<view class="item" :class="orderStatus == 3 ? 'on' : ''" @click="statusClick(3)">
+					<view>{{ $t(`待收货`) }}</view>
+					<!-- <view class="num ">{{ orderData.received_count || 0 }}</view> -->
+				</view>
+				<!-- <view class="item" :class="orderStatus == 3 ? 'on' : ''" @click="statusClick(3)">
 					<view>{{$t(`待评价`)}}</view>
 					<view class="num">{{ orderData.evaluated_count || 0 }}</view>
-				</view>
+				</view> -->
 				<view class="item" :class="orderStatus == 4 ? 'on' : ''" @click="statusClick(4)">
-					<view>{{$t(`已完成`)}}</view>
-					<view class="num">{{ orderData.complete_count || 0 }}</view>
+					<view>{{ $t(`已完成`) }}</view>
+					<!-- <view class="num">{{ orderData.complete_count || 0 }}</view> -->
 				</view>
 			</view>
 			<view class="list">
 				<view class="item" v-for="(item, index) in orderList" :key="index">
-					<view @click="goOrderDetails(item.order_id)">
+					<view @click="goOrderDetails(item.id)">
 						<view class="title acea-row row-between-wrapper">
 							<view class="acea-row row-middle">
 								<text class="sign cart-color acea-row row-center-wrapper"
-									v-if="item.type == 2">{{$t(`砍价`)}}</text>
+									v-if="item.type == 2">{{ $t(`砍价`) }}</text>
 								<text class="sign cart-color acea-row row-center-wrapper"
-									v-else-if="item.type == 3">{{$t(`拼团`)}}</text>
+									v-else-if="item.type == 3">{{ $t(`拼团`) }}</text>
 								<text class="sign cart-color acea-row row-center-wrapper"
-									v-else-if="item.type == 1">{{$t(`秒杀`)}}</text>
+									v-else-if="item.type == 1">{{ $t(`秒杀`) }}</text>
 								<text class="sign cart-color acea-row row-center-wrapper"
-									v-else-if="item.type == 4">{{$t(`预售`)}}</text>
-								<view>{{ item._add_time }}</view>
-							</view>
-							<view v-if="item._status._type == 9" class="font-color">{{$t(`线下付款,未支付`)}}</view>
-							<view v-else-if="item._status._type == 0" class="font-color">{{$t(`待付款`)}}</view>
-							<view v-else-if="item._status._type == 1 && item.shipping_type == 1" class="font-color">{{$t(`待发货`)}}
-								<text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
-							</view>
-							<view v-else-if="item._status._type == 1 && item.shipping_type == 2" class="font-color">{{$t(`待核销`)}}
-								<text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
-							</view>
-							<view v-else-if="item._status._type == 2" class="font-color">{{$t(`待收货`)}}
-								<text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
+									v-else-if="item.type == 4">{{ $t(`预售`) }}</text>
+								<view>{{ item.createTime }}</view>
 							</view>
-							<view v-else-if="item._status._type == 3" class="font-color">{{$t(`待评价`)}}
-								<text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
+							<view v-if="item.payFlag == 9" class="font-color">{{ $t(`线下付款,未支付`) }}</view>
+							<view v-else-if="item.payFlag == 1" class="font-color">{{ $t(`待付款`) }}</view>
+							<view v-else-if="item.payFlag == 2" class="font-color">{{ $t(`待发货`) }}
+								<!-- <text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text> -->
 							</view>
-							<view v-else-if="item._status._type == 4" class="font-color">{{$t(`已完成`)}}
-								<text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
+							<view v-else-if="item.payFlag == 3" class="font-color">{{ $t(`待收货`) }}
+								<!-- <text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text> -->
 							</view>
-							<view v-else-if="item._status._type == 5 && item.status == 0" class="font-color">{{$t(`未核销`)}}
-								<text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
+							<view v-else-if="item.payFlag == 4" class="font-color">{{ $t(`已完成`) }}
+								<!-- <text v-if="item.refund.length">，{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text> -->
 							</view>
-							<view v-else-if="item._status._type == -2" class="font-color">{{$t(`已退款`)}}
+							<view v-else-if="item.payFlag == -2" class="font-color">{{ $t(`已退款`) }}
 							</view>
-
 						</view>
-						<view class="item-info acea-row row-between row-top" v-for="(items, index) in item.cartInfo"
+						<view class="item-info acea-row row-between row-top" v-for="(items, index) in item.orderGoods"
 							:key="index">
 							<view class="pictrue">
-								<image :src="items.productInfo.image"></image>
+								<image :src="items.goodsImg"></image>
 							</view>
 							<view class="text  row-between">
-								<text class="name line2">{{ items.productInfo.store_name }}</text>
+								<text class="name line2">{{ items.goodsName }}</text>
 								<view class="money">
-									<view v-if="items.productInfo.attrInfo">{{$t(`￥`)}}{{ items.productInfo.attrInfo.price }}
+									<view v-if="items.goodsPrice">{{ $t(`￥`) }}{{ items.goodsPrice }}
 									</view>
-									<view v-else>{{$t(`￥`)}}{{ items.productInfo.price }}</view>
-									<view>x{{ items.cart_num }}</view>
-									<view v-if="items.refund_num && item._status._type != -2" class="return">
+									<view v-else>{{ $t(`￥`) }}{{ items.salePrice }}</view>
+									<view>x{{ items.goodsNum }}</view>
+									<!-- <view v-if="items.refund_num && item.payFlag != -2" class="return">
 										{{ items.refund_num }}{{$t(`件退款中`)}}
-									</view>
+									</view> -->
 								</view>
 							</view>
 						</view>
 						<view class="totalPrice">
-							{{$t(`共`)}}{{ item.total_num || 0 }}{{$t(`件商品，总金额`)}}
-							<text class="money">{{$t(`￥`)}}{{ item.pay_price }}</text>
+							{{ $t(`共`) }}{{ item.orderGoods.length || 0 }}{{ $t(`件商品，总金额`) }}
+							<text class="money">{{ $t(`￥`) }}{{ item.totalFee }}</text>
 						</view>
 					</view>
 					<view class="bottom acea-row row-right row-middle">
-						<view class="bnt cancelBnt" v-if="item._status._type == 0 || item._status._type == 9"
-							@click="cancelOrder(index, item.order_id)">{{$t(`取消订单`)}}</view>
-						<view class="bnt bg-color" v-if="item._status._type == 0"
-							@click="goPay(item.pay_price, item.order_id)">{{$t(`立即付款`)}}</view>
-						<!-- <view class="bnt bg-color" v-else-if="item._status._type == 3"
+						<view class="bnt cancelBnt" v-if="item.payFlag == 1 || item.payFlag == 9"
+							@click="cancelOrder(index, item.id)">{{ $t(`取消订单`) }}</view>
+						<view class="bnt cancelBnt" v-if="item.payFlag == 2 || item.payFlag == 3"
+							@click="cancelOrder(index, item.id)">{{ $t(`申请退款`) }}</view>
+						<view class="bnt bg-color" v-if="item.payFlag == 1" @click="goPay(item.totalFee, item.id)">
+							{{ $t(`立即支付`) }}</view>
+						<!-- <view class="bnt bg-color" v-else-if="item.payFlag == 3"
 							@click="goOrderDetails(item.order_id)">去评价</view> -->
 						<!-- <view class="bnt bg-color"
-							v-else-if="item.seckill_id < 1 && item.bargain_id < 1 && item.combination_id < 1 && item._status._type == 4"
+							v-else-if="item.seckill_id < 1 && item.bargain_id < 1 && item.combination_id < 1 && item.payFlag == 4"
 							@click="goOrderDetails(item.order_id)">
 							再次购买
 						</view> -->
-						<view class="bnt cancelBnt" v-if="item._status._type == 4"
-							@click="delOrder(item.order_id, index)">{{$t(`删除订单`)}}</view>
-						<view class="bnt bg-color" @click="goOrderDetails(item.order_id)">{{$t(`查看详情`)}}</view>
+						<view class="bnt cancelBnt" v-if="item.payFlag == 4" @click="delOrder(item.order_id, index)">
+							{{ $t(`删除订单`) }}</view>
+						<!-- <view class="bnt bg-color" @click="goOrderDetails(item.order_id)">{{$t(`查看详情`)}}</view> -->
 					</view>
 				</view>
 			</view>
@@ -134,530 +130,534 @@
 </template>
 
 <script>
-	import {
-		getOrderList,
-		orderData,
-		orderCancel,
-		orderDel,
-		orderPay
-	} from '@/api/order.js';
-	import {
-		getUserInfo
-	} from '@/api/user.js';
-	import {
-		openOrderSubscribe
-	} from '@/utils/SubscribeMessage.js';
-	import home from '@/components/home';
-	import payment from '@/components/payment';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from 'vuex';
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import emptyPage from '@/components/emptyPage.vue';
-	import colors from '@/mixins/color.js';
-	export default {
-		components: {
-			payment,
-			home,
-			emptyPage,
-			// #ifdef MP
-			authorize
-			// #endif
+import {
+	getUserOrderPage
+} from '@/api/home.js';
+import {
+	getOrderList,
+	orderData,
+	orderCancel,
+	orderDel,
+	orderPay
+} from '@/api/order.js';
+import {
+	getUserInfo
+} from '@/api/user.js';
+import {
+	openOrderSubscribe
+} from '@/utils/SubscribeMessage.js';
+import home from '@/components/home';
+import payment from '@/components/payment';
+import {
+	toLogin
+} from '@/libs/login.js';
+import {
+	mapGetters
+} from 'vuex';
+// #ifdef MP
+import authorize from '@/components/Authorize';
+// #endif
+import emptyPage from '@/components/emptyPage.vue';
+import colors from '@/mixins/color.js';
+export default {
+	components: {
+		payment,
+		home,
+		emptyPage,
+		// #ifdef MP
+		authorize
+		// #endif
+	},
+	mixins: [colors],
+	data() {
+		return {
+			loading: false, //是否加载中
+			loadend: false, //是否加载完毕
+			loadTitle: this.$t(`加载更多`), //提示语
+			orderList: [], //订单数组
+			orderData: {}, //订单详细统计
+			orderStatus: 0, //订单状态
+			page: 1,
+			limit: 20,
+			payMode: [{
+				name: this.$t(`微信支付`),
+				icon: 'icon-weixinzhifu',
+				value: 'weixin',
+				title: this.$t(`使用微信快捷支付`),
+				payStatus: true
+			},
+			// {
+			// 	name: this.$t(`支付宝支付`),
+			// 	icon: 'icon-zhifubao',
+			// 	value: 'alipay',
+			// 	title: this.$t(`使用支付宝支付`),
+			// 	payStatus: true
+			// },
+			// {
+			// 	name: this.$t(`余额支付`),
+			// 	icon: 'icon-yuezhifu',
+			// 	value: 'yue',
+			// 	title: this.$t(`可用余额`),
+			// 	number: 0,
+			// 	payStatus: true
+			// }, {
+			// 	"name": this.$t(`好友代付`),
+			// 	"icon": "icon-haoyoudaizhifu",
+			// 	value: 'friend',
+			// 	title: this.$t(`找微信好友支付`),
+			// 	payStatus: 1,
+			// }
+			],
+			pay_close: false,
+			pay_order_id: '',
+			totalPrice: '0',
+			isAuto: false, //没有授权的不会自动授权
+			isShowAuth: false //是否隐藏授权
+		};
+	},
+	computed: mapGetters(['isLogin']),
+	onShow() {
+		if (this.isLogin) {
+			this.page = 1;
+			this.orderList = []
+			this.loadend = false;
+			this.onLoadFun();
+			this.getOrderList();
+		} else {
+			toLogin();
+		}
+	},
+	methods: {
+		onLoadFun() {
+			this.getOrderData();
+			this.getUserInfo();
 		},
-		mixins: [colors],
-		data() {
-			return {
-				loading: false, //是否加载中
-				loadend: false, //是否加载完毕
-				loadTitle: this.$t(`加载更多`), //提示语
-				orderList: [], //订单数组
-				orderData: {}, //订单详细统计
-				orderStatus: 0, //订单状态
-				page: 1,
-				limit: 20,
-				payMode: [{
-						name: this.$t(`微信支付`),
-						icon: 'icon-weixinzhifu',
-						value: 'weixin',
-						title: this.$t(`使用微信快捷支付`),
-						payStatus: true
-					},
-					{
-						name: this.$t(`支付宝支付`),
-						icon: 'icon-zhifubao',
-						value: 'alipay',
-						title: this.$t(`使用支付宝支付`),
-						payStatus: true
-					},
-					{
-						name: this.$t(`余额支付`),
-						icon: 'icon-yuezhifu',
-						value: 'yue',
-						title: this.$t(`可用余额`),
-						number: 0,
-						payStatus: true
-					}, {
-						"name": this.$t(`好友代付`),
-						"icon": "icon-haoyoudaizhifu",
-						value: 'friend',
-						title: this.$t(`找微信好友支付`),
-						payStatus: 1,
-					}
-				],
-				pay_close: false,
-				pay_order_id: '',
-				totalPrice: '0',
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false //是否隐藏授权
-			};
+		// 授权关闭
+		authColse: function (e) {
+			this.isShowAuth = e;
 		},
-		computed: mapGetters(['isLogin']),
-		onShow() {
-			if (this.isLogin) {
-				this.page = 1;
-				this.orderList = []
-				this.loadend = false;
-				this.onLoadFun();
-				this.getOrderList();
-			} else {
-				toLogin();
-			}
+		/**
+		 * 事件回调
+		 *
+		 */
+		onChangeFun: function (e) {
+			let opt = e;
+			let action = opt.action || null;
+			let value = opt.value != undefined ? opt.value : null;
+			action && this[action] && this[action](value);
 		},
-		methods: {
-			onLoadFun() {
-				this.getOrderData();
-				this.getUserInfo();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-			/**
-			 * 事件回调
-			 *
-			 */
-			onChangeFun: function(e) {
-				let opt = e;
-				let action = opt.action || null;
-				let value = opt.value != undefined ? opt.value : null;
-				action && this[action] && this[action](value);
-			},
-			/**
-			 * 获取用户信息
-			 *
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.payMode[2].number = res.data.now_money;
-					that.$set(that, 'payMode', that.payMode);
-				});
-			},
-			/**
-			 * 关闭支付组件
-			 *
-			 */
-			payClose: function() {
-				this.pay_close = false;
-			},
-			/**
-			 * 生命周期函数--监听页面加载
-			 */
-			onLoad: function(options) {
-				if (options.status) this.orderStatus = options.status;
-			},
-			/**
-			 * 获取订单统计数据
-			 *
-			 */
-			getOrderData: function() {
-				let that = this;
-				orderData().then(res => {
-					that.$set(that, 'orderData', res.data);
-					that.payMode.map(item => {
-						if (item.value == 'weixin') {
-							item.payStatus = res.data.pay_weixin_open ? true : false;
-						}
-						if (item.value == 'alipay') {
-							item.payStatus = res.data.ali_pay_status ? true : false;
-						}
-						if (item.value == 'yue') {
-							item.payStatus = res.data.yue_pay_status == 1 ? true : false;
-						}
-						if (item.value == 'friend') {
-							item.payStatus = res.data.friend_pay_status == 1 ? true : false;
-						}
-					});
-					//#ifdef MP
-					this.payMode[1].payStatus = false;
-					//#endif
+		/**
+		 * 获取用户信息
+		 *
+		 */
+		getUserInfo: function () {
+			let that = this;
+			getUserInfo().then(res => {
+				that.payMode[2].number = res.data.now_money;
+				that.$set(that, 'payMode', that.payMode);
+			});
+		},
+		/**
+		 * 关闭支付组件
+		 *
+		 */
+		payClose: function () {
+			this.pay_close = false;
+		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad: function (options) {
+			if (options.status) this.orderStatus = options.status;
+		},
+		/**
+		 * 获取订单统计数据
+		 *
+		 */
+		getOrderData: function () {
+			let that = this;
+			// orderData().then(res => {
+			// 	that.$set(that, 'orderData', res.data);
+			// 	that.payMode.map(item => {
+			// 		if (item.value == 'weixin') {
+			// 			item.payStatus = res.data.pay_weixin_open ? true : false;
+			// 		}
+			// 		if (item.value == 'alipay') {
+			// 			item.payStatus = res.data.ali_pay_status ? true : false;
+			// 		}
+			// 		if (item.value == 'yue') {
+			// 			item.payStatus = res.data.yue_pay_status == 1 ? true : false;
+			// 		}
+			// 		if (item.value == 'friend') {
+			// 			item.payStatus = res.data.friend_pay_status == 1 ? true : false;
+			// 		}
+			// 	});
+			// 	//#ifdef MP
+			// 	this.payMode[1].payStatus = false;
+			// 	//#endif
+			// });
+		},
+		/**
+		 * 取消订单
+		 *
+		 */
+		cancelOrder: function (index, order_id) {
+			let that = this;
+			if (!order_id)
+				return that.$util.Tips({
+					title: that.$t(`缺少订单号无法取消订单`)
 				});
-			},
-			/**
-			 * 取消订单
-			 *
-			 */
-			cancelOrder: function(index, order_id) {
-				let that = this;
-				if (!order_id)
+			orderCancel(order_id)
+				.then(res => {
 					return that.$util.Tips({
-						title: that.$t(`缺少订单号无法取消订单`)
-					});
-				orderCancel(order_id)
-					.then(res => {
-						return that.$util.Tips({
-								title: res.msg,
-								icon: 'success'
-							},
-							function() {
-								that.orderList.splice(index, 1);
-								that.$set(that, 'orderList', that.orderList);
-								that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
-								that.getOrderData();
-							}
-						);
-					})
-					.catch(err => {
-						return that.$util.Tips({
-							title: err
-						});
-					});
-			},
-			/**
-			 * 打开支付组件
-			 *
-			 */
-			goPay: function(pay_price, order_id) {
-				this.$set(this, 'pay_close', true);
-				this.$set(this, 'pay_order_id', order_id);
-				this.$set(this, 'totalPrice', pay_price);
-			},
-			/**
-			 * 支付成功回调
-			 *
-			 */
-			pay_complete: function() {
-				this.loadend = false;
-				this.page = 1;
-				this.$set(this, 'orderList', []);
-				this.pay_close = false;
-				uni.navigateTo({
-					url: '/pages/goods/order_pay_status/index?order_id=' + this.pay_order_id +
-						'&msg='+this.$t(`支付成功`)+'&type=3&totalPrice=' + this.totalPrice
+						title: res.msg,
+						icon: 'success'
+					},
+						function () {
+							that.orderList.splice(index, 1);
+							that.$set(that, 'orderList', that.orderList);
+							that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+							that.getOrderData();
+						}
+					);
 				})
-				this.pay_order_id = '';
-				this.getOrderData();
-				this.getOrderList();
-			},
-			/**
-			 * 支付失败回调
-			 *
-			 */
-			pay_fail: function() {
-				this.pay_close = false;
-				this.pay_order_id = '';
-			},
-			/**
-			 * 去订单详情
-			 */
-			goOrderDetails: function(order_id) {
-				let that = this;
-				if (!order_id)
+				.catch(err => {
 					return that.$util.Tips({
-						title: that.$t(`缺少订单号无法查看订单详情`)
+						title: err
 					});
-				// #ifdef MP
-				uni.showLoading({
-					title: that.$t(`正在加载中`)
 				});
-				openOrderSubscribe()
-					.then(() => {
-						uni.hideLoading();
-						uni.navigateTo({
-							url: '/pages/goods/order_details/index?order_id=' + order_id
-						})
-					})
-					.catch(err => {
-						uni.hideLoading();
-					});
-				// #endif
-				// #ifndef MP
-				uni.navigateTo({
-					url: '/pages/goods/order_details/index?order_id=' + order_id
+		},
+		/**
+		 * 打开支付组件
+		 *
+		 */
+		goPay: function (pay_price, order_id) {
+			this.$set(this, 'pay_close', true);
+			this.$set(this, 'pay_order_id', order_id);
+			this.$set(this, 'totalPrice', pay_price);
+		},
+		/**
+		 * 支付成功回调
+		 *
+		 */
+		pay_complete: function () {
+			this.loadend = false;
+			this.page = 1;
+			this.$set(this, 'orderList', []);
+			this.pay_close = false;
+			uni.navigateTo({
+				url: '/pages/goods/order_pay_status/index?order_id=' + this.pay_order_id +
+					'&msg=' + this.$t(`支付成功`) + '&type=3&totalPrice=' + this.totalPrice
+			})
+			this.pay_order_id = '';
+			this.getOrderData();
+			this.getOrderList();
+		},
+		/**
+		 * 支付失败回调
+		 *
+		 */
+		pay_fail: function () {
+			this.pay_close = false;
+			this.pay_order_id = '';
+		},
+		/**
+		 * 去订单详情
+		 */
+		goOrderDetails: function (order_id) {
+			let that = this;
+			if (!order_id)
+				return that.$util.Tips({
+					title: that.$t(`缺少订单号无法查看订单详情`)
 				});
-				// #endif
-			},
-			/**
-			 * 切换类型
-			 */
-			statusClick: function(status) {
-				if (status == this.orderStatus) return;
-				this.orderStatus = status;
-				this.loadend = false;
-				this.page = 1;
-				this.$set(this, 'orderList', []);
-				this.getOrderList();
-			},
-			/**
-			 * 获取订单列表
-			 */
-			getOrderList: function() {
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-				that.loading = true;
-				that.loadTitle = that.$t(`加载更多`);
-				getOrderList({
-						type: that.orderStatus,
-						page: that.page,
-						limit: that.limit
-					})
-					.then(res => {
-						let list = res.data || [];
-						let loadend = list.length < that.limit;
-						that.orderList = that.$util.SplitArray(list, that.orderList);
-						that.$set(that, 'orderList', that.orderList);
-						that.loadend = loadend;
-						that.loading = false;
-						that.loadTitle = loadend ? that.$t(`没有更多内容啦~`) : that.$t(`加载更多`);
-						that.page = that.page + 1;
+			// #ifdef MP
+			uni.showLoading({
+				title: that.$t(`正在加载中`)
+			});
+			openOrderSubscribe()
+				.then(() => {
+					uni.hideLoading();
+					uni.navigateTo({
+						url: '/pages/goods/order_details/index?order_id=' + order_id
 					})
-					.catch(err => {
-						that.loading = false;
-						that.loadTitle = that.$t(`加载更多`);
-					});
-			},
+				})
+				.catch(err => {
+					uni.hideLoading();
+				});
+			// #endif
+			// #ifndef MP
+			uni.navigateTo({
+				url: '/pages/goods/order_details/index?order_id=' + order_id
+			});
+			// #endif
+		},
+		/**
+		 * 切换类型
+		 */
+		statusClick: function (status) {
+			if (status == this.orderStatus) return;
+			this.orderStatus = status;
+			this.loadend = false;
+			this.page = 1;
+			this.$set(this, 'orderList', []);
+			this.getOrderList();
+		},
+		/**
+		 * 获取订单列表
+		 */
+		getOrderList: function () {
+			let that = this;
+			if (that.loadend) return;
+			if (that.loading) return;
+			that.loading = true;
+			that.loadTitle = that.$t(`加载更多`);
+			getUserOrderPage({
+				userId: this.$store.state.app.uid,
+				current: that.page,
+				size: that.limit,
+				payFlag: this.orderStatus
+			})
+				.then(res => {
+					let list = res.data || [];
+					let loadend = list.length < that.limit;
+					that.orderList = that.$util.SplitArray(list, that.orderList);
+					that.$set(that, 'orderList', that.orderList);
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? that.$t(`没有更多内容啦~`) : that.$t(`加载更多`);
+					that.page = that.page + 1;
+				})
+				.catch(err => {
+					that.loading = false;
+					that.loadTitle = that.$t(`加载更多`);
+				});
+		},
 
-			/**
-			 * 删除订单
-			 */
-			delOrder: function(order_id, index) {
-				let that = this;
-				uni.showModal({
-					title: that.$t(`删除订单`),
-					content: that.$t(`确定删除该订单`),
-					success: function(res) {
-						if (res.confirm) {
-							orderDel(order_id)
-								.then(res => {
-									that.orderList.splice(index, 1);
-									that.$set(that, 'orderList', that.orderList);
-									that.$set(that.orderData, 'unpaid_count', that.orderData
-										.unpaid_count - 1);
-									that.getOrderData();
-									return that.$util.Tips({
-										title: that.$t(`删除成功`),
-										icon: 'success'
-									});
-								})
-								.catch(err => {
-									return that.$util.Tips({
-										title: err
-									});
+		/**
+		 * 删除订单
+		 */
+		delOrder: function (order_id, index) {
+			let that = this;
+			uni.showModal({
+				title: that.$t(`删除订单`),
+				content: that.$t(`确定删除该订单`),
+				success: function (res) {
+					if (res.confirm) {
+						orderDel(order_id)
+							.then(res => {
+								that.orderList.splice(index, 1);
+								that.$set(that, 'orderList', that.orderList);
+								that.$set(that.orderData, 'unpaid_count', that.orderData
+									.unpaid_count - 1);
+								that.getOrderData();
+								return that.$util.Tips({
+									title: that.$t(`删除成功`),
+									icon: 'success'
+								});
+							})
+							.catch(err => {
+								return that.$util.Tips({
+									title: err
 								});
-						} else if (res.cancel) {
-							return that.$util.Tips({
-								title: that.$t(`已取消`)
 							});
-						}
+					} else if (res.cancel) {
+						return that.$util.Tips({
+							title: that.$t(`已取消`)
+						});
 					}
-				});
+				}
+			});
 
-			}
-		},
-		onReachBottom: function() {
-			this.getOrderList();
 		}
-	};
+	},
+	onReachBottom: function () {
+		this.getOrderList();
+	}
+};
 </script>
 
 <style scoped lang="scss">
-	.my-order .header {
-		height: 260rpx;
-		padding: 0 30rpx;
-	}
-
-	.my-order .header .picTxt {
-		height: 190rpx;
-	}
-
-	.my-order .header .picTxt .text {
-		color: rgba(255, 255, 255, 0.8);
-		font-size: 26rpx;
-		font-family: 'Guildford Pro';
-	}
-
-	.my-order .header .picTxt .text .name {
-		font-size: 34rpx;
-		font-weight: bold;
-		color: #fff;
-		margin-bottom: 20rpx;
-	}
-
-	.my-order .header .picTxt .pictrue {
-		width: 122rpx;
-		height: 109rpx;
-	}
-
-	.my-order .header .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.my-order .nav {
-		background-color: #fff;
-		width: 690rpx;
-		height: 140rpx;
-		border-radius: 6rpx;
-		margin: -73rpx auto 0 auto;
-	}
-
-	.my-order .nav .item {
-		text-align: center;
-		font-size: 26rpx;
-		color: #282828;
-		padding: 27rpx 0;
-		border-bottom: 5rpx solid transparent;
-	}
-
-	.my-order .nav .item.on {
-		/* #ifdef H5 || MP */
-		font-weight: bold;
-		/* #endif */
-		/* #ifdef APP-PLUS */
-		color: #000;
-		/* #endif */
-		border-color: var(--view-theme);
-	}
-
-	.my-order .nav .item .num {
-		margin-top: 18rpx;
-	}
-
-	.my-order .list {
-		width: 690rpx;
-		margin: 14rpx auto 0 auto;
-	}
-
-	.my-order .list .item {
-		background-color: #fff;
-		border-radius: 6rpx;
-		margin-bottom: 14rpx;
-	}
-
-	.my-order .list .item .title {
-		height: 84rpx;
-		padding: 0 30rpx;
-		border-bottom: 1rpx solid #eee;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.my-order .list .item .title .sign {
-		font-size: 24rpx;
-		padding: 0 7rpx;
-		height: 36rpx;
-		margin-right: 15rpx;
-	}
-
-	.my-order .list .item .item-info {
-		padding: 0 30rpx;
-		margin-top: 22rpx;
-	}
-
-	.my-order .list .item .item-info .pictrue {
-		width: 120rpx;
-		height: 120rpx;
-	}
-
-	.my-order .list .item .item-info .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.my-order .list .item .item-info .text {
-		width: 486rpx;
-		font-size: 28rpx;
-		color: #999;
-		margin-top: 6rpx;
-		display: flex;
-	}
-
-	.my-order .list .item .item-info .text .name {
-		width: 306rpx;
-		color: #282828;
-		height: 78rpx;
-	}
-
-	.my-order .list .item .item-info .text .money {
-		text-align: right;
-		flex: 1;
-	}
-
-	.my-order .list .item .totalPrice {
-		font-size: 26rpx;
-		color: #282828;
-		text-align: right;
-		margin: 27rpx 0 0 30rpx;
-		padding: 0 30rpx 30rpx 0;
-		border-bottom: 1rpx solid #eee;
-	}
-
-	.my-order .list .item .totalPrice .money {
-		font-size: 28rpx;
-		font-weight: bold;
-		color: var(--view-priceColor);
-	}
-
-	.my-order .list .item .bottom {
-		height: 107rpx;
-		padding: 0 30rpx;
-	}
-
-	.my-order .list .item .bottom .bnt {
-		width: 176rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		border-radius: 50rpx;
-		font-size: 27rpx;
-	}
-
-	.my-order .list .item .bottom .bnt.cancelBnt {
-		border: 1rpx solid #ddd;
-		color: #aaa;
-	}
-
-	.my-order .list .item .bottom .bnt~.bnt {
-		margin-left: 17rpx;
-	}
-
-	.noCart {
-		margin-top: 171rpx;
-		padding-top: 0.1rpx;
-	}
-
-	.noCart .pictrue {
-		width: 414rpx;
-		height: 336rpx;
-		margin: 78rpx auto 56rpx auto;
-	}
-
-	.noCart .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.my-order .list .item .item-info .text .money .return {
-		// color: var(--view-priceColor);
-		margin-top: 10rpx;
-		font-size: 24rpx;
-	}
+.my-order .header {
+	height: 220rpx;
+	padding: 0 30rpx;
+}
+
+.my-order .header .picTxt {
+	height: 160rpx;
+}
+
+.my-order .header .picTxt .text {
+	color: rgba(255, 255, 255, 0.8);
+	font-size: 26rpx;
+	font-family: 'Guildford Pro';
+}
+
+.my-order .header .picTxt .text .name {
+	font-size: 34rpx;
+	font-weight: bold;
+	color: #fff;
+	margin-bottom: 20rpx;
+}
+
+.my-order .header .picTxt .pictrue {
+	width: 122rpx;
+	height: 109rpx;
+}
+
+.my-order .header .picTxt .pictrue image {
+	width: 100%;
+	height: 100%;
+}
+
+.my-order .nav {
+	background-color: #fff;
+	width: 690rpx;
+	// height: 140rpx;
+	border-radius: 6rpx;
+	margin: -73rpx auto 0 auto;
+}
+
+.my-order .nav .item {
+	text-align: center;
+	font-size: 26rpx;
+	color: #282828;
+	padding: 27rpx 0;
+	border-bottom: 5rpx solid transparent;
+}
+
+.my-order .nav .item.on {
+	/* #ifdef H5 || MP */
+	font-weight: bold;
+	/* #endif */
+	/* #ifdef APP-PLUS */
+	color: #000;
+	/* #endif */
+	border-color: var(--view-theme);
+}
+
+.my-order .nav .item .num {
+	margin-top: 18rpx;
+}
+
+.my-order .list {
+	width: 690rpx;
+	margin: 14rpx auto 0 auto;
+}
+
+.my-order .list .item {
+	background-color: #fff;
+	border-radius: 6rpx;
+	margin-bottom: 14rpx;
+}
+
+.my-order .list .item .title {
+	height: 84rpx;
+	padding: 0 30rpx;
+	border-bottom: 1rpx solid #eee;
+	font-size: 28rpx;
+	color: #282828;
+}
+
+.my-order .list .item .title .sign {
+	font-size: 24rpx;
+	padding: 0 7rpx;
+	height: 36rpx;
+	margin-right: 15rpx;
+}
+
+.my-order .list .item .item-info {
+	padding: 0 30rpx;
+	margin-top: 22rpx;
+}
+
+.my-order .list .item .item-info .pictrue {
+	width: 120rpx;
+	height: 120rpx;
+}
+
+.my-order .list .item .item-info .pictrue image {
+	width: 100%;
+	height: 100%;
+	border-radius: 6rpx;
+}
+
+.my-order .list .item .item-info .text {
+	width: 486rpx;
+	font-size: 28rpx;
+	color: #999;
+	margin-top: 6rpx;
+	display: flex;
+}
+
+.my-order .list .item .item-info .text .name {
+	width: 306rpx;
+	color: #282828;
+	height: 78rpx;
+}
+
+.my-order .list .item .item-info .text .money {
+	text-align: right;
+	flex: 1;
+}
+
+.my-order .list .item .totalPrice {
+	font-size: 26rpx;
+	color: #282828;
+	text-align: right;
+	margin: 27rpx 0 0 30rpx;
+	padding: 0 30rpx 30rpx 0;
+	border-bottom: 1rpx solid #eee;
+}
+
+.my-order .list .item .totalPrice .money {
+	font-size: 28rpx;
+	font-weight: bold;
+	color: var(--view-priceColor);
+}
+
+.my-order .list .item .bottom {
+	height: 107rpx;
+	padding: 0 30rpx;
+}
+
+.my-order .list .item .bottom .bnt {
+	width: 176rpx;
+	height: 60rpx;
+	text-align: center;
+	line-height: 60rpx;
+	color: #fff;
+	border-radius: 50rpx;
+	font-size: 27rpx;
+}
+
+.my-order .list .item .bottom .bnt.cancelBnt {
+	border: 1rpx solid #ddd;
+	color: #aaa;
+}
+
+.my-order .list .item .bottom .bnt~.bnt {
+	margin-left: 17rpx;
+}
+
+.noCart {
+	margin-top: 171rpx;
+	padding-top: 0.1rpx;
+}
+
+.noCart .pictrue {
+	width: 414rpx;
+	height: 336rpx;
+	margin: 78rpx auto 56rpx auto;
+}
+
+.noCart .pictrue image {
+	width: 100%;
+	height: 100%;
+}
+
+.my-order .list .item .item-info .text .money .return {
+	// color: var(--view-priceColor);
+	margin-top: 10rpx;
+	font-size: 24rpx;
+}
 </style>

pages/goods_details/index.vue

@@ -101,12 +101,12 @@
 								<u-icon name="more-dot-fill"></u-icon>
 							</view>
 						</view>
-						<view class="attribute acea-row row-between-wrapper skeleton-rect" @click="selecAttr">
+						<view class="attribute acea-row row-between-wrapper skeleton-rect" @click="selecAddrAttr">
 							<view class="flex">
 								<view style="display: flex; align-items: center; width: 90%">
 									<view class="attr-txt"> 送至： </view>
 									<view class="atterTxt line1" style="width: 82%">{{
-											attrAddrValue
+											attrAddrValue.province + attrAddrValue.city + attrAddrValue.district + attrAddrValue.detail
 									}}</view>
 								</view>
 								<u-icon name="more-dot-fill"></u-icon>
@@ -243,9 +243,10 @@
 					</view> -->
 			</view>
 			<!-- 组件 -->
-			<productWindow v-if="attr.cartAttr" :attr="attr" :isShow="1" :iSplus="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-				@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id="product-window"
-				:is_vip="is_vip" @getImg="showImg" :is_virtual="storeInfo.is_virtual"></productWindow>
+			<productWindow v-if="attr.cartAttr" :attr="attr" :isShow="1" :iSplus="1" @myevent="onMyEvent"
+				@ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum"
+				id="product-window" :is_vip="is_vip" @getImg="showImg" :is_virtual="storeInfo.isSale">
+			</productWindow>
 			<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
 				@shareFriend="listenerActionSheet" />
 			<couponListWindow :coupon="coupon" v-if="coupon" @ChangCouponsClone="ChangCouponsClone"
@@ -324,7 +325,7 @@
 <script>
 let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 import {
-	getGoodsDetail,getUserAddressByUserId
+	getGoodsDetail, getUserAddressByUserId
 } from "@/api/home.js";
 import {
 	getProductDetail,
@@ -463,7 +464,9 @@ export default {
 			attr: {
 				cartAttr: false,
 				productAttr: [],
-				productSelect: {},
+				productSelect: {
+					cart_num: 1
+				},
 				attrValueId: 0 //已选属性Id
 			},
 			description: "",
@@ -498,7 +501,7 @@ export default {
 			svip_price_open: 1
 		};
 	},
-	computed: mapGetters(["isLogin","uid","userInfo"]),
+	computed: mapGetters(["isLogin", "uid", "userInfo"]),
 	watch: {
 		isLogin: {
 			handler: function (newV, oldV) {
@@ -704,6 +707,7 @@ export default {
 		 *
 		 */
 		iptCartNum: function (e) {
+			this.attr.productSelect.totalStock = this.attr.productSelect.totalStock - e;
 			this.$set(this.attr.productSelect, "cart_num", e);
 		},
 		// 后退
@@ -805,7 +809,7 @@ export default {
 		getUserInfo: function () {
 			let that = this;
 			getUserInfo().then((res) => {
-				that.$set(that, "uid", res.data.uid);
+				that.$set(that, "uid", res.data.userId);
 				that.$set(that, "is_money_level", res.data.is_money_level);
 			});
 		},
@@ -816,23 +820,22 @@ export default {
 		ChangeCartNum: function (changeValue) {
 			//changeValue:是否 加|减
 			//获取当前变动属性
-			let productSelect = this.productValue[this.attrValue];
 			//如果没有属性,赋值给商品默认库存
-			if (productSelect === undefined && !this.attr.productAttr.length)
-				productSelect = this.attr.productSelect;
+			let productSelect = this.attr.productSelect;
 			//无属性值即库存为0；不存在加减；
 			if (productSelect === undefined) return;
-			let stock = productSelect.stock || 0;
-			let num = this.attr.productSelect;
+			let stock = productSelect.totalStock || 0;
 			if (changeValue) {
-				num.cart_num++;
-				if (num.cart_num > stock) {
+				this.attr.productSelect.cart_num++;
+				this.attr.productSelect.totalStock--;
+				if (this.attr.productSelect.cart_num > stock) {
 					this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
 					this.$set(this, "cart_num", stock ? stock : 1);
 				}
 			} else {
-				num.cart_num--;
-				if (num.cart_num < 1) {
+				this.attr.productSelect.cart_num--;
+				this.attr.productSelect.totalStock++;
+				if (this.attr.productSelect.cart_num < 1) {
 					this.$set(this.attr.productSelect, "cart_num", 1);
 					this.$set(this, "cart_num", 1);
 				}
@@ -854,7 +857,7 @@ export default {
 				this.$util.Tips({
 					title: this.$t(`重新选择`),
 					success: () => {
-						
+
 					},
 				});
 			} else {
@@ -984,7 +987,7 @@ export default {
 				userId: this.$store.state.app.uid,
 				type: 1
 			}).then(res => {
-
+				this.attrAddrValue = res.data
 			})
 		},
 		/**
@@ -1076,13 +1079,19 @@ export default {
 				}
 			}
 		},
+		// 跳转到地址列表
+		selecAddrAttr: function() {
+			uni.navigateTo({
+				url: '/pages/users/user_address_list/index?type=1'
+			});
+		},
 		/**
 		 * 打开属性插件
 		 */
 		selecAttr: function () {
 			this.$set(this.attr, "cartAttr", true);
 			this.$set(this.attr, "productAttr", this.skuArr);
-			this.storeInfo.cart_num = 0
+			this.storeInfo.cart_num = 1
 			this.$set(this.attr, "productSelect", this.storeInfo);
 			this.$set(this, "isOpen", true);
 		},
@@ -1124,7 +1133,7 @@ export default {
 		 */
 		goCat: function (news) {
 			let that = this,
-				productSelect = that.productValue[this.attrValue];
+			productSelect = that.productValue[this.attrValue];
 			that.currentPage = false;
 			//打开属性
 			if (that.attrValue) {

pages/user/index.vue

@@ -370,7 +370,7 @@ export default {
 			},
 			{
 				img: 'icon-daipingjia',
-				title: '待评价',
+				title: '已完成',
 				url: '/pages/goods/order_list/index?status=3'
 			},
 			{

pages/users/user_address_list/index.vue

@@ -1,30 +1,33 @@
 <template>
 	<view :style="colorStyle">
-		<view class='address-management' :class='addressList.length < 1 && page > 1 ? "fff":""'>
+		<view class='address-management' :class='addressList.length < 1 && page > 1 ? "fff" : ""'>
 			<view class='line'>
 				<image src='../../../static/images/line.jpg' v-if="addressList.length"></image>
 			</view>
 			<radio-group class="radio-group" @change="radioChange" v-if="addressList.length">
-				<view class='item' v-for="(item,index) in addressList" :key="index">
+				<view class='item' v-for="(item, index) in addressList" :key="index">
 					<view class='address' @click='goOrder(item.id)'>
-						<view class='consignee'>{{$t(`收货人`)}}：{{item.realName}}<text class='phone'>{{item.phone}} </text></view>
-						<view>{{$t(`收货地址`)}}：{{item.province}}{{item.city}}{{item.district}}{{item.detail}}</view>
+						<view class='consignee'>{{ $t(`收货人`) }}：{{ item.realName }}<text class='phone'>{{ item.phone }}
+							</text></view>
+						<view>{{ $t(`收货地址`) }}：{{ item.province }}{{ item.city }}{{ item.district }}{{ item.detail }}</view>
 					</view>
 					<view class='operation acea-row row-between-wrapper'>
 						<!-- #ifdef MP -->
 						<radio class="radio" :value="index" :checked="item.defaultState == '2' ? true : false">
-							<text>{{$t(`默认地址`)}}</text>
+							<text>{{ $t(`默认地址`) }}</text>
 						</radio>
 						<!-- #endif -->
 						<view class='acea-row row-middle'>
-							<view @click='editAddress(item.id)'><text class='iconfont icon-bianji'></text>{{$t(`编辑`)}}</view>
-							<view @click='delAddress(index)'><text class='iconfont icon-shanchu'></text>{{$t(`删除`)}}</view>
+							<view @click='editAddress(item.id)'><text class='iconfont icon-bianji'></text>{{ $t(`编辑`) }}
+							</view>
+							<view @click='delAddress(index)'><text class='iconfont icon-shanchu'></text>{{ $t(`删除`) }}
+							</view>
 						</view>
 					</view>
 				</view>
 			</radio-group>
 			<view class='loadingicon acea-row row-center-wrapper' v-if="addressList.length">
-				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				<text class='loading iconfont icon-jiazai' :hidden='loading == false'></text>{{ loadTitle }}
 			</view>
 			<view class='noCommodity' v-if="addressList.length < 1 && page > 1">
 				<view class='pictrue'>
@@ -35,444 +38,451 @@
 			<view class='footer acea-row row-between-wrapper'>
 				<!-- #ifdef APP-PLUS -->
 				<view class='addressBnt on' @click='addAddress'><text
-						class='iconfont icon-tianjiadizhi'></text>{{$t(`添加新地址`)}}</view>
+						class='iconfont icon-tianjiadizhi'></text>{{ $t(`添加新地址`) }}</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-->
 				<view class='addressBnt on' @click='addAddress'><text
-						class='iconfont icon-tianjiadizhi'></text>{{$t(`添加新地址`)}}</view>
+						class='iconfont icon-tianjiadizhi'></text>{{ $t(`添加新地址`) }}</view>
 				<!-- <view class='addressBnt' @click='getWxAddress'><text class='iconfont icon-weixin2'></text>{{$t(`导入微信地址`)}} -->
-				</view>
-				<!-- #endif -->
-				<!-- #ifdef H5-->
-				<view class='addressBnt' :class="this.$wechat.isWeixin()?'wxbnt':'on'" @click='addAddress'><text
-						class='iconfont icon-tianjiadizhi'></text>{{$t(`添加新地址`)}}</view>
-				<view class=""></view>		
-				<view class='addressBnt' @click='getAddress' v-if="this.$wechat.isWeixin()"><text
-						class='iconfont icon-weixin2'></text>{{$t(`导入微信地址`)}}</view>
-				<!-- #endif -->
 			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5-->
+			<view class='addressBnt' :class="this.$wechat.isWeixin() ? 'wxbnt' : 'on'" @click='addAddress'><text
+					class='iconfont icon-tianjiadizhi'></text>{{ $t(`添加新地址`) }}</view>
+			<view class=""></view>
+			<view class='addressBnt' @click='getAddress' v-if="this.$wechat.isWeixin()"><text
+					class='iconfont icon-weixin2'></text>{{ $t(`导入微信地址`) }}</view>
+			<!-- #endif -->
 		</view>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
-		<!-- #ifndef MP -->
-		<home></home>
-		<!-- #endif -->
+	</view>
+	<!-- #ifdef MP -->
+	<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+	<!-- #endif -->
+	<!-- #ifndef MP -->
+	<home></home>
+	<!-- #endif -->
 	</view>
 </template>
 
 <script>
-	import {
-		getUserAddressPage,
-		postUserAddressUpdate,
-		postUserAddressRemove
-	} from '@/api/home.js';
-	import {
-		getAddressList,
-		setAddressDefault,
-		delAddress,
-		editAddress,
-		postAddress
-	} from '@/api/user.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import home from '@/components/home';
-	import colors from '@/mixins/color.js';
-	import {HTTP_REQUEST_URL} from '@/config/app';
-	export default {
-		components: {
-			// #ifdef MP
-			authorize,
-			// #endif
-			home
-		},
-		mixins:[colors],
-		data() {
-			return {
-				imgHost:HTTP_REQUEST_URL,
-				addressList: [],
-				cartId: '',
-				pinkId: 0,
-				couponId: 0,
-				loading: false,
-				loadend: false,
-				loadTitle: this.$t(`加载更多`),
-				page: 1,
-				limit: 20,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				news: '',
-				noCoupon: 0
-			};
+import {
+	getUserAddressPage,
+	postUserAddressUpdate,
+	postUserAddressRemove
+} from '@/api/home.js';
+import {
+	getAddressList,
+	setAddressDefault,
+	delAddress,
+	editAddress,
+	postAddress
+} from '@/api/user.js';
+import {
+	toLogin
+} from '@/libs/login.js';
+import {
+	mapGetters
+} from "vuex";
+// #ifdef MP
+import authorize from '@/components/Authorize';
+// #endif
+import home from '@/components/home';
+import colors from '@/mixins/color.js';
+import { HTTP_REQUEST_URL } from '@/config/app';
+export default {
+	components: {
+		// #ifdef MP
+		authorize,
+		// #endif
+		home
+	},
+	mixins: [colors],
+	data() {
+		return {
+			type: 0,
+			imgHost: HTTP_REQUEST_URL,
+			addressList: [],
+			cartId: '',
+			pinkId: 0,
+			couponId: 0,
+			loading: false,
+			loadend: false,
+			loadTitle: this.$t(`加载更多`),
+			page: 1,
+			limit: 20,
+			isAuto: false, //没有授权的不会自动授权
+			isShowAuth: false, //是否隐藏授权
+			news: '',
+			noCoupon: 0
+		};
+	},
+	computed: mapGetters(['isLogin']),
+	onLoad(options) {
+		if (options.type) {
+			this.type = options.type
+			uni.setNavigationBarTitle({
+				title: "选择地址"
+			});
+		}
+		if (this.isLogin) {
+			this.cartId = options.cartId || '';
+			this.noCoupon = options.noCoupon || 0;
+			this.pinkId = options.pinkId || 0;
+			this.couponId = options.couponId || 0;
+			this.news = options.news || 0;
+			this.getAddressList(true);
+		} else {
+			toLogin();
+		}
+	},
+	onShow: function () {
+		let that = this;
+		that.getAddressList(true);
+	},
+	methods: {
+		onLoadFun: function () {
+			this.getAddressList();
 		},
-		computed: mapGetters(['isLogin']),
-		onLoad(options) {
-			if (this.isLogin) {
-				this.cartId = options.cartId || '';
-				this.noCoupon = options.noCoupon || 0;
-				this.pinkId = options.pinkId || 0;
-				this.couponId = options.couponId || 0;
-				this.news = options.news || 0;
-				this.getAddressList(true);
-			} else {
-				toLogin();
-			}
+		// 授权关闭
+		authColse: function (e) {
+			this.isShowAuth = e
 		},
-		onShow: function() {
+		/*
+		 * 导入微信地址（小程序）
+		 */
+		getWxAddress: function () {
 			let that = this;
-			that.getAddressList(true);
-		},
-		methods: {
-			onLoadFun: function() {
-				this.getAddressList();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			/*
-			 * 导入微信地址（小程序）
-			 */
-			getWxAddress: function() {
-				let that = this;
-				uni.authorize({
-					scope: 'scope.address',
-					success: function(res) {
-						uni.chooseAddress({
-							success: function(res) {
-								let addressP = {};
-								addressP.province = res.provinceName;
-								addressP.city = res.cityName;
-								addressP.district = res.countyName;
-								editAddress({
-									address: addressP,
-									is_default: 1,
-									realName: res.userName,
-									post_code: res.postalCode,
-									phone: res.telNumber,
-									detail: res.detailInfo,
-									id: 0,
-									type: 1
-								}).then(res => {
-									that.$util.Tips({
-										title: that.$t(`添加成功`),
-										icon: 'success'
-									}, function() {
-										that.getAddressList(true);
-									});
-								}).catch(err => {
-									return that.$util.Tips({
-										title: err
-									});
+			uni.authorize({
+				scope: 'scope.address',
+				success: function (res) {
+					uni.chooseAddress({
+						success: function (res) {
+							let addressP = {};
+							addressP.province = res.provinceName;
+							addressP.city = res.cityName;
+							addressP.district = res.countyName;
+							editAddress({
+								address: addressP,
+								is_default: 1,
+								realName: res.userName,
+								post_code: res.postalCode,
+								phone: res.telNumber,
+								detail: res.detailInfo,
+								id: 0,
+								type: 1
+							}).then(res => {
+								that.$util.Tips({
+									title: that.$t(`添加成功`),
+									icon: 'success'
+								}, function () {
+									that.getAddressList(true);
+								});
+							}).catch(err => {
+								return that.$util.Tips({
+									title: err
+								});
+							});
+						},
+						fail: function (res) {
+							if (res.errMsg == 'chooseAddress:cancel') return that.$util
+								.Tips({
+									title: that.$t(`取消选择`)
+								});
+						},
+					})
+				},
+				fail: function (res) {
+					uni.showModal({
+						title: that.$t(`您已拒绝导入微信地址权限`),
+						content: that.$t(`是否进入权限管理，调整授权？`),
+						success(res) {
+							if (res.confirm) {
+								uni.openSetting({
+									success: function (res) { }
+								});
+							} else if (res.cancel) {
+								return that.$util.Tips({
+									title: that.$t(`已取消！`)
 								});
-							},
-							fail: function(res) {
-								if (res.errMsg == 'chooseAddress:cancel') return that.$util
-									.Tips({
-										title: that.$t(`取消选择`)
-									});
-							},
-						})
-					},
-					fail: function(res) {
-						uni.showModal({
-							title: that.$t(`您已拒绝导入微信地址权限`),
-							content: that.$t(`是否进入权限管理，调整授权？`),
-							success(res) {
-								if (res.confirm) {
-									uni.openSetting({
-										success: function(res) {}
-									});
-								} else if (res.cancel) {
-									return that.$util.Tips({
-										title: that.$t(`已取消！`)
-									});
-								}
 							}
-						})
-					}
+						}
+					})
+				}
+			})
+		},
+		/*
+		 * 导入微信地址（公众号）
+		 */
+		getAddress() {
+			let that = this;
+			that.$wechat.openAddress().then(userInfo => {
+				// open();
+				editAddress({
+					realName: userInfo.userName,
+					phone: userInfo.telNumber,
+					address: {
+						province: userInfo.provinceName,
+						city: userInfo.cityName,
+						district: userInfo.countryName
+					},
+					detail: userInfo.detailInfo,
+					post_code: userInfo.postalCode,
+					is_default: 1,
+					type: 1
 				})
-			},
-			/*
-			 * 导入微信地址（公众号）
-			 */
-			getAddress() {
-				let that = this;
-				that.$wechat.openAddress().then(userInfo => {
-					// open();
-					editAddress({
-							realName: userInfo.userName,
-							phone: userInfo.telNumber,
-							address: {
-								province: userInfo.provinceName,
-								city: userInfo.cityName,
-								district: userInfo.countryName
-							},
-							detail: userInfo.detailInfo,
-							post_code: userInfo.postalCode,
-							is_default: 1,
-							type: 1
-						})
-						.then(() => {
-							that.$util.Tips({
-								title: that.$t(`添加成功`),
-								icon: 'success'
-							}, function() {
-								// close();
-								that.getAddressList(true);
-							});
-						})
-						.catch(err => {
+					.then(() => {
+						that.$util.Tips({
+							title: that.$t(`添加成功`),
+							icon: 'success'
+						}, function () {
 							// close();
-							return that.$util.Tips({
-								title: err || that.$t(`添加失败`)
-							});
+							that.getAddressList(true);
 						});
-				});
-			},
-			/**
-			 * 获取地址列表
-			 * 
-			 */
-			getAddressList: function(isPage) {
-				let that = this;
-				if (isPage) {
-					that.loadend = false;
-					that.page = 1;
-					that.$set(that, 'addressList', []);
-				};
-				if (that.loading) return;
-				if (that.loadend) return;
-				that.loading = true;
-				that.loadTitle = '';
-				getUserAddressPage({
-					userId: this.$store.state.app.uid,
-					current: that.page,
-					size: that.limit
-				}).then(res => {
-					let list = res.data;
-					let loadend = list.length < that.limit;
-					that.addressList = that.$util.SplitArray(list, that.addressList);
+					})
+					.catch(err => {
+						// close();
+						return that.$util.Tips({
+							title: err || that.$t(`添加失败`)
+						});
+					});
+			});
+		},
+		/**
+		 * 获取地址列表
+		 * 
+		 */
+		getAddressList: function (isPage) {
+			let that = this;
+			if (isPage) {
+				that.loadend = false;
+				that.page = 1;
+				that.$set(that, 'addressList', []);
+			};
+			if (that.loading) return;
+			if (that.loadend) return;
+			that.loading = true;
+			that.loadTitle = '';
+			getUserAddressPage({
+				userId: this.$store.state.app.uid,
+				current: that.page,
+				size: that.limit
+			}).then(res => {
+				let list = res.data;
+				let loadend = list.length < that.limit;
+				that.addressList = that.$util.SplitArray(list, that.addressList);
+				that.$set(that, 'addressList', that.addressList);
+				that.loadend = loadend;
+				that.loadTitle = loadend ? that.$t(`我也是有底线的`) : that.$t(`加载更多`);
+				that.page = that.page + 1;
+				that.loading = false;
+			}).catch(err => {
+				that.loading = false;
+				that.loadTitle = that.$t(`加载更多`);
+			});
+		},
+		/**
+		 * 设置默认地址
+		 */
+		radioChange: function (e) {
+			let index = parseInt(e.detail.value),
+				that = this;
+			let address = this.addressList[index];
+			if (address == undefined) return that.$util.Tips({
+				title: that.$t(`您设置的默认地址不存在!`)
+			});
+			address.defaultState = 2
+			postUserAddressUpdate(address).then(res => {
+				for (let i = 0, len = that.addressList.length; i < len; i++) {
+					if (i == index) that.addressList[i].is_default = true;
+					else that.addressList[i].is_default = false;
+				}
+				that.$util.Tips({
+					title: that.$t(`设置成功`),
+					icon: 'success'
+				}, function () {
 					that.$set(that, 'addressList', that.addressList);
-					that.loadend = loadend;
-					that.loadTitle = loadend ? that.$t(`我也是有底线的`) : that.$t(`加载更多`);
-					that.page = that.page + 1;
-					that.loading = false;
-				}).catch(err => {
-					that.loading = false;
-					that.loadTitle = that.$t(`加载更多`);
 				});
-			},
-			/**
-			 * 设置默认地址
-			 */
-			radioChange: function(e) {
-				let index = parseInt(e.detail.value),
-					that = this;
-				let address = this.addressList[index];
-				if (address == undefined) return that.$util.Tips({
-					title: that.$t(`您设置的默认地址不存在!`)
+			}).catch(err => {
+				return that.$util.Tips({
+					title: err
 				});
-				address.defaultState = 2
-				postUserAddressUpdate(address).then(res => {
-					for (let i = 0, len = that.addressList.length; i < len; i++) {
-						if (i == index) that.addressList[i].is_default = true;
-						else that.addressList[i].is_default = false;
-					}
-					that.$util.Tips({
-						title: that.$t(`设置成功`),
-						icon: 'success'
-					}, function() {
-						that.$set(that, 'addressList', that.addressList);
-					});
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
+			});
+		},
+		/**
+		 * 编辑地址
+		 */
+		editAddress: function (id) {
+			let cartId = this.cartId,
+				pinkId = this.pinkId,
+				couponId = this.couponId;
+			this.cartId = '';
+			this.pinkId = '';
+			this.couponId = '';
+			uni.navigateTo({
+				url: '/pages/users/user_address/index?id=' + id + '&cartId=' + cartId + '&pinkId=' +
+					pinkId + '&couponId=' +
+					couponId + '&new=' + this.news
+			})
+		},
+		/**
+		 * 删除地址
+		 */
+		delAddress: function (index) {
+			let that = this,
+				address = this.addressList[index];
+			if (address == undefined) return that.$util.Tips({
+				title: that.$t(`您删除的地址不存在!`)
+			});
+			postUserAddressRemove({ ids: address.id }).then(res => {
+				that.$util.Tips({
+					title: that.$t(`删除成功`),
+					icon: 'success'
+				}, function () {
+					that.addressList.splice(index, 1);
+					that.$set(that, 'addressList', that.addressList);
 				});
-			},
-			/**
-			 * 编辑地址
-			 */
-			editAddress: function(id) {
-				let cartId = this.cartId,
-					pinkId = this.pinkId,
-					couponId = this.couponId;
-				this.cartId = '';
-				this.pinkId = '';
-				this.couponId = '';
-				uni.navigateTo({
-					url: '/pages/users/user_address/index?id=' + id + '&cartId=' + cartId + '&pinkId=' +
-						pinkId + '&couponId=' +
-						couponId + '&new=' + this.news
-				})
-			},
-			/**
-			 * 删除地址
-			 */
-			delAddress: function(index) {
-				let that = this,
-					address = this.addressList[index];
-				if (address == undefined) return that.$util.Tips({
-					title: that.$t(`您删除的地址不存在!`)
+			}).catch(err => {
+				return that.$util.Tips({
+					title: err
 				});
-				postUserAddressRemove({ids:address.id}).then(res => {
-					that.$util.Tips({
-						title: that.$t(`删除成功`),
-						icon: 'success'
-					}, function() {
-						that.addressList.splice(index, 1);
-						that.$set(that, 'addressList', that.addressList);
-					});
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				});
-			},
-			/**
-			 * 新增地址
-			 */
-			addAddress: function() {
-				let cartId = this.cartId,
-					pinkId = this.pinkId,
-					couponId = this.couponId;
+			});
+		},
+		/**
+		 * 新增地址
+		 */
+		addAddress: function () {
+			let cartId = this.cartId,
+				pinkId = this.pinkId,
+				couponId = this.couponId;
+			this.cartId = '';
+			this.pinkId = '';
+			this.couponId = '';
+			uni.navigateTo({
+				url: '/pages/users/user_address/index?cartId=' + cartId + '&pinkId=' + pinkId +
+					'&couponId=' + couponId + '&new=' + this.news
+			})
+		},
+		goOrder: function (id) {
+			let cartId = '';
+			let pinkId = '';
+			let couponId = '';
+			if (this.cartId && id) {
+				cartId = this.cartId;
+				pinkId = this.pinkId;
+				couponId = this.couponId;
 				this.cartId = '';
 				this.pinkId = '';
 				this.couponId = '';
-				uni.navigateTo({
-					url: '/pages/users/user_address/index?cartId=' + cartId + '&pinkId=' + pinkId +
-						'&couponId=' + couponId + '&new=' + this.news
+				uni.redirectTo({
+					url: '/pages/goods/order_confirm/index?is_address=1&new=' + this.news + '&cartId=' +
+						cartId + '&addressId=' + id + '&pinkId=' +
+						pinkId + '&couponId=' + couponId + '&noCoupon=' + this.noCoupon
+
 				})
-			},
-			goOrder: function(id) {
-				let cartId = '';
-				let pinkId = '';
-				let couponId = '';
-				if (this.cartId && id) {
-					cartId = this.cartId;
-					pinkId = this.pinkId;
-					couponId = this.couponId;
-					this.cartId = '';
-					this.pinkId = '';
-					this.couponId = '';
-					uni.redirectTo({
-						url: '/pages/goods/order_confirm/index?is_address=1&new=' + this.news + '&cartId=' +
-							cartId + '&addressId=' + id + '&pinkId=' +
-							pinkId + '&couponId=' + couponId + '&noCoupon=' + this.noCoupon
-							
-					})
-				}
 			}
-		},
-		onReachBottom: function() {
-			this.getAddressList();
 		}
+	},
+	onReachBottom: function () {
+		this.getAddressList();
 	}
+}
 </script>
 
 <style>
-	.address-management.fff {
-		background-color: #fff;
-		height: 1300rpx
-	}
+.address-management.fff {
+	background-color: #fff;
+	height: 1300rpx
+}
 
-	.address-management .line {
-		width: 100%;
-		height: 3rpx;
-	}
+.address-management .line {
+	width: 100%;
+	height: 3rpx;
+}
 
-	.address-management .line image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
+.address-management .line image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
 
-	.address-management .item {
-		background-color: #fff;
-		padding: 0 30rpx;
-		margin-bottom: 12rpx;
-	}
+.address-management .item {
+	background-color: #fff;
+	padding: 0 30rpx;
+	margin-bottom: 12rpx;
+}
 
-	.address-management .item .address {
-		padding: 30rpx 0;
-		border-bottom: 1rpx solid #eee;
-		font-size: 28rpx;
-		color: #282828;
-	}
+.address-management .item .address {
+	padding: 30rpx 0;
+	border-bottom: 1rpx solid #eee;
+	font-size: 28rpx;
+	color: #282828;
+}
 
-	.address-management .item .address .consignee {
-		font-size: 28rpx;
-		font-weight: bold;
-		margin-bottom: 8rpx;
-	}
+.address-management .item .address .consignee {
+	font-size: 28rpx;
+	font-weight: bold;
+	margin-bottom: 8rpx;
+}
 
-	.address-management .item .address .consignee .phone {
-		margin-left: 25rpx;
-	}
+.address-management .item .address .consignee .phone {
+	margin-left: 25rpx;
+}
 
-	.address-management .item .operation {
-		height: 83rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
+.address-management .item .operation {
+	height: 83rpx;
+	font-size: 28rpx;
+	color: #282828;
+}
 
-	.address-management .item .operation .radio text {
-		margin-left: 13rpx;
-	}
+.address-management .item .operation .radio text {
+	margin-left: 13rpx;
+}
 
-	.address-management .item .operation .iconfont {
-		color: #2c2c2c;
-		font-size: 35rpx;
-		vertical-align: -2rpx;
-		margin-right: 10rpx;
-	}
+.address-management .item .operation .iconfont {
+	color: #2c2c2c;
+	font-size: 35rpx;
+	vertical-align: -2rpx;
+	margin-right: 10rpx;
+}
 
-	.address-management .item .operation .iconfont.icon-shanchu {
-		margin-left: 40rpx;
-		font-size: 38rpx;
-	}
+.address-management .item .operation .iconfont.icon-shanchu {
+	margin-left: 40rpx;
+	font-size: 38rpx;
+}
 
-	.address-management .footer {
-		position: fixed;
-		width: 100%;
-		background-color: #fff;
-		bottom: 0;
-		height: 106rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-	}
+.address-management .footer {
+	position: fixed;
+	width: 100%;
+	background-color: #fff;
+	bottom: 0;
+	height: 106rpx;
+	padding: 0 30rpx;
+	box-sizing: border-box;
+}
 
-	.address-management .footer .addressBnt {
-		width: 330rpx;
-		height: 76rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 76rpx;
-		font-size: 30rpx;
-		color: #fff;
-		background-color: var(--view-theme);
-	}
+.address-management .footer .addressBnt {
+	width: 330rpx;
+	height: 76rpx;
+	border-radius: 50rpx;
+	text-align: center;
+	line-height: 76rpx;
+	font-size: 30rpx;
+	color: #fff;
+	background-color: var(--view-theme);
+}
 
-	.address-management .footer .addressBnt.on {
-		width: 690rpx;
-		margin: 0 auto;
-	}
+.address-management .footer .addressBnt.on {
+	width: 690rpx;
+	margin: 0 auto;
+}
 
-	.address-management .footer .addressBnt .iconfont {
-		font-size: 35rpx;
-		margin-right: 8rpx;
-		vertical-align: -1rpx;
-	}
+.address-management .footer .addressBnt .iconfont {
+	font-size: 35rpx;
+	margin-right: 8rpx;
+	vertical-align: -1rpx;
+}
 
-	.address-management .footer .addressBnt.wxbnt {
-		background-color: #FE960F;
-	}
+.address-management .footer .addressBnt.wxbnt {
+	background-color: #FE960F;
+}
 </style>