wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

Browse Source
h5
wangdong 10 months ago
parent 6c86022f90 56eb0e6e3a
commit 212492d936
2 changed files with 29 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 27
      pages/goods/detail.vue
  2. 8
      pages/goods/seckillDetail.vue

27
pages/goods/detail.vue
Unescape View File

@ -138,8 +138,10 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="storeVersion == 1 && goods.merchant_id > 0 && goods.merchant" class="merchant-info" @click="toShop()"> <view v-if="storeVersion == 1 && goods.merchant_id > 0 && goods.merchant" class="merchant-info"
<image :src="goods.merchant.logoImage && goods.merchant.logoImage[0].external_url" mode="aspectFill"></image> @click="toShop()">
<image :src="goods.merchant.logoImage && goods.merchant.logoImage[0].external_url" mode="aspectFill">
</image>
<view class="info-box"> <view class="info-box">
<view class="info-name"> <view class="info-name">
<text>{{ goods.merchant.shop_name }}</text> <text>{{ goods.merchant.shop_name }}</text>
@ -213,6 +215,14 @@
<text class="li" style="margin-right: 5rpx;">全程跟踪</text> <text class="li" style="margin-right: 5rpx;">全程跟踪</text>
</view> </view>
</view> </view>
<view class="chosed" v-if="goods.remark">
<view class="title">须知</view>
<view class="info">
<u-read-more :toggle="true" font-size='24' text-indent='0' show-height="200" open-text='收起' close-text='展开'>
<rich-text :nodes="goods.remark"></rich-text>
</u-read-more>
</view>
</view>
</view> </view>
<!-- <view class="about"> <!-- <view class="about">
<view class="aboutHead"> <view class="aboutHead">
@ -407,7 +417,7 @@
</view> </view>
<view class="shareWechat" v-if="shareType=='share'"> <view class="shareWechat" v-if="shareType=='share'">
<view class="shareGoods"> <view class="shareGoods">
<image :src="goods.goods_image" class="shareImg"> <image :src="goods.goods_image" class="shareImg">
</image> </image>
</view> </view>
<view class="shareInfo"> <view class="shareInfo">
@ -600,7 +610,6 @@
this.isLogin = false; this.isLogin = false;
this.userInfo = {} this.userInfo = {}
} }
console.log(this.userInfo)
}, },
onPageScroll(e) { onPageScroll(e) {
if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true
@ -1663,41 +1672,47 @@
} }
} }
} }
.merchant-info { .merchant-info {
margin: 20rpx 18rpx 0 18rpx; margin: 20rpx 18rpx 0 18rpx;
padding: 30rpx; padding: 30rpx;
background: #fff; background: #fff;
display: flex; display: flex;
>image { >image {
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
margin-right: 20rpx; margin-right: 20rpx;
flex-shrink: 0; flex-shrink: 0;
} }
.info-box { .info-box {
width: calc(100% - 110rpx); width: calc(100% - 110rpx);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
>.info-name { >.info-name {
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
font-weight: bold; font-weight: bold;
display: flex; display: flex;
align-items: center; align-items: center;
>text { >text {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
width: calc(100% - 21rpx); width: calc(100% - 21rpx);
} }
>image { >image {
margin-left: 10rpx; margin-left: 10rpx;
width: 13rpx; width: 13rpx;
height: 24rpx; height: 24rpx;
} }
} }
>.label { >.label {
text { text {
display: inline-block; display: inline-block;
@ -1713,7 +1728,7 @@
} }
} }
} }
.orderInfo { .orderInfo {
// width: 720rpx; // width: 720rpx;
background: #FFFFFF; background: #FFFFFF;

8
pages/goods/seckillDetail.vue
Unescape View File

@ -188,6 +188,14 @@
<text class="li" style="margin-right: 5rpx;">全程跟踪</text> <text class="li" style="margin-right: 5rpx;">全程跟踪</text>
</view> </view>
</view> </view>
<view class="chosed" v-if="goods.remark">
<view class="title">须知</view>
<view class="info">
<u-read-more :toggle="true" font-size='24' text-indent='0' show-height="200" open-text='收起' close-text='展开'>
<rich-text :nodes="goods.remark"></rich-text>
</u-read-more>
</view>
</view>
</view> </view>
<view class="detail-content" @click="onLook(goods.isLink,goods.contentLink)" v-if="goods.isLink" <view class="detail-content" @click="onLook(goods.isLink,goods.contentLink)" v-if="goods.isLink"
v-html="goods.content"></view> v-html="goods.content"></view>

Write Preview
Loading…
Cancel
Save