1-3

pages.json

@@ -621,7 +621,8 @@
 					{
 						"path": "maintainItem",
 						"style": {
-							"navigationBarTitleText": "商品详情"
+							"navigationStyle": "custom"
+							//"enablePullDownRefresh": true
 						}
 					},
 					{

pages/activity/jkDetail.vue

@@ -1223,10 +1223,11 @@ color: #FFFFFF;font-size: 26rpx;
 }
 .separate{
 	width: 284rpx;margin-left: 30rpx;
-	height: 74rpx;
-	background: #ffe1f1;
+	height: 70rpx;
+	/* background: #ffe1f1; */
 	border-radius: 37rpx;
 	text-align: center;color:#EC0F0A;
+	border: 2rpx solid #EC0F0A;
 }
 .separate .separateTop{
 	color:#EC0F0A;
@@ -1331,8 +1332,8 @@ color: #FFFFFF;font-size: 26rpx;
 	}
 	.bmBtn{
 		width: 690rpx;
-		height: 74rpx;
-		background: #EC0F0A;
+		height: 70rpx;
+		 background: #EC0F0A; 
 		border-radius: 37rpx;
 		text-align: center;
 		line-height: 74rpx;
@@ -1341,6 +1342,7 @@ color: #FFFFFF;font-size: 26rpx;
 		margin-top: 23rpx;
 		margin-left: 30rpx;
 		margin-top: 20rpx;
+		/* border: 2rpx solid #EC0F0A; */
 	}
 	.bmshopjt{
 		width: 12rpx;

pages/index/index.vue

@@ -356,7 +356,7 @@
 		
 		<view style="height: 60rpx;"></view>
 		<!-- 手机号授权 -->
-		<view class="authorizBox" v-if="authorizShow" @click="authorizShowHide">
+		<view class="authorizBox"  v-if="authorizShow" @click="authorizShowHide"><!--   -->
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
@@ -1850,6 +1850,22 @@ color: #EC0F0A;margin-right: 10rpx; border-radius: 6rpx;
 		
 		margin-left:40rpx;
 	}
+	.sqRefuse{
+		width: 210rpx;
+		height: 66rpx;
+		border: 1px solid #eaeaea;
+		line-height: 66rpx;
+		border-radius: 36rpx;
+		text-align: center;
+		font-size:30rpx;
+		margin-right:40rpx;
+		color: #999999;
+	}
+	.sqLine{
+			margin-top: 62rpx;
+		display: flex;
+		justify-content: space-between;
+	}
 	.qrBox{
 		position: fixed;
 		width: 100vw;

pages/index/paintSure.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
-		<view class="topBox"></view>
-		<view class="yuanhu"></view>
+		<view class="topBox" :style="{background:'#'+themeColor}"></view>
+		<view class="yuanhu" :style="{background:'#'+themeColor}"></view>
 		<view class="carBox">
 			<view class="left">
 				<image :src="carInfo.brandLogo" mode="widthFix" class="brandLogo" v-if="carInfo.brandLogo">

pages/shop/confirm.vue

@@ -1,7 +1,7 @@
 <template>
 <view class="box">
-	<view class="topBox" :style="{background:'#'+themeColor}"></view>
-	<view class="yuanhu" :style="{background:'#'+themeColor}"></view>
+	<view class="topBox" ></view>
+	<view class="yuanhu" ></view>
 	<view class="goodsBox">
 		<view class="goodsBoxLeft">
 			<image :src="goodsInfo.ImgList[0].url" mode="" v-if="goodsInfo.ImgList.length>0" class="hotGoodsLineImg"></image>

pages/subPack/maintain.vue

@@ -13,7 +13,8 @@
 		 <view class="ibRight">
 			 <image src="../../static/img2/gl.png" mode="" class="glIcon"></image>
 			 <view class="glInput" v-if="milage">{{milage}}km</view>
-			 <input type="text" v-else placeholder="暂无填写" class="glInput"/>
+			 <view class="glInput" v-else>暂无填写</view>
+			<!-- <input type="text" v-else placeholder="暂无填写" class="glInput"/> -->
 			 <image src="../../static/img2/xia.png" mode="" class="xiaIcon"></image>
 		 </view>
 	 </view>
@@ -134,43 +135,45 @@
  <view class="tkBox" v-if="tkShow">
 	 <view class="tkCont">
 		 <view class="tkTop">
-			 
-			 <image class="tkImg" v-if="itemDefault.mainImgUrl" :src="itemDefault.mainImgUrl" mode=""></image>
-			 <image class="tkImg" v-else src="../../static/timg/noimg.png" mode=""></image>
-			 <view class="tkNameBox">
-				 <view class="tkName">{{itemDefault.goodsname}}</view>
-				 <view class="goodsPrice">
-				 	<view class="goodsPrice2">￥</view>
-				 	<view class="goodsPrice3">{{itemDefault.money}}</view>
-				 	<!-- <view class="goodsPrice4" >原价：¥{{itemDefault.crossedPrice}}</view> -->
-				 </view>
-				 
+			 <view class="tkDelBox" @click="clearAll">
+			 	<image src="../../static/img2/shanchu.png" mode="" class="tkDelIcon"></image>
+			 	<view class="tkDelTxt">清空</view>
 			 </view>
+			 <view class="tkTitle">清单</view>
+			
 			 <image @click="qdTkclose" class="chahao" src="../../static/img2/chahao.png" mode=""></image>
 		 </view>
-		 <view class="buyLine">
-		 		 <view class="buyTitle">商品规格</view>
-		 		 <view class="buyData">
-		 				 <view class="goodsGuige activeGuige" style="margin-right: 24rpx;">{{itemDefault.title}}</view>
-		 				<!-- <view class="goodsGuige">保养套餐卡</view> -->
-		 			 </view>
-		 </view>
-		 <view class="buyLine">
-		 		 <view class="buyTitle">商品数量</view>
-		 		 <view class="buyData">
-		 				 <view class="numJsbox">
-		 				 	<view class="numJj" @click="calculation(1)">-</view>
-		 				 	<view class="goodsnum">
-		 				 	 <input type="number" value="" v-model="goodsnum" class="goodsnumInput"/>
-		 				 	</view>
-		 				 	<view class="numJj" @click="calculation(2)">+</view>
-		 				 </view>
-		 			 </view>
-		 </view>
-		 
-		 <view class="tkBottom">
-			 <view class="tkBottomBtn commonBtn" @click="goSubmit">立即购买</view>
-		 </view>
+	<view class="tkCBox">
+	<view class="tkLine"  v-if="itemDefault">
+		<view class="tkLineTop">
+			<view class="tklineTopTitle">套餐卡</view>
+			<view class="tkDelBox" @click="delitemDefault">
+				<image src="../../static/img2/shanchu.png" mode="" class="tkDelIcon"></image>
+				<view class="tkDelTxt">删除</view>
+			</view>
+		</view>
+		
+			<view class="tklineCont">
+				<image class="tkImg" v-if="itemDefault.mainImgUrl" :src="itemDefault.mainImgUrl" mode=""></image>
+				<image class="tkImg" v-else src="../../static/timg/noimg.png" mode=""></image>
+				<view class="tkNameBox">
+					 <view class="tkName">{{itemDefault.goodsname}}</view>
+					 <view class="goodsPrice">
+						 <view class="goodsPrice4" >{{itemDefault.money}}</view>
+						<view class="goodsPrice2">￥</view>
+						<view class="goodsPrice3">{{itemDefault.price}}</view>
+						<view class="tkcount">{{itemDefault.count}}次</view>
+						<!-- <view class="goodsPrice4" >原价：¥{{itemDefault.crossedPrice}}</view> -->
+					 </view>
+								 
+				</view>
+			</view>
+		
+		
+	</view>
+	</view>
+		
+		
 		 
 	 </view>
  </view>
@@ -256,6 +259,22 @@
 			qdTkclose(){
 			  this.tkShow=false	
 			},
+			clearAll(){
+				this.list.forEach(item=>{
+					item.packageItems.forEach(v=>{
+						v.select=false
+					})
+				})
+				 this.itemDefault=''
+			},
+			delitemDefault(){
+				this.list.forEach(item=>{
+					item.packageItems.forEach(v=>{
+						v.select=false
+					})
+				})
+				 this.itemDefault=''
+			},
 			selectItem(v,item){
 				this.list.forEach(item=>{
 					item.packageItems.forEach(v=>{
@@ -328,6 +347,7 @@
 						if(d.isDefault==1){
 							d.select=true
 							this.itemDefault=d
+							this.itemDefault.goodsname=this.lineItem.title
 							this.totalPrice=d.money
 						}
 					})
@@ -365,8 +385,8 @@
 }
 .tkCont{
 	width: 750rpx;
-	height: 611rpx;
-	background: #FFFFFF;
+	height: 60vh;
+	background: #EFEFEF;
 	border-radius: 28rpx 28rpx 0rpx 0rpx;
 	position: absolute;
 	left: 0;bottom: 0;
@@ -572,6 +592,7 @@ color: #666666;padding-left: 25rpx;
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
 	background: #FFFFFF;
+	z-index: 111;
 }
 .kaBox{
 	height: 70rpx;
@@ -694,19 +715,23 @@ color: #A26D4F;
 	display: flex;padding: 40rpx 24rpx;
 }
 .tkImg{
-	width: 160rpx;
-	height: 160rpx;border-radius: 13rpx;
+width: 120rpx;
+height: 120rpx;
+background: #DDDDDD;
+border-radius: 6rpx;
 }
 .tkName{
-	font-size: 30rpx;
+	font-weight: 400;
+	font-size: 24rpx;
 	color: #222222;
-	line-height: 42rpx;
+	line-height: 33rpx;
 }
 .tkNameBox{
 	padding-left: 24rpx;width: 500rpx;
 }
 .chahao{
 	width: 22rpx;height: 22rpx;padding-top: 10rpx;
+	padding-left: 80rpx;
 }
 .buyLine{
 	display: flex;justify-content: space-between;
@@ -819,4 +844,61 @@ color: #666E80;
 	border: 1px solid #FE0200;
 	background: #FFF7F7;
 }
+.tkLine{
+	background: #ffffff;
+	padding: 12rpx 22rpx;
+	padding-bottom: 30rpx;
+}
+.tkDelIcon{
+	width: 25rpx;height: 27rpx;
+	margin: 6rpx;
+}
+.tkTitle{
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #222222;
+	line-height: 42rpx;
+}
+.tkTop{
+	justify-content: space-between;
+}
+.tkDelBox{
+	display: flex;
+}
+.tkTop .tkDelTxt{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #222222;
+	line-height: 42rpx;
+	padding-left: 8rpx;
+}
+.tkCBox{
+	padding: 0 22rpx;
+}
+.tkLineTop{
+	display: flex;justify-content: space-between;
+}
+.tkCBox .tkDelTxt{
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #222222;
+	line-height: 42rpx;
+	padding-left: 8rpx;
+}
+.tklineCont{
+	display: flex;
+	padding-top: 24rpx;
+	padding-left: 20rpx;
+}
+.tkcount{
+	font-weight: 400;
+	font-size: 22rpx;
+	color: #222222;
+	padding-left: 22rpx;
+	padding-top: 14rpx;
+}
+.tkCBox .goodsPrice{
+	padding-top: 36rpx;
+    justify-content: flex-end;
+}
 </style>

pages/subPack/maintainItem.vue

@@ -1,11 +1,11 @@
 <template>
 <view class="box">
-
+<homenav :iStatusBarHeight="iStatusBarHeight" :title="'商品详情'"></homenav>
  <view class="spwBox">
  	<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
  		<swiper-item v-for="(item,index) in detail.openMaintainImgUrls">
  			<view class="swiper-item">
- 				<img mode="aspectFit" :src="item.url" alt="" class="swiper-itemImg" >
+ 				<img mode="aspectFit" :src="item" alt="" class="swiper-itemImg" >
  				
  			</view>
  		</swiper-item>
@@ -19,13 +19,17 @@
  			<view class="goodsPrice3" >{{itemDefault.money}}</view>
  			<view class="goodsPrice4"  v-if="itemDefault.showCrossedPrice==1">原价：¥{{itemDefault.crossedPrice}}</view>
  		</view>
- 		<view class="shareBox" >
+		<button open-type="share" class="shareBox" >
 			<view class="shareTxt">分享</view>
 			<image class="shareIcon" src="../../static/timg/share.png" mode=""></image>
-		</view>
+		</button>
+ 	<!-- 	<view class="shareBox" >
+			
+			
+		</view> -->
  	</view>
  	<view class="goodsName">{{detail.title}}</view>
- 	<view class="goodsMSBox" >
+ 	<view class="goodsMSBox" v-if="detail.content">
 		<!-- <view class="goodsMs" v-if="detail.showOilType">机油类型|{{detail.showOilType}}</view>
 		<view class="goodsMs" v-if="detail.showOilLevel">机油等级|{{detail.showOilLevel}}</view>
 		<view class="goodsMs" v-if="detail.showFit">适配粘度|{{detail.showFit}}</view> -->
@@ -132,7 +136,7 @@
  <view class="bottomTianc"></view>
   
   <view class="bottom">
- 	 <view class="bleft">
+ 	 <view class="bleft" @click="makePhoneCall(showSetting.tel)">
  		<image class="kefuIcon" src="../../static/img2/kefu.png" mode=""></image>
  		<view style="text-align: center;font-size: 20rpx;color: #110B01;">客服</view>
  	</view>
@@ -145,7 +149,7 @@
  <view class="tkBox" v-if="tkShow" @click="closeTk">
  	 <view class="tkCont" @click.stop="">
  		 <view class="tkTop">
-			 <image class="tkImg" v-if="detail.mainImgUrl" :src="detail.mainImgUrl" mode="" ></image>
+			 <image class="tkImg" v-if="itemDefault.mainImgUrl" :src="itemDefault.mainImgUrl" mode="" ></image>
  			 <image class="tkImg" v-else src="../../static/timg/noimg.png" mode="" ></image>
  			 <view class="tkNameBox">
  				 <view class="tkName">{{detail.title}}</view>
@@ -209,9 +213,10 @@
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		
 		data() {
@@ -229,9 +234,12 @@
 				isRecommend:'',
 				tkShow:false,
 				keyongShow:false,
+				showSetting:'',
+				 iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.ext = this.$common.getExtStoreId();
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.maintainId=opt.maintainId
@@ -241,10 +249,12 @@
 			//console.log("this.isRecommend=="+this.isRecommend)
 			if(this.userInfo){
 				this.getdetail()
+				this.getInfo()
 			}else{
 				this.$common.automaticlogin().then(val => {
 					this.userInfo=this.$store.state.userInfo;
 					this.getdetail()
+					this.getInfo()
 				})
 			}
 			
@@ -259,6 +269,20 @@
 			
 		},
 		methods: {
+			makePhoneCall(tel){
+				uni.makePhoneCall({
+				  phoneNumber: tel,
+				});
+			},
+			getInfo(){
+				this.$http('openreservation/getInfo', {
+					lat: '',
+					lng: '',
+				
+				}, 'GET').then(res => {
+					 this.showSetting=res.data.showSetting
+				})
+			},
 			ckCar(){
 				uni.navigateTo({
 					url:'../user/addCar/cailist?type=5'
@@ -266,12 +290,13 @@
 			},
 			goodsGuige(item){
 				this.itemDefault=item
+				this.itemDefault.mainImgUrl=this.detail.openMaintainImgUrls[0]
 			},
 			goSubmit(){
 				this.itemDefault.goodsnum=this.goodsnum
 				this.itemDefault.goodsname=this.detail.title
 				this.itemDefault.itemId=this.detail.id
-				this.itemDefault.mainImgUrl=this.detail.mainImgUrl
+				this.itemDefault.mainImgUrl=this.detail.openMaintainImgUrls[0]
 				uni.setStorage({
 					key: 'itemDefault',
 					data: this.itemDefault,
@@ -334,6 +359,7 @@
 					this.detail.packageItems.forEach(item=>{
 						if(item.isDefault==1){
 							 this.itemDefault=item
+							 this.itemDefault.mainImgUrl=this.detail.openMaintainImgUrls[0]
 						}
 						if(item.content){
 							item.content=item.content.replace(/\<img/gi, '<img style="max-width:100% !important;height:auto" ');
@@ -350,7 +376,30 @@
 			
 			
 			
-		}
+		},
+		onShareAppMessage(res) {
+			var img='';
+			if(this.detail.openMaintainImgUrls.length>0){
+				img=this.detail.openMaintainImgUrls[0]
+			}
+			return {
+				title: this.detail.title,
+				imageUrl:img,
+				path: 'pages/subPack/maintainItem?maintainId=' + this.maintainId+'&isRecommend='+this.isRecommend+'&shareId='+this.userInfo.openId,
+				success(res){
+					uni.showToast({
+						title:'分享成功'
+					})
+				},
+				fail(res){
+					uni.showToast({
+						title:'分享失败',
+						icon:'none',
+						duration: 3000
+					})
+				}
+			}
+		},
 	}
 </script>
 
@@ -488,7 +537,7 @@ color: #666E80;
 	display: inline-block;
 }
 .activeGuige{
-	width: 146rpx;
+/* 	width: 146rpx; */
 	height: 46rpx;line-height: 46rpx;
 	border: 2rpx solid #FF0035;
 	border-radius: 5rpx;
@@ -757,7 +806,7 @@ color: #666E80;
 }
 
 .activeGuige{
-	width: 146rpx;
+	/* width: 146rpx; */
 	height: 46rpx;line-height: 46rpx;
 	border: 2rpx solid #FF0035;
 	border-radius: 5rpx;
@@ -827,4 +876,29 @@ color: #666E80;
 	width: 12rpx;height: 24rpx;
 	margin-top: 6rpx;margin-left: 10rpx;
 }
+button::after{
+ 	border: none;
+}
+button{
+	position: relative;
+	display: block;
+	margin-left: 0;
+	margin-right: 0;
+	padding-left: 0px;
+	padding-right: 0px;
+	box-sizing: border-box;
+	// font-size: 18px;
+	text-align: center;
+	text-decoration: none;
+	// line-height: 1;
+	line-height: 1.35;
+	// border-radius: 5px;
+	-webkit-tap-highlight-color: transparent;
+	overflow: hidden;
+	color: #000000;
+	background-color: #fff;
+	
+	height: 100%;
+	}
+
 </style>

pages/subPack/maintainSubmit.vue

@@ -177,7 +177,7 @@
 							 duration: 2000
 						 });
 						 uni.navigateTo({
-						 	url:'paySuccess?type=1'
+						 	url:'paySuccess?type=1&orderType=1'
 						 })
 						
 						
@@ -190,7 +190,7 @@
 						 duration: 2000
 				      });
 					  uni.navigateTo({
-					  	url:'paySuccess?type=2'
+					  	url:'paySuccess?type=2&orderType=1'
 					  })
 					  }
 					 

pages/subPack/paySuccess.vue

@@ -1,11 +1,15 @@
 <template>
 <view class="box">
    <view class="imgBox">
-	   <image class="duihao" src="../../static/img/icon_selectY.png" mode=""></image>
+	   <image class="duihao" src="http://dmsphoto.66km.com.cn/thFiles/3488A63B-237D-4E73-96BC-C51D79AE01A3.png" mode=""></image>
    </view>
   <!-- <view class="txt" v-if="type==1">下单成功</view>
    <view class="txt" v-if="type==2">付款失败</view> -->
    <view class="txt" >下单成功</view>
+   <view class="txt2">赶快查看商品详细订单</view>
+   <view class="seeBox">
+	   <view class="seeBtn" @click="seeFn">查看订单</view>
+   </view>
    <view class="goBack" @click="goBack">返回首页</view>
  
 </view>
@@ -20,10 +24,12 @@
 		data() {
 			return {
 				type:'',
+				orderType:'',
 			}
 		},
 		onLoad(opt) {
 			this.type=opt.type
+			this.orderType=opt.orderType
 			/* if(this.type==2){
 				uni.setNavigationBarTitle({
 				    title: '下单失败' //页面标题为"新标题"
@@ -35,6 +41,14 @@
 			
 		},
 		methods: {
+			seeFn(){
+			
+				if(this.orderType==1){
+					uni.navigateTo({
+						url:'../user/myOrder/myOrder'
+					})
+				}
+			},
 			goBack(){
 				uni.switchTab({
 					url:'/pages/index/index'
@@ -76,4 +90,25 @@
 	text-align: center;
 	padding-top: 30rpx;
 }
+.txt2{
+	font-weight: 400;
+	font-size: 22rpx;
+	color: #666E80;
+	line-height: 30rpx;
+	text-align: center;
+	padding-top: 20rpx;
+}
+.seeBtn{
+	width: 282rpx;
+	height: 70rpx;
+	background: #FCD903;
+	border-radius: 43rpx;
+	text-align: center;
+	line-height: 70rpx;
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #110B01;
+	margin: 0 auto;
+	margin-top: 44rpx;
+}
 </style>

pages/user/bespeakDetail.vue

@@ -801,7 +801,7 @@
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #DDDDDD;
+		border: 2rpx solid #DDDDDD;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -812,7 +812,7 @@
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #EC0F0A;
+		border: 2rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;

pages/user/myOrder/activityOrderDetail.vue

@@ -1310,7 +1310,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		justify-content: flex-end;
 		padding: 20rpx;
 		background-color: #FFFFFF;
-		align-items: center;
+	/* 	align-items: center; */
 		height: 98rpx;
 		width: 100vw;
 		position: fixed;
@@ -1325,7 +1325,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #DDDDDD;
+		border: 2rpx solid #DDDDDD;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -1337,7 +1337,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #EC0F0A;
+		border: 2rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;

pages/user/myOrder/mallOrderDetail.vue

@@ -1041,7 +1041,7 @@
 		justify-content: flex-end;
 		padding: 20rpx;
 		background-color: #FFFFFF;
-		align-items: center;
+	/* 	align-items: center; */
 		height: 98rpx;
 		width: 100vw;
 		position: fixed;
@@ -1056,7 +1056,7 @@
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #DDDDDD;
+		border: 2rpx solid #DDDDDD;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -1068,7 +1068,7 @@
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #EC0F0A;
+		border: 2rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;

pages/user/myOrder/myOrder.vue

@@ -26,10 +26,10 @@
 					
                     <view class="itemSheetState redColor" v-if="item.SheetState==5">待成团</view>
 					<view class="itemSheetState redColor" v-if="item.SheetState==1">待付款</view>
-					<view v-if="item.SheetType==7">
+					<!-- <view v-if="item.SheetType==7">
 						<view class="itemSheetState orangeColor" v-if="item.SheetState==2">已完成</view>
-					</view>
-					<view class="itemSheetState orangeColor" v-if="item.SheetState==2&&item.SheetType!=7">待服务</view>
+					</view> -->
+					<view class="itemSheetState orangeColor" v-if="item.SheetState==2">待服务</view>
 					<view class="itemSheetState greenColor" v-if="item.SheetState==3">已完成</view>
 					<view class="itemSheetState" v-if="item.SheetState==4">已取消</view>
                    

pages/user/myOrder/paintOrderDetail.vue

@@ -1027,7 +1027,7 @@
 		justify-content: flex-end;
 		padding: 20rpx;
 		background-color: #FFFFFF;
-		align-items: center;
+		/* align-items: center; */
 		height: 98rpx;
 		width: 100vw;
 		position: fixed;
@@ -1042,7 +1042,7 @@
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #DDDDDD;
+		border: 2rpx solid #DDDDDD;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -1054,7 +1054,7 @@
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #EC0F0A;
+		border: 2rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;

utils/request.js

@@ -9,7 +9,7 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 //const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.1.9:20187/'
+//const baseUrl='http://192.168.1.11:20187/'
 const baseUrl='http://api.dms.66km.com.cn/'
 //const baseUrl='http://192.168.0.10:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'