Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

pages/FQA/index.vue

@@ -2,6 +2,8 @@
 	<view>
 		<rich-text :nodes="content" v-if="content"></rich-text>
 		<my-nocontent v-else></my-nocontent>
+		<!-- 回到顶部 -->
+		<u-back-top :scroll-top="pageScrollTop"></u-back-top>
 	</view>
 </template>
 

pages/agreement/agreement.vue

@@ -2,6 +2,8 @@
 	<view class="padding-lr">
 		<rich-text :nodes="detail.content" v-if="detail.content"></rich-text>
 		<my-nocontent v-else></my-nocontent>
+		<!-- 回到顶部 -->
+		<u-back-top :scroll-top="pageScrollTop"></u-back-top>
 	</view>
 </template>
 

pages/center/index.vue

@@ -66,7 +66,7 @@
 		<view class="lf-m-b-20 shop-list" v-if="isRight(info.store)">
 			<view class="lf-row-between lf-m-b-20">
 				<view class="lf-font-36 lf-font-bold">商家工具</view>
-				<view class="lf-font-28" style="color: #555555;">{{ info.store.name }}</view>
+				<view class="lf-font-28 lf-line-1" style="color: #555555; max-width: 400rpx;">{{ info.store.name }}</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/shopOrder/index')">
 				<view class="lf-row-center">

pages/collect/index.vue

@@ -26,6 +26,8 @@
 				<text v-if="list.length" :class="{'loading-more-text': loadingClass}">{{ loadingText }}</text>
 				<my-nocontent v-else></my-nocontent>
 			</view>
+			<!-- 回到顶部 -->
+			<u-back-top :scroll-top="pageScrollTop"></u-back-top>
 		</skeleton>
 	</view>
 </template>

pages/goodsDetail/index.vue

@@ -34,7 +34,7 @@
 						<view class="lf-flex">
 							<image class="lf-fle shop-img" :src="goods_detail.store.cover" v-if="goods_detail.store.cover"></image>
 							<image class="lf-fle shop-img" src="../../static/center/shop-logo.png" v-else></image>
-							<view class="lf-font-32 lf-m-l-20" style="max-width: 512rpx;">{{ goods_detail.store.name }}</view>
+							<view class="lf-font-32 lf-m-l-20 lf-line-1" style="max-width: 512rpx;">{{ goods_detail.store.name }}</view>
 						</view>
 						<view @click="makePhoneCall(goods_detail.store.tel)">
 							<text class="lf-iconfont lf-icon-dianhua lf-font-40" style="color: #3A62FF;"></text>
@@ -78,6 +78,8 @@
 					</view>
 					<button class="btn" @click="toAddOrder">立即抢购</button>
 				</view>
+				<!-- 回到顶部 -->
+				<u-back-top :scroll-top="pageScrollTop"></u-back-top>
 			</block>
 		</skeleton>
 	</view>

pages/index/index.vue

@@ -10,12 +10,14 @@
 				</view>
 				<view class="right">
 					<view class="lf-line-2 title">{{ item.name }}</view>
-					<view class="lf-flex tips" v-if="item.specs[0]">
+					<view class="lf-flex tips">
 						<view class="u-line-progress" v-if="item.specs[0].sold_percent">
 							<u-line-progress :percent="item.specs[0].sold_percent" height="20" :striped="true" active-color="#FE9903" :show-percent="false" inactive-color="#F5F5F5"></u-line-progress>
 						</view>
+						<block v-if="item.specs[0]">
 							<text class="progress lf-m-r-10">{{ item.specs[0].sold_percent_text }}</text>
 							<text class="bought">{{ item.specs[0].sold_stock_text }}</text>
+						</block>
 					</view>
 					<view class="lf-row-between price">
 						<lf-price :price="item.specs[0].selling_price" v-if="item.specs[0]"></lf-price>