bug修改

pages/activity/jkDetail.vue

@@ -381,9 +381,10 @@
 				if(this.info.activityContent){
 					sellingPoint=this.info.activityContent
 				}
+				//console.log(sellingPoint)
 				this.shareShow=false;
 				uni.navigateTo({
-					url:'../shop/wp?img='+this.mainImg+'&name='+this.info.activityName+'&time='+time+'&sellingPoint'+sellingPoint+'&id='+this.collectingID+'&type=2'
+					url:'../shop/wp?img='+this.mainImg+'&name='+this.info.activityName+'&time='+time+'&sellingPoint='+sellingPoint+'&id='+this.collectingID+'&type=2'
 				})
 			},
 			shareShowyc(){
@@ -641,6 +642,7 @@
 				}, 'GET').then(res => {
 					//uni.hideLoading();
 					this.info = res.data;
+					console.log(this.info)
 					this.getInfo()
 					if(this.info.imgList){
 						this.info.imgList.forEach(item=>{

pages/index/couponShare.vue

@@ -13,7 +13,7 @@
 					<view class="name">{{detail.actName}}</view>
 					<view class="time" v-if="detail.startTime">
 						有效期：{{detail.startTime.slice(0,10)}}-{{detail.endTime.slice(0,10)}}</view>
-					<view class="time" v-else>有效期：</view>
+					<view class="time" v-else>有效期：领取后{{detail.endOffsetDays}}天有效</view>
 				</view>
 
 			</view>
@@ -84,6 +84,7 @@
 				userInfo:'',
 				ext:'',
 				wxOpenData:'',
+				scene:'',
 			}
 		},
 		onLoad(opt) {
@@ -92,13 +93,25 @@
 			this.type=opt.type;
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
+			//scene=2E03F5108B434EFABD70F2D208890209
 			if(this.userInfo){
-				this.getData();
+				if(opt.scene&&opt.scene!='undefined'){
+					this.scene=opt.scene;
+					this.getShareParams()
+				}else{
+				 this.getData();
+				}
+				
 			}else{
 				this.$common.automaticlogin().then(val => {
 					this.userInfo=this.$store.state.userInfo;
 					this.wxOpenData=this.$store.state.wxOpenData;
-					this.getData();
+					if(opt.scene&&opt.scene!='undefined'){
+						this.scene=opt.scene;
+						this.getShareParams()
+					}else{
+					 this.getData();
+					}
 					if(!this.userInfo){
 						this.authorizShow=true
 					}
@@ -108,6 +121,16 @@
 			
 		},
 		methods: {
+			getShareParams(){
+				this.$http('openMall/getShareParamsCache', {
+				  scene:this.scene,
+				 },'GET').then(res => {
+					 var data= JSON.parse(res.data) ;
+					 console.log(data)
+					 this.id=data.couponId;
+					 this.getData(); 
+				 })
+			},
 			receive(id){
 				uni.showLoading({
 					title: '领取中'
@@ -137,7 +160,7 @@
 						custId:this.$store.state.wxOpenData.loginInfo.customerInfo.id
 					}
 				}else{
-					var url='opencoupon/detailsCoupon'
+					var url='opencoupon/detailsCouponDetails'
 					var params={
 						id: this.id,
 					}

pages/index/index.vue

@@ -417,13 +417,13 @@
 				})
 			},
 			changeCar(){
-				// uni.scanCode({
-				// 	success: function (res) {
-				// 		console.log('条码类型：' + res.scanType);
-				// 		console.log( res);
-				// 	}
-				// });
-				// return false;
+			   /* uni.scanCode({
+				 	success: function (res) {
+				 		console.log('条码类型：' + res.scanType);
+						console.log( res);
+				 	}
+				 });
+				 return false; */
 				uni.navigateTo({
 					url:'../user/addCar/cailist'
 				})
@@ -589,8 +589,11 @@
 						uni.navigateTo({
 							url:'aboutUS?unionID='+this.userInfo.unionId
 						})
+					}else if(item.bizType==18){ //领券中心
+							uni.navigateTo({
+								url:'receiveCoupon'
+							})
 					}
-					
 					// uni.navigateTo({
 					// 	url:url
 					// })

pages/index/onlineBooking.vue

@@ -192,6 +192,7 @@
 				authorizShow:false,
 				wxOpenData:'',
 				code:'',
+				scene:'',
 			}
 		},
 		onLoad(opt) {
@@ -203,17 +204,29 @@
 				this.naShopId = ''
 			}
 			console.log(this.naShopId)
+			//scene=8049C9CFFFEF4BE3B0893890B676F909
 			var that = this;
 			this.ext=this.$common.getExtStoreId();
 			if(this.userInfo){
+				if(opt.scene&&opt.scene!='undefined'){
+					this.scene=opt.scene;
+					this.getShareParams()
+				}else{
 				 that.getInfo()
+				}
+				
 			}else{
 				this.$common.automaticlogin().then(val => {
 					this.themeColor = uni.getStorageSync("themeColor");
 					this.userInfo=this.$store.state.userInfo;
 					this.wxOpenData=this.$store.state.wxOpenData;
 					
-					that.getInfo()
+					if(opt.scene&&opt.scene!='undefined'){
+						this.scene=opt.scene;
+						this.getShareParams()
+					}else{
+					 that.getInfo()
+					}
 					
 				})
 			}
@@ -228,6 +241,17 @@
 			}
 		},
 		methods: {
+			getShareParams(){
+				this.$http('openMall/getShareParamsCache', {
+				  scene:this.scene,
+				 },'GET').then(res => {
+					 var data= JSON.parse(res.data) ;
+					 console.log(data)
+					 this.naShopId=data.naShopId;
+					
+					 this.getInfo(); 
+				 })
+			},
 			authorizShowno(){
 				this.authorizShow=false
 			},

pages/index/receiveCoupon.vue

@@ -59,6 +59,7 @@
 		onLoad(opt) {
             this.userInfo=this.$store.state.userInfo;
             this.ext=this.$common.getExtStoreId();
+			//scene=2E03F5108B434EFABD70F2D208890209
 			if(this.userInfo){
 				this.getCouponCenterList()
 			}else{

pages/shop/wp.vue

@@ -21,7 +21,7 @@
 	export default {
 		data() {
 			return {
-				mpWxQr: "http://dmsphoto.66km.com.cn/thFiles/2D929DEF-6178-42E3-AC8F-1EA2078CD9C4.png",
+				mpWxQr: "https://apidms.66km.com/static/third/jialian.ico",
 				canvasW: 0,
 				canvasH: 0,
 				invest_areas: [{id: 1, name: "儿童教育"}, {id: 1, name: "少儿编程"}, {id: 1, name: "生物智能"}, {id: 1, name: "万物相连"}, {id: 1, name: "大数据"}],