1

pages/friendcircle/activeContent.vue

@@ -9,6 +9,7 @@
 		height:200px;
 		border-radius: 6px;
 		overflow: hidden;
+		box-shadow:0 6px 10px 1px #F2F2F2;
 	}
 	.active_Title{
 		color:#111111;
@@ -48,6 +49,26 @@
 		font-size: 13px;
 		margin-right:8px;
 	}
+	.active_good{
+		width: 100%;
+		padding-bottom:20px ;
+		overflow-x: auto!important;
+		display: flex;
+		flex-direction: row;
+	}
+	.active_good_item{
+		width: 80px;
+		margin-right: 15px;
+		border-radius: 4px;
+		box-shadow:0 6px 10px 1px #F2F2F2;
+		
+	}
+	.active_text{
+		width: 100%;
+		padding: 10px;
+		font-size: 12px;
+		
+	}
 </style>
 <template>
   <view class="activeContent" :style="{ height: contentHeight }">
@@ -60,7 +81,7 @@
     >
      <view class="viewContent">
 		 <view class="avtive_TopImg">
-			 <img :src="dataList.CoverImage" mode='aspectFill' style="width:100%;height:100%;" alt=""/>
+			 <img :src="dataList.CoverImage" mode='aspectFill' style="width:100%;height:100%;border-radius: 6px;" alt=""/>
 		 </view>
 		 <view class="avtive_Title">
 			 {{dataList.ActivityName}}
@@ -92,10 +113,18 @@
 			<view v-if="dataList.RangeType==2">指定商品</view>
 		 </view>
 		 <view style="margin-top:10px;" v-if="dataList.RangeType==1">
-			<text v-for="item in dataList.RangeList" class="active_RangeName">{{item.Name}}</text>
+			<text v-for="item in dataList.RangeList" class="active_RangeName" @click="goitemize(item)">{{item.Name}}</text>
 		 </view>
 		 <view style="margin-top:10px;" v-if="dataList.RangeType==2">
-			<view>
+			<view class="active_good">
+				<view class="active_good_item" v-for="(item,index) in dataList.RangeList" @click="goGood(item.Id)">
+					<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1609340166000_272.jpg"
+					 style="width: 80px;height: 80px;border-top-left-radius:4px ;border-top-right-radius:4px "></image>
+					 <view class="active_text">
+						商品名称
+					 </view>
+				</view>
+				
 				
 			</view>
 		 </view>
@@ -204,6 +233,14 @@ export default {
 	  	}
 	  );
     },
+	goGood(id){
+		uni.navigateTo({
+			url: "/pages/goods/goods?GoodsId=" +id
+		});
+	},
+	goitemize(item){
+		uni.navigateTo({ url: '/pages/goods/list?coupon_id='+ item.Id+'&UseType=1' });
+	}
   },
 };
 </script>

pages/index/index.vue

@@ -18,7 +18,7 @@
 						<u-icon name="arrow-left" size="44"></u-icon>
 					</view>
 				</view>
-				<view @click='yj' style="width: 200px;height: 50px;">活动</view>
+				<!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> -->
 				<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
 				 :is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
 				<template v-for="(item, i) in myPageData.home_pages.navs">

pages/school/teacherDetails.vue

@@ -239,6 +239,68 @@
 				this.init()//根据老师id获取老师的课程列表
 			}
 		},
+		onShareTimeline() {
+			setTimeout(() => {
+				// console.log("分享调用");
+				// this.getReceive();
+			}, 2500);
+			let uid = uni.getStorageSync("mall_UserInfo") ?
+				uni.getStorageSync("mall_UserInfo").UserId :
+				0;
+			if (uid == 0) {
+				uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
+			}
+			let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
+				uni.getStorageSync("mall_UserInfo").SmallShopId :
+				0;
+			if (SmallShopId == 0) {
+				//如果微店id为0 去找所属微店id
+				SmallShopId = uni.getStorageSync("mall_UserInfo") ?
+					uni.getStorageSync("mall_UserInfo").UserSmallShopId :
+					0;
+			}
+		
+			let Up = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserPageType : 0;
+			let teacherId = this.id;
+			let img = this.teacher.teacherResult.TeacherLogo?this.teacher.teacherResult.TeacherLogo:'';
+			let title = this.teacher.teacherResult.Name?this.teacher.teacherResult.Name:'甲鹤任教老师';
+			return {
+				title: title,
+				query: "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up+ "&teacherId=" + teacherId,
+				imageUrl: img,
+			};
+		},
+		onShareAppMessage(res) {
+			setTimeout(() => {
+				// console.log("分享调用");
+				// this.getReceive();
+			}, 2500);
+			let uid = uni.getStorageSync("mall_UserInfo") ?
+				uni.getStorageSync("mall_UserInfo").UserId :
+				0;
+			if (uid == 0) {
+				uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
+			}
+			let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
+				uni.getStorageSync("mall_UserInfo").SmallShopId :
+				0;
+			if (SmallShopId == 0) {
+				//如果微店id为0 去找所属微店id
+				SmallShopId = uni.getStorageSync("mall_UserInfo") ?
+					uni.getStorageSync("mall_UserInfo").UserSmallShopId :
+					0;
+			}
+			let Up = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo").UserPageType : 0;
+			let teacherId = this.id;
+			let img = this.teacher.teacherResult.TeacherLogo?this.teacher.teacherResult.TeacherLogo:'';
+			let title = this.teacher.teacherResult.Name?this.teacher.teacherResult.Name:'甲鹤任教老师';
+			return {
+				title: title,
+				path: "/pages/index/index?user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up+ "&teacherId=" + teacherId,
+				imageUrl: img,
+			};
+		
+		},
 		created() {
 			this.mc = this.$uiConfig.mainColor;
 			this.pricecolor = this.$uiConfig.pricecolor;