diff --git a/back/src/router/index.js b/back/src/router/index.js index b8b164b1..6945f87b 100644 --- a/back/src/router/index.js +++ b/back/src/router/index.js @@ -83,7 +83,6 @@ const router = new Router({ }) router.beforeEach((to, from, next) => { - debugger // 判断是否有token // const token = Cookies.get('token') // 添加动态(菜单)路由 diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index f06e90ee..6b2ff93a 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -264,7 +264,7 @@ :placeholder="'请输入' + placeHolderWords(item.name)+',单位为元'" @change="changeIiem(item.name, item.note1)" /> - (仅用于测算为部门节省资金) + (单位为元,*仅用于测算为部门节省资金) 申请使用 - + diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue index e273bad5..8cb9ea2b 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue @@ -62,6 +62,12 @@ diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue index ff59cccb..57e8dd97 100644 --- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue +++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue @@ -56,7 +56,8 @@ 申请使用 - + diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue index e939e841..18243621 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue @@ -54,7 +54,8 @@ 申请使用 - + {{ props.dataList.isInShoppingCart ? '已' : '' }}加入购物车 diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue index 3de36d1f..e2ca4100 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue @@ -62,6 +62,8 @@ (val) => val.attrType == '外部服务地址' ).length === 0 " + :style="{ cursor: !props.dataList.isInShoppingCart ? 'pointer': 'not-allowed', }" + > {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车 diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index f9cd1cf4..86cc4566 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -540,6 +540,7 @@ total.value = 5 getZwyBusinessList(params).then( (res) => { + cloudList.data = res.data.data.list num.value = [] total.value = res.data.data.total