Commit 4ddffa5b by 毛勇泽

import冲突修改

parent e06e4009
import { BzhxDao, SQLiteContext,Bzhx } from '@ohos/common'
import { uuid } from '@ohos/common/src/main/ets/utils/util'
import database from '../database/database'
import { Bzhx } from '@ohos/common/src/main/ets/entity/Bzhx'
import { importSql } from '../sql/index'
import { Wzdm, Wzhxdm,SQLiteContext, WzdmDao,WzhxdmDao, BzhxDao,Logger } from '@ohos/common'
import { Wzdm, Wzhxdm,Bzhx,SQLiteContext, WzdmDao,WzhxdmDao, BzhxDao,Logger } from '@ohos/common'
// 被装号型
class BzhxModal {
......
import { TitleBar } from '../../view/title/TitleBar'
import { BasicTable } from '../../view/BasicTable/BasicTable'
import {analysisQrCode} from '../../identify/analysis/analysis_QR_code'
import {
Logger
} from '@ohos/common';
@Extend(Button) function CommonButtonStyle() {
.borderWidth(2)
.borderColor('#0fa983')
......@@ -89,7 +93,7 @@ struct UHFScanPage{
BasicTable({dataSource:[]})
}.flexGrow(1)
Row() {
Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center}) {
Button("选择货位").CommonButtonStyle().width("50%")
Button("扫货位码").CommonButtonStyle().width("50%")
}
......@@ -101,4 +105,12 @@ struct UHFScanPage{
colors: [[0x36a3c0, 0.0], [0x97c6a6, 1], [0xc7d799, 0.0]] // 数组末尾元素占比小于1时满足重复着色效果
})
}
/*界面展示*/
onPageShow(){
}
/*界面关闭*/
onPageHide(){
}
}
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论