twt 2 年之前
父节点
当前提交
6284216beb
共有 4 个文件被更改,包括 37 次插入18 次删除
  1. 30 13
      pages/activity/jkDetail.vue
  2. 5 3
      pages/index/index.vue
  3. 1 1
      pages/index/paintSure.vue
  4. 1 1
      pages/user/myOrder/activityOrderDetail.vue

+ 30 - 13
pages/activity/jkDetail.vue

@@ -118,10 +118,10 @@
 					</view>
 					<!-- clWhere报名凭证1,2,3,4 1手机号2车牌号3姓名4单位 -->
 					<view class="bmLine" v-if="info.clWhere.indexOf(1)!=-1" >
-						<input  type="text" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="mobilePhone"  class="bmlineInput" placeholder="输入手机号" placeholder-style="color:#999999">
+						<input  type="number" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="mobilePhone"  class="bmlineInput" placeholder="输入手机号" placeholder-style="color:#999999">
 					</view>
-					<view class="bmLine" v-if="info.clWhere.indexOf(2)!=-1">
-						<input type="text" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="plateNumber"   class="bmlineInput" placeholder="输入车牌号" placeholder-style="color:#999999">
+					<view class="bmLine" v-if="info.clWhere.indexOf(2)!=-1" @click="focusState2cl">
+						<input type="text" :focus="focusState2" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="plateNumber"   class="bmlineInput" placeholder="输入车牌号" placeholder-style="color:#999999">
 					</view>
 					<view class="bmLine" v-if="info.clWhere.indexOf(3)!=-1">
 						<input type="text" :adjust-position="false" @blur="inputBindBlur" @focus="inputBindFocus" v-model="customerName"  class="bmlineInput" placeholder="输入姓名" placeholder-style="color:#999999">
@@ -244,13 +244,14 @@
 				 mp3Url:'',
 				 payshow:false,
 				 jpNum:1,
+				 focusState2:false,
 			}
 		},
 		onLoad(opt) {
 		   this.userInfo=this.$store.state.userInfo;
 		   if(this.userInfo){
 		   	this.collectingID=opt.id;
-		   	this.getInfo();
+		   	//this.getInfo();
 		   	this.queryActivityInfo();
 			this.queryGoodsLook()
 		   }else{
@@ -258,7 +259,7 @@
 		   		this.userInfo=this.$store.state.userInfo;
 		   		
 		   		this.collectingID=opt.id;
-		   		this.getInfo();
+		   		//this.getInfo();
 		   		this.queryActivityInfo();
 				this.queryGoodsLook()
 		   	})
@@ -279,7 +280,7 @@
 		   
 		},
 		onPullDownRefresh(){
-			this.getInfo();
+			//this.getInfo();
 			this.queryActivityInfo();
 			setTimeout(() => {
 					uni.stopPullDownRefresh(); // 关闭下拉刷新 
@@ -296,13 +297,16 @@
 			this.bgmMusic.stop()
 		},
 		methods: {
+			focusState2cl(){
+				this.focusState2=true;
+			},
 			inputBindFocus(e){
-				console.log( e.detail.height);
+				//console.log( e.detail.height);
 				this.jpHeight=e.detail.height+ "px";
-				console.log(this.jpHeight)
+				//console.log(this.jpHeight)
 			},
 			inputBindBlur(){
-				
+				//return false;
 				uni.onKeyboardHeightChange((obj)=>{
 				    console.log("inputBindBlur"+obj.height)
 					let _sysInfo = uni.getSystemInfoSync();
@@ -523,8 +527,9 @@
 				this.$http('openHome/queryActivityInfo', {
 					collectingID:this.collectingID
 				}, 'GET').then(res => {
-					uni.hideLoading();
+					//uni.hideLoading();
 					this.info = res.data;
+					this.getInfo()
 					if(this.info.imgList){
 						this.info.imgList.forEach(item=>{
 							if(item.imgType==1){
@@ -574,6 +579,7 @@
 								   		 
 					}
 					
+					
 				})
 			},
 			play2(){
@@ -594,9 +600,20 @@
 					lng: '',
 				
 				}, 'GET').then(res => {
-					//uni.hideLoading();
-					this.shopInfo = res.data.shopInfo
-					
+					uni.hideLoading();
+					//this.shopInfo = res.data.shopInfo
+					var shopinfo=res.data.shopInfo;
+					this.info.shopList.forEach(item=>{
+						//console.log(item.id)
+						//console.log(shopinfo.id)
+						if(item.id==shopinfo.id){
+							
+							this.shopInfo=shopinfo
+						}
+					})
+					if(this.shopInfo==''){
+						this.shopInfo=this.info.shopList[0]
+					}
 				})
 			},
 			call() {

+ 5 - 3
pages/index/index.vue

@@ -1077,7 +1077,7 @@
 	.hotLineTopImg{
 		width: 702rpx;
 		height: 280rpx;
-		
+		display: block;
 	}
 	.hotLineTop{
 		position: relative;
@@ -1116,16 +1116,18 @@
 		bottom: 0;
 		
 		display: flex;
+		align-items: flex-end;
 	}
 	.hotTime{
 		background: rgba(0, 0, 0, 0.5);
 		font-weight: 400;
 		color: #FFFFFF;
 		font-size: 24rpx;
-		line-height: 44rpx;
-		padding: 0 20rpx;
+		/* line-height: 44rpx; */
+		padding: 5rpx 20rpx;
 		margin-top: 9rpx;
 		margin-left: -8rpx;
+		border-radius: 0px 10rpx 0px 0px;
 	}
 	.hotName{
 		padding: 24rpx 20rpx;

+ 1 - 1
pages/index/paintSure.vue

@@ -219,7 +219,7 @@
 			},
 			submit() {
 				console.log(this.shopID)
-				if (this.shopID == '') {
+				if (!this.shopID) {
 					uni.showToast({
 						title: '请选择服务门店',
 						icon: 'none',

+ 1 - 1
pages/user/myOrder/activityOrderDetail.vue

@@ -151,7 +151,7 @@
 			<view class="informationLine">
 				<view class="informationTxt">支付方式:</view>
 				<view class="informationNum" v-if="orderData.data.payType==1">在线支付</view>
-				<view class="informationNum" v-if="orderData.data.payType==2">线下支付</view>
+				<view class="informationNum" v-if="orderData.data.payType==2">-</view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">支付时间:</view>