颜色替换

components/timeSelect/timeSelect.vue

@@ -201,8 +201,8 @@ export default {
 	      .time-select-popup-body-time-ltem-body.select{
 	        background-color: rgb(255, 255, 255);
 	        height: 80rpx;
-	        border: 1px solid #F03B3B;
-	        color:#F03B3B;
+	        border: 1px solid #FF0000;
+	        color:#FF0000;
 	        position: relative;
 	        &:before{
 	          position: absolute;
@@ -234,7 +234,7 @@ export default {
 	  color: #ffffff;
 	  height: 100rpx;
 	  line-height: 100rpx;
-	  background: #F03B3B;
+	  background: #FF0000;
 	  font-size: 32rpx;
 	  text-align: center;
 	  

pages.json

@@ -158,6 +158,13 @@
                 "enablePullDownRefresh": true
             }
             
+        },{
+            "path" : "pages/shop/confirm",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单确认"
+            }
+            
         }
     ],
 	"tabBar": {

pages/index/confirmYuyue.vue

@@ -261,7 +261,7 @@
 	margin-top: 23rpx;
 }
 .bottom-container-price{
-	color: #F03B3B;
+	color: #FF0000;
 	padding-top: 30rpx;
 	padding-left: 30rpx;
 	font-size: 32rpx;

pages/index/discountCard.vue

@@ -6,7 +6,7 @@
 			<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">可赠送</view>
 
 		</view>
-		
+		
 		<view class="main" :class="{mainActive:tabIndex==1}">
 			<view class="okBox" v-if="tabIndex==1">
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==0}" @click="tabClick2(0)">可使用</view>
@@ -17,7 +17,7 @@
 				<view class="itemTop">
 					<view class="leftB">
 						<view class="use" v-if="item.state==0">￥<span class="use2">{{item.actMoney}}</span></view>
-						<view class="used" v-else>￥<span class="used2">{{item.actMoney}}</span></view>
+						<view class="used" v-else>￥<span class="used2">{{item.actMoney}}</span></view>
 						<view class="tiaojian">{{item.whereMoney!==0?'满'+item.whereMoney+'元可用':'满任意金额可用'}}</view>
 					</view>
 					<view class="centerB">
@@ -25,21 +25,21 @@
 						<view class="time" v-if="item.startTime">有效期：{{item.startTime.slice(0,10)}}-{{item.endTime.slice(0,10)}}</view>
 						<view class="time" v-else>有效期：</view>
 					</view>
-					<view class="rightB">
-						<image src="../../static/img/icon_yishiyong.png" mode="" v-if="item.state==2&&tabIndex==1"  class="couponlineTopImg"></image>
-						<image src="../../static/img/icon_guoqi.png" mode="" v-if="item.state==1&&tabIndex==1"  class="couponlineTopImg"></image>
-						
-						<view class="shareB"  v-if="item.shareQty>0&&tabIndex==2" @click.stop="">
-						  <image  src="../../static/img/icon_share.png" alt="" class="couponlineshareImg"></image>
-						  <view class="keshare">赠送给好友</view>
-						</view>
+					<view class="rightB">
+						<image src="../../static/img/icon_yishiyong.png" mode="" v-if="item.state==2&&tabIndex==1"  class="couponlineTopImg"></image>
+						<image src="../../static/img/icon_guoqi.png" mode="" v-if="item.state==1&&tabIndex==1"  class="couponlineTopImg"></image>
+						
+						<view class="shareB"  v-if="item.shareQty>0&&tabIndex==2" @click.stop="">
+						  <image  src="../../static/img/icon_share.png" alt="" class="couponlineshareImg"></image>
+						  <view class="keshare">赠送给好友</view>
+						</view>
 					</view>
 				</view>
 
 				<view class="itemBottom">
-					<view v-if="tabIndex==1">可用次数:{{item.avaQty}}</view>
+					<view v-if="tabIndex==1">可用次数:{{item.avaQty}}</view>
 					<view v-else>可分享次数:{{item.shareQty}}</view>
-					<view @click="goDetail(item.id)">查看详情 ></view>
+					<view @click="goDetail(item.id)">查看详情 ></view>
 					
 				</view>
 			</view>
@@ -55,15 +55,15 @@
 	export default {
 		components: {
 			nodata
-		},
-		computed: {
-		  currentList () {
-		    if (this.tabIndex == 2) {
-		      return this.items.filter(item => ~~item.shareQty > 0)
-		    } else {
-		      return this.items.filter(item => item.state == this.tabIndex2)
-		    }
-		  }
+		},
+		computed: {
+		  currentList () {
+		    if (this.tabIndex == 2) {
+		      return this.items.filter(item => ~~item.shareQty > 0)
+		    } else {
+		      return this.items.filter(item => item.state == this.tabIndex2)
+		    }
+		  }
 		},
 		data() {
 			return {
@@ -88,10 +88,10 @@
 		},
 		methods: {
 
-			goDetail(id) {
-				uni.navigateTo({
-					url: 'discountCardDetail?id=' + id
-				})
+			goDetail(id) {
+				uni.navigateTo({
+					url: 'discountCardDetail?id=' + id
+				})
 			},
 
 			tabClick(num) {
@@ -164,8 +164,8 @@
 	}
 
 	.tabActive {
-		color: #F03B3B;
-		border-bottom: 4rpx solid #F03B3B;
+		color: #FF0000;
+		border-bottom: 4rpx solid #FF0000;
 
 	}
 
@@ -173,11 +173,11 @@
 		padding-top: 92rpx;
 		padding-bottom: 20rpx;
 		background-color: #F4F5F7;
-	}
-	.mainActive{
-		padding-top: 184rpx;
-		padding-bottom: 20rpx;
-		background-color: #F4F5F7;
+	}
+	.mainActive{
+		padding-top: 184rpx;
+		padding-bottom: 20rpx;
+		background-color: #F4F5F7;
 	}
 
 	.okBox {
@@ -189,7 +189,7 @@
 		position: fixed;
 		width: 100vw;
 		padding-left: 24rpx;
-		padding-right: 24rpx;
+		padding-right: 24rpx;
 		margin-top: -93rpx;
 		height: 92rpx;
 		z-index: 11;
@@ -203,7 +203,7 @@
 		height: 56rpx;
 		background: #F4F5F7;
 		border-radius: 28rpx;
-		line-height: 56rpx;
+		line-height: 56rpx;
 		margin-right: 24rpx;
 	}
 
@@ -215,7 +215,7 @@
 
 		font-size: 28rpx;
 
-		color: #F03B3B;
+		color: #FF0000;
 		width: 144rpx;
 		height: 56rpx;
 		line-height: 56rpx;
@@ -238,14 +238,14 @@
 	.use {
 
 		font-size: 26rpx;
-		color: #F03B3B;
+		color: #FF0000;
 	}
 
 	.use2 {
 
 		font-size: 40rpx;
 		font-weight: 500;
-		color: #F03B3B;
+		color: #FF0000;
 		line-height: 56rpx;
 	}
 
@@ -261,30 +261,30 @@
 		font-weight: 500;
 		color: #666666;
 		line-height: 56rpx;
-	}
-	.rightB{
-		position: relative;
 	}
-	.tiaojian{
-		
-		font-size: 24rpx;
-		
-		color: #666666;
-		
-	}
-	.name{
-		
-		font-size: 30rpx;
-		
-		font-weight: 500;
-		color: #333333;
-		line-height: 42rpx;
-	}
-	.time{
-		font-size: 24rpx;
-		
-		color: #666666;
-		margin-top: 15rpx;
+	.rightB{
+		position: relative;
+	}
+	.tiaojian{
+		
+		font-size: 24rpx;
+		
+		color: #666666;
+		
+	}
+	.name{
+		
+		font-size: 30rpx;
+		
+		font-weight: 500;
+		color: #333333;
+		line-height: 42rpx;
+	}
+	.time{
+		font-size: 24rpx;
+		
+		color: #666666;
+		margin-top: 15rpx;
 	}
 	.itemBottom {
 		display: flex;
@@ -292,29 +292,29 @@
 		padding-top: 20rpx;
 		border-top: 1rpx solid #EEEEEE;
 		font-size: 24rpx;
-		color: #999999;
+		color: #999999;
 		line-height: 33rpx;
-	}
-	.couponlineTopImg{
-		width: 118rpx;
-		height: 86rpx;
-		position: absolute;
-		top: -24rpx;
-		right: 0;
-	}
-	.shareB{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-	.couponlineshareImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.keshare{
-		font-size: 22rpx;
-		color: #666666;
-		margin-top: 15rpx;
 	}
-</style>
+	.couponlineTopImg{
+		width: 118rpx;
+		height: 86rpx;
+		position: absolute;
+		top: -24rpx;
+		right: 0;
+	}
+	.shareB{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.couponlineshareImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.keshare{
+		font-size: 22rpx;
+		color: #666666;
+		margin-top: 15rpx;
+	}
+</style>

pages/index/discountCardDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="box">
-		<view style="width: 750rpx;height: 172rpx;background: #F03B3B;"></view>
+		<view style="width: 750rpx;height: 172rpx;background: #FF0000;"></view>
 
 		<view class="detailBg">
 			<view class="detailTop">
@@ -112,14 +112,14 @@
 	.use {
 
 		font-size: 26rpx;
-		color: #F03B3B;
+		color: #FF0000;
 	}
 
 	.use2 {
 
 		font-size: 40rpx;
 		font-weight: 500;
-		color: #F03B3B;
+		color: #FF0000;
 		line-height: 56rpx;
 	}
 
@@ -180,7 +180,7 @@
 	.redPoint {
 		width: 18rpx;
 		height: 18rpx;
-		background: #F03B3B;
+		background: #FF0000;
 		border-radius: 9rpx;
 		margin-right: 10rpx;
 	}
@@ -197,4 +197,4 @@
 		margin-top: 16rpx;
 		margin-left: 28rpx;
 	}
-</style>
+</style>

pages/index/index.vue

@@ -650,7 +650,7 @@
 	.hotSx{
 		width: 8rpx;
 		height: 30rpx;
-		background: #F03B3B;
+		background: #FF0000;
 		border-radius: 5rpx;
 	}
 	.hotLeft{
@@ -699,7 +699,7 @@
 	.hotlinestate2{
 		width: 102rpx;
 		height: 44rpx;
-		background:#F03B3B ; 	
+		background:#FF0000 ; 	
 		line-height: 44rpx;
 		font-weight: 500;
 		color: #FFFFFF;
@@ -763,17 +763,17 @@
 	.goodsPrice1{
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 	}
 	.goodsPrice2{
 		font-size: 22rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 	}
 	.goodsPrice3{
 		font-size: 32rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 	}
 	.goodsPrice3{
 		font-size: 24rpx;

pages/index/onlineBooking.vue

@@ -455,7 +455,7 @@
 	font-weight: 500;
 }
 .newyyBox .totalPrice{
-	color: #F03B3B;
+	color: #FF0000;
 	font-size: 32rpx;
 }
 .hejishul{

pages/index/vipCard.vue

@@ -42,7 +42,7 @@
 			</view>
 
 			<view class="itemBox" v-for="(item,index) in vipData.cardTimeList">
-				<view v-if="AmountQtyJs(item.list)">
+				<view v-if="AmountQtyJs(item.list)">
 				<view class="itemTop">
 					<view class="itemName">{{item.PackName}}</view>
 					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
@@ -55,7 +55,7 @@
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
 				</view>
 
-				<view v-if="item.open">
+				<view v-if="item.open">
 					<!-- 不展示剩余为0项 -->
 					<view class="itemBg" v-if="dis&&v.AmountQty!=0" v-for="(v,index2) in item.list" :key="index2">
 
@@ -70,23 +70,23 @@
 							</view>
 						</view>
 
-					</view>
-					
-					<!-- 展示所有 -->
-					<view class="itemBg" v-if="!dis" v-for="(v,index2) in item.list" :key="index2">
-					
-							<view class="nameTop" v-if="v.FlowType==2"><span class="type">项目</span> {{v.FlowName}}</view>
-							<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
-					
-							<view class="timeBottom">
-								<view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
-								<view class="time" v-else>有效期：永久</view>
-								<view>剩余/总：<span
-										style="color: #FF3B30;font-weight: bold;">{{v.AmountQty}}</span>/{{v.TotalQty}}
-								</view>
-							</view>
-					
-						</view>
+					</view>
+					
+					<!-- 展示所有 -->
+					<view class="itemBg" v-if="!dis" v-for="(v,index2) in item.list" :key="index2">
+					
+							<view class="nameTop" v-if="v.FlowType==2"><span class="type">项目</span> {{v.FlowName}}</view>
+							<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
+					
+							<view class="timeBottom">
+								<view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
+								<view class="time" v-else>有效期：永久</view>
+								<view>剩余/总：<span
+										style="color: #FF3B30;font-weight: bold;">{{v.AmountQty}}</span>/{{v.TotalQty}}
+								</view>
+							</view>
+					
+						</view>
 					
 				</view>
 
@@ -125,9 +125,9 @@
 				<view style="margin-left: 10rpx;color: #3C3C3C;font-size: 24rpx;">不展示剩余为0项</view>
 			</view>
 
-			<view class="itemBox" v-for="(item,index) in vipData.carMoneyList">
+			<view class="itemBox" v-for="(item,index) in vipData.carMoneyList">
 				<!-- 不展示剩余为0项 -->
-				<view v-if="disCz&&item.Money!=0">
+				<view v-if="disCz&&item.Money!=0">
 				<view class="itemTop">
 					<view class="itemName">{{item.PacKName}}</view>
 					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
@@ -154,39 +154,39 @@
 						<view class="count" v-else>+{{v.Money}}</view>
 					</view>
 				</view>
-
-				</view>
-				
-				<!-- 展示所有 -->
-				<view v-if="!disCz">
-				<view class="itemTop">
-					<view class="itemName">{{item.PacKName}}</view>
-					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
-				</view>
-				<view class="itemBottom" :class="{active:item.open}">
-					<view class="shopName">{{item.ShopName}}</view>
-				
-					<view style="font-size: 24rpx; color: #FF3B30;">￥<span class="money">{{item.Money}}</span> <span
-							style="color: #999999;font-size: 24rpx;">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
-					</view>
-					<image @click="changeState(item)" v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
-						mode="" style="width: 34rpx;height: 22rpx;"></image>
-					<image @click="changeState(item)" v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
-						mode="" style="width: 34rpx;height: 22rpx;"></image>
-				</view>
-				
-				<view class="itemBg" v-if="item.open" v-for="(v,index2) in item.payList" :key="index2">
-				
-					<view class="timeBottom">
-						<view class="time" v-if="v.CreateTime">{{v.CreateTime}}</view>
-				
-				
-						<view v-if="v.Type==2">-{{v.Money}}</view>
-						<view class="count" v-else>+{{v.Money}}</view>
-					</view>
-				</view>
-				
-				</view>
+
+				</view>
+				
+				<!-- 展示所有 -->
+				<view v-if="!disCz">
+				<view class="itemTop">
+					<view class="itemName">{{item.PacKName}}</view>
+					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
+				</view>
+				<view class="itemBottom" :class="{active:item.open}">
+					<view class="shopName">{{item.ShopName}}</view>
+				
+					<view style="font-size: 24rpx; color: #FF3B30;">￥<span class="money">{{item.Money}}</span> <span
+							style="color: #999999;font-size: 24rpx;">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
+					</view>
+					<image @click="changeState(item)" v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
+						mode="" style="width: 34rpx;height: 22rpx;"></image>
+					<image @click="changeState(item)" v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
+						mode="" style="width: 34rpx;height: 22rpx;"></image>
+				</view>
+				
+				<view class="itemBg" v-if="item.open" v-for="(v,index2) in item.payList" :key="index2">
+				
+					<view class="timeBottom">
+						<view class="time" v-if="v.CreateTime">{{v.CreateTime}}</view>
+				
+				
+						<view v-if="v.Type==2">-{{v.Money}}</view>
+						<view class="count" v-else>+{{v.Money}}</view>
+					</view>
+				</view>
+				
+				</view>
 				
 				<!-- 使用条款-->
 
@@ -238,20 +238,20 @@
 			this.myOrderCoupon();
 		},
 
-		methods: {
-			AmountQtyJs (item) {
-			  var state = false
-			  if (this.dis) {
-			    item.forEach(v => {
-			      if (v.AmountQty != 0) {
-			        state = true
-			      }
-			    })
-			  } else {
-			    state = true
-			  }
-			
-			  return state
+		methods: {
+			AmountQtyJs (item) {
+			  var state = false
+			  if (this.dis) {
+			    item.forEach(v => {
+			      if (v.AmountQty != 0) {
+			        state = true
+			      }
+			    })
+			  } else {
+			    state = true
+			  }
+			
+			  return state
 			},
 			useCl(useComment) {
 				this.useComment = useComment;
@@ -525,7 +525,7 @@
 	}
 
 	.count {
-		color: #F03B3B;
+		color: #FF0000;
 	}
 
 	.shiyongBox {
@@ -575,4 +575,4 @@
 	.shiyongno {
 		color: #666666;
 	}
-</style>
+</style>

pages/shop/confirm.vue

@@ -0,0 +1,73 @@
+<template>
+<view class="box">
+	<view class="topBox"></view>
+	<view class="yuanhu"></view>
+</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				userInfo:'',
+				goodsnum:1,
+				id:'',
+				info:'',
+			}
+		},
+		onLoad(opt) {
+			//this.id=opt.id;
+			this.userInfo = uni.getStorageSync("userInfo");
+			//this.openGoodsDetailById()
+		},
+		
+		methods: {
+			openGoodsDetailById(){
+				this.$http('openMall/openGoodsDetailById', {
+				  id:this.id
+				 },'GET').then(res => {
+						this.info=res.data			
+				 })
+			},
+			goINdex(){
+				uni.switchTab({
+					url:'../index/index'
+				})
+			},
+			calculation(type){
+				if(type==1){
+					if(this.goodsnum>1){
+						this.goodsnum--
+					}
+				}else{
+					if(this.info.oneQty>this.goodsnum){
+						this.goodsnum++
+					}
+				}
+			}
+			
+		}
+	}
+</script>
+
+<style scoped lang="less">
+
+.box{
+	background: #F4F5F7;
+	min-height: 100vh;
+}
+.topBox{
+	height: 150rpx;
+	background: #FF0000;
+	width: 750rpx;
+}
+.yuanhu{
+	width: 750rpx;
+	height: 20rpx;
+	background: #FF0000;
+	border-radius: 0 0 100% 100%;
+}
+</style>

pages/shop/goodsDetail.vue

@@ -146,7 +146,7 @@
 				</view>
 			</view>
 			<view class="buybtnBox">
-				<view class="buyBtn">立即购买</view>
+				<view class="buyBtn" @click="goBuy">立即购买</view>
 			</view>
 			
 		</view>
@@ -190,6 +190,11 @@
 					url:'../index/index'
 				})
 			},
+			goBuy(){
+				uni.navigateTo({
+					url:'confirm'
+				})
+			},
 			calculation(type){
 				if(type==1){
 					if(this.goodsnum>1){
@@ -362,20 +367,20 @@ color: #F4F5F7;
 	.goodsPrice11{
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 		padding-top: 8rpx;
 	}
 	.goodsPrice22{
 		font-size: 22rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 		padding-top: 8rpx;
 		padding-left: 5rpx;
 	}
 	.goodsPrice33{
 		font-size: 32rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 	}
 	.goodsPrice44{
 		font-size: 24rpx;
@@ -493,12 +498,12 @@ color: #F4F5F7;
 .fwlcyuan{
 	width: 16rpx;
 	height: 16rpx;
-	background: #F03B3B;
+	background: #FF0000;
 	border-radius: 50%;
 }
 .fwHx{
 	height: 4rpx;
-	background: #F03B3B;
+	background: #FF0000;
 	width: 186rpx;
 	margin-top: 7rpx;
 }
@@ -537,27 +542,27 @@ color: #F4F5F7;
 .goodsPrice1{
 	font-size: 24rpx;
 	font-weight: 400;
-	color: #F03B3B;
+	color: #FF0000;
 	padding-top: 14rpx;
 }
 .goodsPrice2{
 	font-size: 28rpx;
 	font-weight: 400;
-	color: #F03B3B;
+	color: #FF0000;
 	padding-top: 10rpx;
 	padding-left: 14rpx;
 }
 .goodsPrice3{
 	font-size:28rpx;
 	font-weight: 400;
-	color: #F03B3B;
+	color: #FF0000;
 	
 	padding-right: 10rpx;
 }
 .goodsPrice3{
 	font-size: 40rpx;
 	font-weight: 400;
-	color: #F03B3B;
+	color: #FF0000;
 }
 .goodsPrice4{
 	font-size: 24rpx;

pages/shop/shop.vue

@@ -227,7 +227,7 @@
 
 <style scoped lang="less">
 .pxActive{
-	color: #F03B3B !important;
+	color: #FF0000 !important;
 }
 .paixuLineTbtopIcon{
 	width: 16rpx;
@@ -290,7 +290,7 @@
 .classificationHx{
 	width: 40rpx;
 	height: 4rpx;
-	background: #F03B3B;
+	background: #FF0000;
 	margin: 0 auto;
 }
 .paixuBox{
@@ -342,19 +342,19 @@
 	.goodsPrice1{
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 		padding-top: 8rpx;
 	}
 	.goodsPrice2{
 		font-size: 22rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 		padding-top: 8rpx;
 	}
 	.goodsPrice3{
 		font-size: 32rpx;
 		font-weight: 400;
-		color: #F03B3B;
+		color: #FF0000;
 	}
 	.goodsPrice4{
 		font-size: 24rpx;

pages/user/bespeakDetail.vue

@@ -5,10 +5,10 @@
 			<view class="orderState">
 				<image src="../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
 				
-		
-				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 0">待确认</view>
-				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 1">预约中</view>
-				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 2">已到店</view>
+		
+				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 0">待确认</view>
+				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 1">预约中</view>
+				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 2">已到店</view>
 				<view class="SheetState" v-if="orderData.orderSheet.sheetState == 3">已取消</view>
 			</view>
 
@@ -72,33 +72,33 @@
 				<view class="detailedLine" v-for="(v,index) in orderData.orderDetails">
 						<view class="detailedName">{{v.itemName}}</view>
 						<span>￥{{v.amountMoney}}</span>
-				</view>
-				<view class="detailedLine" v-if=" orderData.orderDetails.length!=0">
-						<view class="detailedName">预估总价</view>
-						<span v-if="orderData.sumMoney>0">￥{{orderData.sumMoney}}</span>
-				</view>
+				</view>
+				<view class="detailedLine" v-if=" orderData.orderDetails.length!=0">
+						<view class="detailedName">预估总价</view>
+						<span v-if="orderData.sumMoney>0">￥{{orderData.sumMoney}}</span>
+				</view>
 				<view class="content">温馨提示：该报价仅为参考价格，实际以门店为准（不同品牌和车型费用会不同）</view>
 			</view>
 		</view>
 
-		
-		<view class="bottom" v-if="(orderData.orderSheet.sheetState == 0)||(orderData.orderSheet.sheetState == 1)">
-		
-			<view class="cancel" @click="cancelBespeak" >取消预约</view>
-			<view class="defer" @click="cktime">延期</view>
-		</view>
-		
-		<!-- 预约时间 -->
+		
+		<view class="bottom" v-if="(orderData.orderSheet.sheetState == 0)||(orderData.orderSheet.sheetState == 1)">
+		
+			<view class="cancel" @click="cancelBespeak" >取消预约</view>
+			<view class="defer" @click="cktime">延期</view>
+		</view>
+		
+		<!-- 预约时间 -->
 		<timeSelect ref="timeSelect" :timedata="timedata" @changeTime="changeTime"></timeSelect>	
 
 	</view>
 </template>
 
-<script>
-	import timeSelect from '@/components/timeSelect/timeSelect.vue'
-	export default {
-		components: {
-			timeSelect
+<script>
+	import timeSelect from '@/components/timeSelect/timeSelect.vue'
+	export default {
+		components: {
+			timeSelect
 		},
 	
 		data() {
@@ -106,80 +106,80 @@
 				location: '',
 				id: '',
 				orderData: '',
-				timedata:'',
+				timedata:'',
 				billDate:'',
 
 			}
 		},
 		onLoad(opt) {
 			
-			this.id = opt.id
+			this.id = opt.id
 			
-			if (this.id) {
-				this.getData()
+			if (this.id) {
+				this.getData()
 			}
 
 		},
 		
 		methods: {
-			changeTime(data){
-				console.log(data)
-				this.billDate=data
-				this.upTime();
-			},
-			cktime(){
-				 this.$refs.timeSelect.open();
-			},
-			upTime() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				var that = this
-				this.$http('openreservation/carOwner/updateTimeOfAppointment', {
-			
-					id: this.id,
-					shopId: this.orderData.shopInfo.id,
-					billDate:this.billDate
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					// var list = res.data.Items
-					var list = res.data
-					console.log("result+=",res.data);
-					uni.showToast({
-						title: '延期成功',
-						icon: 'none',
-						duration: 2000
-					});
-					setTimeout(function() {
-						that.getData();
-					}, 1000);
-					
-			
-				})
-			},
-			cancelBespeak() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				var that = this
-				this.$http('openreservation/carOwner/updateState', {
-			
-					id: this.id,
-					shopId: this.orderData.shopInfo.id,
-					sheetState:3
-				}, 'POST').then(res => {
-					uni.hideLoading();
-					// var list = res.data.Items
-					var list = res.data
-					uni.showToast({
-						title: '取消成功',
-						icon: 'none',
-						duration: 2000
-					});
-					setTimeout(function() {
-						that.getData();
-					}, 1000);
-				})
+			changeTime(data){
+				console.log(data)
+				this.billDate=data
+				this.upTime();
+			},
+			cktime(){
+				 this.$refs.timeSelect.open();
+			},
+			upTime() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				var that = this
+				this.$http('openreservation/carOwner/updateTimeOfAppointment', {
+			
+					id: this.id,
+					shopId: this.orderData.shopInfo.id,
+					billDate:this.billDate
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					// var list = res.data.Items
+					var list = res.data
+					console.log("result+=",res.data);
+					uni.showToast({
+						title: '延期成功',
+						icon: 'none',
+						duration: 2000
+					});
+					setTimeout(function() {
+						that.getData();
+					}, 1000);
+					
+			
+				})
+			},
+			cancelBespeak() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				var that = this
+				this.$http('openreservation/carOwner/updateState', {
+			
+					id: this.id,
+					shopId: this.orderData.shopInfo.id,
+					sheetState:3
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					// var list = res.data.Items
+					var list = res.data
+					uni.showToast({
+						title: '取消成功',
+						icon: 'none',
+						duration: 2000
+					});
+					setTimeout(function() {
+						that.getData();
+					}, 1000);
+				})
 			},
 			map() {
 				console.log("打开地图")
@@ -227,10 +227,10 @@
 					uni.hideLoading();
 					this.orderData = res.data;
 
-					
+					
 					
 				})
-			},
+			},
 			
 			goback() {
 
@@ -260,7 +260,7 @@
 
 	.top {
 		height: 190rpx;
-		background-color: #F03B3B;
+		background-color: #FF0000;
 
 	}
 
@@ -329,7 +329,7 @@
 	.shopName {
 		font-size: 30rpx;
 		font-weight: bold;
-		color: #3C3C3C;
+		color: #3C3C3C;
 		line-height: 42rpx;
 	}
 
@@ -453,7 +453,7 @@
 
 	.detailedLine {
 		display: flex;
-		padding: 20rpx 20rpx 0rpx;
+		padding: 20rpx 20rpx 0rpx;
 		justify-content: space-between;
 	}
 
@@ -470,9 +470,9 @@
 		color: #3C3C3C;
 	}
 
-	span{
-		font-size: 26rpx;
-		color: #999999;
+	span{
+		font-size: 26rpx;
+		color: #999999;
 	}
 
 	.goodscost {
@@ -759,48 +759,48 @@
 		display: flex;
 		justify-content: flex-start;
 		align-items: center;
-	}
-	.content{
-		background-color: #F4F5F7;
-		border-radius: 10rpx;
-		padding: 16rpx;
-		color: #999999;
-		font-size: 24rpx;
-		margin: 20rpx;
-	}
-	.bottom {
-		display: flex;
-		justify-content: flex-end;
-		padding: 20rpx;
-		background-color: #FFFFFF;
-		align-items: center;
-		height: 98rpx;
-		width: 100vw;
-		position: fixed;
-		bottom: 0rpx;
-	}
-	.cancel{
-		color: #3C3C3C;
-		font-size: 28rpx;
-		width: 150rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 1rpx solid #DDDDDD;
-		text-align: center;
-		line-height: 56rpx;
-		margin-right: 40rpx;
-	}
-	.defer {
-		color: #D53533;
-		font-size: 28rpx;
-		width: 150rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
-		text-align: center;
-		line-height: 56rpx;
-		margin-right: 40rpx;
-	}
-	
+	}
+	.content{
+		background-color: #F4F5F7;
+		border-radius: 10rpx;
+		padding: 16rpx;
+		color: #999999;
+		font-size: 24rpx;
+		margin: 20rpx;
+	}
+	.bottom {
+		display: flex;
+		justify-content: flex-end;
+		padding: 20rpx;
+		background-color: #FFFFFF;
+		align-items: center;
+		height: 98rpx;
+		width: 100vw;
+		position: fixed;
+		bottom: 0rpx;
+	}
+	.cancel{
+		color: #3C3C3C;
+		font-size: 28rpx;
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 1rpx solid #DDDDDD;
+		text-align: center;
+		line-height: 56rpx;
+		margin-right: 40rpx;
+	}
+	.defer {
+		color: #D53533;
+		font-size: 28rpx;
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 1rpx solid #D53533;
+		text-align: center;
+		line-height: 56rpx;
+		margin-right: 40rpx;
+	}
+	
 	
-</style>
+</style>

pages/user/historyDetail.vue

@@ -113,7 +113,7 @@
 		},
 		onLoad(opt) {
 			
-			this.id = opt.id
+			this.id = opt.id
 			
 			this.getData()
 			
@@ -199,7 +199,7 @@
 
 	.top {
 		height: 190rpx;
-		background-color: #F03B3B;
+		background-color: #FF0000;
 
 	}
 
@@ -268,7 +268,7 @@
 	.shopName {
 		font-size: 30rpx;
 		font-weight: bold;
-		color: #3C3C3C;
+		color: #3C3C3C;
 		line-height: 42rpx;
 	}
 
@@ -392,7 +392,7 @@
 
 	.detailedLine {
 		display: flex;
-		padding: 20rpx 20rpx 0rpx;
+		padding: 20rpx 20rpx 0rpx;
 		justify-content: space-between;
 	}
 
@@ -409,9 +409,9 @@
 		color: #3C3C3C;
 	}
 
-	span{
-		font-size: 26rpx;
-		color: #999999;
+	span{
+		font-size: 26rpx;
+		color: #999999;
 	}
 
 	.goodscost {
@@ -701,4 +701,4 @@
 		justify-content: flex-start;
 		align-items: center;
 	}
-</style>
+</style>

pages/user/myBespeak.vue

@@ -4,7 +4,7 @@
 
 			<view class="carPlate">
 				<view class="time">{{item.BillDate}}</view>
-				<view class="mileage" v-if="item.SheetState == 0" style="color: #F03B3B">待确认</view>
+				<view class="mileage" v-if="item.SheetState == 0" style="color: #FF0000">待确认</view>
 				<view class="mileage" v-if="item.SheetState == 1" style="color: #3F90F7">预约中</view>
 				<view class="mileage" v-if="item.SheetState == 2" style="color: #00A040;">已到店</view>
 				<view class="mileage" v-if="item.SheetState == 3">已取消</view>
@@ -46,10 +46,10 @@
 		onLoad() {
 			this.page = 1
 			this.myOrderCoupon()
-		},
-		onShow() {
-			this.page = 1
-			this.myOrderCoupon()
+		},
+		onShow() {
+			this.page = 1
+			this.myOrderCoupon()
 		},
 		methods: {
 			goDetail(id) {
@@ -179,4 +179,4 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

pages/user/user.vue

@@ -187,28 +187,28 @@
 				shopData: '',
 				numList: '',
 				uid: '',
-				headImg: '',
-				location: {
-					lng: '',
-					lat: '',
+				headImg: '',
+				location: {
+					lng: '',
+					lat: '',
 				},
 			}
 		},
-		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
-			
-					that.queryMyDetail() 
-			
-				},
-				fail(err) {
-			
-				}
+		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
+			
+					that.queryMyDetail() 
+			
+				},
+				fail(err) {
+			
+				}
 			});
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			const wxOpenData = uni.getStorageSync("wxOpenData");
@@ -272,8 +272,8 @@
 					title: '加载中'
 				})
 				this.$http('openreservation/getInfo', {
-					lat: this.location.lat ? this.location.lat : '',
-					lng: this.location.lng ? this.location.lng : '',
+					lat: this.location.lat ? this.location.lat : '',
+					lng: this.location.lng ? this.location.lng : '',
 					
 				}, 'GET').then(res => {
 					uni.hideLoading();
@@ -295,15 +295,15 @@
 				})
 			},
 
-		},
-		
-		// 下拉刷新
-		onPullDownRefresh() {
-			
-			this.queryMyDetail()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			
+			this.queryMyDetail()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 	}
 </script>
@@ -476,7 +476,7 @@
 
 	.orderNum {
 		line-height: 26rpx;
-		background: #F03B3B;
+		background: #FF0000;
 		padding: 0 8rpx;
 		border-radius: 13rpx;
 		color: #FFFFFF;
@@ -592,11 +592,11 @@
 	.distance {
 		color: #999999;
 		font-size: 24rpx;
-		padding-top: 15rpx;
-		
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		padding-top: 15rpx;
+		
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
@@ -608,4 +608,4 @@
 		width: 44rpx;
 		height: 45rpx;
 	}
-</style>
+</style>