fix:修复样式

App.vue

@@ -65,7 +65,7 @@ export default {
 				}
 			}
 		},
-		cartNum(newCart, b) {
+		cartNum (newCart, b) {
 			this.$store.commit('indexData/setCartNum', newCart + '')
 			if (newCart > 0) {
 				uni.setTabBarBadge({
@@ -79,7 +79,7 @@ export default {
 			}
 		}
 	},
-	async onLaunch(option) {
+	async onLaunch (option) {
 		let that = this;
 		let res = {
 			data: {
@@ -88,34 +88,34 @@ export default {
 			}
 		}
 		// colorChange('color_change').then(res => {
-			uni.setStorageSync('is_diy', res.data.is_diy)
-			uni.$emit('is_diy', res.data.is_diy)
-			switch (res.data.status) {
-				case 1:
-					uni.setStorageSync('viewColor', blue)
-					uni.$emit('ok', blue, res.data.status)
-					break;
-				case 2:
-					uni.setStorageSync('viewColor', green)
-					uni.$emit('ok', green, res.data.status)
-					break;
-				case 3:
-					uni.setStorageSync('viewColor', red)
-					uni.$emit('ok', red, res.data.status)
-					break;
-				case 4:
-					uni.setStorageSync('viewColor', pink)
-					uni.$emit('ok', pink, res.data.status)
-					break;
-				case 5:
-					uni.setStorageSync('viewColor', orange)
-					uni.$emit('ok', orange, res.data.status)
-					break;
-				default:
-					uni.setStorageSync('viewColor', red)
-					uni.$emit('ok', red, res.data.status)
-					break
-			}
+		uni.setStorageSync('is_diy', res.data.is_diy)
+		uni.$emit('is_diy', res.data.is_diy)
+		switch (res.data.status) {
+			case 1:
+				uni.setStorageSync('viewColor', blue)
+				uni.$emit('ok', blue, res.data.status)
+				break;
+			case 2:
+				uni.setStorageSync('viewColor', green)
+				uni.$emit('ok', green, res.data.status)
+				break;
+			case 3:
+				uni.setStorageSync('viewColor', red)
+				uni.$emit('ok', red, res.data.status)
+				break;
+			case 4:
+				uni.setStorageSync('viewColor', pink)
+				uni.$emit('ok', pink, res.data.status)
+				break;
+			case 5:
+				uni.setStorageSync('viewColor', orange)
+				uni.$emit('ok', orange, res.data.status)
+				break;
+			default:
+				uni.setStorageSync('viewColor', red)
+				uni.$emit('ok', red, res.data.status)
+				break
+		}
 		// });
 		if (option.query.spread) {
 			that.$Cache.set('spread', option.query.spread);
@@ -215,7 +215,7 @@ export default {
 
 		// #ifdef H5
 		uni.getSystemInfo({
-			success(e) {
+			success (e) {
 				/* 窗口宽度大于420px且不在PC页面且不在移动设备时跳转至 PC.html 页面 */
 				if (e.windowWidth > 420 && !window.top.isPC && !/iOS|Android/i.test(e.system)) {
 					window.location.pathname = '/static/html/pc.html';
@@ -370,6 +370,30 @@ export default {
 @import 'static/css/guildford.css';
 @import 'static/css/style.scss';
 
+.custom_box {
+	position: fixed;
+	width: 100%;
+	z-index: 999999;
+	top: 0;
+}
+
+.sys-head {
+	position: relative;
+	width: 100%;
+}
+
+.sys-head .sys-title {
+	z-index: 10;
+	position: relative;
+	height: 43px;
+	text-align: left;
+	line-height: 43px;
+	font-size: 36rpx;
+	color: rgba(17, 17, 17, 1);
+	font-weight: bolder;
+	padding-left: 36rpx;
+}
+
 view {
 	box-sizing: border-box;
 }
@@ -412,7 +436,7 @@ page {
 	height: 100vh;
 }
 
-::v-deep .u-tabs__wrapper__nav__item{
+::v-deep .u-tabs__wrapper__nav__item {
 	flex: 1 !important;
 }
 </style>

pages.json

@@ -14,9 +14,8 @@
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "中意购",
 				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white",
+				"navigationBarTextStyle": "black",
 				"app-plus": {
-					"scrollIndicator": "none"
 				}
 				
 			}

pages/index/diy/index_mall.vue

@@ -1,65 +1,63 @@
 <template>
 	<view>
 		<!-- <headerSerch :dataConfig="headItem"></headerSerch> -->
-		<view class="nav-bar_2">
+		<!-- <view class="nav-bar_2">
 			<text class="text_3">中意购</text>
-		</view>
-		<view class="block_2  flex-row justify-between">
-			<view class="image-text_9 flex-row justify-between">
-				<image class="icon_1" referrerpolicy="no-referrer" src="../../../static/images/addressIcon.png" />
-				<text class="text-group_1 ">{{ markers[0].label.content }}</text>
-			</view>
-			<view class="image-text_10 flex-row justify-between">
-				<text class="text-group_2" @click="changeAddress()">切换地点</text>
-				<image class="icon_2" referrerpolicy="no-referrer" src="../../../static/images/quehuan.png" />
+		</view> -->
+
+		<view class="custom_box" style="background: rgb(254,245,246); color: black;">
+			<view class="sys-head">
+				<view class="sys-bar" :style="{ height: sysHeight }"></view>
+				<view class="sys-title">中意购</view>
+				<view class="bg"></view>
 			</view>
 		</view>
-		<u-popup :show="showMap"  mode="center"  @close="showMap = false" @open="open">
-			<view class="popup flex-col justify-center ">
 
-<view class="map1_box flex-row justify-center">
-	<map id="map1" class="map" :latitude="markers[0].latitude" :longitude="markers[0].longitude" :markers="markers"
-		@regionchange="regionChange">
-	</map>
-</view>
-<view class="btn_box flex-row justify-center">
-	<u-button @click="closePopup">取消</u-button>
-	<u-button @click="closePopup">确定</u-button>
-</view>
-</view>
-	</u-popup>
-		<!-- 轮播 -->
-		<view class="swiper-group">
-			<u-swiper :list="swiperList" @change="e => current = e.current" :autoplay="false">
-				<view slot="indicator" class="indicator">
-					<view class="indicator__dot" v-for="(item, index) in swiperList" :key="index"
-						:class="[index === current && 'indicator__dot--active']">
-					</view>
+		<view class="index_body">
+			<view class="block_2  flex-row justify-between">
+				<view class="image-text_9 flex-row justify-between">
+					<image class="icon_1" referrerpolicy="no-referrer" src="../../../static/images/addressIcon.png" />
+					<text class="text-group_1 ">{{ markers[0].label.content }}</text>
+				</view>
+				<view class="image-text_10 flex-row justify-between">
+					<text class="text-group_2" @click="changeAddress()">切换地点</text>
+					<image class="icon_2" referrerpolicy="no-referrer" src="../../../static/images/quehuan.png" />
 				</view>
-			</u-swiper>
+			</view>
 
+			<!-- 轮播 -->
+			<view class="swiper-group">
+				<u-swiper :list="swiperList" @change="e => current = e.current" :autoplay="false">
+					<view slot="indicator" class="indicator">
+						<view class="indicator__dot" v-for="(item, index) in swiperList" :key="index"
+							:class="[index === current && 'indicator__dot--active']">
+						</view>
+					</view>
+				</u-swiper>
 
-		</view>
 
-		<view class="header-group">
-			<view class="tabs">
-				<u-tabs class="defalt-utabs" :is-scroll="false" :list="navigationList" @click="clickNav" lineColor="#B22338"
-					:inactiveStyle="{ color: '#999999' }" :activeStyle="{ color: '#B22338', fontWeight: 'bold' }"
-					keyName="title"></u-tabs>
 			</view>
-		</view>
 
-		<view class="good-list">
-			<latestGroupBuying @changeTab="changeTab" :iSshowH="true" @detail="goDetail" :currentId="currentId" -
-				:isSortType="false" :positionInfo="positionInfo" ref="latestGroupBuying"></latestGroupBuying>
-		</view>
+			<view class="header-group">
+				<view class="tabs">
+					<u-tabs class="defalt-utabs" :is-scroll="false" :list="navigationList" @click="clickNav" lineColor="#B22338"
+						:inactiveStyle="{ color: '#999999' }" :activeStyle="{ color: '#B22338', fontWeight: 'bold' }"
+						keyName="title"></u-tabs>
+				</view>
+			</view>
 
-		<view v-if="!isLogin">
-			<u-skeleton :loading="true" rows="20" :animate="true"></u-skeleton>
-		</view>
-		<view v-else>
-		</view>
+			<view class="good-list">
+				<latestGroupBuying @changeTab="changeTab" :iSshowH="true" @detail="goDetail" :currentId="currentId" -
+					:isSortType="false" :positionInfo="positionInfo" ref="latestGroupBuying"></latestGroupBuying>
+			</view>
 
+			<view v-if="!isLogin">
+				<u-skeleton :loading="true" rows="20" :animate="true"></u-skeleton>
+			</view>
+			<view v-else>
+			</view>
+
+		</view>
 		<u-popup :round="15" :show="showTips" class="TipsPop" mode="center" @close="showTips = false" @open="() => { }">
 			<view class="tips">
 			</view>
@@ -86,10 +84,25 @@
 				</button>
 			</view>
 		</u-popup>
+		<u-popup :show="showMap" mode="center" @close="showMap = false" @open="open">
+			<view class="popup flex-col justify-center ">
+
+				<view class="map1_box flex-row justify-center">
+					<map id="map1" class="map" :latitude="markers[0].latitude" :longitude="markers[0].longitude" :markers="markers"
+						@regionchange="regionChange">
+					</map>
+				</view>
+				<view class="btn_box flex-row justify-center">
+					<u-button @click="closePopup">取消</u-button>
+					<u-button @click="closePopup">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
 <script>
+let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 import headerSerch from './components/headerSerch';
 import latestGroupBuying from './components/latestGroupBuying';
 import { getAddress } from '../../../api/wxMap'
@@ -113,6 +126,7 @@ export default {
 	},
 	data () {
 		return {
+			sysHeight: sysHeight,
 			showTips: true,
 			showMap: false,
 			markers: [{
@@ -236,7 +250,7 @@ export default {
 		},
 
 		changeAddress () {
-		this.showMap = true
+			this.showMap = true
 		},
 		// 通过自带的方法获取到当前的经纬度，调用方法获取到地址获取到地址的中文信息
 		getCurrentLocation () {
@@ -887,9 +901,9 @@ page {
 .tips {
 	width: 550rpx;
 	border-radius: 30px;
-  left: 50%;
- 	transform: translateX(-50%);
- 	height: 56vh;
+	left: 50%;
+	transform: translateX(-50%);
+	height: 56vh;
 	background-size: 100% auto;
 	background-image: url('http://www.gzzzyd.com/groupon/home_slices/编组 47@2x.png');
 	background-repeat: no-repeat;
@@ -904,70 +918,73 @@ page {
 .txt {
 	width: 550rpx;
 	border-radius: 30px;
-  left: 50%;
- transform: translateX(-50%);
- height: 56vh;
+	left: 50%;
+	transform: translateX(-50%);
+	height: 56vh;
 	text-align: center;
 	position: relative;
 	z-index: 999;
-		padding: 30rpx;
-	
-.tips1 {
-	height: 80rpx;
-	font-size: 56rpx;
-	font-weight: 400;
-	color: #333333;
-	line-height: 80rpx;
-	letter-spacing: 5px;
-	margin-bottom: 30rpx;
-}
+	padding: 30rpx;
 
-.tips2 {
-	height: 88rpx;
-	font-size: 32rpx;
-	font-weight: 400;
-	color: #333333;
-	line-height: 44rpx;
-	margin-bottom: 30rpx;
-}
+	.tips1 {
+		height: 80rpx;
+		font-size: 56rpx;
+		font-weight: 400;
+		color: #333333;
+		line-height: 80rpx;
+		letter-spacing: 5px;
+		margin-bottom: 30rpx;
+	}
 
-.tips3 {
-	height: 66rpx;
-	font-size: 48rpx;
-	font-weight: 600;
-	color: #333333;
-	line-height: 66rpx;
-	margin-bottom: 30rpx;
-}
+	.tips2 {
+		height: 88rpx;
+		font-size: 32rpx;
+		font-weight: 400;
+		color: #333333;
+		line-height: 44rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.tips3 {
+		height: 66rpx;
+		font-size: 48rpx;
+		font-weight: 600;
+		color: #333333;
+		line-height: 66rpx;
+		margin-bottom: 30rpx;
+	}
 
-.tips4 {
-	height: 34rpx;
-	font-size: 24rpx;
-	font-weight: 400;
-	color: #333333;
-	line-height: 34rpx;
-	margin-bottom: 30rpx;
+	.tips4 {
+		height: 34rpx;
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #333333;
+		line-height: 34rpx;
+		margin-bottom: 30rpx;
 
-	.red {
-		color: #B42A3E;
+		.red {
+			color: #B42A3E;
+		}
 	}
-}
 
-.tips5 {
-	position: absolute;
-    bottom: 50rpx;
-	width: 80%;
-	left: 50%;
- transform: translateX(-50%);
-	height: 76rpx;
-	background: #B42A3E;
-	border-radius: 48rpx;
-	line-height: 76rpx;
-	font-size: 28rpx;
-	font-weight: 400;
-	color: #FFFFFF;
-	margin-top: 30rpx;
+	.tips5 {
+		position: absolute;
+		bottom: 50rpx;
+		width: 80%;
+		left: 50%;
+		transform: translateX(-50%);
+		height: 76rpx;
+		background: #B42A3E;
+		border-radius: 48rpx;
+		line-height: 76rpx;
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		margin-top: 30rpx;
+	}
 }
+.index_body{
+	position: relative;
+	top: 63px;
 }
-
 </style>

pages/order/index.vue

@@ -1010,9 +1010,5 @@ export default {
 	}
 }
 
-.custom_box {
-	position: fixed;
-	width: 100%;
-	z-index: 999999;
-}
+
 </style>

pages/user/indexOrigin.vue

@@ -351,22 +351,22 @@ export default {
 			orderMenu: [{
 				img: 'icon-daifukuan',
 				title: '待付款',
-				url: '/pages/goods/order_list/index?status=1'
+				url: '/pages/order/index?status=1'
 			},
 			{
 				img: 'icon-daifahuo',
 				title: '待发货',
-				url: '/pages/goods/order_list/index?status=2'
+				url: '/pages/order/index?status=2'
 			},
 			{
 				img: 'icon-daishouhuo',
 				title: '待收货',
-				url: '/pages/goods/order_list/index?status=3'
+				url: '/pages/order/index?status=3'
 			},
 			{
 				img: 'icon-daipingjia',
 				title: '已完成',
-				url: '/pages/goods/order_list/index?status=4'
+				url: '/pages/order/index?status=4'
 			},
 			{
 				img: 'icon-a-shouhoutuikuan',