门店 优惠券 下单 联系人

pages/iPhone/addphone.vue

@@ -126,7 +126,7 @@ export default {
 		
 		},
 		add(){
-			this.$http('miniAppMyBMemberCar/addOrEditBMemberContact', {
+			this.$http('worldKeepCar/keepCarMy/addOrEditTMemberContact', {
 			  name:this.name,
 			  phone:this.phone,
 			  isDefault:this.isDefaultNum,
@@ -148,7 +148,7 @@ export default {
 			})
 		},
 		edit(){
-			this.$http('miniAppMyBMemberCar/addOrEditBMemberContact', {
+			this.$http('worldKeepCar/keepCarMy/addOrEditTMemberContact', {
 			  name:this.name,
 			  phone:this.phone,
 			  isDefault:this.isDefaultNum,

pages/iPhone/phoneList.vue

@@ -52,7 +52,7 @@ export default {
 		},
 		getList(){
 			uni.showLoading({ });
-			this.$http('miniAppMyBMemberCar/listBMemberContactPage', {
+			this.$http('worldKeepCar/keepCarMy/listTMemberContactPage', {
 			  page:this.page,
 			  limit:10,
 			 },'GET').then(res => {

pages/me/discountCard.vue

@@ -30,7 +30,7 @@
 
 					<!-- 第二快 -->
 					<view class="bottomView">
-						<view>发放门店：{{item.ShopName}}</view>
+						<view>发放门店：{{item.UsedShopName}}</view>
 						<view @click="goDiscountDetail(item)">查看详情</view>
 					</view>
 				</view>
@@ -72,27 +72,34 @@
 		methods: {
 			ckCoupon(item){
 				console.log(item);
-				uni.setStorage({
-					key: 'couponData',
-					data: item,
-					success: function () {
-						uni.navigateBack({
-							delta:1
-						})
-					}
-				}); 
+				if(this.payMoney){
+					uni.setStorage({
+						key: 'couponData',
+						data: item,
+						success: function () {
+							uni.navigateBack({
+								delta:1
+							})
+						}
+					}); 
+				}else{
+					uni.navigateTo({
+						url: 'discountDetail?couponId=' + item.CouponID,
+					})
+				}
+				
 			},
 			myOrderCoupon(){
 				uni.showLoading({
 					title: '加载中'
 				})
-				this.$http('miniApp/maintainOrder/myOrderCoupon', {
+				this.$http('worldKeepCar/maintainOrder/myOrderCoupon', {
 				  money:this.payMoney,
-				  page:this.page,
-				  limit:10,
+				  /* page:this.page,
+				  limit:10, */
 				 },'GET').then(res => {
 					uni.hideLoading();
-					var list = res.data.Items
+					var list = res.data
 					
 					// 处理 undefined和null转为空白字符串
 					list.forEach((item, index) => {
@@ -124,7 +131,7 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'miniAppMyBMemberCar/listMiniAppCouponPage',
+				let url = 'worldKeepCar/keepCarMy/listTCouponMemberPage',
 					params = {
 						page: this.page,
 						limit: 20,

pages/me/discountDetail.vue

@@ -74,9 +74,9 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'miniAppMyBMemberCar/queryMiniAppCouponDetail',
+				let url = 'worldKeepCar/keepCarMy/queryTCouponDetail',
 					params = {
-						couponId: this.couponId,
+						id: this.couponId,
 						
 					}
 				this.$http(url, params, 'GET').then(res => {

pages/module/confirmOrder.vue

@@ -194,7 +194,7 @@ export default {
 		  
 		   this.packJsonArr.push(obj)
 	   })
-	   //this.myOrderCoupon() 优惠券
+	   this.myOrderCoupon()// 优惠券
 	   console.log( this.packJsonArr)
 	},
 	onShow() {
@@ -221,16 +221,19 @@ export default {
 		myOrderCoupon(){
 			
 			var payMoney=this.goodsMoney+this.itemMoney;
-			this.$http('miniApp/maintainOrder/myOrderCoupon', {
+			//payMoney=40
+			
+			this.$http('worldKeepCar/maintainOrder/myOrderCoupon', {
 			  money:payMoney,
-			  page:1,
-			  limit:2,
+			  /* page:1,
+			  limit:2, */
 			 },'GET').then(res => {
-				this.yhTotalSize=res.data.TotalSize
+				this.yhTotalSize=res.data.length
 			})
 		},
 		gocoupon(){
 			var payMoney=this.goodsMoney+this.itemMoney;
+			//payMoney=40
 			uni.navigateTo({
 				url:'../me/discountCard?payMoney='+payMoney
 			})
@@ -244,7 +247,7 @@ export default {
 			
 			//this.payMoney=3;
 			
-			/* if(this.iphoneData){
+		 if(this.iphoneData){
 				if(this.iphoneData.name==''){
 					uni.showToast({
 					     title: '请选择联系人',
@@ -261,7 +264,7 @@ export default {
 				 });
 				return false;
 			}
-			 */
+			 
 	        /* var cardata={
 				 annualmoney: "2017",
 				 brand: "大众",
@@ -297,8 +300,8 @@ export default {
 			uni.showLoading({ });
 			this.$http('worldKeepCar/maintainOrder/submitOrder', {
 			  shopName:this.orderShop.shopName,
-			  contactName:'张杰',//this.iphoneData.name,
-			  contactPhone:'10086',//this.iphoneData.phone,
+			  contactName:this.iphoneData.name,
+			  contactPhone:this.iphoneData.phone,
 			  carID:this.maintainCarData.id,
 			  plateNumber:this.maintainCarData.plateNumber,
 			  carModel:this.maintainCarData.carModel,

pages/shop/shopDetail.vue

@@ -14,8 +14,8 @@
 					
 				</swiper>
 				 <image src="../../static/img/750500.png" mode="" class="swpImg" v-else></image>
-				 <view class="Member" @click="deleteMember" v-if="shopdata.isAttention">取消关注</view>
-				  <view class="Member" @click="Member" v-if="!shopdata.isAttention">关注</view>
+				 <!-- <view class="Member" @click="deleteMember" v-if="shopdata.isAttention">取消关注</view>
+				  <view class="Member" @click="Member" v-if="!shopdata.isAttention">关注</view> -->
 			</view>
 			<!-- 店铺主体 -->
 			<view class="shopMain">
@@ -64,7 +64,7 @@
 				</view>
 			</view>
 			<!-- 车型里程 -->
-			<view class="Cartop">
+		<!-- 	<view class="Cartop">
 				<view class="CartopLeft">
 					<image :src="maintainCarData.brandLogo" mode="" class="CarbrandLogo"  @click="carEdit"></image>
 					<view class="carName"  @click="carEdit">
@@ -81,11 +81,11 @@
 					</view>
 					
 				</view>
-			</view>
+			</view> -->
 			<!-- 车型里程 -->
 			
 			<!-- 保养 -->
-			<view class="main"  style="margin-top: 20rpx;">
+			<!-- <view class="main"  style="margin-top: 20rpx;">
 				<view class="mainLeft">
 					<scroll-view scroll-y="true" class="mainscrollView">
 						<view class="mainLeftLine" v-for="(item,index) in mealData" :class="{lineLeftActive:leftIndex==index}"
@@ -112,7 +112,7 @@
 								<view class="contTopRight" @click="listcheck(item)">
 									<image src="../../static/img/login_icon_checked.png" mode="" class="imgPrivacy" v-show="item.planItem"></image>
 									<image src="../../static/img/login_icon_uncheck.png" mode="" class="imgPrivacy" v-show="!item.planItem"></image>
-									<!-- <view class="nock" v-show="!item.check"></view> -->
+									
 								</view>
 							</view>
 							<view class="contZk">
@@ -158,10 +158,10 @@
 						
 					</scroll-view>
 				</view>
-			</view>
+			</view> -->
 			<!-- 保养 -->
 			<!-- 底部 -->
-			<view class="bottom">
+		<!-- 	<view class="bottom">
 				<view class="bottomLeft">
 					<view class="caidan" @click="caidanClick">
 						<image src="../../static/img/caidan.png" mode="" class="caidanImg"></image>
@@ -173,8 +173,8 @@
 					</view>
 				</view>
 				<view class="settlement" @click="settlement">去结算</view>
-			</view>
-			<view class="caidanTk" v-show="qingdanShow" @click="qingdanShow=false">
+			</view> -->
+			<!-- <view class="caidanTk" v-show="qingdanShow" @click="qingdanShow=false">
 				<view class="tkCont" @click.stop="">
 					<view class="caidanTkTop" >
 						<view class="tkTopTitle">清单</view>
@@ -222,7 +222,7 @@
 				</view>
 				
 				
-			</view>
+			</view> -->
 		</view>
 	
 	</view>
@@ -252,7 +252,7 @@ export default {
 		}
 	},
 	onShow() {
-	var maintainCarData2=uni.getStorageSync("maintainCarData");
+/* 	var maintainCarData2=uni.getStorageSync("maintainCarData");
 	if(this.maintainCarData.id!=maintainCarData2.id){
 		this.maintainCarData=maintainCarData2;
 		if(this.maintainCarData.milage==0){
@@ -271,7 +271,7 @@ export default {
 		this.mealData[this.leftIndex].listPackage[this.replaceIndex1].listGoodsAll[this.replaceIndex2]=this.unique(this.mealData[this.leftIndex].listPackage[this.replaceIndex1].listGoodsAll[this.replaceIndex2])
 		
 		this.$forceUpdate()
-	}
+	} */
 		
 	},
 	onLoad(opt) {
@@ -280,8 +280,8 @@ export default {
 	   this.location=uni.getStorageSync("location");
 	   this.maintainCarData=uni.getStorageSync("maintainCarData");
 	   this.getData();
-	   this.addBMemberShopFootprint();
-	   this.getmainData()
+	  /* this.addBMemberShopFootprint();
+	   this.getmainData() */
 	},
 	methods: {
 		goGoods(item){
@@ -352,7 +352,7 @@ export default {
         getData(){
 			uni.showLoading({ });
 			this.shopImg=[];
-			this.$http('miniAppShopInfoController/queryShopDetail', {
+			this.$http('worldKeepCar/worldHome/queryKeepCarShopDetail', {
 			  id:this.shopId,
 			  lat:this.location.lat,
 			  lng:this.location.lng,
@@ -613,7 +613,7 @@ export default {
 	}
 	.shopMain{
 		width: 702rpx;
-		height: 368rpx;
+		/* height: 368rpx; */
 		background: #FFFFFF;
 		border-radius: 10rpx;
 		margin-left: 24rpx;

pages/shop/shopList.vue

@@ -12,16 +12,16 @@
 				<view class="screen">
 					<view class="screenLine">
 						<view class="screenLineTxt" @click="showCity=true,comprehensiveShow=false,levelShow=false">{{cityname}}</view>
-						<!-- <image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!showCity" class="screenJt"></image>
-						<image src="../../static/img/icon_arrow_cheng.png" mode="" v-show="showCity" class="screenJt"></image> -->
+						<image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!showCity" class="screenJt"></image>
+						
 					</view>
 					
 					<view class="screenLine" @click="juli" :class="{colorCS:comprehensiveShow}">
 						<view class="screenLineTxt" v-if="comprehensive==0">综合排序</view>
 						<view class="screenLineTxt"  v-if="comprehensive==1">距离最近</view>
 						<view class="screenLineTxt"  v-if="comprehensive==2">评分最高</view>
-						<!-- <image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!comprehensiveShow" class="screenJt"></image>
-						<image src="../../static/img/icon_arrow_cheng.png" mode="" v-show="comprehensiveShow" class="screenJt"></image> -->
+						<image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!comprehensiveShow" class="screenJt"></image>
+						
 					</view>
 					
 					<!-- 综合排序 -->
@@ -40,30 +40,36 @@
 				</view>
 			</view>
 			<view class="shopLineBox">
-				<view class="shopBox shopBox2" v-for="(item,index) in queryShopList" @click="goDetail(item)">
-					    <view class="">
-						 <image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
-						<!-- <image src="../../static/img/noimg.png" mode="" class="shopImg" v-else></image> -->
-						</view>
-						<view class="shopCont">
-							<view class="shopName">{{item.shopName}}</view>
-							<view class="flex shopRight">
-								<view>
-									<span class="span1" v-if="item.shopScore">{{item.shopScore}}</span>
-									<span class="span2" v-if="item.shopScore">分</span>
-									<span class="span2" v-if="!item.shopScore">暂无评分</span>
-									<span class="span3">服务次数 {{item.sheetSum}} </span>
-								</view>
-								<view class="shopBq" v-show="item.levelName">{{item.levelName}}</view>
-							</view>
-							<view class="shopTime"><span v-show="item.startTime">{{item.startTime}}</span> - <span v-show="item.endTime">{{item.endTime}}</span> </view>
-							<view class="flex addressBox">
-								<view class="address" > <span v-show="item.address"> {{item.address}}</span></view>
-								<view class="shopKm" v-show="item.distance&&item.distance!= '0.00'">{{item.distance}}km</view>
-							</view>
-						</view>
+				
+					  <view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
+					  	<view class="shoplineLeft">
+					  		<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
+					  		<image src="../../static/img/noimg.png" mode="" class="shopImg" v-else></image>
+					  	</view>
+					  	<view class="shopright">
+					  		<view class="shopTop">
+					  			<view class="shopName">{{item.shopName}}</view>
+					  			<!-- <image src="../../static/img/shopcall.png" mode="" class="shopCallImg"></image> -->
+					  		</view>
+					  		<view class="shopScore">
+					  			<span class="shopScore1" v-if="item.shopScore">{{item.shopScore}}</span>
+					  			<span class="shopScore2" v-if="item.shopScore">分</span>
+					  			<span class="shopScore2" v-if="!item.shopScore">暂无评分</span>
+					  			<span class="shopScore3">服务次数 {{item.sheetSum}}</span>
+					  		</view>
+					  		<view class="shopTime"><span v-if="item.startTime">{{item.startTime}}</span> - <span v-if="item.endTime">{{item.endTime}}</span> </view>
+					  	    <view class="shopBottom">
+					  			<view class="shopBottomLeft">
+					  				<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span>
+					  				<span class="shopaddress">{{item.address}}</span>
+					  			</view>
+					  		<!-- 	<view class="Btn" @click="ckshop(item)">确定</view> -->
+					  		</view>
+					  	
+					  	</view>
+					  </view>
 					
-				</view>
+				
 				<view v-if="queryShopList==''" class="nodataBox">
 					<image src="../../static/img/nodata.png" mode="widthFix" class="nodataImg"></image>
 					<view class="noTxt">暂无数据</view>
@@ -147,7 +153,7 @@ export default {
 		},
 		getqueryShopList(){
 			uni.showLoading({ });
-			this.$http('miniAppShopInfoController/queryShopList', {
+			this.$http('worldKeepCar/worldHome/getWorldShopInfoList', {
 			   shopName:this.shopName,
 			  lat:this.location.lat,
 			  lng:this.location.lng,
@@ -198,7 +204,7 @@ export default {
 		},
         goDetail(item){
 			uni.navigateTo({
-				url:'../Shop/shopDetail?id='+item.shopId
+				url:'../shop/shopDetail?id='+item.shopId
 			})
 		}
 	}
@@ -427,4 +433,83 @@ export default {
 	.colorCS{
 		color: #FF4F00;
 	}
+	.shopbox{
+		padding:0 16rpx;
+	}
+	.shopline{
+		padding: 20rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+		display: flex;
+	}
+	.shopImg{
+		width: 146rpx;
+		height: 146rpx;
+		border-radius: 10rpx;
+	}
+	.shopCallImg{
+		width: 38rpx;
+		height: 46rpx;
+	}
+	.shopTop{
+		display: flex;
+		justify-content: space-between;
+		width: 510rpx;
+	}
+	.shopright{
+		padding-left: 20rpx;
+	}
+	.shopName{
+		font-size: 26rpx;
+		color: #333333;
+		line-height: 37rpx;
+		width:450rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.shopScore1{
+		font-size: 36rpx;
+		color: #FF4F00;
+	}
+	.shopScore2{
+		font-size: 22rpx;
+		color: #FF4F00;
+	}
+	.shopScore3{
+		font-size: 22rpx;
+		color: #333333;
+		padding-left: 20rpx;
+	}
+	.shopTime{
+		font-size: 22rpx;
+		color: #666666;
+		line-height: 30rpx;
+		padding-top: 10rpx;
+	}
+	.Btn{
+		width: 104rpx;
+		height: 56rpx;
+		background: #FF2400 linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		border-radius: 6rpx;
+		font-size: 26rpx;
+		text-align: center;
+		color: #FFFFFF;
+		line-height: 56rpx;
+	}
+	.shopBottom{
+		display: flex;
+		
+	}
+	.shopBottomLeft{
+		width: 500rpx;
+		font-size: 22rpx;
+		color: #666666;
+		line-height: 30rpx;
+		padding-top: 10rpx;
+	}
+	.shopaddress{
+		padding-left: 10rpx;
+	}
 </style>