improve: 优化

template/uni-app/components/recommend/index.vue

@@ -19,6 +19,14 @@
 				</view>
 				<view class='name line1'>{{item.store_name}}</view>
 				<view class='money font-color'>{{$t(`￥`)}}<text class='num'>{{item.price}}</text></view>
+				<view class='vip-money' v-if="item.vip_price && item.vip_price > 0 && item.base">
+					{{$t(`￥`)}}{{item.vip_price}}
+					<image src='/static/images/jvip.png' class="jvip"></image>
+				</view>
+				<view class='vip-money' v-if="item.vip_price && item.vip_price > 0 && item.is_vip">
+					{{$t(`￥`)}}{{item.vip_price}}
+					<image src='/static/images/vip.png'></image>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -93,7 +101,7 @@
 		margin-bottom: 30rpx;
 		border-radius: 20rpx 20rpx 0 0;
 		box-shadow: 0rpx 3rpx 10rpx 2rpx rgba(0, 0, 0, 0.03);
-		;
+		padding-bottom: 10rpx;
 	}
 
 	.recommend .recommendList .item .pictrue {
@@ -126,7 +134,22 @@
 	.recommend .recommendList .item .money {
 		font-size: 20rpx;
 		margin-top: 8rpx;
-		padding: 0 10rpx 10rpx 10rpx;
+		padding: 0 10rpx 0rpx 10rpx;
+	}
+
+	.recommend .vip-money {
+		font-size: 24rpx;
+		color: #282828;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		padding: 0rpx 0 0 10rpx;
+
+		image {
+			width: 46rpx;
+			height: 21rpx;
+			margin-left: 4rpx;
+		}
 	}
 
 	.recommend .recommendList .item .money .num {

template/uni-app/pages/annex/vip_paid/index.vue

@@ -4,7 +4,7 @@
 			<view class="acea-row row-middle">
 				<image class="image" :src="userInfo.avatar"></image>
 				<view class="text">
-					<view class="name">{{userInfo.nickname}}</view>
+					<view class="name line1">{{userInfo.nickname}}</view>
 					<view v-if="userInfo.is_ever_level">{{$t(`永久SVIP会员`)}}</view>
 					<view v-else-if="userInfo.is_money_level">{{$t(`SVIP会员`)}} {{userInfo.overdue_time | dateFormat}}
 						{{$t(`到期`)}}
@@ -816,7 +816,8 @@
 			font-weight: bold;
 			font-size: 30rpx;
 			line-height: 42rpx;
-			color: #333333;
+			color: #333333;
+			max-width: 360rpx;
 		}
 
 		.info {

template/uni-app/pages/goods/goods_comment_con/components/lotteryAleart.vue

@@ -1,123 +1,123 @@
-<template>
-	<view class="aleart" v-if="aleartStatus">
-		<image src="../../../../static/images/poster-close.png" class="close" @click="posterImageClose"></image>
-		<view class="title">
-			{{aleartData.title}}
-		</view>
-		<view class="aleart-body">
-			<image v-if="aleartData.img" class="goods-img" :src="aleartData.img" mode=""></image>
-			<text class="msg">{{aleartData.msg}}</text>
-		</view>
-		<view class="btn" @click="posterImageClose()">
-			{{aleartData.btn}}
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				aleartData: {}
-			}
-		},
-		props: {
-			aleartType: {
-				type: Number
-			},
-			alData: {
-				type: Object
-			},
-			aleartStatus: {
-				type: Boolean,
-				default: false
-			}
-		},
-		watch: {
-			aleartType() {
-				if (type === 2) {
-					this.aleartData = {
-						title: '抽奖结果',
-						img: this.alData.image,
-						msg: this.alData.prompt,
-						btn: '好的',
-						type: this.alData.type
-					}
-				}
-			},
-			aleartStatus(status) {
-				if (!status) {
-					this.aleartData = {}
-				}
-			}
-		},
-		methods: {
-			//隐藏弹窗
-			posterImageClose(type) {
-				this.$emit("close", false)
-			},
-		}
-
-	}
-</script>
-
-<style lang="scss" scoped>
-	.aleart {
-		width: 500rpx;
-		// height: 714rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 9999;
-		top: 50%;
-		margin-top: -357rpx;
-		background-color: #fff;
-		padding: 30rpx;
-		border-radius: 12rpx;
-
-		.title {
-			font-size: 18px;
-			color: #E82C27;
-			font-weight: bold;
-			text-align: center;
-			padding-bottom: 10rpx;
-			border-bottom: 1px solid rgba(#E82C27, 0.2);
-		}
-
-		.aleart-body {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			padding: 60rpx 0;
-
-			.goods-img {
-				width: 150rpx;
-				height: 150rpx;
-			}
-
-			.msg {
-				font-size: 30rpx;
-				color: #282828;
-			}
-		}
-
-		.btn {
-			width: 100%;
-			padding: 15rpx 0;
-			color: #fff;
-			background: linear-gradient(90deg, #F34A46 0%, #FA9532 100%);
-			border-radius: 20px;
-			text-align: center;
-		}
-
-		.close {
-			width: 46rpx;
-			height: 75rpx;
-			position: fixed;
-			right: 0;
-			top: -73rpx;
-			display: block;
-		}
-	}
+<template>
+	<view class="aleart" v-if="aleartStatus">
+		<image src="../../../../static/images/poster-close.png" class="close" @click="posterImageClose"></image>
+		<view class="title">
+			{{aleartData.title}}
+		</view>
+		<view class="aleart-body">
+			<image v-if="aleartData.img" class="goods-img" :src="aleartData.img" mode=""></image>
+			<text class="msg">{{aleartData.msg}}</text>
+		</view>
+		<view class="btn" @click="posterImageClose()">
+			{{aleartData.btn}}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				aleartData: {}
+			}
+		},
+		props: {
+			aleartType: {
+				type: Number
+			},
+			alData: {
+				type: Object
+			},
+			aleartStatus: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			aleartType(type) {
+				if (type === 2) {
+					this.aleartData = {
+						title: '抽奖结果',
+						img: this.alData.image,
+						msg: this.alData.prompt,
+						btn: '好的',
+						type: this.alData.type
+					}
+				}
+			},
+			aleartStatus(status) {
+				if (!status) {
+					this.aleartData = {}
+				}
+			}
+		},
+		methods: {
+			//隐藏弹窗
+			posterImageClose(type) {
+				this.$emit("close", false)
+			},
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.aleart {
+		width: 500rpx;
+		// height: 714rpx;
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 9999;
+		top: 50%;
+		margin-top: -357rpx;
+		background-color: #fff;
+		padding: 30rpx;
+		border-radius: 12rpx;
+
+		.title {
+			font-size: 18px;
+			color: #E82C27;
+			font-weight: bold;
+			text-align: center;
+			padding-bottom: 10rpx;
+			border-bottom: 1px solid rgba(#E82C27, 0.2);
+		}
+
+		.aleart-body {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			padding: 60rpx 0;
+
+			.goods-img {
+				width: 150rpx;
+				height: 150rpx;
+			}
+
+			.msg {
+				font-size: 30rpx;
+				color: #282828;
+			}
+		}
+
+		.btn {
+			width: 100%;
+			padding: 15rpx 0;
+			color: #fff;
+			background: linear-gradient(90deg, #F34A46 0%, #FA9532 100%);
+			border-radius: 20px;
+			text-align: center;
+		}
+
+		.close {
+			width: 46rpx;
+			height: 75rpx;
+			position: fixed;
+			right: 0;
+			top: -73rpx;
+			display: block;
+		}
+	}
 </style>

template/uni-app/pages/goods/goods_comment_con/lottery_comment.vue

@@ -163,7 +163,6 @@
 				this.$set(this, 'couponsHidden', !this.couponsHidden);
 			},
 			getWiningIndex(callback) {
-				this.aleartType = 0
 				startLottery({
 					id: this.id
 				}).then(res => {
@@ -174,6 +173,7 @@
 							callback(this.lottery_draw_param);
 						}
 					})
+					this.aleartType = 0
 				}).catch(err => {
 					this.$util.Tips({
 						title: err

template/uni-app/pages/goods/order_list/index.vue

@@ -225,38 +225,39 @@
 				isShowAuth: false //是否隐藏授权
 			};
 		},
-		computed: mapGetters(['isLogin']),
-		onLoad() {
-			console.log('1')
-			if (this.isLogin) {
-				this.page = 1;
-				this.orderList = []
-				this.loadend = false;
-				this.pay_close = false;
-				this.onLoadFun();
-				this.getOrderList();
-			} else {
-				toLogin();
-			}
-		},
-		onShow() {
-			console.log('2')
-			let options = wx.getEnterOptionsSync();
-			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
-				// 代表从收银台小程序返回
-				let extraData = options.referrerInfo.extraData;
-				this.initIn = false
-				if (!extraData) {
-					this.getOrderList();
-					// "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
-				} else {
-					if (extraData.code == 'success') {
-						this.getOrderList();
-					} else if (extraData.code == 'cancel') {} else {
-						// "支付失败：" + extraData.errmsg;
-					}
-				}
-			}
+		computed: mapGetters(['isLogin']),
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad: function(options) {
+			if (options.status) this.orderStatus = options.status;
+			console.log('1')
+			if (this.isLogin) {
+				this.page = 1;
+				this.orderList = []
+				this.loadend = false;
+				this.pay_close = false;
+				this.onLoadFun();
+				this.getOrderList();
+			} else {
+				toLogin();
+			}
+			let EnOptions = wx.getEnterOptionsSync();
+			if (EnOptions.scene == '1038' && EnOptions.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
+				// 代表从收银台小程序返回
+				let extraData = EnOptions.referrerInfo.extraData;
+				this.initIn = false
+				if (!extraData) {
+					this.getOrderList();
+					// "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
+				} else {
+					if (extraData.code == 'success') {
+						this.getOrderList();
+					} else if (extraData.code == 'cancel') {} else {
+						// "支付失败：" + extraData.errmsg;
+					}
+				}
+			}
 		},
 		methods: {
 			onLoadFun() {
@@ -295,12 +296,7 @@
 			payClose: function() {
 				this.pay_close = false;
 			},
-			/**
-			 * 生命周期函数--监听页面加载
-			 */
-			onLoad: function(options) {
-				if (options.status) this.orderStatus = options.status;
-			},
+		
 			/**
 			 * 获取订单统计数据
 			 *

template/uni-app/pages/users/user_info/index.vue

@@ -43,7 +43,7 @@
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view>{{$t(`昵称`)}}</view>
-						<view class='input'><input type='nickname' name='nickname' :maxlength="16"
+						<view class='input'><input type='nickname' name='nickname' :maxlength="10"
 								:value='userInfo.nickname'></input>
 						</view>
 					</view>

template/uni-app/pages/users/user_invoice_form/index.vue

@@ -372,8 +372,8 @@
 					}
 				}
 				formData.is_default = formData.is_default.length;
-				formData.id = this.id;
-				
+				formData.id = this.id;
+
 				uni.showLoading({
 					title: that.$t(`保存中`)
 				});
@@ -424,7 +424,14 @@
 			},
 			// 调起发票类型弹窗
 			callType() {
-				this.popupType = true;
+				if (this.header_type == 2) {
+					this.popupType = true;
+				} else {
+					uni.showToast({
+						title: this.$t(`个人仅支持普通发票`),
+						icon: 'none'
+					});
+				}
 			},
 			// 选择发票类型
 			changeType(e) {

template/uni-app/pages/users/user_sgin/index.vue

@@ -8,7 +8,7 @@
 							<image :src='userInfo.avatar'></image>
 						</view>
 						<view class='text'>
-							<view class='line1'>{{userInfo.nickname}}</view>
+							<view class='line1'>{{userInfo.nickname || ''}}</view>
 							<view class='integral acea-row'><text>{{$t(`积分`)}}: {{userInfo.integral || ''}}</text>
 							</view>
 						</view>

template/uni-app/pages/users/visit_list/index.vue

@@ -465,7 +465,8 @@
 									color: #fff;
 									font-size: 22rpx;
 									border-radius: 50%;
-									padding: 22rpx 0;
+									// padding: 22rpx 0;
+									line-height: 110rpx;
 									text-align: center;
 								}
 							}