|
|
@@ -93,11 +93,16 @@
|
|
|
<image class="none-image" :src="productNoneImage" mode=""></image>
|
|
|
<view class="none-text">此商品已{{goodsData.disabledText}}，请浏览以下推荐商品~</view>
|
|
|
</view>
|
|
|
- <view class="product-parameter" @click="showPopup" v-if="!goodsData.isNoneDisabled">
|
|
|
+ <view class="product-parameter" @click="showPopup(0)" v-if="!goodsData.isNoneDisabled">
|
|
|
<text class="title">参数：</text>
|
|
|
<text class="name">品牌 起订量 分类...</text>
|
|
|
<text class="iconfont icon-xiayibu"></text>
|
|
|
</view>
|
|
|
+ <view class="product-parameter" @click="showPopup(1)" v-if='product.commodityType == 2'>
|
|
|
+ <text class="title">培训方案：</text>
|
|
|
+ <text class="name">线上培训</text>
|
|
|
+ <text class="iconfont icon-xiayibu"></text>
|
|
|
+ </view>
|
|
|
<view class="product-supplier" v-if="isNoneSupplier" @click="goSupplier">
|
|
|
<view class="logo"><img :src="shop.logo ? shop.logo :'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
|
|
|
<view class="main">
|
|
|
@@ -147,7 +152,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 商品参数 -->
|
|
|
- <tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
|
|
|
+ <tui-bottom-popup :radius="true" :show="popupShow0" @close="hidePopup(0)">
|
|
|
<view class="tui-popup-box clearfix">
|
|
|
<view class="title">商品参数</view>
|
|
|
<div class="tui-popup-main">
|
|
|
@@ -184,7 +189,30 @@
|
|
|
</div>
|
|
|
<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
|
|
|
<view class="tui-flex-1">
|
|
|
- <view class="tui-button" @click="hidePopup()">收起</view>
|
|
|
+ <view class="tui-button" @click="hidePopup(0)">收起</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </tui-bottom-popup>
|
|
|
+ <!-- 培训方案 -->
|
|
|
+ <tui-bottom-popup :radius="true" :show="popupShow1" @close="hidePopup(1)">
|
|
|
+ <view class="tui-popup-box clearfix">
|
|
|
+ <view class="title">培训方案</view>
|
|
|
+ <div class="tui-popup-main">
|
|
|
+ <scroll-view class="tui-popup-scroll train" scroll-y="true">
|
|
|
+ <view class="content-tr">
|
|
|
+ <view class="content-td">培训方式：</view>
|
|
|
+ <view class="content-th">{{ product.trainingMethod == 1 ? '线上培训' : '线下培训' }}</view>
|
|
|
+ </view>
|
|
|
+ <view class="content-tr">
|
|
|
+ <view class="content-td">培训费用：</view>
|
|
|
+ <view class="content-th">{{ product.trainingType == 1 ? '￥'+product.trainingFee : '售价已包含' }}</view>
|
|
|
+ </view>
|
|
|
+ </scroll-view>
|
|
|
+ </div>
|
|
|
+ <view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
|
|
|
+ <view class="tui-flex-1">
|
|
|
+ <view class="tui-button" @click="hidePopup(1)">收起</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -298,7 +326,7 @@
|
|
|
mode:'round',
|
|
|
iconClass:'icon-aixin',
|
|
|
iconColor:'#ff9100',
|
|
|
- specClass: '',//规格弹窗css类，控制开关动画
|
|
|
+ specClass: '', // 规格弹窗css类，控制开关动画
|
|
|
isBtnType:'',
|
|
|
isRequest:false,
|
|
|
isScrollTop:false,
|
|
|
@@ -322,8 +350,8 @@
|
|
|
userId:'',
|
|
|
shopID:'',
|
|
|
productId:0,
|
|
|
- userIdentity:0,//用户类型
|
|
|
- goodsData:{},//自定义数据
|
|
|
+ userIdentity:0, // 用户类型
|
|
|
+ goodsData:{}, // 自定义数据
|
|
|
shop:{},//供应商信息
|
|
|
product:{},//采美
|
|
|
productImage:[],
|
|
|
@@ -335,19 +363,20 @@
|
|
|
minBuyNumber:0,
|
|
|
productsList:[],
|
|
|
goodListData:[],
|
|
|
- headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
|
|
|
- systeminfo: this.setSysteminfo(), //获取设备信息
|
|
|
+ headerBtnPosi: this.setHeaderBtnPosi(), // 获取设备顶部胶囊高度
|
|
|
+ systeminfo: this.setSysteminfo(), // 获取设备信息
|
|
|
isIphoneX:this.$store.state.isIphoneX,
|
|
|
windowHeight: '',
|
|
|
headerColor:false,
|
|
|
backPage:1,
|
|
|
- nvabarData: { //顶部自定义导航
|
|
|
- showCapsule: 1, // 是否显示左上角图标 1表示显示 0表示不显示
|
|
|
- title: '' // 导航栏 中间的标题
|
|
|
+ nvabarData: { // 顶部自定义导航
|
|
|
+ showCapsule: 1, // 是否显示左上角图标 1表示显示 0表示不显示
|
|
|
+ title: '' // 导航栏 中间的标题
|
|
|
},
|
|
|
linkPath:'',
|
|
|
- CustomBar:this.CustomBar,// 顶部导航栏高度
|
|
|
- popupShow:false,//参数弹窗
|
|
|
+ CustomBar:this.CustomBar, // 顶部导航栏高度
|
|
|
+ popupShow0:false, // 参数弹窗
|
|
|
+ popupShow1:false, // 培训方案
|
|
|
tabSelectFlag:false,
|
|
|
sectionPropsArr: [],
|
|
|
scrollTopArray:[],
|
|
|
@@ -675,11 +704,25 @@
|
|
|
imageUrl:`${this.productImage[0]}`
|
|
|
}
|
|
|
},
|
|
|
- showPopup(){
|
|
|
- this.popupShow = true
|
|
|
+ showPopup(index){
|
|
|
+ switch(index){
|
|
|
+ case 0:
|
|
|
+ this.popupShow0 = true
|
|
|
+ break;
|
|
|
+ case 1:
|
|
|
+ this.popupShow1 = true
|
|
|
+ break;
|
|
|
+ }
|
|
|
},
|
|
|
- hidePopup(){
|
|
|
- this.popupShow = false
|
|
|
+ hidePopup(index){
|
|
|
+ switch(index){
|
|
|
+ case 0:
|
|
|
+ this.popupShow0 = false
|
|
|
+ break;
|
|
|
+ case 1:
|
|
|
+ this.popupShow1 = false
|
|
|
+ break;
|
|
|
+ }
|
|
|
},
|
|
|
getSectionProps() {//获取每个tab对应区域的scrollTop值
|
|
|
let className = '.product-details',
|
|
|
@@ -1850,6 +1893,9 @@
|
|
|
.tui-popup-scroll{
|
|
|
width: 100%;
|
|
|
height: 500rpx;
|
|
|
+ &.train{
|
|
|
+ height: 240rpx;
|
|
|
+ }
|
|
|
.content-tr{
|
|
|
width: 100%;
|
|
|
min-height: 58rpx;
|
