修改

pages/friendcircle/activeContent.vue

+<style>
+	.viewContent{
+		width:100%;
+		height:100%;
+		padding:15px;
+	}
+	.avtive_TopImg{
+		width:100%;
+		height:200px;
+		border-radius: 6px;
+		overflow: hidden;
+	}
+	.active_Title{
+		color:#111111;
+		font-size:13px;
+		margin:15px 0;
+		font-weight: bold;
+	}
+	.avtice_Sperate{
+		padding:3px 8px;
+		font-size:13px;
+		display:inline-block;
+		margin-right:8px;
+		color:#FF4048;
+		text-align: center;
+		border:1px solid #FF4048;
+	}
+	.active_Inner{
+		color:#777777;
+		font-size:13px;
+	}
+	.active_PrizeImage{
+		margin:10px 0 20px 0;
+		width:100%;
+		height:270px;
+	}
+	.avtive_Title{
+		font-size: 16px;
+		color:#111111;
+		font-weight: bold;
+		margin-top:10px;
+	}
+	.active_RangeName{
+		padding:3px 8px;
+		display: inline-block;
+		border:1px solid #FF4048;
+		color:#FF4048;
+		font-size: 13px;
+		margin-right:8px;
+	}
+</style>
 <template>
+  <view class="activeContent" :style="{ height: contentHeight }">
+    <view
+      style="
+        height: calc(100vh );
+        width: calc(100vw);
+		padding-bottom: 10px;
+      "
+    >
+     <view class="viewContent">
+		 <view class="avtive_TopImg">
+			 <img :src="dataList.CoverImage" mode='aspectFill' style="width:100%;height:100%;" alt=""/>
+		 </view>
+		 <view class="avtive_Title">
+			 {{dataList.ActivityName}}
+		 </view>
+		 <view class="active_Title">
+			 <view v-if="dataList.Type==1" class="active_Inner">
+				 订单数量需满足{{dataList.OrderNum}}个
+			 </view>
+			 <view v-if="dataList.Type==2">
+				 订单金额需满足{{dataList.OrderMoney}}元
+			 </view>
+			 <view v-if="dataList.Type==3">
+				 商品数量需满足{{dataList.GoodsNum}}个
+			 </view>
+		 </view>
+		 <view class="active_Title">活动对象</view>
+		 <view>
+		    <text class="avtice_Sperate" v-if="dataList.Tier==0">全部</text>
+			<text class="avtice_Sperate" v-if="dataList.Tier==1">一级分销</text>
+			<text class="avtice_Sperate" v-if="dataList.Tier==2">一级分销</text>
+			<text class="avtice_Sperate" v-if="dataList.Tier==3">一级分销</text>
+		 </view>
+		 <view>
+			 
+		 </view>
+		 <view class="active_Title">活动类型</view>
+		 <view class="active_Inner">
+			<view v-if="dataList.RangeType==1">活动分类</view>
+			<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>
+		 </view>
+		 <view style="margin-top:10px;" v-if="dataList.RangeType==2">
+			<view>
+				
+			</view>
+		 </view>
+		 <view class="active_Title">活动有效期</view>
+		 <view class="active_Inner">
+			 <view>{{dataList.StartTime}}<text style="margin:0 5px">至</text>{{dataList.EndTime}}</view>
+		 </view>
+		 <view class="active_Title">领取方式</view>
+		 <view class="active_Inner">
+			 <view v-if="dataList.Way==1">线上</view>
+			 <view v-if="dataList.Way==2">线下</view>
+		 </view>
+		 <view class="active_Title">兑换期限</view>
+		 <view class="active_Inner">
+			 <view>截止<text style="margin:0 5px">{{dataList.ReceiveTime}}</text>之前</view>
+		 </view>
+		 <view class="active_Title">活动说明</view>
+		 <view class="active_Inner">
+			 <view>{{dataList.Description}}</view>
+		 </view>
+		 <view class="active_Title">活动奖品</view>
+		 <view class="active_Inner">
+			 <view>{{dataList.PrizeName}}</view>
+		 </view>
+		 <view class="active_PrizeImage">
+			 <img :src="dataList.PrizeImage" mode='aspectFill' style="width:100%;height:100%;" alt=""/>
+		 </view>
+	 </view> 
+
+   
+    <!-- 取消提示 -->
+    <u-toast ref="uToast" />
+   <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
+	</view>
+  </view>
 </template>
 
 <script>
+import auth from "@/components/auth/index.vue";
+export default {
+  components: {
+    auth
+  },
+  data() {
+    return {
+      pageTitle: "活动内容",
+      showAuth:false,
+	  u:{},
+	  show:false,
+     
+      mainColor: "",
+      contentHeight: 0,
+	  msg:{
+	     ActivityId:0
+	  },
+      dataList: {},
+      loading: false
+    };
+  },
+  created() {
+    this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
+    this.mainColor = this.$uiConfig.mainColor;
+	this.useName = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").Name:''
+  },
+  mounted() {
+    let currentPages = getCurrentPages();
+    let u = "/" + currentPages[currentPages.length - 1].route;
+    let pages = wx.getStorageSync("basedata")
+      ? wx.getStorageSync("basedata").bar_title
+      : [];
+    pages.forEach((x) => {
+      if (x.value == u) {
+        this.pageTitle = x.new_name ? x.new_name : x.name;
+      }
+    });
+    uni.setNavigationBarTitle({
+      title: this.pageTitle,
+    });
+  },
+  onLoad: function (option) {    
+	this.msg.ActivityId = option.ActivityId;
+	console.log(option,'optionss');
+    this.u = uni.getStorageSync("mall_UserInfo");
+    if (!this.u) {
+      this.u = {
+    	nickName: "未登录",
+    	avatarUrl: ""
+      };
+      this.showAuth = true;
+    }	else{
+    	this.init();
+    }
+  },
+  methods: {
+    init() {
+	  this.request2(
+	  	{
+	  		url: '/api/AppletOrder/GetGoosdActivityInfo',
+	  		data: this.msg
+	  	},
+	  	res => {
+	  		if(res.resultCode==1){
+				console.log(res,'数据');
+				this.dataList = res.data;
+	  		}
+	  	}
+	  );
+    },
+  },
+};
 </script>
-
-<style>
-</style>

pages/friendcircle/activitylist.vue

@@ -14,7 +14,7 @@
 		<view v-if="g.length > 0" style="height: calc(100vh - 100px);width: calc(100vw);overflow: hidden; ">
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
 				<view class="interDList" >
-					<view class="inter-item" v-for="(x, i) in g" :key="i">
+					<view class="inter-item" v-for="(x, i) in g" :key="i" @click="goActiveContent(x)">
 						<view style="width: 100%;height: 190px;border-top-left-radius: 6px;border-top-right-radius: 6px;position: relative;">
 							<image :src="x.CoverImage" mode='aspectFill' style="width: 100%;height: 190px;;border-top-left-radius: 6px;border-top-right-radius: 6px;"></image>
 							<view class="imgview" v-if="x.IsFinish==1 && x.SurplusDay!=0" style="background: #CCCCCC;color: #777777;">活动已完成</view>
@@ -182,6 +182,13 @@
 				uni.navigateTo({
 					url: 'myreward',
 				});
+			},
+			//跳转到详情
+			goActiveContent(x){
+				console.log(x,'xxx');
+				uni.navigateTo({
+					url: '/pages/friendcircle/activeContent?ActivityId=' + x.Id
+				});
 			}
 		},
 	};