|
@@ -50,7 +50,7 @@
|
|
|
</view>
|
|
|
<!-- 切换 -->
|
|
|
<up-picker :show="showPicker" :columns="columns" :defaultIndex="[0]" @cancel="handleCancel"
|
|
|
- @confirm="handleConfirm"></up-picker>
|
|
|
+ @confirm="handleConfirm" keyName="name" valueName="speciesId"></up-picker>
|
|
|
<!-- 签到打卡 -->
|
|
|
<checkinPopup></checkinPopup>
|
|
|
<!-- 编辑树名称 -->
|
|
@@ -80,15 +80,12 @@
|
|
|
import TREE from '@/api/tree.js'
|
|
|
import USER from '@/api/user.js'
|
|
|
import {
|
|
|
- ref,
|
|
|
- reactive,
|
|
|
+ ref
|
|
|
} from 'vue';
|
|
|
|
|
|
const name = ref('荔枝')
|
|
|
const showPicker = ref(false)
|
|
|
- const columns = reactive([
|
|
|
- ['荔枝', '香蕉', '苹果']
|
|
|
- ]);
|
|
|
+ const columns = ref([]);
|
|
|
const handleShow = () => {
|
|
|
showPicker.value = true
|
|
|
}
|
|
@@ -162,10 +159,10 @@
|
|
|
|
|
|
//品类查询所有
|
|
|
const featchCategoryList = () =>{
|
|
|
- USER.categoryList().then(({
|
|
|
+ TREE.categoryList().then(({
|
|
|
data
|
|
|
}) => {
|
|
|
- columns[0] = data || []
|
|
|
+ columns.value[0] = data || []
|
|
|
})
|
|
|
}
|
|
|
|