1

pages/goods_details/index.vue

@@ -341,10 +341,10 @@
 					<view class="iconfont icon-haibao"></view>
 					<view class="">生成海报</view>
 				</button>
-			<!-- 	<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
+				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
 					<view class="iconfont icon-fuzhikouling1"></view>
 					<view>生成口令</view>
-				</button> -->
+				</button>
 			</view>
 			<view class="mask" v-if="posters" @click="listenerActionClose"></view>
 			<!--口令复制结果-->

pages/goods_details/noticeItem.vue

@@ -1,7 +1,13 @@
 <template>
-<div>
+<view style="padding: 24rpx;">
+	<view class="title">
+		{{title}}
+	</view>
+	<view class="time">
+		{{time}}
+	</view>
 	<u-parse :content="content"></u-parse>
-</div>
+</view>
 </template>
 
 <script>
@@ -10,6 +16,8 @@ export default{
 	data(){
 		return{
 			content:'',
+			title:'',
+			time:''
 		}
 	},
 	onLoad(option) {
@@ -19,7 +27,9 @@ export default{
 			let list= res.data.list;
 			list.forEach(item=>{
 				if(item.notice_id==option.id){
-					this.content = item.notice_content
+					this.title = item.notice_title
+					this.time = item.create_time
+					this.content = item.notice_content;
 				}
 			})
 			
@@ -29,5 +39,12 @@ export default{
 </script>
 
 <style lang="scss" scoped>
-
+.title{
+	font-size: 40rpx;
+}
+.time{
+	text-align: right;
+	margin: 20rpx 0;
+	color: #aaaaaa;
+}
 </style>

pages/store/detail/index.vue

@@ -24,6 +24,7 @@
 						<text v-else-if="store.is_trader" class="font-bg-red ml8">自营</text>
 					</view>
 					<!-- <view class="fans">{{ store.care_count < 10000 ? store.care_count : (store.care_count / 10000).toFixed(2) + '万' }}人关注</view> -->
+					<view class="fans">{{ store.care_count}}人关注</view>
 					
 				</view>
 				<view class="section wrap" style="margin-top: 22rpx;padding:0;background: none;">
@@ -83,7 +84,8 @@
 				<view class="item very">
 					<view class="name">店铺地址</view>
 					<view class="value">{{ store.mer_address }}</view>
-					<image src="/static/images/dizhi.png" mode="" v-if="store.lat && store.long && mer_location == 1" @click="showMaoLocation(store.lat, store.long)" style="width:38rpx;height:38rpx;"></image>
+					<!-- && mer_location == 1 -->
+					<image src="/static/images/dizhi.png" mode="" v-if="store.lat && store.long " @click="showMaoLocation(store.lat, store.long)" style="width:38rpx;height:38rpx;"></image>
 					<!-- <view v-if="store.lat && store.long && mer_location == 1" class="iconfont icon-dingwei" @click="showMaoLocation(store.lat, store.long)"></view> -->
 				</view>
 				<view v-if="store.service_phone" class="item">

pages/store/home/index.vue

@@ -192,12 +192,15 @@
 										<text class="name_text line1">{{ item.store_name }}</text>
 									</view>
 									<view class="item_bot">
+										<text class="font-bg-red">{{item.merchant.type_name}}</text>
 										<view class="money-wrap acea-row">
+											
 											<view class="money">
-												¥<text>{{ item.price }}</text>
+												¥<text>{{ item.price }}</text> <text style="font-size: 24rpx;color: #aaa;text-decoration: line-through;margin-left: 10rpx;">￥{{item.ot_price}}</text>
 											</view>
 											<view v-if="item.show_svip_info && item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle">
 												<text class='vip-money'>￥{{item.svip_price}}</text>
+												
 												<view class="vipImg">
 													<image class="image" src="/static/images/svip.png"></image>
 												</view>
@@ -1326,7 +1329,7 @@
 				.money-wrap {
 					display: flex;
 					align-items: center;
-					margin-top: 43rpx;
+					margin-top: 12rpx;
 					.money {
 						font-weight: bold;
 						font-size: 26rpx;
@@ -1437,7 +1440,7 @@
 				.money-wrap {
 					display: flex;
 					align-items: center;
-					margin-top: 52rpx;
+					margin-top: 12rpx;
 					.ticket {
 						height: 28rpx;
 						padding-right: 12rpx;

pages/users/user_address/index.vue

@@ -379,7 +379,7 @@
 		top: 15rpx;
 		text-align: center;
 		font-size: 20rpx;
-		z-index:999;
+		z-index:1;
 		.iconfont{
 			color: var(--view-theme);
 		}