Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  1.活动列表

pages/activity/activity.vue

@@ -4,10 +4,11 @@
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item.id)">
 			<image :src="item.img" mode="" class="itemImg"></image>
 			<view class="timeBox">
-				<image src="../../static/img/bg_huangse.png" mode="" class="state"></image>
-				<view class="time">{{item.CreateTime}}</view>
+				<image v-if="item.state==2" src="../../static/img/bg_huangse.png" mode="" class="state"></image>
+				<image v-if="item.state==1" src="../../static/img/bg_hongse.png" mode="" class="state"></image>
+				<view class="time" v-if="item.startTime">{{item.startTime.slice(0,10)}}-{{item.endTime.slice(0,10)}}</view>
 			</view>
-			<view class="name">{{item.PlateNumber}}</view>
+			<view class="name">{{item.activityName}}</view>
 
 		</view>
 
@@ -46,16 +47,18 @@
 				code: '',
 				wxOpenData: '',
 				page: 1,
-				itemData: [1,2,3,4],
-				noMoreShow: false,
+				itemData: [],
+				noMoreShow: false,
+				ext:'',
 			}
 		},
 		onLoad() {
 			this.userInfo = this.$store.state.userInfo;
 			this.wxOpenData = this.$store.state.wxOpenData
-
+			
+			this.ext=this.$common.getExtStoreId();
 			this.page = 1
-			// this.myOrderCoupon()
+			this.myOrderCoupon()
 		},
 
 		methods: {
@@ -68,10 +71,11 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				this.$http('opencheckSheet/getTestList', {
+				this.$http('openHome/queryActivityList', {
 
 					// page: this.page,
-					// limit: 10,
+					// limit: 10,
+					 unionId:this.ext.unionId
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					// var list = res.data.Items
@@ -203,12 +207,13 @@
 
 	.itemImg {
 		height: 280rpx;
-
+		width: 702rpx;
+border-radius: 10rpx 10rpx 0px 0px;
 	}
 
 	.timeBox {
 		display: flex;
-		margin-top: -53rpx;
+		margin-top: -61rpx;
 		align-items: flex-end;
 	}
 	.state{

pages/index/paint.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="box">
-		<view class="top">
+		<view class="top" @click="goCarlist">
 			<view class="left">
 				<image :src="carInfo.brandLogo" mode="widthFix" class="brandLogo" v-if="carInfo.brandLogo">
 					<img src="../../static/timg/nocar.png" alt="" class="brandLogo" v-else>
@@ -8,7 +8,7 @@
 					<view class="car" v-else>暂无</view>
 				</image>
 			</view>
-			<image @click="goCarlist" src="../../static/img/big_rightArrow.png" mode=""
+			<image src="../../static/img/big_rightArrow.png" mode=""
 				style="width: 30rpx;height: 30rpx;"></image>
 		</view>
 
@@ -24,15 +24,15 @@
 			<view class="mainRight">
 				<view class="rightTop">{{itemList[leftIndex].name}}</view>
 				<view class="mainRightLine" v-for="(item2,index) in itemList[leftIndex].list" :key="index">
-					<view class="itemTop">
+					<view class="itemTop" @click="changeState(item2)">
 						<view class="itemName">{{item2.ItemName}}</view>
 
-						<span class="rightState" v-if="item2.open==false" @click="changeState(item2)">展开<image
+						<span class="rightState" v-if="item2.open==false">展开<image
 								src="../../static/img/icon_arrow_down.png" mode=""
 								style="width: 20rpx;height: 11rpx; padding: 5rpx 8rpx;"></image>
 						</span>
 
-						<span class="rightState" v-else @click="changeState(item2)">收起<image
+						<span class="rightState" v-else>收起<image
 								src="../../static/img/icon_arrow_up.png" mode=""
 								style="width: 20rpx;height: 11rpx; padding: 5rpx 8rpx;"></image>
 						</span>
@@ -48,8 +48,13 @@
 						</view>
 						<view class="type marginLeft" :class="{orangeLine:item2.type==2}" @click="select2(item2)">
 							<view class="typeName" :class="{orangeColor:item2.type==2}">钣金喷漆</view>
-							<view class="money"><span
-									class="renminbi">￥</span>{{item2.BPSalePrice?item2.BPSalePrice:'0'}}</view>
+							<view class="priceBox">
+								<view class="money"><span
+										class="renminbi">￥</span>{{item2.BPSalePrice?item2.BPSalePrice:'0'}}</view>
+								<view class="money old"><span
+										class="renminbi">￥</span>{{item2.BPSalePrice?item2.BPSalePrice:'0'}}</view>
+							</view>
+									
 						</view>
 					</view>
 
@@ -341,18 +346,11 @@
 		background: #F4F5F7;
 	}
 
-	.mainLeftLine {
-		color: #3C3C3C;
-		padding: 30rpx 20rpx;
-		font-size: 26rpx;
-		text-align: center;
-		position: relative;
-		
-	}
+	
 
 	.leftTitle {
 		color: #333333;
-		font-weight: bold;
+		
 		font-size: 26rpx;
 	}
 
@@ -371,7 +369,8 @@
 	}
 
 	.lineLeftActive {
-		background: #FFFFFF;
+		background: #FFFFFF;
+		font-weight: bold;
 	}
 
 	.mainRight {
@@ -406,13 +405,13 @@
 
 	.itemName {
 		font-size: 28rpx;
-		font-weight: bold;
+		
 		color: #333333;
 	}
 
 	.rightState {
 		font-size: 24rpx;
-		color: #6666666;
+		color: #666666;
 
 	}
 
@@ -458,14 +457,22 @@
 		font-size: 22rpx;
 
 	}
-
+	.priceBox{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 	.money {
 		height: 76rpx;
 		line-height: 76rpx;
 		font-size: 32rpx;
 		color: #FF0000;
 	}
-
+	.old {
+		color: #999999;
+	
+		text-decoration: line-through;
+	}
 
 	.main {
 		display: flex;
@@ -500,12 +507,14 @@
 		width: 604rpx;
 	}
 
-	.mainLeftLine {
-		color: #3C3C3C;
-		padding: 30rpx 20rpx;
-		font-size: 24rpx;
-		text-align: center;
-		position: relative;
+	
+	.mainLeftLine {
+		color: #3C3C3C;
+		padding: 30rpx 20rpx;
+		font-size: 26rpx;
+		text-align: left;
+		position: relative;
+		
 	}
 
 	.lineNum {

pages/index/paintSure.vue

@@ -18,19 +18,20 @@
 		</view>
 		<view class="cont">
 			<view class="contKk">
-
-				<view class="contLine">
-					<view class="contlineLeft">联系人</view>
-					<view class="contlineRight">
-						<view class="contlineRight">{{customerName}}</view>
-					</view>
-				</view>
-				<view class="contLine">
-					<view class="contlineLeft">手机号</view>
-					<view class="contlineRight">
-						<view class="contlineRight">{{mobilePhone}}</view>
-					</view>
-				</view>
+			
+			<view class="contLine">
+				<view class="contlineLeft">联系人</view>
+				<view class="contlineRight">
+					<input type="text" v-model="customerName" placeholder="请输入联系人姓名" class="contlineRightInput">
+				</view>
+			</view>
+			<view class="contLine">
+				<view class="contlineLeft">手机号</view>
+				<view class="contlineRight">
+					<input type="text" v-model="mobilePhone" placeholder="请输入联系人手机号" class="contlineRightInput">
+				</view>
+			</view>
+				
 
 				<view class="contLine">
 					<view class="contlineLeft">
@@ -43,7 +44,7 @@
 					</view>
 				</view>
 
-				<view class="contLine">
+				<view class="contLine" style="border-bottom: none;">
 					<view class="contlineLeft">
 						<image src="../../static/img/icon_star.png" mode="" class="star"></image>
 						预约时间
@@ -67,9 +68,9 @@
 						<image src="../../static/img/icon_xianxia.png" mode="" class="zhifuImg"></image>
 						线下支付
 					</view>
-					<!-- <view class="contlineRight">
-						<image src="../../static/img/icon_selectN.png" mode="" class="selectBtn"></image>
-					</view> -->
+					<view class="contlineRight">
+						<image src="../../static/img/icon_selectY.png" mode="" class="selectBtn"></image>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -171,17 +172,21 @@
 		},
 		onShow() {
 			this.carInfo = this.$store.state.carInfo;
-			this.shopInfo=this.$store.state.ckshopInfo;
-			this.shopInfo.id = this.shopInfo.shopId
-			this.shopID=this.shopInfo.id
+			let shopInfo = this.$store.state.ckshopInfo;
+			if (shopInfo) {
+				this.shopInfo= shopInfo
+				this.shopInfo.id = this.shopInfo.shopId
+				this.shopID=this.shopInfo.id
+				
+				uni.setStorage({
+					key: 'yyshopInfo',
+					data:this.shopInfo,
+					 success: function () {
+					    
+					 }
+				}); 
+			}
 			
-			uni.setStorage({
-				key: 'yyshopInfo',
-				data:this.shopInfo,
-				 success: function () {
-				    
-				 }
-			}); 
 			console.log('服务门店选择过-=',this.shopInfo)
 		},
 		methods: {
@@ -377,22 +382,7 @@
 				})
 				this.totalMoney = money;
 				
-				// if (this.goodsInfo.salePrice) {
-				// 	this.totalMoney = this.goodsInfo.salePrice * this.goodsnum;
-				// 	if (this.goodsInfo.scribingPrice) {
-				// 		var wyh = this.goodsInfo.scribingPrice * this.goodsnum;
-				// 		this.yhMoney = wyh - this.totalMoney;
-				// 		console.log(this.yhMoney)
-				// 		this.yhMoney = this.yhMoney.toFixed(2)
-				// 	} else {
-				// 		this.yhMoney = 0
-				// 	}
-				// 	this.totalMoney = this.totalMoney.toFixed(2)
-				// } else {
-				// 	this.totalMoney = this.goodsInfo.scribingPrice * this.goodsnum
-				// 	this.totalMoney = this.totalMoney.toFixed(2)
-				// 	this.yhMoney = 0
-				// }
+				
 			}
 
 		}
@@ -416,7 +406,9 @@
 
 	.bottomLeft {
 		padding-top: 23rpx;
-		padding-left: 30rpx;
+		padding-left: 30rpx;
+		    height: 74rpx;
+		    line-height: 74rpx;
 	}
 
 	.bottomLeftLine {
@@ -468,9 +460,9 @@
 		align-content: flex-start;
 		
 		
-		font-size: 30rpx;
+		font-size: 24rpx;
 		font-weight: bold;
-		color: #3C3C3C;
+		color: #666666;
 	}
 
 	.contLine {