back/src/router/index.js

@@ -83,6 +83,7 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
+  debugger
   // 判断是否有token
   // const token = Cookies.get('token')
   // 添加动态(菜单)路由

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -264,7 +264,7 @@
                 :placeholder="'请输入' + placeHolderWords(item.name)+',单位为元'"
                 @change="changeIiem(item.name, item.note1)"
               />
-             <span style="color:red"> (单位为元，*仅用于测算为部门节省资金)</span>
+             <span style="color:red"> (仅用于测算为部门节省资金)</span>
             </div>
               <a-input
                 :maxLength="1000"

front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue

@@ -59,12 +59,7 @@
           </template>
           申请使用
         </a-button>
-        <a-button type="primary" @click="addShoppingCart()" :style="{
-          cursor:
-          !props.dataList.isInShoppingCart
-              ? 'pointer'
-              : 'not-allowed',
-        }">
+        <a-button type="primary" @click="addShoppingCart()">
           <!-- <template #icon>
             <shopping-cart-outlined />
           </template> -->

front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue

@@ -62,12 +62,6 @@
         <a-button
           v-if="!dataList.fuseResourceList"
           type="primary"
-          :style="{
-          cursor:
-          !props.dataList.isInShoppingCart
-              ? 'pointer'
-              : 'not-allowed',
-        }"
           @click="addShoppingCart()"
         >
           <!-- <template #icon><shopping-cart-outlined /></template> -->

front/src/views/detailsAll/components/Business/BusinessTopDetails.vue

@@ -56,8 +56,7 @@
           </template>
           申请使用
         </a-button>
-        <a-button type="primary" @click="addShoppingCart()"  
-         :style="{ cursor: !props.dataList.isInShoppingCart ? 'pointer': 'not-allowed', }">
+        <a-button type="primary" @click="addShoppingCart()">
           <!-- <template #icon>
             <shopping-cart-outlined />
           </template> -->

front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue

@@ -54,8 +54,7 @@
           <template #icon><form-outlined /></template>
           申请使用
         </a-button>
-        <a-button type="primary" @click="addShoppingCart()"
-        :style="{ cursor: !props.dataList.isInShoppingCart  ? 'pointer': 'not-allowed', }">
+        <a-button type="primary" @click="addShoppingCart()">
           <!-- <template #icon><shopping-cart-outlined /></template> -->
           {{ props.dataList.isInShoppingCart ? '已' : '' }}加入购物车
         </a-button>

front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue

@@ -62,8 +62,6 @@
               (val) => val.attrType == '外部服务地址'
             ).length === 0
           "
-          :style="{ cursor: !props.dataList.isInShoppingCart ? 'pointer': 'not-allowed', }"
-
         >
           <!-- <template #icon><shopping-cart-outlined /></template> -->
           {{ props.dataList.isInShoppingCart ? '已' : '' }}加入申购车

front/src/views/personalCenter/components/MyApply.vue

@@ -534,22 +534,11 @@
       name: yunForm.busineesName,
     }
     total.value = 5
-<<<<<<< HEAD
-      getZwyBusinessList(params).then(
-        (res) => {
-       
-          cloudList.data = res.data.data.list
-          num.value = []
-          total.value = res.data.data.total
-        }
-      )
-=======
     getZwyBusinessList(params).then((res) => {
       cloudList.data = res.data.data.list
       num.value = []
       total.value = res.data.data.total
     })
->>>>>>> 8906f1f60aad20082e68337c7c166c057237fdd1
   }
   //查询政务云状态
   const getCloudResource = () => {