Merge pull request '修改小程序bug' (#117) from dj into dev

Reviewed-on: http://git.feashow.cn/feashow/pupil/pulls/117

package-lock.json

@@ -1,6 +1,4 @@
 {
-  "name": "pupil",
-  "lockfileVersion": 2,
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {

packageReport/certifiedCjDetail/certifiedCjDetail.vue

@@ -1,25 +1,27 @@
 <template>
 	<view>
-		<u-image :src="imgUrl+detailList.cover" width="750rpx" height="290rpx">
-		</u-image>
-		<view class="feature">
-			<text class="one_title">经营范围及特色</text>
-			<view class="green_block">
-				<text class="green_features">{{detailList.desc}}</text>
+		<view style="position: relative;padding-bottom: 50rpx;">
+			<u-image :src="imgUrl+detailList.cover" width="750rpx" height="290rpx">
+			</u-image>
+			<view class="feature">
+				<text class="one_title">经营范围及特色</text>
+				<view class="green_block">
+					<text class="green_features">{{detailList.desc}}</text>
+				</view>
+			</view>
+			<view class="introduce">
+				<view class="introduce_title">企业介绍</view>
+				<u-parse :content="detailList.content"></u-parse>
+			</view>
+			<view class="show">
+				<view class="introduce_title">企业展示</view>
+				<u-grid :border="false" col="4">
+					<u-grid-item v-for="(listItem,listIndex) in detailList.images" :key="listIndex">
+						<u--image :src="imgUrl+listItem" width="170rpx" height="170rpx" :lazy-load="true">
+						</u--image>
+					</u-grid-item>
+				</u-grid>
 			</view>
-		</view>
-		<view class="introduce">
-			<view class="introduce_title">企业介绍</view>
-			<text class="business_introduce">{{detailList.content}}</text>
-		</view>
-		<view class="show">
-			<view class="introduce_title">企业展示</view>
-			<u-grid :border="false" col="4">
-				<u-grid-item v-for="(listItem,listIndex) in detailList.images" :key="listIndex">
-					<u--image :src="imgUrl+listItem" width="170rpx" height="170rpx" :lazy-load="true">
-					</u--image>
-				</u-grid-item>
-			</u-grid>
 		</view>
 		<view class="footer" @click="showModal()">
 			<u-icon name="kefu-ermai" color="#fff" size="30rpx"></u-icon>
@@ -203,7 +205,7 @@
 	}
 
 	.footer {
-		position: absolute;
+		position: fixed;
 		bottom: 0;
 		width: 100%;
 		height: 100rpx;

pages/detail/productsDetail/productsDetail.vue

@@ -25,13 +25,14 @@
 					<view class="title_tag">{{detailList.cate_bname}}</view>
 				</view>
 				<view class="desc">
-					{{detailList.title}}
+					<text>{{detailList.title}}</text>
+
 				</view>
 				<view class="classify">
 					{{detailList.cate_name}}
 				</view>
 				<view class="tag_view">
-					<view>
+					<view style="width: 85%;">
 						<text class="tagOne" v-for="item in detailList.tags" :key="item.id">{{item}}</text>
 					</view>
 					<!-- thumb有值，显示数字+赞 -->
@@ -72,7 +73,7 @@
 				<text>{{detailList.pub_time}}</text>
 			</view>
 
-			<u-parse :content="detailList.desc" @preview="preview" @navigate="navigate"></u-parse>
+			<u-parse :content="detailList.desc"></u-parse>
 
 			<u-modal :show="showCall" closeOnClickOverlay="false" confirmText="确定" @confirm="confirmCopy">
 				<rich-text :nodes="contentCopy"></rich-text>
@@ -308,6 +309,7 @@
 			align-items: center;
 
 			.title {
+				width: 80%;
 				font-size: 48rpx;
 				font-weight: bold;
 				color: #134b40;
@@ -335,8 +337,10 @@
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #3E3E3E;
-			// line-height: 38rpx;
 			padding: 24rpx 0;
+			overflow: hidden;
+			// white-space: nowrap;
+			text-overflow: ellipsis;
 		}
 
 		.classify {