Merge branch 'dev-sy'
This commit is contained in:
commit
ccf00f726e
|
|
@ -224,6 +224,8 @@ import moment, { max } from 'moment'
|
||||||
import { InfoFilled } from '@element-plus/icons-vue'
|
import { InfoFilled } from '@element-plus/icons-vue'
|
||||||
import CustomDatePickerButton from './components/date-picker-button.vue'
|
import CustomDatePickerButton from './components/date-picker-button.vue'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
|
import { useStore } from '../../store/user'
|
||||||
|
const userStore = useStore()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const protocolChecked = ref<boolean>(false)
|
const protocolChecked = ref<boolean>(false)
|
||||||
|
|
@ -448,7 +450,7 @@ const onCartSubmit = async () => {
|
||||||
type: 'success',
|
type: 'success',
|
||||||
})
|
})
|
||||||
|
|
||||||
userStore.editcurrentMenuItem('goodsManagement')
|
userStore.editcurrentMenuItem('orderManagementCz')
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
router.push({
|
router.push({
|
||||||
name: 'my-user',
|
name: 'my-user',
|
||||||
|
|
|
||||||
|
|
@ -193,6 +193,8 @@ import CustomDatePickerButton from '../cart/components/date-picker-button.vue'
|
||||||
import { getDetail } from 'http/api/equip'
|
import { getDetail } from 'http/api/equip'
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
|
import { useStore } from '../../store/user'
|
||||||
|
const userStore = useStore()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const pageParams = route.params
|
const pageParams = route.params
|
||||||
|
|
@ -385,7 +387,7 @@ const onCartSubmit = async () => {
|
||||||
message: '提交成功',
|
message: '提交成功',
|
||||||
type: 'success',
|
type: 'success',
|
||||||
})
|
})
|
||||||
userStore.editcurrentMenuItem('goodsManagement')
|
userStore.editcurrentMenuItem('orderManagementCz')
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
router.push({
|
router.push({
|
||||||
name: 'my-user',
|
name: 'my-user',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue