Pre Merge pull request !130 from Mrlee2016/master
commit
f1aa2a5f60
|
|
@ -24,17 +24,19 @@
|
||||||
<view class="goods-box ss-r-10 ss-m-b-14" v-for="item in state.list" :key="item.id">
|
<view class="goods-box ss-r-10 ss-m-b-14" v-for="item in state.list" :key="item.id">
|
||||||
<view class="ss-flex ss-col-center">
|
<view class="ss-flex ss-col-center">
|
||||||
<label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
|
<label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
|
||||||
<radio :checked="state.selectedIds.includes(item.id)" color="var(--ui-BG-Main)"
|
<radio :disabled="!item.sku && !state.editMode" :checked="state.selectedIds.includes(item.id)" color="var(--ui-BG-Main)"
|
||||||
style="transform: scale(0.8)" @tap.stop="onSelectSingle(item.id)" />
|
style="transform: scale(0.8)" @tap.stop="onSelectSingle(item.id)" />
|
||||||
</label>
|
</label>
|
||||||
<s-goods-item :title="item.spu.name" :img="item.spu.picUrl || item.goods.image"
|
<s-goods-item :title="item.spu.name" :img="item.spu.picUrl || item.goods.image"
|
||||||
:price="item.sku.price"
|
:price="item.sku && item.sku.price"
|
||||||
:skuText="item.sku.properties.length>1? item.sku.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.sku.properties[0].valueName"
|
:skuText="item.sku && item.sku.properties.length>1? item.sku && item.sku.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.sku && item.sku.properties[0].valueName"
|
||||||
priceColor="#FF3000" :titleWidth="400">
|
priceColor="#FF3000" :titleWidth="400">
|
||||||
<template v-if="!state.editMode" v-slot:tool>
|
<template v-if="!state.editMode" v-slot:tool>
|
||||||
<su-number-box :min="0" :max="item.sku.stock" :step="1" v-model="item.count" @change="onNumberChange($event, item)" />
|
<su-number-box v-if="item.sku" class="ss-flex-1" :min="0" :max="item.sku && item.sku.stock" :step="1" v-model="item.count" @change="onNumberChange($event, item)" />
|
||||||
|
<s-block v-else style="color:#FF3000">已经失效,请重新选择</s-block>
|
||||||
</template>
|
</template>
|
||||||
</s-goods-item>
|
</s-goods-item>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -102,6 +104,10 @@
|
||||||
let goods_list = [];
|
let goods_list = [];
|
||||||
state.selectedList = state.list.filter((item) => state.selectedIds.includes(item.id));
|
state.selectedList = state.list.filter((item) => state.selectedIds.includes(item.id));
|
||||||
state.selectedList.map((item) => {
|
state.selectedList.map((item) => {
|
||||||
|
if(!item.sku) {
|
||||||
|
sheep.$helper.toast('请不要选择失效商品');
|
||||||
|
return;
|
||||||
|
}
|
||||||
// 此处前端做出修改
|
// 此处前端做出修改
|
||||||
items.push({
|
items.push({
|
||||||
skuId: item.sku.id,
|
skuId: item.sku.id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue