xhj 2 anni fa
parent
commit
b6ac00bbd5

+ 1 - 1
card/cardFound/cardFound.vue

@@ -8,7 +8,7 @@
 			<view class="nearby-yuan"></view>
 			<image src="../../static/images/fj_loca.png" class="loca"></image>
 			<view class="nearby">
-				<view class="nearby-text ddflex">附近<image src="../../static/images/fj_ico.png"></image></view>
+				<view class="nearby-text ddflex">附近<image src="/static/images/fj_loca.png"></image></view>
 				<view class="gan"></view>
 			</view>
 		</view>

+ 3 - 1
integralshop/content/content.vue

@@ -9,7 +9,9 @@
 			<view class="viewMore"><mp-html :content="detaile.text" :lazy-load="true" @imgtap="choose"></mp-html></view>
 		</view>
 		<view class="operate dflex" style="justify-content: flex-end;">
-			<button class="share dflex" hover-class="none" open-type="share"><image src="../static/integralShop/images/share.png"></image>分享</button>
+			<button class="share dflex" hover-class="none" open-type="share">
+				<!-- <image src="../static/integralShop/images/share.png"></image> -->
+			分享</button>
 		</view>
 	</view>
 </template>

+ 6 - 2
library/poster/index.vue

@@ -18,7 +18,7 @@
 				<view class="search-tag" v-for="item in 12">问候日签</view>
 			</view>
 			<view class="ddflex" style="padding: 30rpx;">
-				<view class="poster-item" v-for="item in 6">
+				<view class="poster-item" v-for="item in 6" @click="jumpUrl('/library/posterService/posterService')">
 					<image class="poster-item-pic" src="/static/images/lj_img.png"></image>
 					<view class="poster-item-title tover">海报名称</view>
 					<view class="poster-item-use">2056 人正在使用</view>
@@ -48,7 +48,11 @@
 			
 		},
 		methods: {
-			
+			jumpUrl(url){
+				uni.navigateTo({
+					url:url
+				})
+			}
 		},
 		mounted() {
 			const systemInfo = uni.getSystemInfoSync();

+ 66 - 0
library/posterService/posterService.css

@@ -0,0 +1,66 @@
+.poster{
+	margin: 30rpx 40rpx;
+	background-color: #fff;
+}
+.poster-pic{
+	width: 100%;
+}
+.poster-title{
+	line-height: 40rpx;
+	font-size: 28rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #333333;
+	margin-top: 20rpx;
+}
+.poster-note{
+	line-height: 37rpx;
+	font-size: 26rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+	margin-top: 20rpx;
+}
+.poster-code{
+	width: 126rpx;
+	height: 126rpx;
+	margin-left: 20rpx;
+}
+
+.change-product{
+	position: absolute;
+	right: 0;
+	top:0;
+	padding: 4rpx 18rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+	line-height: 45rpx;
+	background: rgba(0,0,0,0.7);
+}
+.change-product image{
+	width: 24rpx;
+	height: 25rpx;
+	margin-right: 10rpx;
+}
+	
+.share-btn{
+	background-color: #fff;
+	padding: 30rpx 40rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+}
+.btn{
+	line-height: 80rpx;
+	background: #27D699;
+	border-radius: 40rpx 40rpx 40rpx 40rpx;
+	opacity: 1;
+	font-size: 32rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+	text-align: center;
+}

+ 109 - 0
library/posterService/posterService.vue

@@ -0,0 +1,109 @@
+<template>
+	<view>
+		<view class="poster" id="poster">
+			<image class="poster-pic" :src="posterBg" mode="widthFix"></image>
+			<view class="ddflex" style="padding: 22rpx 35rpx;position: relative;">
+				<view class="flex">
+					<view class="poster-title">杜平 | 中国人寿股份湖南分公司</view>
+					<view class="poster-note">长按小程序码了解更多</view>
+				</view>
+				<image class="poster-code" src="/static/images/lj_img.png"></image>
+				<view class="change-product ddflex" @click="jumpUrl('/library/productLink/productLink')" data-html2canvas-ignore="true">
+					<image src="/static/images/edit1.png"></image>
+					产品链接</view>
+			</view>
+		</view>
+		
+		<view style="height: 150rpx;"></view>
+		<view class="share-btn">
+			<view class="btn" @click="toImg">立即分享</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	const req = require("../../utils/request.js");
+	import html2canvas from '../static/html2canvas.min.js';
+
+	export default {
+		components: {},
+		props: {},
+		data() {
+			return {
+				systems: {},
+				isTop:0,
+				productLink:'',
+				posterBg:'',
+				base64:''
+			}
+		},
+		onLoad(options) {
+			this.posterBg = 'http://img.zhiqiyun.com/test/2023/07/31/8b7ed072b68fe70f0d6f409a71a8b17b.png'
+			// this.posterBg = 'https://hxdms.oss-cn-hangzhou.aliyuncs.com/hxdms/2986a2805d414b75952d609381f2d280.png'
+			this.imageChange(this.posterBg)
+		},
+		onShow() {
+			
+		},
+		methods: {
+			jumpUrl(url){
+				uni.navigateTo({
+					url:url
+				})
+			},
+			creatCode(){
+				
+			},
+			toImg() {
+				// 使页面滑到顶部,避免顶部出现白边
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 0
+				})
+				var dom = document.querySelector('#poster'); // 获取dom元素
+				html2canvas(dom, {
+					width: dom.clientWidth, //dom 原始宽度
+					height: dom.clientHeight,
+					scrollY: 0, // html2canvas默认绘制视图内的页面,需要把scrollY,scrollX设置为0
+					scrollX: 0,
+					useCORS: true, //支持跨域,但好像没什么用
+				}).then((canvas) => {
+					// 将生产的canvas转为base64图片
+					this.base64 = canvas.toDataURL('image/png')
+					console.log(this.base64)
+				});
+			},
+			imageChange(img){
+				// let imagePromise = this.getCoverSrc(img);
+				// Promise.all([imagePromise]).then(([image]) => {
+				// 	console.log(image)
+				// 	this.posterBg = image
+				// })
+				// this.posterBg = image
+				//创建xhr对象
+			}
+		},
+		mounted() {
+			const systemInfo = uni.getSystemInfoSync();
+			// px转换到rpx的比例
+			let pxToRpxScale = 750 / systemInfo.windowWidth;
+			let systems = {
+				ktxStatusHeight: systemInfo.statusBarHeight * pxToRpxScale, // 状态栏的高度
+				navigationHeight: 44 * pxToRpxScale // 导航栏的高度
+			};
+			systems.barHeight = systems.ktxStatusHeight + systems.navigationHeight;
+			this.systems = systems;
+		},
+		onPageScroll: function(e) {
+			if (e.scrollTop > this.systems.barHeight) {
+				this.isTop = 1;
+			} else {
+				this.isTop = 0;
+			}
+		}
+	}
+</script>
+<style>
+	@import "./posterService.css";
+</style>

+ 176 - 0
library/productLink/productLink.css

@@ -0,0 +1,176 @@
+page{
+	background-color: #fff;
+}
+.form{
+	padding: 30rpx;
+}
+.form-title{
+	line-height: 50rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC-Bold, PingFang SC;
+	font-weight: bold;
+	color: #333333;
+}
+.form-item-title{
+	line-height: 45rpx;
+	font-size: 32rpx;
+	font-family: PingFang SC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #333333;
+	margin-top: 32rpx;
+}
+.upload-pic{
+	width: 690rpx;
+	height: 400rpx;
+	background: #F8F8F8;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+	margin:30rpx auto 0;
+	text-align: center;
+	line-height: 45rpx;
+	font-size: 32rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+	flex-direction: column;
+	justify-content: center;
+}
+.upload-pic image{
+	width: 59rpx;
+	height: 62rpx;
+}
+.upload-image{
+	width: 690rpx;
+	height: 400rpx;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+	margin:30rpx auto 0;
+}
+.form-limit{
+	line-height: 33rpx;
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #999999;
+	margin-top: 20rpx;
+}
+.upload-photo{
+	width: 120rpx;
+	height: 120rpx;
+	background: #F8F8F8;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+	margin-bottom: 20rpx;
+}
+.upload-photo image{
+	width: 46rpx;
+	height: 35rpx;
+	margin: auto;
+}
+.upload-photo-image{
+	width: 120rpx;
+	height: 120rpx;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+	margin-right: 20rpx;
+	position: relative;
+	margin-bottom: 20rpx;
+}
+.upload-photo-image image{
+	width: 120rpx;
+	height: 120rpx;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+}
+.upload-photo-close{
+	width: 28rpx !important;
+	height: 28rpx !important;
+	position: absolute;
+	top:-14rpx;
+	right: -14rpx;
+}
+.form-border{
+	height: 20rpx;
+	background: #F8F8F8;
+	border-radius: 0rpx 0rpx 0rpx 0rpx;
+	opacity: 1;
+}
+.form-input-box{
+	padding: 30rpx 0;
+	border-bottom: 2rpx solid #DEDEDE;
+	line-height: 45rpx;
+	font-size: 32rpx;
+}
+.form-input-placeholder{
+	color: #CCCCCC;
+}
+.more{
+	float: right;
+}
+.more image{
+	width: 14rpx;
+	height: 22rpx;
+	margin-left: 10rpx;
+}
+.next-btn{
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	height: 88rpx;
+	line-height: 88rpx;
+	background: #27D699;
+	border-radius: 44rpx 44rpx 44rpx 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+	text-align: center;
+	margin: 150rpx 30rpx 30rpx;
+}
+.form-number-select{
+	margin-top: 30rpx;
+}
+.form-number-select view:first-child,.form-number-select view:last-child{
+	width: 80rpx;
+	height: 67rpx;
+	line-height: 67rpx;
+	background: #F8F8F8;
+	border-radius: 4rpx 4rpx 4rpx 4rpx;
+	opacity: 1;
+	text-align: center;
+	color: #B3B3B3;
+	font-size: 40rpx;
+}
+.form-number-select input{
+	width: 112rpx;
+	height: 63rpx;
+	background: #FFFFFF;
+	border-radius: 4rpx 4rpx 4rpx 4rpx;
+	opacity: 1;
+	border: 2rpx solid #DEDEDE;
+	margin: 0 20rpx;
+	text-align: center;
+}
+.form-date-select{
+	background: #F8F8F8;
+	border-radius: 5rpx 5rpx 5rpx 5rpx;
+	text-align: center;
+	line-height: 76rpx;
+	height: 76rpx;
+	color: #CCCCCC;
+	font-size: 32rpx;
+}
+.clear-btn{
+	width: 104rpx;
+	line-height: 56rpx;
+	background: #FFFFFF;
+	border-radius: 28rpx 28rpx 28rpx 28rpx;
+	opacity: 1;
+	border: 1rpx solid #707070;
+	text-align: center;
+	font-size: 24rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #333333;
+	margin-left: 10rpx;
+}

+ 72 - 0
library/productLink/productLink.vue

@@ -0,0 +1,72 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item-title">产品标题</view>
+			<view class="form-input-box">
+				<input placeholder-class="form-input-placeholder" placeholder="请输入产品标题"/>
+			</view>
+			<view class="form-item-title">产品链接</view>
+			<view class="form-input-box ddflex">
+				<input class="flex" v-model="productLink" placeholder-class="form-input-placeholder" placeholder="请填写或粘贴产品链接"/>
+				<view class="clear-btn">清空</view>
+			</view>
+			<view class="next-btn" @click="submit">保存</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	const req = require("../../utils/request.js");
+
+	export default {
+		components: {},
+		props: {},
+		data() {
+			return {
+				systems: {},
+				isTop:0,
+				productLink:''
+			}
+		},
+		onLoad(options) {
+
+		},
+		onShow() {
+			
+		},
+		methods: {
+			submit(){
+				let pages = getCurrentPages();
+				var prevPage = pages[pages.length - 2];
+				if (prevPage) {
+					prevPage.$vm.setData({
+						productLink: this.productLink
+					});
+				}
+			}
+		},
+		mounted() {
+			const systemInfo = uni.getSystemInfoSync();
+			// px转换到rpx的比例
+			let pxToRpxScale = 750 / systemInfo.windowWidth;
+			let systems = {
+				ktxStatusHeight: systemInfo.statusBarHeight * pxToRpxScale, // 状态栏的高度
+				navigationHeight: 44 * pxToRpxScale // 导航栏的高度
+			};
+			systems.barHeight = systems.ktxStatusHeight + systems.navigationHeight;
+			this.systems = systems;
+		},
+		onPageScroll: function(e) {
+			if (e.scrollTop > this.systems.barHeight) {
+				this.isTop = 1;
+			} else {
+				this.isTop = 0;
+			}
+		}
+	}
+</script>
+
+<style>
+	@import "./productLink.css";
+</style>

File diff suppressed because it is too large
+ 19 - 0
library/static/html2canvas.min.js


+ 1 - 1
match/activityDet/activityDet.vue

@@ -7,7 +7,7 @@
 					<view class="title tovers">{{detail.title}}</view>
 					<view class="sta ddflex">
 						<view class="area fflex ddflex" v-if="detail.address">
-							<image src="../static/mine/images/dzico.png"></image>
+							<!-- <image src="../static/mine/images/dzico.png"></image> -->
 							<view class="tover fflex">{{detail.address}}</view>
 						</view>
 						<view class="money"><text>¥</text>{{detail.money}}</view>

+ 11 - 3
match/activityDetail/activityDetail.css

@@ -2,7 +2,7 @@
 page{background: #fff;}
 .top{padding: 0rpx 0rpx 40rpx;border-bottom: 15rpx solid #f6f6f6;}
 .act-img{width: 100%;height: 461rpx;}
-.title{font-size: 40rpx;color: #000;line-height: 50rpx;margin: 45rpx 32rpx 10rpx;font-weight: bold;}
+.title{font-size: 40rpx;color: #000;line-height: 50rpx;margin: 45rpx 32rpx 16rpx;font-weight: bold;}
 .datas{font-size: 24rpx;color: #999;margin: 0 32rpx;}
 .money-box{
 	margin: 40rpx 32rpx;
@@ -27,11 +27,13 @@ page{background: #fff;}
 	font-size: 24rpx;
 	font-weight: 500;
 	color: #999999;
+	margin-top: 45rpx;
 }
 .baoming-box image{
 	width: 40rpx;
 	height: 44rpx;
-	margin-right: 22rpx;
+	margin-right: 20rpx;
+	margin-top: 10rpx;
 }
 .baoming-time{
 	margin-left: 62rpx;
@@ -48,7 +50,8 @@ page{background: #fff;}
 .hddz-box image{
 	width: 40rpx;
 	height: 44rpx;
-	margin-right: 22rpx;
+	margin-right: 20rpx;
+	margin-top: 10rpx;
 }
 .hddz-area{
 	margin-left: 62rpx;
@@ -70,6 +73,11 @@ page{background: #fff;}
 .rico{width: 14rpx;height: 23rpx;margin-left: 20rpx;}
 .tit{font-size: 32rpx;color: #333;font-weight: bold;padding: 30rpx;justify-content: space-between;border-bottom: 1rpx solid #DEDEDE;}
 .content{font-size: 28rpx;color: #999;line-height: 44rpx;padding: 50rpx 0 120rpx;}
+.user-tag{
+	line-height: 28rpx;padding: 0 10rpx;background: linear-gradient(319deg, #E6BB82 0%, #FAE4CD 100%);border-radius: 3rpx;font-size: 20rpx;color: #84600A;
+	margin-right: 10rpx;
+	margin-top: 4rpx;
+}
 
 .bot{align-items: center;padding: 10rpx 30rpx 10rpx 0;border-top: 1rpx solid #e5e5e5;justify-content: space-between;}
 .btnfot{display: flex;justify-content: space-around;}

+ 12 - 39
match/activityDetail/activityDetail.vue

@@ -3,18 +3,7 @@
 		<view class="top">
 			<image :src="detail.pic" mode="aspectFill" class="act-img"></image>
 			<view class="title">{{detail.title}}</view>
-			<!-- <view class="datas">浏览 {{detail.browse}}</view> -->
-			
-			<view class="money-box ddflex">
-				<!-- <view class="ddflex">
-					<image src="../static/images/bmfy.png"></image>
-					<text>报名费用</text>
-				</view> -->
-				<view>
-					<view class="money free" v-if="userinfovip.levelGrade>0&& !userinfovip.end">{{detail.vipMoney!=0?('¥'+detail.vipMoney):'免费'}}</view>
-					<view class="money free" v-else>{{detail.money!=0?('¥'+detail.money):'免费'}}</view>
-				</view>
-			</view>
+			<view class="datas">浏览 {{detail.browse}}  收藏  69</view>
 			
 			<view class="baoming-box">
 				<view class="ddflex">
@@ -22,7 +11,7 @@
 					<text>报名时间</text>
 				</view>
 				<view class="baoming-time">{{formData(detail.enlistStartTime)}} 至 {{formData(detail.enlistEndTime)}}</view>
-				<view class="ddflex" style="margin-top: 26rpx;">
+				<view class="ddflex" style="margin-top: 25rpx;">
 					<image src="../static/images/bmfy.png" style="visibility: hidden;"></image>
 					<text>活动时间</text>
 				</view>
@@ -44,37 +33,21 @@
 			</view>
 		</view>
 		
-		<!-- <view class="date">
-			<view class="datass">
-				<view class="ddflex">
-					<image :src="detail.associationLogo" style="width:80rpx ;height: 80rpx;border-radius: 100%;" mode="aspectFill" class="dimg"></image>
-					<view style="font-size: 30rpx;">{{detail.associationTitle}}</view>
-				</view>
-			</view>
-		</view> -->
-		
 		<view class="date">
-			<view class="datass ddflex" style="justify-content: space-between;" v-if="detail.associationId" @click="jumpUrl('/businessAssociation/associationIndex/associationIndex?id='+detail.associationId)">
+			<view class="datass ddflex" style="justify-content: space-between;" v-if="true" @click="jumpUrl('/businessAssociation/associationIndex/associationIndex?id='+detail.associationId)">
 				<view class="ddflex">
-					<image :src="detail.associationLogo" style="width:65rpx ;height: 65rpx;border-radius: 100%;" mode="aspectFill" class="dimg"></image>
-					<view style="font-size: 28rpx;">{{detail.associationTitle}}</view>
+					<image src="/static/images/lj_img.png" style="width:66rpx ;height: 66rpx;border-radius: 100%;" mode="aspectFill" class="dimg"></image>
+					<view>
+						<view style="font-size: 28rpx;font-weight: bold;color: #333333;line-height: 40rpx;">杜平</view>
+						<view style="margin-top: 3rpx;" class="ddflex">
+							<view class="user-tag">中国人寿湖南</view>
+							<view class="user-tag">高级组经理</view>
+							<view class="user-tag">入司10年</view>
+						</view>
+					</view>
 				</view>
 				<image src="../static/images/crico2.png" class="rico"></image>
 			</view>
-			<!-- 
-			<view class="datass">
-				<view class="ddflex"><image src="../static/images/sjico.png" class="dimg"></image>报名时间:</view>
-				<view>{{detail.enlistStartTime}} - {{detail.enlistEndTime}}</view>
-			</view>
-			<view class="datass ddflex">
-				<view class="ddflex"><image src="../static/images/sjico.png" class="dimg"></image>活动时间:</view>
-				<view>{{detail.startTime}} - {{detail.endTime}}</view>
-			</view>
-			<view class="datass ddflex" v-if="detail.address" @click="openMap()">
-				<image src="../static/images/dzico1.png" class="dimg"></image>
-				<view class="fflex">{{detail.address}}</view>
-				<image src="../../static/pages/images/crico1.png" class="rico"></image>
-			</view> -->
 		</view>
 		<view class="det">
 			<view class="tit ddflex">活动介绍<!-- <image src="../../static/pages/images/crico1.png" class="rico"></image> --></view>

+ 5 - 5
match/sign/sign.css

@@ -1,12 +1,12 @@
 /* sign.css */
 page{padding-bottom: 110rpx;}
-.top{background: #fff;padding: 40rpx 32rpx 0;}
+.top{background: #fff;padding: 40rpx 32rpx 32rpx;}
 .top>.ddflex{align-items: flex-start;}
 .act-img{width: 270rpx;height: 174rpx;border-radius: 6rpx;margin-right: 23rpx;}
-.title{font-size: 28rpx;color: #000;line-height: 38rpx;margin-bottom: 15rpx;}
+.title{font-size: 28rpx;color: #000;line-height: 39rpx;height: 78rpx;}
 .time{font-size: 26rpx;color: #666;}
-.time image{width: 22rpx;height: 25rpx;margin-right: 6rpx;}
-.sta{margin-top: 25rpx;}
+.time image{width: 22rpx;height: 25rpx;margin-right: 6rpx;margin-top: 7rpx;}
+.sta{margin-top: 16rpx;}
 .area{font-size: 22rpx;color: #999;margin-right: 6rpx;}
 .area image{width: 22rpx;height: 25rpx;margin-right: 6rpx;}
 .money{font-size: 30rpx;color: #FF1919;}
@@ -16,7 +16,7 @@ page{padding-bottom: 110rpx;}
 .info{background: #fff;border-radius: 16rpx;margin: 22rpx 32rpx 0;}
 .tit{font-size: 32rpx;color: #000;font-weight: bold;padding: 20rpx 30rpx;border-bottom: 1rpx solid #E9E9E9;justify-content: space-between;}
 .tit text{font-size: 28rpx;font-weight: normal;}
-.add{height: 68rpx;background: #FFFFFF;border: 1rpx solid #E9001E;border-radius: 35rpx;font-size: 32rpx;color: #E9001E;text-align: center;line-height: 68rpx;margin: 40rpx 30rpx 16rpx;}
+.add{height: 68rpx;background: #FFFFFF;border: 1rpx solid var(--main);border-radius: 35rpx;font-size: 32rpx;color: var(--main);text-align: center;line-height: 68rpx;margin: 40rpx 30rpx 16rpx;}
 .list{padding: 0 30rpx 40rpx;}
 .list .li{padding: 25rpx 0;border-bottom: 1rpx solid #E9E9E9;font-size: 26rpx;color: #333;}
 .list .li:last-child{border-bottom: none;}

+ 31 - 14
match/sign/sign.vue

@@ -8,30 +8,32 @@
 					<view class="sta ddflex">
 						<view class="area fflex ddflex" v-if="detail.address">
 							<image src="../static/images/dzico1.png"></image>
-							<view class="tover fflex">{{detail.address}}</view>
+							<view class="tovers fflex">{{detail.address}}</view>
+						</view>
+						<view  class="time ddflex">
+							<image style="width: 21rpx;height: 21rpx;margin-right: 10rpx;" src="../static/images/pic.png"></image>
+							<text class="flex">{{ detail.enlistStartTime?formatTime(detail.enlistStartTime):'' }}-{{ detail.enlistEndTime?formatTime(detail.enlistEndTime):'' }}</text>
+						</view>
+						<view  class="time ddflex" style="margin-top: 12rpx;">
+							<image style="width: 19rpx;height: 24rpx;margin-right: 10rpx;" src="../static/images/pic.png"></image>
+							<text class="flex">{{ detail.address?detail.address:'宁德市教育局' }}</text>
 						</view>
-						<!-- <view class="money" v-if="userinfovip.levelGrade>0&& !userinfovip.end">¥{{detail.vipMoney}}</view> -->
-						<view class="money">¥{{price}}</view>
 					</view>
 				</view>
 			</view>
-			<view class="date">
-				<view class="time ddflex"><!-- <image src="../static/images/sjico.png"></image> -->报名时间:{{ detail.enlistStartTime }}-{{ detail.enlistEndTime }}</view>
-				<view class="time ddflex"><!-- <image src="../static/images/sjico.png"></image> -->活动时间:{{ detail.startTime }}-{{ detail.endTime }}</view>
-			</view>
 		</view>
 		<view class="info">
 			<view class="tit ddflex">报名信息<text>{{personList.length}}人</text></view>
 			<view class="add" @click="addSign()">+ 添加报名人</view>
 			<view class="list">
-				<view class="li ddflex" v-for="(item,index) in personList" :key="index">
+				<view class="li ddflex" v-for="(item,index) in personList" :key="index" @click="jumpUrl('/match/signPerson/signPerson?index='+(index+1))">
 					<image src="../../static/pages/images/userimg.png" mode="aspectFill" class="user"></image>
 					<view class="fflex">{{item.name}}<text>{{item.phone}}</text></view>
 					<image src="../static/images/jian.png" class="jian" @click="delPerson(index)"></image>
 				</view>
 			</view>
 		</view>
-		<view class="btn" @click="jumpUrl('/match/signConfirm/signConfirm?id=' + detail.id + '&priceId=' + options.priceId)">下一步</view>
+		<view class="btn" @click="jumpUrlNext('/match/signConfirm/signConfirm?id=' + detail.id + '&priceId=' + options.priceId)">下一步</view>
 		<!-- 添加报名信息 -->
 		<view class="ceng" v-if="isAdd"></view>
 		<view class="popup" v-if="isAdd">
@@ -70,13 +72,16 @@ export default {
 	},
 	onLoad(options) {
 		this.options = options;
-		if(req.getStorage('personList')){
-			this.personList = req.getStorage('personList')
-		}
+		// if(req.getStorage('personList')){
+		// 	this.personList = req.getStorage('personList')
+		// }
 	},
 	onShow() {
 		this.price = req.getStorage('actPrice');
 		this.getuserVip();
+		if(req.getStorage('personList')){
+			this.personList = req.getStorage('personList')
+		}
 		this.getData(true);
 	},
 	methods: {
@@ -127,14 +132,22 @@ export default {
 				this.detail.isCollect = !this.detail.isCollect;
 			})
 		},
-		jumpUrl(url){
+		jumpUrlNext(url){
 			if(this.personList && this.personList.length < 1) return req.msg('请添加报名人员');
 			uni.navigateTo({
 				url: url
 			})
 		},
+		jumpUrl(url){
+			uni.navigateTo({
+				url: url
+			})
+		},
 		addSign(){
-			this.isAdd = true;
+			// this.isAdd = true;
+			uni.navigateTo({
+				url: '/match/signPerson/signPerson'
+			})
 		},
 		cancel(){
 			this.isAdd = false;
@@ -162,6 +175,10 @@ export default {
 			this.personList.splice(index,1)
 			req.setStorage('personList',this.personList)
 		},
+		formatTime(date){
+			date = new Date(date.replace(/-/g, '/'))
+			return util.formatTime(date).t3
+		}
 	}
 };
 </script>

+ 5 - 5
match/signConfirm/signConfirm.css

@@ -1,12 +1,12 @@
 /* Confirm.css */
 page{padding-bottom: 110rpx;}
-.top{background: #fff;padding: 40rpx 32rpx 0;}
+.top{background: #fff;padding: 40rpx 32rpx 32rpx;}
 .top>.ddflex{align-items: flex-start;}
 .act-img{width: 270rpx;height: 174rpx;border-radius: 6rpx;margin-right: 23rpx;}
-.title{font-size: 28rpx;color: #000;line-height: 38rpx;margin-bottom: 15rpx;}
+.title{font-size: 28rpx;color: #000;line-height: 39rpx;height: 78rpx;}
 .time{font-size: 26rpx;color: #666;}
-.time image{width: 22rpx;height: 25rpx;margin-right: 6rpx;}
-.sta{margin-top: 15rpx;}
+.time image{width: 22rpx;height: 25rpx;margin-right: 6rpx;margin-top: 7rpx;}
+.sta{margin-top: 16rpx;}
 .area{font-size: 22rpx;color: #999;margin-right: 6rpx;}
 .area image{width: 22rpx;height: 25rpx;margin-right: 6rpx;}
 .money{font-size: 30rpx;color: #333;}
@@ -27,4 +27,4 @@ page{padding-bottom: 110rpx;}
 .heji{font-size: 30rpx;color: #000;}
 .heji text{color: #FF1919;font-size: 36rpx;}
 .heji text.yuan{font-size: 20rpx;}
-.btn{width: 370rpx;height: 70rpx;background: #E9001E;border-radius: 35rpx;font-size: 36rpx;color: #fff;text-align: center;line-height: 70rpx;}
+.btn{height: 68rpx;background:var(--main);border: 1rpx solid var(--main);border-radius: 35rpx;font-size: 32rpx;color: #fff;text-align: center;line-height: 68rpx;}

+ 29 - 16
match/signConfirm/signConfirm.vue

@@ -10,25 +10,34 @@
 							<image src="../static/images/dzico1.png"></image>
 							<view class="tover fflex">{{detail.address}}</view>
 						</view>
-						<!-- <view class="money" v-if="userinfovip.levelGrade>0&& !userinfovip.end">¥{{detail.vipMoney}}</view> -->
-						<view class="money">¥{{price}}</view>
+					</view>
+					<view  class="time ddflex">
+						<image style="width: 21rpx;height: 21rpx;margin-right: 10rpx;" src="../static/images/pic.png"></image>
+						<text class="flex">{{ detail.enlistStartTime?formatTime(detail.enlistStartTime):'' }}-{{ detail.enlistEndTime?formatTime(detail.enlistEndTime):'' }}</text>
+					</view>
+					<view  class="time ddflex" style="margin-top: 12rpx;">
+						<image style="width: 19rpx;height: 24rpx;margin-right: 10rpx;" src="../static/images/pic.png"></image>
+						<text class="flex">{{ detail.address?detail.address:'宁德市教育局' }}</text>
 					</view>
 				</view>
 			</view>
-			<view class="date">
-				<view class="time ddflex"><!-- <image src="../static/images/sjico.png"></image> -->报名时间:{{ detail.enlistStartTime }}-{{ detail.enlistEndTime }}</view>
-				<view class="time ddflex"><!-- <image src="../static/images/sjico.png"></image> -->活动时间:{{ detail.startTime }}-{{ detail.endTime }}</view>
-			</view>
-			<view class="piao ddflex" v-if="money > 0">
-				<view class="fflex">收费票</view>
-				<view class="num">x{{personList.length}}</view>
-				<view class="price"><text>¥</text>{{money}}</view>
-			</view>
 		</view>
 		<view class="list">
-			<view class="li ddflex" v-for="(item,index) in personList" :key="index">
-				<view class="fflex">{{item.name}}</view>
-				<text>{{item.phone}}</text>
+			<view class="li" v-for="(item,index) in personList" :key="index">
+				<view class="ddflex">
+					<view class="fflex">{{item.name}}</view>
+					<view class="ddflex" style="color: #A1A1A1;font-size: 24rpx;">
+						展开
+						<image style="width: 9rpx;height: 19rpx;margin-left: 10rpx;" src="/static/pages/images/more.png"></image>
+					</view>
+				</view>
+				<view style="line-height: 42rpx;color: #A1A1A1;">{{item.phone}}</view>
+				<view v-if="item.extend">
+					<view v-for="it in item.extend" class="ddflex" style="font-size: 24rpx;margin-top: 20rpx;">
+						<view style="color: #A1A1A1;margin-right: 24rpx;">{{it.label}}</view>
+						<view style="color: #333333;">{{it.value}}</view>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="ming">
@@ -39,8 +48,8 @@
 			</view>
 		</view>
 		<view class="bot ddflex">
-			<view class="heji">合计:<text class="yuan">¥</text><text>{{money}}</text></view>
-			<view class="btn" @click="pay()">确认支付</view>
+			<!-- <view class="heji">合计:<text class="yuan">¥</text><text>{{money}}</text></view> -->
+			<view class="btn flex" @click="pay()">确认支付</view>
 		</view>
 	</view>
 </template>
@@ -161,6 +170,10 @@ export default {
 			req.payOrders(id,success =>{
 				this.jumpUrl('/match/success/success?id=' + this.detail.id)
 			})
+		},
+		formatTime(date){
+			date = new Date(date.replace(/-/g, '/'))
+			return util.formatTime(date).t3
 		}
 	}
 };

+ 85 - 0
match/signPerson/signPerson.css

@@ -0,0 +1,85 @@
+page{
+	background-color: #fff;
+}
+.p-form{
+	padding:40rpx;
+}
+.p-form-item{
+	margin-bottom: 40rpx;
+}
+.p-label{
+	line-height: 45rpx;
+	font-size: 32rpx;
+	font-family: PingFang SC-Semibold, PingFang SC;
+	font-weight: 500;
+	color: #333333;
+	margin-bottom: 20rpx;
+}
+.p-input{
+	background: #F8F8F8;
+	border-radius: 8rpx;
+	padding: 24rpx;
+	opacity: 1;
+	font-size: 26rpx;
+}
+.p-placeholder{
+	font-size: 26rpx;
+	color: #999999;
+}
+.p-select{
+	line-height: 47rpx;
+	font-size: 32rpx;
+	font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+	font-weight: 400;
+	color: #999999;
+}
+.p-select-item{
+	margin-right: 70rpx;
+}
+.p-select-item:last-child{
+	margin-right: 0;
+}
+.p-select-item image{
+	width: 30rpx;
+	height: 30rpx;
+	margin-right: 12rpx;
+}
+
+.p-select-group{
+
+}
+.p-select-group-item{
+	line-height: 70rpx;
+	font-size: 28rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #333333;
+	background: #F3F5F7;
+	border-radius: 35rpx 35rpx 35rpx 35rpx;
+	padding: 0 30rpx;
+	margin-right: 20rpx;
+}
+.p-select-group-item-active{
+	background-color: var(--main);
+	color: #fff;
+}
+.share-btn{
+	background-color: #fff;
+	padding: 30rpx 40rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 5;
+}
+.btn{
+	line-height: 80rpx;
+	background: #27D699;
+	border-radius: 40rpx 40rpx 40rpx 40rpx;
+	opacity: 1;
+	font-size: 32rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #FFFFFF;
+	text-align: center;
+}

+ 195 - 0
match/signPerson/signPerson.vue

@@ -0,0 +1,195 @@
+<template>
+	<view>
+		<view class="p-form">
+			<view class="p-label">姓名</view>
+			<view class="p-input">
+				<input v-model="name" placeholder="请输入姓名" placeholder-class="p-placeholder"/>
+			</view>
+			<view class="p-label">手机号</view>
+			<view class="p-input">
+				<input v-model="phone" placeholder="请输入手机号" placeholder-class="p-placeholder"/>
+			</view>
+			<view v-for='item,index in parmas' class="p-form-item">
+				<view class="p-label">{{item.label}}</view>
+				<!-- 输入框 -->
+				<view v-if="item.type==1" class="p-input">
+					<input v-model="item.value" :placeholder="'请输入'+item.label" placeholder-class="p-placeholder"/>
+				</view>
+				<!-- 单选 -->
+				<view v-if="item.type==2" class="p-select">
+					<view class="ddflex">
+						<view class="ddflex p-select-item"  v-for="it in item.data" @click="pSelect(item,it)">
+							<image v-if="item.value===it.value" src="/static/images/select_h.png"></image>
+							<image v-else src="/static/images/select.png"></image>
+							<view>{{it.label}}</view>
+						</view>
+					</view>
+				</view>
+				<!-- 多选 -->
+				<view v-if="item.type==3" class="p-select-group">
+					<view class="ddflex">
+						<view :class="'ddflex p-select-group-item '+(item.value.indexOf(it.value)!=-1?'p-select-group-item-active':'')"  v-for="it in item.data" @click="pSelectGroup(item,it)">
+							<view>{{it.label}}</view>
+						</view>
+					</view>
+				</view>
+				<!-- 文本域 -->
+				<view v-if="item.type==4" class="p-input">
+					<view class="ddflex">
+						<textarea v-model="item.value" :placeholder="'请输入'+item.label" placeholder-class="p-placeholder"></textarea>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view style="height: 150rpx;"></view>
+		<view class="share-btn">
+			<view class="btn" @click="submit">保存</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	const req = require("../../utils/request.js");
+
+	export default {
+		components: {},
+		props: {},
+		data() {
+			return {
+				systems: {},
+				isTop:0,
+				name:'',
+				phone:'',
+				parmas:[{
+					label:'姓名',
+					name:'name',
+					value:'',
+					type:1,//输入框
+				},{
+					label:'性别',
+					name:'sex',
+					value:'',
+					data:[{label:'男',value:1},{label:'女',value:2}],
+					type:2,//单选
+				},{
+					label:'手机号码',
+					name:'phone',
+					value:'',
+					type:1,//输入框
+				},{
+					label:'身份证号码',
+					name:'userName',
+					value:'',
+					type:1,//输入框
+				},{
+					label:'兴趣爱好',
+					name:'like',
+					value:'',
+					data:[{label:'户外运动',value:1},{label:'旅游',value:2}],
+					type:3,//多选
+				},{
+					label:'建议',
+					name:'suggest',
+					value:'',
+					type:4,//文本域
+				}],
+				index:null
+			}
+		},
+		onLoad(options) {
+			if(options.index){
+				this.index = options.index
+				if(req.getStorage('personList')){
+					let parmas = req.getStorage('personList')[options.index-1]
+					 this.name = parmas.name
+					 this.phone = parmas.phone
+					 this.parmas.map(item=>{
+						 parmas.extend.map(it=>{
+							if(item.type == it.type&&item.name == it.name){
+														 item.value = it.value
+							}
+						 })
+					 })
+				}
+			}
+		},
+		onShow() {
+			
+		},
+		methods: {
+			pSelect(item,it){
+				if(item.value === it.value){
+					item.value=''
+				}else if(item.value != it.value){
+					item.value=it.value
+				}
+			},
+			pSelectGroup(item,it){
+				if(item.value=='') item.value=[]
+				let index = item.value.indexOf(it.value)
+				if(index!=-1){
+					item.value.splice(index,1)
+				}else {
+					item.value.push(it.value)
+				}
+			},
+			submit(){
+				if(this.index){
+					console.log('parmas',JSON.stringify(this.parmas))
+					let personList = []
+					let parmas = {
+						name: this.name?this.name:'',
+						phone: this.phone?this.phone:'',
+						extend:this.parmas
+					}
+					if(req.getStorage('personList')){
+						personList = req.getStorage('personList')
+						personList[this.index-1] = parmas
+						req.setStorage('personList',personList)
+					}else{
+						personList = personList.concat(parmas);
+					}
+					uni.navigateBack()
+				}else{
+					console.log('parmas',JSON.stringify(this.parmas))
+					let personList = []
+					if(req.getStorage('personList')){
+						personList = req.getStorage('personList')
+					}
+					let parmas = {
+						name: this.name?this.name:'',
+						phone: this.phone?this.phone:'',
+						extend:this.parmas
+					}
+					personList = personList.concat(parmas);
+					req.setStorage('personList',personList)
+					uni.navigateBack()
+				}
+			}
+		},
+		mounted() {
+			const systemInfo = uni.getSystemInfoSync();
+			// px转换到rpx的比例
+			let pxToRpxScale = 750 / systemInfo.windowWidth;
+			let systems = {
+				ktxStatusHeight: systemInfo.statusBarHeight * pxToRpxScale, // 状态栏的高度
+				navigationHeight: 44 * pxToRpxScale // 导航栏的高度
+			};
+			systems.barHeight = systems.ktxStatusHeight + systems.navigationHeight;
+			this.systems = systems;
+		},
+		onPageScroll: function(e) {
+			if (e.scrollTop > this.systems.barHeight) {
+				this.isTop = 1;
+			} else {
+				this.isTop = 0;
+			}
+		}
+	}
+</script>
+
+<style>
+	@import "./signPerson.css";
+</style>

BIN
match/static/images/bmsj.png


BIN
match/static/images/hddz.png


+ 2 - 2
office/detail/detail.vue

@@ -53,9 +53,9 @@
 				</view>
 			</view>
 			<view class="que ddflex" v-if="detail.question" @click="jumpUrl('/learn/topic/index?questId=' + detail.question.id)">
-				<image src="../../static/images/ht_ico1.png" class="st-ico"></image>
+				<!-- <image src="../../static/images/ht_ico1.png" class="st-ico"></image> -->
 				<view class="fflex"><rich-text :nodes="detail.question.title" class="tovers"></rich-text></view>
-				<image src="../../static/images/ht_ico2.png" class="st-rico"></image>
+				<!-- <image src="../../static/images/ht_ico2.png" class="st-rico"></image> -->
 			</view>
 			<!-- <view class="cates ddflex" v-if="detail.question && detail.question.cateName">
 				<text>{{ detail.question.cateName }}</text>

BIN
office/static/images/fx.png


+ 15 - 0
pages.json

@@ -1166,6 +1166,11 @@
 					"style": {
 						"navigationBarTitleText": "创建活动"
 					}
+				},{
+					"path": "signPerson/signPerson",
+					"style": {
+						"navigationBarTitleText": "填写报名信息"
+					}
 				}
 			]
 		},
@@ -1284,6 +1289,16 @@
 					"style": {
 						"navigationBarTitleText": ""
 					}
+				},{
+					"path": "posterService/posterService",
+					"style": {
+						"navigationBarTitleText": "海报"
+					}
+				},{
+					"path": "productLink/productLink",
+					"style": {
+						"navigationBarTitleText": "产品链接"
+					}
 				}
 			]
 		}

+ 6 - 6
pages/shop/shop.vue

@@ -1,12 +1,12 @@
 <template>
 	<view>
 		<view class="top" :style="'height: '+ systems.barHeight + 'rpx;'">
-			<image src="../../static/pages/images/topbg.png" class="topbg"></image>
+			<!-- <image src="../../static/pages/images/topbg.png" class="topbg"></image> -->
 			<view class="title" :style="'line-height: '+ systems.navigationHeight + 'rpx;top:' + systems.ktxStatusHeight + 'rpx;'">小店团</view>
 		</view>
 		<view :style="'height: '+ systems.barHeight + 'rpx;'"></view>
 		<view class="tcon">
-			<image src="../../static/pages/images/mbg.png" class="tcbg"></image>
+			<!-- <image src="../../static/pages/images/mbg.png" class="tcbg"></image> -->
 			<view class="merchant ddflex">
 				<image src="../../static/pages/images/blue/wdbg.png" mode="aspectFit" class="logo"></image>
 				<view class="fflex">
@@ -25,19 +25,19 @@
 				</view>
 				<view class="nav ddflex">
 					<view class="li">
-						<image src="../../static/pages/images/navico1.png" mode="aspectFill"></image>
+						<!-- <image src="../../static/pages/images/navico1.png" mode="aspectFill"></image> -->
 						<view>团长说</view>
 					</view>
 					<view class="li">
-						<image src="../../static/pages/images/navico2.png" mode="aspectFill"></image>
+						<!-- <image src="../../static/pages/images/navico2.png" mode="aspectFill"></image> -->
 						<view>店长推荐</view>
 					</view>
 					<view class="li">
-						<image src="../../static/pages/images/navico3.png" mode="aspectFill"></image>
+						<!-- <image src="../../static/pages/images/navico3.png" mode="aspectFill"></image> -->
 						<view>热卖爆款</view>
 					</view>
 					<view class="li">
-						<image src="../../static/pages/images/navico4.png" mode="aspectFill"></image>
+						<!-- <image src="../../static/pages/images/navico4.png" mode="aspectFill"></image> -->
 						<view>联系店长</view>
 					</view>
 				</view>

+ 2 - 2
pages/user/user.vue

@@ -16,12 +16,12 @@
 				<view class="mines" @click="jumpUrl('mine/set/index')" v-if="isLogin">
 					<view class="ddflex">
 						{{ userInfos.nickName }}
-						<image src="../../static/pages/images/rz_qy_h.png" class="auth-img"
+						<!-- <image src="../../static/pages/images/rz_qy_h.png" class="auth-img"
 							v-if="userInfos.authStatus == 2"></image>
 						<image src="../../static/pages/images/rz_qy.png" class="auth-img" v-else></image>
 						<image src="../../static/pages/images/rz_gr_h.png" class="auth-img"
 							v-if="userInfos.companyStatus == 2"></image>
-						<image src="../../static/pages/images/rz_gr.png" class="auth-img" v-else></image>
+						<image src="../../static/pages/images/rz_gr.png" class="auth-img" v-else></image> -->
 					</view>
 					<text class="edu" v-if="userInfos.mobile">{{ styleHintPhoneText(userInfos.mobile) }}</text>
 				</view>

BIN
static/images/edit1.png


BIN
static/images/select.png


BIN
static/images/select_h.png


BIN
static/images/yd.png


+ 10 - 10
topic/shop/shop.vue

@@ -14,7 +14,7 @@
 			</view>
 		</view>
 		<view class="content">
-			<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="shop-img"></image>
+			<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="shop-img"></image> -->
 			<view class="shop">
 				<view class="shop-info ddflex">
 					<view class="fflex">
@@ -22,7 +22,7 @@
 						<view class="shop-datas">快送约43分钟·月售1438·开发票</view>
 					</view>
 					<view class="shop-pic">
-						<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="shop-logo"></image>
+						<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="shop-logo"></image> -->
 					</view>
 				</view>
 				<view class="shop-news tover">公告:嗨!欢迎,欢迎,欢迎,欢迎来到智企云助手(中电软件园店)</view>
@@ -94,7 +94,7 @@
 				</navigator>
 				<view class="rec-list ddflex">
 					<navigator url="" hover-class="none" class="li">
-						<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="rec-img"></image>
+						<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="rec-img"></image> -->
 						<view class="rec-title tover">商品名称商品名称商品名称</view>
 						<view class="res-op ddflex">
 							<view class="unit ddflex">
@@ -105,7 +105,7 @@
 						</view>
 					</navigator>
 					<navigator url="" hover-class="none" class="li">
-						<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="rec-img"></image>
+						<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="rec-img"></image> -->
 						<view class="rec-title tover">商品名称商品名称商品名称</view>
 						<view class="res-op ddflex">
 							<view class="unit ddflex">
@@ -116,7 +116,7 @@
 						</view>
 					</navigator>
 					<navigator url="" hover-class="none" class="li">
-						<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="rec-img"></image>
+						<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="rec-img"></image> -->
 						<view class="rec-title tover">商品名称商品名称商品名称</view>
 						<view class="res-op ddflex">
 							<view class="unit ddflex">
@@ -147,14 +147,14 @@
 					<view class="tit">买过</view>
 					<view class="buy">
 						<view class="li ddflex">
-							<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="buy-img"></image>
+							<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="buy-img"></image> -->
 							<view class="buy-tit tover fflex">商品名称商品名称商品名称</view>
 							<view class="buy-count ddflex">1次</view>
 							<view class="sale"><text>¥</text>19.9</view>
 							<image src="../../static/pages/images/jia.png" class="jia"></image>
 						</view>
 						<view class="li ddflex">
-							<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="buy-img"></image>
+							<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="buy-img"></image> -->
 							<view class="buy-tit tover fflex">商品名称商品名称商品名称</view>
 							<view class="buy-count ddflex">1次</view>
 							<view class="sale"><text>¥</text>19.9</view>
@@ -164,7 +164,7 @@
 					<view class="tit">热销<text>大家喜欢吃,才叫真好吃</text></view>
 					<view class="pro-list">
 						<view class="li ddflex">
-							<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="pro-img"></image>
+							<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="pro-img"></image> -->
 							<view class="fflex">
 								<view class="pro-tit">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
 								<view class="pro-bri tovers">商品简介商品简介商品简介商品简介商品简介</view>
@@ -182,7 +182,7 @@
 							</view>
 						</view>
 						<view class="li ddflex">
-							<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="pro-img"></image>
+							<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="pro-img"></image> -->
 							<view class="fflex">
 								<view class="pro-tit">商品名称商品名称商品名称商品</view>
 								<view class="pro-bri tovers">商品简介商品简介商品简介商品简介商品简介</view>
@@ -200,7 +200,7 @@
 							</view>
 						</view>
 						<view class="li ddflex">
-							<image src="../../static/pages/images/mbg.png" mode="aspectFill" class="pro-img"></image>
+							<!-- <image src="../../static/pages/images/mbg.png" mode="aspectFill" class="pro-img"></image> -->
 							<view class="fflex">
 								<view class="pro-tit">商品名称商品名称商品名称商品</view>
 								<view class="pro-bri tovers">商品简介商品简介商品简介商品简介商品简介</view>

+ 2 - 2
topics/release/release.vue

@@ -81,9 +81,9 @@
 					</view>
 				</block>
 				<view class="que ddflex" v-if="item.question" @click="jumpUrl('/learn/topic/index?questId=' + item.question.id)">
-					<image src="../../static/images/ht_ico1.png" class="st-ico"></image>
+					<!-- <image src="../../static/images/ht_ico1.png" class="st-ico"></image> -->
 					<view class="fflex"><rich-text :nodes="item.question.title" class="tovers"></rich-text></view>
-					<image src="../../static/images/ht_ico2.png" class="st-rico"></image>
+					<!-- <image src="../../static/images/ht_ico2.png" class="st-rico"></image> -->
 				</view>
 				<view class="cates ddflex" v-if="item.question && item.question.cateName">
 					<text>{{ item.question.cateName }}</text>

Some files were not shown because too many files changed in this diff