|
@@ -196,7 +196,7 @@
|
|
|
</van-field>
|
|
|
</template>
|
|
|
<!-- 花型种类 -->
|
|
|
- <template v-if="isAdmind && machineType === '0'">
|
|
|
+ <template v-if="isAdmind && (machineType === '0' || machineType === '1')">
|
|
|
<!-- <van-field readonly :label="`${$t('device.flowerType')}`" placeholder="">
|
|
|
<template #input>
|
|
|
<div class="van-cell__value van-field__value radioBox">
|
|
@@ -211,7 +211,8 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</van-field> -->
|
|
|
- <van-field v-model="deviceDetal.flowers" is-link readonly :label="$t('device.flowerType')" placeholder="选择花型种类"
|
|
|
+ <van-field v-model="deviceDetal.flowers" is-link readonly :label="machineType === '1'? '口味种类' : $t('device.flowerType')"
|
|
|
+ :placeholder="machineType === '1'? '选择口味种类' : '选择花型种类'"
|
|
|
@click="showFlowerPicker = true" />
|
|
|
</template>
|
|
|
<!-- 版本号 -->
|
|
@@ -419,7 +420,7 @@ export default {
|
|
|
} else if (data.data.machineType === '2') {
|
|
|
machineType.value = '1';
|
|
|
}
|
|
|
- if (machineType.value == '0') {
|
|
|
+ if (machineType.value == '0' || machineType.value == '1') {
|
|
|
selectedFlower.value = [deviceDetal.value.flowers];
|
|
|
getFlowerNumber(machineType.value);
|
|
|
}
|