1

pages/home/index.vue

@@ -81,7 +81,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="other">
+								<view class="other" v-if="item.p_act">
 									<text class="act" v-for="(tag,index) in item.p_act" :key="index">{{tag}}</text>
 								</view>
 								<view class="acttags">

pages/week/index.vue

@@ -48,6 +48,10 @@
 										<view class="money">
 											<text>¥{{tag.sell_money}}</text>
 										</view>
+										<view class="other" v-if="tag.p_act">
+											<text class="act" v-for="(tags,indexx) in tag.p_act"
+												:key="indexx">{{tags}}</text>
+										</view>
 									</view>
 								</view>
 							</view>
@@ -395,6 +399,19 @@
 								color: #ff0000;
 								margin: 0 0 1vw 0;
 							}
+
+							.other {
+								display: flex;
+								justify-content: space-between;
+
+								.act {
+									font-size: 12px;
+									color: #FFA500;
+									border: 1px solid #FFA500;
+									border-radius: 5px;
+									padding: 0 1vw;
+								}
+							}
 						}
 					}
 				}

pagesHome/market/search.vue

@@ -8,23 +8,27 @@
 				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
 					<view class="list-scroll-view">
 						<view class="two_1">
-							<view :class="['list',condActive==index?'activeList':'']" v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
+							<view :class="['list',condActive==index?'activeList':'']" v-for="(item,index) in condList"
+								:key="index" @tap="toCond(index,item)">
 								<view class="name">
 									{{item.name}}
 								</view>
 								<view class="icon">
 									<view class="icon_1">
-										<text :class="['iconfont',item.shangActive]" v-if="condActive==index&&shang=='1'"></text>
+										<text :class="['iconfont',item.shangActive]"
+											v-if="condActive==index&&shang=='1'"></text>
 										<text :class="['iconfont',item.shang]" v-else></text>
 									</view>
 									<view class="icon_1">
-										<text :class="['iconfont', item.xiaActive]" v-if="condActive==index&&xia=='-1'"></text>
+										<text :class="['iconfont', item.xiaActive]"
+											v-if="condActive==index&&xia=='-1'"></text>
 										<text :class="['iconfont', item.xia]" v-else></text>
 									</view>
 								</view>
 							</view>
 							<view class="screenList" v-if="pid">
-								<picker @change="screenChange" name="screen" :value="screen" :range="screenList" range-key="label">
+								<picker @change="screenChange" name="screen" :value="screen" :range="screenList"
+									range-key="label">
 									<view class="uni-input">{{screen_name||'筛选'}}</view>
 								</picker>
 							</view>
@@ -32,7 +36,8 @@
 						<view class="two_2">
 							<view class="pubu">
 								<view class="list" v-for="(item,index) in list" :key="index" @tap="toBuy(item)">
-									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
+									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+										mode="">
 									</image>
 									<view class="sale" v-if="item.is_sale==true">
 										<text>已售尽</text>
@@ -52,6 +57,9 @@
 											<text class="iconfont icon-gouwuche"></text>
 										</view>
 									</view>
+									<view class="other" v-if="item.p_act">
+										<text class="act" v-for="(tag,index) in item.p_act" :key="index">{{tag}}</text>
+									</view>
 									<view class="acttags">
 										<text v-for="i in item.actTagsShow" :key="i">{{i.label}}</text>
 									</view>
@@ -378,16 +386,17 @@
 
 						.name {
 							font-size: var(--font16Size);
-							margin: 0 0 1vw 0;
 						}
 
 						.other {
 							display: flex;
 							flex-direction: row;
 							justify-content: space-between;
+							padding: 1vw 0 0 0;
 
 							.money {
 								font-size: var(--font14Size);
+								color: var(--ff0Color);
 
 								text:nth-child(1) {
 									font-size: var(--font12Size);
@@ -410,12 +419,21 @@
 									font-size: var(--font20Size);
 								}
 							}
+
+							.act {
+								font-size: 12px;
+								color: #FFA500;
+								border: 1px solid #FFA500;
+								border-radius: 5px;
+								padding: 0 1vw;
+							}
 						}
+
 						.acttags {
 							position: absolute;
 							top: 2vw;
 							width: 93%;
-						
+
 							text {
 								display: inline-block;
 								background-color: #ff0000;
@@ -423,7 +441,7 @@
 								border-radius: 1vw;
 								padding: 0.5vw;
 								font-size: 12px;
-						
+
 								margin: 0 1vw 0 0;
 							}
 						}

pagesHome/market/type.vue

@@ -2,13 +2,15 @@
 	<mobile-frame>
 		<view class="main">
 			<view class="one">
-				<input type="text" placeholder="寻找您喜爱的商品" @tap="toCommon('pagesHome/market/search')" placeholder-class="placss">
+				<input type="text" placeholder="寻找您喜爱的商品" @tap="toCommon('pagesHome/market/search')"
+					placeholder-class="placss">
 			</view>
 			<view class="two">
 				<view class="two_1">
 					<scroll-view scroll-y="true" class="scroll-view">
 						<view class="list-scroll-view">
-							<view class="list" :class="[active==index?'listActive':'']" v-for="(item,index) in typeList" :key="index" @tap="toChange(index,item)">
+							<view class="list" :class="[active==index?'listActive':'']" v-for="(item,index) in typeList"
+								:key="index" @tap="toChange(index,item)">
 								<text>{{item.label}}</text>
 							</view>
 						</view>
@@ -19,16 +21,22 @@
 						<view class="list-scroll-view">
 							<view class="two_2_1">
 								<scroll-view scroll-x="true" class="typeScrollview">
-									<view class="list" v-for="(item,index) in list" :key="index" @tap="twoChange(item,index)">
-										<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:logoUrl" mode=""></image>
-										<view class="label textOver"><text :style="{color:twoActive==index?'#ff0000':'#000000'}">{{item.label}}</text></view>
+									<view class="list" v-for="(item,index) in list" :key="index"
+										@tap="twoChange(item,index)">
+										<image class="image"
+											:src="item.file&&item.file.length>0?item.file[0].url:logoUrl" mode="">
+										</image>
+										<view class="label textOver"><text
+												:style="{color:twoActive==index?'#ff0000':'#000000'}">{{item.label}}</text>
+										</view>
 									</view>
 								</scroll-view>
 							</view>
 							<view class=" two_2_2">
 								<view class="list" v-for="(tag,index) in marketList" :key="index" @tap="toBuy(tag)">
 									<view class="img">
-										<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''" mode=""></image>
+										<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''"
+											mode=""></image>
 									</view>
 									<view class="info">
 										<view class="name textOver">
@@ -40,6 +48,10 @@
 										<view class="money">
 											<text>¥{{tag.sell_money}}</text>
 										</view>
+										<view class="other" v-if="tag.p_act">
+											<text class="act" v-for="(tags,indexx) in tag.p_act"
+												:key="indexx">{{tags}}</text>
+										</view>
 									</view>
 								</view>
 							</view>
@@ -363,6 +375,19 @@
 								color: var(--fFB1Color);
 								margin: 0 0 1vw 0;
 							}
+
+							.other {
+								display: flex;
+								justify-content: space-between;
+
+								.act {
+									font-size: 12px;
+									color: #FFA500;
+									border: 1px solid #FFA500;
+									border-radius: 5px;
+									padding: 0 1vw;
+								}
+							}
 						}
 					}
 				}

pagesHome/shop/index.vue

@@ -11,7 +11,8 @@
 						<view class="one_1_2">
 							<view class="pubu">
 								<view class="list" v-for="(item,index) in shoplist" :key="index" @tap="toBuy(item)">
-									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
+									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+										mode=""></image>
 									<view class="name textOver">
 										{{item.name}}
 									</view>
@@ -25,6 +26,9 @@
 											</view>
 										</view>
 									</view>
+									<view class="other" v-if="item.p_act">
+										<text class="act" v-for="(tag,index) in item.p_act" :key="index">{{tag}}</text>
+									</view>
 									<view class="acttags">
 										<text v-for="i in item.actTagsShow" :key="i">{{i.label}}</text>
 									</view>
@@ -41,17 +45,20 @@
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
 							<view class="list-scroll-view">
 								<view class="second_1">
-									<view :class="['list',condActive==index?'activeList':'']" v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
+									<view :class="['list',condActive==index?'activeList':'']"
+										v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
 										<view class="name">
 											{{item.name}}
 										</view>
 										<view class="icon">
 											<view class="icon_1">
-												<text :class="['iconfont',item.shangActive]" v-if="condActive==index&&shang=='1'"></text>
+												<text :class="['iconfont',item.shangActive]"
+													v-if="condActive==index&&shang=='1'"></text>
 												<text :class="['iconfont',item.shang]" v-else></text>
 											</view>
 											<view class="icon_1">
-												<text :class="['iconfont', item.xiaActive]" v-if="condActive==index&&xia=='-1'"></text>
+												<text :class="['iconfont', item.xiaActive]"
+													v-if="condActive==index&&xia=='-1'"></text>
 												<text :class="['iconfont', item.xia]" v-else></text>
 											</view>
 										</view>
@@ -60,7 +67,8 @@
 								<view class="second_2">
 									<view class="pubu">
 										<view class="list" v-for="(item,index) in list" :key="index" @tap="toBuy(item)">
-											<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
+											<image class="image"
+												:src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
 											</image>
 											<view class="sale" v-if="item.is_sale==true">
 												<text>已售尽</text>
@@ -78,6 +86,10 @@
 													</view>
 												</view>
 											</view>
+											<view class="other">
+												<text class="act" v-for="(tag,index) in item.p_act"
+													:key="index">{{tag}}</text>
+											</view>
 											<view class="acttags">
 												<text v-for="i in item.actTagsShow" :key="i">{{i.label}}</text>
 											</view>
@@ -112,7 +124,8 @@
 							</view>
 						</view>
 						<view class="qrcode_1">
-							<uqrcode ref="uqrcode" canvas-id="qrcode" :value="uqrcodeInfo" :options="{ margin:10,backgroundColor:'#f1f1f1' }">
+							<uqrcode ref="uqrcode" canvas-id="qrcode" :value="uqrcodeInfo"
+								:options="{ margin:10,backgroundColor:'#f1f1f1' }">
 							</uqrcode>
 							<view class="txt">
 								店铺二维码
@@ -505,13 +518,13 @@
 
 							.name {
 								font-size: var(--font15Size);
-								margin: 0 0 2vw 0;
 							}
 
 							.other {
 								display: flex;
 								flex-direction: row;
 								justify-content: space-between;
+								padding: 1vw 0 0 0;
 
 								.money {
 									display: flex;
@@ -542,6 +555,13 @@
 									}
 								}
 
+								.act {
+									font-size: 12px;
+									color: #FFA500;
+									border: 1px solid #FFA500;
+									border-radius: 5px;
+									padding: 0 1vw;
+								}
 							}
 
 							.acttags {
@@ -740,13 +760,13 @@
 
 								.name {
 									font-size: var(--font16Size);
-									margin: 0 0 1vw 0;
 								}
 
 								.other {
 									display: flex;
 									flex-direction: row;
 									justify-content: space-between;
+									padding: 1vw 0 0 0;
 
 									.money {
 										display: flex;
@@ -777,6 +797,13 @@
 										}
 									}
 
+									.act {
+										font-size: 12px;
+										color: #FFA500;
+										border: 1px solid #FFA500;
+										border-radius: 5px;
+										padding: 0 1vw;
+									}
 								}
 
 								.acttags {

pagesRest/recom/index.vue

@@ -10,7 +10,8 @@
 						<view class="one_2">
 							<view class="list" v-for="(item,index) in list" :key="index" @tap="toBuy(item)">
 								<view class="list_1">
-									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
+									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+										mode=""></image>
 								</view>
 								<view class="name textOver">
 									{{item.name}}
@@ -25,6 +26,9 @@
 										</view>
 									</view>
 								</view>
+								<view class="other">
+									<text class="act" v-for="(tag,index) in item.p_act" :key="index">{{tag}}</text>
+								</view>
 								<view class="acttags">
 									<text v-for="i in item.actTagsShow" :key="i">{{i.label}}</text>
 								</view>
@@ -238,6 +242,7 @@
 						display: flex;
 						flex-direction: row;
 						justify-content: space-between;
+						padding: 1vw 0 0 0;
 
 						.money {
 							display: flex;
@@ -268,6 +273,13 @@
 							}
 						}
 
+						.act {
+							font-size: 12px;
+							color: #FFA500;
+							border: 1px solid #FFA500;
+							border-radius: 5px;
+							padding: 0 1vw;
+						}
 					}
 
 					.acttags {