2023-02-28

功能完善

mallplusui-uniapp-app/pages/index/index.vue

@@ -1079,11 +1079,13 @@
 			}
 
 			.price {
+				font-size: 18px;
 				color: $uni-color-primary;
+				line-height: 1;
 			}
-
+			
 			.m-price {
-				font-size: $font-sm;
+				font-size: 16px;
 				color: $font-color-light;
 				margin-left: 10upx;
 			}
@@ -1180,15 +1182,16 @@
 		}
 
 		.price {
+			font-size: 18px;
 			color: $uni-color-primary;
+			line-height: 1;
 		}
-
+		
 		.m-price {
-			font-size: $font-sm;
+			font-size: 16px;
 			color: $font-color-light;
 			margin-left: 10upx;
 		}
-
 		.pro-box {
 			display: flex;
 			align-items: center;
@@ -1250,17 +1253,16 @@
 		}
 
 		.price {
-			font-size: 16px;
+			font-size: 18px;
 			color: $uni-color-primary;
 			line-height: 1;
 		}
-
+		
 		.m-price {
-			font-size: $font-sm;
+			font-size: 16px;
 			color: $font-color-light;
 			margin-left: 10upx;
 		}
-
 		.coupon_box {
 			width: 100%;
 			height: auto;

mallplusui-uniapp-app/pages/index/user.vue

@@ -70,13 +70,13 @@
 				</view> -->
 			</view>
 			<!-- 订单 -->
-			<view class="order-section">
+			<!-- 	<view class="order-section">
 				<view class="order-item" @click="navTo('/pages/order/order?status=0')" hover-class="common-hover"
 					:hover-stay-time="50">
 					<text class="yticon icon-shouye"></text>
 					<text>全部订单</text>
 				</view>
-				<view class="order-item" @click="navTo('/pages/order/order?status=2')" hover-class="common-hover"
+				<view class="order-item" @click="navTo('/pages/order/order?status=1')" hover-class="common-hover"
 					:hover-stay-time="50">
 					<text class="yticon icon-daifukuan"></text>
 					<text>待付款</text>
@@ -92,7 +92,7 @@
 					<text class="yticon icon-shouhoutuikuan"></text>
 					<text>退款/售后</text>
 				</view>
-			</view>
+			</view> -->
 			<!-- 浏览历史 -->
 			<view class="history-section icon">
 				<view class="sec-header" v-if="viewList && viewList.length > 0">
@@ -103,7 +103,8 @@
 					<image v-for="(item, index) in viewList" :key="index" @click="navToDetailPage(item)" :src="item.pic"
 						mode="aspectFill"></image>
 				</scroll-view>
-				<!--<list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的钱包" tips="您的会员还有3天过期"></list-cell>-->
+				<list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的订单"
+					@eventClick="navTo('../../pages/order/order?status=0')"></list-cell>
 				<list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理"
 					@eventClick="navTo('../../pagesU/address/address')"></list-cell>
 				<list-cell icon="icon-tuandui" iconColor="#EE82EE" title="个人资料"
@@ -270,10 +271,10 @@
 			async getuserinfo() {
 				let params = {};
 				let data1 = await Api.apiCall('get', Api.index.userInfo, params);
+				console.log("data》》》", data1);
 				if (!data1) {
 					this.userDetailInfo = {};
 				}
-				console.log("data", data1);
 
 				if (!data1.member) {
 					this.logout();
@@ -296,15 +297,15 @@
 					this.viewList = data.result;
 				}
 			},
-			upData(){
+			upData() {
 				uni.showModal({
 					title: '提示',
 					content: '已经是最新版本',
-					showCancel:false,
+					showCancel: false,
 					success: function(res) {
 						if (res.confirm) {
-							
-						} 
+
+						}
 					}
 				});
 			},
@@ -316,7 +317,7 @@
 				uni.navigateTo({
 					url: url
 				});
-				
+
 			},
 			toUserInfo() {
 				uni.navigateTo({