|
|
@ -120,7 +120,8 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view v-if="storeVersion == 1 && goods.merchant_id > 0" class="merchant-info" @click="toShop()"> |
|
|
|
<view v-if="storeVersion == 1 && goods.merchant_id > 0" class="merchant-info" @click="toShop()"> |
|
|
|
<image :src="goods.merchant.logoImage && goods.merchant.logoImage[0].external_url" mode="aspectFill"></image> |
|
|
|
<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> |
|
|
@ -191,7 +192,8 @@ |
|
|
|
<view class="chosed" v-if="goods.remark"> |
|
|
|
<view class="chosed" v-if="goods.remark"> |
|
|
|
<view class="title">须知</view> |
|
|
|
<view class="title">须知</view> |
|
|
|
<view class="info"> |
|
|
|
<view class="info"> |
|
|
|
<u-read-more :toggle="true" font-size='24' text-indent='0' show-height="200" open-text='收起' close-text='展开'> |
|
|
|
<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> |
|
|
|
<rich-text :nodes="goods.remark"></rich-text> |
|
|
|
</u-read-more> |
|
|
|
</u-read-more> |
|
|
|
</view> |
|
|
|
</view> |
|
|
@ -412,6 +414,7 @@ |
|
|
|
import * as address from '@/api/address.js' |
|
|
|
import * as address from '@/api/address.js' |
|
|
|
import * as CartApi from '@/api/cart' |
|
|
|
import * as CartApi from '@/api/cart' |
|
|
|
import * as SharpGoodsApi from '@/api/sharp/goods' |
|
|
|
import * as SharpGoodsApi from '@/api/sharp/goods' |
|
|
|
|
|
|
|
import store from '@/store' |
|
|
|
export default { |
|
|
|
export default { |
|
|
|
components: { |
|
|
|
components: { |
|
|
|
SkuPopup, |
|
|
|
SkuPopup, |
|
|
@ -633,7 +636,7 @@ |
|
|
|
this.$refs.setRange.secondPrice = item.seckill_price |
|
|
|
this.$refs.setRange.secondPrice = item.seckill_price |
|
|
|
this.$refs.setRange.secondQuota = item.is_limit == 1 ? true : false |
|
|
|
this.$refs.setRange.secondQuota = item.is_limit == 1 ? true : false |
|
|
|
this.$refs.setRange.quotaNum = item.limit_times; |
|
|
|
this.$refs.setRange.quotaNum = item.limit_times; |
|
|
|
this.$refs.setRange.cost_price_min=this.goods.cost_price_min |
|
|
|
this.$refs.setRange.cost_price_min = this.goods.cost_price_min |
|
|
|
} |
|
|
|
} |
|
|
|
this.$refs.setRange.afterSale = true; |
|
|
|
this.$refs.setRange.afterSale = true; |
|
|
|
|
|
|
|
|
|
|
@ -1077,10 +1080,11 @@ |
|
|
|
// 获取推荐商品列表 |
|
|
|
// 获取推荐商品列表 |
|
|
|
const that = this; |
|
|
|
const that = this; |
|
|
|
// 构建页面参数 |
|
|
|
// 构建页面参数 |
|
|
|
const params = that.$getShareUrlParams(this.options) |
|
|
|
|
|
|
|
const res = await GoodsApi.goodsShortUrl({ |
|
|
|
const res = await GoodsApi.goodsShortUrl({ |
|
|
|
page_url: `pages/goods/detail?${params}`, |
|
|
|
page_url: encodeURIComponent('pages/goods/seckillDetail?refereeId=' + store.getters.userId + |
|
|
|
page_title: that.goods.goods_name |
|
|
|
'&goodsId=' + this.goods |
|
|
|
|
|
|
|
.goods_id), |
|
|
|
|
|
|
|
page_title: that.goods.goods_name, |
|
|
|
}) |
|
|
|
}) |
|
|
|
if (res.data.url) { |
|
|
|
if (res.data.url) { |
|
|
|
let str = |
|
|
|
let str = |
|
|
@ -1572,41 +1576,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; |
|
|
@ -1622,6 +1632,7 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.orderInfo { |
|
|
|
.orderInfo { |
|
|
|
// width: 720rpx; |
|
|
|
// width: 720rpx; |
|
|
|
background: #FFFFFF; |
|
|
|
background: #FFFFFF; |
|
|
|