提交 b7f30a93 authored 作者: 刘旭's avatar 刘旭

测试

上级 aaf5b8f0
...@@ -196,6 +196,15 @@ const tapOptions = () => { ...@@ -196,6 +196,15 @@ const tapOptions = () => {
}); });
showModel.show = true; showModel.show = true;
} else { } else {
let flag = cartList.value.every((item: any) => {
return item.checked === false;
});
console.log(flag);
if (flag)
return uni.showToast({
title: '请先选择购买商品',
icon: 'none',
});
// 结算 // 结算
let storage: any = { let storage: any = {
cartId: 0, cartId: 0,
......
...@@ -17,16 +17,17 @@ ...@@ -17,16 +17,17 @@
class="u-tab-view menu-scroll-view" class="u-tab-view menu-scroll-view"
:scroll-top="scrollTop" :scroll-top="scrollTop"
> >
<view <block v-for="(item, index) in categoryList" :key="item.id">
v-for="(item, index) in categoryList" <view
:key="item.id" v-if="item.name !== '客户机器'"
class="u-tab-item" class="u-tab-item"
:class="[current == index ? 'u-tab-item-active' : '']" :class="[current == index ? 'u-tab-item-active' : '']"
:data-current="index" :data-current="index"
@tap.stop="swichMenu(index, item.id)" @tap.stop="swichMenu(index, item.id)"
> >
<text class="u-line-1">{{ item.name }}</text> <text class="u-line-1">{{ item.name }}</text>
</view> </view>
</block>
</scroll-view> </scroll-view>
<view class="right-cates"> <view class="right-cates">
<block v-for="(item, index) in currentSubCategoryData" :key="item.id"> <block v-for="(item, index) in currentSubCategoryData" :key="item.id">
......
...@@ -299,6 +299,9 @@ const initDetails = (id: number) => { ...@@ -299,6 +299,9 @@ const initDetails = (id: number) => {
res.data.data!.attribute[s].value = str res.data.data!.attribute[s].value = str
} }
} }
// 清除 富文本图片空隙
res.data.data.info.detail = res.data.data.info.detail.replace(/<img/g,"<img style='display: block'")
res.data.data.info.detail = res.data.data.info.detail.replace(/<video/g,"<video preload='auto'")
detailData.value = res.data.data; detailData.value = res.data.data;
console.log(detailData.value, '商品详情数据'); console.log(detailData.value, '商品详情数据');
} }
......
...@@ -130,12 +130,14 @@ ...@@ -130,12 +130,14 @@
<view class="topic-item"> <view class="topic-item">
<u-image <u-image
width="100%" width="100%"
height="200rpx" height="260rpx"
mode="aspectFit"
:src=" :src="
item.picUrl.split('http').length > 1 item.picUrl.split('http').length > 1
? item.picUrl ? item.picUrl
: baseUrl + item.picUrl : baseUrl + item.picUrl
" "
style="text-align: center;"
></u-image> ></u-image>
<view class="title"> <view class="title">
<view>{{ item.title }}</view> <view>{{ item.title }}</view>
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
</view> </view>
<view class="sum-price"> <view class="sum-price">
<!-- <text style="color: red;">{{ item.price.toFixed(2) }}</text> -->
<view style="display: flex; flex-direction: column;"> <view style="display: flex; flex-direction: column;">
<view <view
style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10rpx;" style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10rpx;"
...@@ -45,6 +44,19 @@ ...@@ -45,6 +44,19 @@
style="width: 200rpx;" style="width: 200rpx;"
/> />
</view> </view>
<view
style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10rpx;"
>
<text>合同报价:</text>
<u-input
v-model="item.contractQuotation"
type="number"
:disabled="true"
height="50"
placeholder=""
style="width: 200rpx;"
/>
</view>
<view style="margin-bottom: 10rpx;"> <view style="margin-bottom: 10rpx;">
金额:¥{{ 金额:¥{{
item.unitPrice item.unitPrice
......
...@@ -160,7 +160,9 @@ let rules = ref({ ...@@ -160,7 +160,9 @@ let rules = ref({
trigger: 'blur', trigger: 'blur',
}], }],
deliveryAddr: [{ required: true, message: '请选择收货地址', trigger: 'blur' }], deliveryAddr: [{ required: true, message: '请选择收货地址', trigger: 'blur' }],
deliveryDate: [{ required: true, message: '请选择交货时间', trigger: 'blur' }], deliveryDate: [{ required: true, message: '请选择交货时间', trigger: 'blur' },
{pattern: /^[1-9]\d*|0$/, message: '不能为负数', trigger: 'blur'},
{type: 'integer', message: '不能为小数', trigger: 'blur'}],
noOrder: [{ required: true, message: '请输入订单号', trigger: 'blur' }], noOrder: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
pay: [{ required: true, message: '请输入付款方式', trigger: 'blur' }], pay: [{ required: true, message: '请输入付款方式', trigger: 'blur' }],
guarantee: [{ required: true, message: '请输入保修', trigger: 'blur' }], guarantee: [{ required: true, message: '请输入保修', trigger: 'blur' }],
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论