修改

common/http.interceptor.js

@@ -48,7 +48,7 @@ const install = (Vue, vm) => {
 									provider: 'weixin',
 									success: (res) => {
 										let url = baseUrl +
-											'/api/mobile/user/login'
+											'​/api​/mobile​/user​/applet-login'
 										uni.request({
 											url: url,
 											data:{

packages/card/detail.vue

@@ -202,12 +202,12 @@
 		width: 140rpx;
 		line-height: 80rpx;
 		color: #fff;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		border-right: 1rpx solid #f6d9b6;
 	}
 
 	.listitem text {
-		font-size: 24rpx;
+		font-size: 26rpx;
 		line-height: 80rpx;
 		color: #f6d9b6;
 		padding-left: 20rpx;
@@ -218,7 +218,7 @@
 		height: 74rpx;
 		line-height: 74rpx;
 		background: #b98b44;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #fff;
 		margin: 0 auto;
 		text-align: center;

packages/card/index.vue

@@ -215,7 +215,7 @@
 		height: 74rpx;
 		line-height: 74rpx;
 		color: #676767 !important;
-		font-size: 20rpx !important;
+		font-size: 26rpx !important;
 		padding-left: 94rpx;
 		padding-right: 30rpx;
 		background-position: left 30rpx center;
@@ -233,7 +233,7 @@
 
 	/deep/ .u-btn {
 		color: #b98b44 !important;
-		font-size: 24rpx !important;
+		font-size: 26rpx !important;
 		font-weight: bold;
 		padding: 0;
 		height: 74rpx !important;

packages/my/score.vue

@@ -9,8 +9,7 @@
 					<u-icon name="arrow-right" size="24"></u-icon> -->
 				</view>
 			</view>
-			<view class="orderlist">
-				
+			<view class="orderlist" v-if="showLog">
 				<view class="orderlist-item" v-for="item in scoreLog">
 					<view>
 						<view>积分获取</view>
@@ -23,19 +22,22 @@
 					</view>
 				</view>
 			</view>
+			<view v-else style="height:80vh">
+				<u-empty mode="data"></u-empty>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
 	export default {
-		components: {
-		},
+		components: {},
 		data() {
 			return {
 				isLoading: false,
-				totalScore:0,
-				scoreLog:[]
+				totalScore: 0,
+				scoreLog: [],
+				showLog:true
 			}
 		},
 		onLoad() {
@@ -45,66 +47,84 @@
 
 
 		methods: {
-			async loadScore(){
+			async loadScore() {
 				const res = await this.$u.api.user()
 				this.totalScore = res.user.score
 				this.scoreLog = res.scoreLog
+				if(res.scoreLog && res.scoreLog.length>0){
+					this.showLog = true
+				}else{
+					this.showLog = false
+				}
+				
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.cotainer{
+	.cotainer {
 		padding: 40rpx;
 		background-color: #f0efed;
 		height: 100vh;
 		overflow: scroll;
 	}
-	.ordertop{
+
+	.ordertop {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-bottom:30rpx;
-		>view{
-			&:first-child{
+		margin-bottom: 30rpx;
+
+		>view {
+			&:first-child {
 				font-size: 52rpx;
-				color:#ba8b45;
+				color: #ba8b45;
 			}
-			&:last-child{
+
+			&:last-child {
 				font-size: 24rpx;
-				color:#666666;
+				color: #666666;
 			}
 		}
 	}
+
 	.orderlist {
-		padding:30rpx;
+		padding: 30rpx;
 		// padding-bottom: 150rpx;
 		background-color: #fff;
 		border-radius: 10rpx;
-		&-item{
-			border-bottom:1px solid #f3f3f3;
-			padding:20rpx;
+
+		&-item {
+			border-bottom: 1px solid #f3f3f3;
+			padding: 20rpx;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			>view{
-				&:first-child{
-					font-size: 24rpx;
-					color:#000;
-					>view{
-						&:last-child{
+			font-size: 28rpx;
+
+			>view {
+				&:first-child {
+					font-size: 28rpx;
+					color: #000;
+
+					>view {
+						&:last-child {
 							font-size: 20rpx;
-							margin-top:10rpx;
-							color:#adadac;
-							text{
-								margin-right:20rpx;
+							margin-top: 10rpx;
+							color: #adadac;
+
+							text {
+								margin-right: 20rpx;
+
+								font-size: 26rpx;
 							}
 						}
 					}
 				}
-				&:last-child{
-					color:#ba8b45;
+
+				&:last-child {
+					color: #ba8b45;
 					font-size: 36rpx;
 				}
 			}

packages/order/order.vue

@@ -202,8 +202,6 @@
 					</view>
 				</view>
 			</u-popup>
-
-
 		</view>
 	</view>
 </template>
@@ -376,9 +374,11 @@
 			async getAddress() {
 				const res = await this.$u.api.getUserAddress()
 				this.listAddress = res.address
-				if (!this.type == 'edit') {
+				console.log("this.type",this.type)
+				if (!(this.type == 'edit')) {
 					this.showAddress = this.listAddress.length > 0 ? true : false
 				}
+				console.log("this.type",this.type,this.showAddress)
 			},
 			// async getExpress() {
 			// 	const res = await this.$u.api.getExpress()
@@ -407,10 +407,12 @@
 					card_number: this.form.card_number
 				}).then(res => {
 					let data = res.card
+					if(data.open_dates && data.open_dates.length===0){
+						toast("当前无可提货时间")
+						return
+					}
 					if (data.open_dates) {
 						for (var k in data.open_dates) {
-							// 剩余数量大于0
-
 							if (data.open_dates[k]['quantity'] - data.open_dates[k]['booked'] > 0) {
 								if(this.isAfterTwoDays(k)){
 									let _k = this.momentDay(k)
@@ -419,9 +421,10 @@
 										..._k
 									})
 								}
-								
 							}
 						}
+					}else{
+						toast("当前无可提货时间")
 					}
 				}).then(res => {