更新

components/activityCard.vue

@@ -6,10 +6,6 @@
           <view v-if="info.content" v-html="info.content.content"></view>
         </scroll-view>
       </view>
-      <view class="btn_box">
-        <image class="btn_img" @click="open()" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/card_btn1.webp"></image>
-        <image class="btn_img" @click="open()" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/card_btn2.webp"></image>
-      </view>
     </view>
     <image class="head_img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/card_head.webp" info="活动标题"></image>
     <image class="close_img" @click="close" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/close.png" info="关闭按钮"></image>

components/personalActive.vue

@@ -0,0 +1,118 @@
+<template>
+  <view class="a_c_home">
+    <view class="c_card">
+      <view class="c_content">
+        <scroll-view style="height: 100%;" scroll-y>
+          <view v-if="info.content" v-html="info.content.content"></view>
+        </scroll-view>
+      </view>
+    </view>
+    <image class="head_img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/ab014202402291802294524.png" info="活动标题"></image>
+    <view class="head_title">春耕采购补贴</view>
+    <image class="close_img" @click="close" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/close.png" info="关闭按钮"></image>
+  </view>
+</template>
+
+<script>
+  import { getArticleList } from "@/api/api.js"
+  export default {
+    data(){
+      return {
+        info: ''
+      }
+    },
+    created() {
+      this.getArticleList();
+    },
+    methods:{
+      close(){
+        this.$emit('close');
+      },
+      open(){
+        uni.navigateTo({
+          url: '/pages/newActivity/activityDetail/activityDetail'
+        })
+      },
+      getArticleList(){
+        getArticleList(25).then(res=>{
+          this.info = res.data.list[0]
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+.a_c_home{
+  width: 600rpx;
+  /* #ifdef H5 */
+  height: 75vh;
+  /* #endif */
+  /* #ifndef H5 */
+  height: 90vh;
+  /* #endif */
+  // border: 1px solid red;
+  position: relative;
+  .head_img{
+    width: 419rpx;
+    height: 86rpx;
+    position: absolute;
+    top: 130rpx;
+    left: 50%;
+    transform: translate(-50%);
+  }
+  .head_title{
+    width: 419rpx;
+    height: 86rpx;
+    position: absolute;
+    top: 130rpx;
+    left: 50%;
+    transform: translate(-50%);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #9C3922;
+    font-weight: bold;
+    font-size: 34rpx;
+  }
+  .c_card{
+    height: calc(100% - 300rpx);
+    width: 100%;
+    background-color: #fff;
+    position: absolute;
+    border-radius: 50rpx;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 30rpx;
+    padding-top: 70rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    .c_content{
+      height: 100%;
+      width: 100%;
+      // background-color: #eee;
+    }
+    .btn_box{
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: center;
+      .btn_img{
+        width: 461rpx;
+        height: 100rpx;
+      }
+    }
+  }
+  .close_img{
+    position: absolute;
+    bottom: 60rpx;
+    left: 50%;
+    transform: translate(-50%);
+    width: 60rpx;
+    height: 60rpx;
+  }
+}
+</style>

pages.json

@@ -1861,7 +1861,7 @@
 		"selectedColor": "#E93323",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-		"iconWidth": "36",
+		// "iconWidth": "36",
 
 		"list": [
 
@@ -1874,15 +1874,15 @@
 			{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar_icon/a.png",
-				"selectedIconPath": "static/tabbar_icon/a-a.png"
+				"selectedIconPath": "static/tabbar_icon/a-a.png",
 				// "text": "泸州"
-				// "text": "供销"
+				"text": "供销"
 			},
 			{
 				"pagePath": "pages/gather/gather",
 				"iconPath": "static/tabbar_icon/b.png",
-				"selectedIconPath": "static/tabbar_icon/b-a.png"
-				// "text": "生产"
+				"selectedIconPath": "static/tabbar_icon/b-a.png",
+				"text": "生产"
 			},
 			// {
 			// 	"pagePath": "pages/plant_release/index",
@@ -1894,14 +1894,14 @@
 			{
 				"pagePath": "pages/order_addcart/order_addcart_t",
 				"iconPath": "static/tabbar_icon/d.png",
-				"selectedIconPath": "static/tabbar_icon/d-a.png"
-				// "text": "购物车"
+				"selectedIconPath": "static/tabbar_icon/d-a.png",
+				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/user/index",
 				"iconPath": "static/tabbar_icon/e.png",
-				"selectedIconPath": "static/tabbar_icon/e-a.png"
-				// "text": "我的"
+				"selectedIconPath": "static/tabbar_icon/e-a.png",
+				"text": "我的"
 			}
 		]
 

pages/index/index.vue

@@ -18,7 +18,7 @@
 			</view>
 
 			<view class="" v-if="!isFshow">
-				<view class="site-box1">
+				<view class="site-box1" style="height: auto;">
 					<view class="box flex_a_c_j_sb">
 						<view class="place_wrapper flex_a_c" @click="changeMap">
 							<view class="iconfont icon-weizhi"></view>
@@ -28,7 +28,7 @@
 							<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
 						</navigator>
 					</view>
-					<navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
+					<!-- <navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
 						class="search_content flex_a_c_j_sb home_search">
 						<view class="flex_a_c">
 							<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
@@ -36,11 +36,11 @@
 								placeholder-style="font-size: 30rpx;" disabled>
 						</view>
 						<button class="search_btn">搜索</button>
-					</navigator>
+					</navigator> -->
 				</view>
 			</view>
 
-			<view class="home_bg">
+			<!-- <view class="home_bg">
 				<image class="image" mode="aspectFill"
 					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_bg.webp"></image>
 				<view class="card">
@@ -48,10 +48,10 @@
 						src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_title.webp">
 					</image>
 				</view>
-			</view>
-			<!-- <zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
+			</view> -->
+			<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
         @change="dchange">
-      </zbpSwiper> -->
+      </zbpSwiper>
 
 			<view class="home_list" style="padding-bottom: 0;">
 				<image class="left" @click="navgo('/pages/cloud_warehouse/big_classification/index')"
@@ -801,8 +801,8 @@
 	}
 
 	page {
-		background: #fff7e6;
-		// background: #f4f7fe;
+		// background: #fff7e6;
+		background: #f4f7fe;
 
 		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}

pages/store/home/index.vue

@@ -434,6 +434,9 @@
 			</view>
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+    <uni-popup ref="activityPopup" :is-mask-click="false">
+    	<personalActive @close="closeActivityCard"></personalActive>
+    </uni-popup>
 	</view>
 </template>
 
@@ -479,6 +482,7 @@
 		HTTP_REQUEST_URL
 	} from '@/config/app';
 	import mConfig from '../component/index.js';
+  import personalActive from "@/components/personalActive.vue"
 	// #ifdef MP || APP-PLUS
 	import activeParty from '@/pages/index/component/activeParty';
 	import coupon from '../../index/component/coupon';
@@ -505,6 +509,7 @@
 			emptyPage,
 			WaterfallsFlow,
 			easyLoadimage,
+      personalActive,
 			// #ifdef MP || APP-PLUS
 			activeParty,
 			bargain,
@@ -767,6 +772,12 @@
 			}
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
       
+      if(options.LihaiYun=='LiHaiQiJianDian'){
+        this.$nextTick(()=>{
+          this.$refs.activityPopup.open();
+        })
+      }
+
 		},
 		onShow() {
 
@@ -812,7 +823,9 @@
 
 		},
 		methods: {
-		
+      closeActivityCard(){
+        this.$refs.activityPopup.close();
+      },
 			getProductSpu() {
 				let that = this;
 				if (that.loadend) return;