1.商城订单详情

pages/user/myOrder/mallOrderDetail.vue

@@ -65,7 +65,7 @@
 
 					</view>
 					<view v-if="v.writeoffState==3" class="detailedName old"><span
-							class="redPoint">{{v.qrCode}}</span><span class="quanState">已使用</span></view>
+							class="redPoint">{{v.qrCode}}</span><span class="quanState2">已使用</span></view>
 					<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
 						v-if="v.writeoffState==1" @click="isShowMa=true"></image>
 				</view>
@@ -88,7 +88,7 @@
 				<view v-for="(item,index) in orderData.projectList" :key="index">
 					<view class="itemContent">
 						<view class="topTitle leftItem">{{item.flowName}}</view>
-						<view class="topTitle">{{item.flowQty}}</view>
+						<view class="topTitle2">{{item.flowQty}}</view>
 						<view class="topTitle">{{item.date}}</view>
 					</view>
 				</view>
@@ -106,7 +106,7 @@
 				<view v-for="(item,index) in orderData.shopList" :key="index">
 					<view class="itemContent">
 						<view class="topTitle leftItem">{{item.flowName}}</view>
-						<view class="topTitle">{{item.flowQty}}</view>
+						<view class="topTitle2">{{item.flowQty}}</view>
 						<view class="topTitle">{{item.date}}</view>
 					</view>
 				</view>
@@ -494,7 +494,7 @@
 
 	.detailedLine {
 		display: flex;
-		padding: 15rpx 20rpx;
+		padding: 0 20rpx 15rpx;
 		justify-content: space-between;
 		align-items: center;
 	}
@@ -545,7 +545,16 @@
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-
+	.quanState2{
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+		
+		border: 1rpx solid #DDDDDD;
+		
+		border-radius: 4rpx;
+		margin-left: 20rpx;
+	}
 
 
 
@@ -701,6 +710,11 @@
 		font-size: 26rpx;
 		color: #333333;
 		margin-right: 10rpx;
+	}
+	.topTitle2{
+		font-size: 26rpx;
+		color: #333333;
+		margin-right: 40rpx;
 	}
 
 	.leftItem {

pages/user/myOrder/myOrder.vue

@@ -138,9 +138,9 @@
 		justify-content: space-between;
 		line-height: 92rpx;
 		position: fixed;
-		width: calc(100vw - 48rpx);
-		padding-left: 24rpx;
-		padding-right: 24rpx;
+		width: calc(100vw - 100rpx);
+		padding-left: 50rpx;
+		padding-right: 50rpx;
 		height: 92rpx;
 		z-index: 11;
 	}
@@ -148,12 +148,13 @@
 	.tabLine {
 
 		font-size: 28rpx;
-		font-weight: bold;
+		
 		text-align: center;
 	}
 
 	.tabActive {
-		color: #FF4F00;
+		color: #FF4F00;
+		font-weight: bold;
 		border-bottom: 4rpx solid #FF4F00;
 
 	}

pages/user/user.vue

@@ -172,7 +172,7 @@
 		</view>
 
 
-		<view class="signOut" @click="signOut">退出登录</view>
+		<!-- <view class="signOut" @click="signOut">退出登录</view> -->
 
 
 	</view>
@@ -196,20 +196,20 @@
 		},
 		onLoad(opt) {
 			var that = this;
-			uni.getLocation({
-				type: 'gcj02',
-				success: function(res) {
-					console.log(res)
-					that.location.lat = res.latitude
-					that.location.lng = res.longitude
+			// uni.getLocation({
+			// 	type: 'gcj02',
+			// 	success: function(res) {
+			// 		console.log(res)
+			// 		that.location.lat = res.latitude
+			// 		that.location.lng = res.longitude
 			
-					that.queryMyDetail() 
+			// 		that.queryMyDetail() 
 			
-				},
-				fail(err) {
+			// 	},
+			// 	fail(err) {
 			
-				}
-			});
+			// 	}
+			// });
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			//const wxOpenData = uni.getStorageSync("wxOpenData");
 			const wxOpenData = this.$store.state.wxOpenData;
@@ -229,7 +229,7 @@
 			map() {
 				console.log("打开地图")
 				var that = this;
-				if (!that.location.lat || !that.location.lng) {
+				if (!that.numList.shopInfo.lat || !that.numList.shopInfo.lng) {
 					uni.showToast({
 						title: '该店铺未设置定位',
 						icon: 'none',
@@ -237,8 +237,8 @@
 					});
 				} else {
 					uni.openLocation({
-						latitude: Number(that.location.lat),
-						longitude: Number(that.location.lng),
+						latitude: Number(that.numList.shopInfo.lat),
+						longitude: Number(that.numList.shopInfo.lng),
 						name: that.numList.shopInfo.shopName,
 						address: that.numList.shopInfo.provinceName+that.numList.shopInfo.cityName+that.numList.shopInfo.areaName+that.numList.shopInfo.address,
 						success: function() {
@@ -467,7 +467,9 @@
 		padding-top: 30rpx;
 	}
 
-	.orderNum {
+	.orderNum {
+		    width: 36rpx;
+		    height: 26rpx;
 		line-height: 26rpx;
 		background: #FF0000;
 		padding: 0 8rpx;