From 0ccbc4e1e745833f71dd4361a18019947aa10911 Mon Sep 17 00:00:00 2001 From: liudianxin Date: Mon, 1 Jun 2020 19:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=EF=BC=8C?= =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=8C=E4=BA=91=E6=9C=8D=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=EF=BC=8C=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/assets/imgs/ic_warning.png | Bin 0 -> 1101 bytes src/components/order-list/order-list-cell.vue | 3 +- src/components/order-list/order-list-com.vue | 118 ++-- src/components/service_list.vue | 405 +++++------- src/components/shop-cloud/shop-cloud.vue | 43 +- .../shopping-cart/shopping-cart-list.vue | 1 - src/pages/authority/menus.vue | 565 ++++++++++++++++- src/pages/login.vue | 589 ++++++++++++++++++ src/pages/service_shop/shop_list.vue | 75 +++ .../service_shop/shop_list_app_store.vue | 28 - .../shop_list_comprehensive_app.vue | 28 - src/pages/service_shop/shop_list_data.vue | 28 - .../service_shop/shop_list_perception.vue | 28 - .../service_shop/shop_list_space_time.vue | 28 - src/pages/service_shop/shop_list_video.vue | 28 - src/pages/service_shop/shopping_cart.vue | 4 +- src/request/api.js | 4 +- src/request/api/authority.js | 26 + src/request/api/service_shop.js | 36 ++ src/request/api/user.js | 4 +- src/request/http.js | 8 +- src/router/index.js | 17 +- src/services/cookie.js | 40 ++ src/services/helper.js | 24 +- 25 files changed, 1580 insertions(+), 552 deletions(-) create mode 100644 src/assets/imgs/ic_warning.png create mode 100644 src/pages/login.vue create mode 100644 src/pages/service_shop/shop_list.vue delete mode 100644 src/pages/service_shop/shop_list_app_store.vue delete mode 100644 src/pages/service_shop/shop_list_comprehensive_app.vue delete mode 100644 src/pages/service_shop/shop_list_data.vue delete mode 100644 src/pages/service_shop/shop_list_perception.vue delete mode 100644 src/pages/service_shop/shop_list_space_time.vue delete mode 100644 src/pages/service_shop/shop_list_video.vue create mode 100644 src/request/api/authority.js create mode 100644 src/services/cookie.js diff --git a/src/App.vue b/src/App.vue index cf846fc..12a058f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ diff --git a/src/assets/imgs/ic_warning.png b/src/assets/imgs/ic_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..e89ba83ece797eeac7e44f2ec4e481f305b38305 GIT binary patch literal 1101 zcmaJ=TWHfz7|zVRO*a%7(}{YF_t`c{*RD-ib+Kt(!Hm)stPjGn5HqUtl9a*oUm{#db${I_%lUyx}7P8D!B>cb_~fs~}9UI;R#+7EM3)kls!f$bDU z?=3;PW#!F;}Zp8(_BEiI0qN={im>-AF&~ugDx6!G;(o$+x$?rm~^0u zk&{Pgu+qhB5n<#OkqwebziTnD`>;R;tq+K>q?T;b}AT&XJ8w}WYu$TD<{VW_7aWP;hU zMWcEyv8sCWT)lcO@v2;wB*Xfb``2Yxj);T&<$`s|X2JZ>B93>6wLiU0Y$ea)UPhMk z-s|4>>mQzs*KQw=HgaH! zkC}$rSM<%6HMi;M#_W_d-8gZv<
-
申请时间：{{ cellItem.applicationTime }}
+
申请时间：{{ helper.dateFormat(cellItem.add_time) }}
订单编号：{{ cellItem.orderNumber }}
删除
@@ -107,6 +107,7 @@ - + diff --git a/src/pages/login.vue b/src/pages/login.vue new file mode 100644 index 0000000..83b2950 --- /dev/null +++ b/src/pages/login.vue @@ -0,0 +1,589 @@ + + + + \ No newline at end of file diff --git a/src/pages/service_shop/shop_list.vue b/src/pages/service_shop/shop_list.vue new file mode 100644 index 0000000..b1bd617 --- /dev/null +++ b/src/pages/service_shop/shop_list.vue @@ -0,0 +1,75 @@ + + + + \ No newline at end of file diff --git a/src/pages/service_shop/shop_list_app_store.vue b/src/pages/service_shop/shop_list_app_store.vue deleted file mode 100644 index 6067bc5..0000000 --- a/src/pages/service_shop/shop_list_app_store.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pages/service_shop/shop_list_comprehensive_app.vue b/src/pages/service_shop/shop_list_comprehensive_app.vue deleted file mode 100644 index fe09c59..0000000 --- a/src/pages/service_shop/shop_list_comprehensive_app.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pages/service_shop/shop_list_data.vue b/src/pages/service_shop/shop_list_data.vue deleted file mode 100644 index f3cfced..0000000 --- a/src/pages/service_shop/shop_list_data.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pages/service_shop/shop_list_perception.vue b/src/pages/service_shop/shop_list_perception.vue deleted file mode 100644 index 1d4dda0..0000000 --- a/src/pages/service_shop/shop_list_perception.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pages/service_shop/shop_list_space_time.vue b/src/pages/service_shop/shop_list_space_time.vue deleted file mode 100644 index 9b52205..0000000 --- a/src/pages/service_shop/shop_list_space_time.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pages/service_shop/shop_list_video.vue b/src/pages/service_shop/shop_list_video.vue deleted file mode 100644 index 3d5ce3f..0000000 --- a/src/pages/service_shop/shop_list_video.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pages/service_shop/shopping_cart.vue b/src/pages/service_shop/shopping_cart.vue index aa4e5e8..31a977c 100644 --- a/src/pages/service_shop/shopping_cart.vue +++ b/src/pages/service_shop/shopping_cart.vue @@ -25,7 +25,7 @@ export default { margin: 0 auto; } .shopping_title { - height: 40px; - line-height: 40px; + height: 45px; + line-height: 45px; } \ No newline at end of file diff --git a/src/request/api.js b/src/request/api.js index b8ef9ac..e58a016 100644 --- a/src/request/api.js +++ b/src/request/api.js @@ -1,9 +1,11 @@ import workbench from '@/request/api/workbench'; import serviceShop from '@/request/api/service_shop'; import user from '@/request/api/user'; +import authority from '@/request/api/authority'; export default { workbench, serviceShop, - user + user, + authority } \ No newline at end of file diff --git a/src/request/api/authority.js b/src/request/api/authority.js new file mode 100644 index 0000000..178f01a --- /dev/null +++ b/src/request/api/authority.js @@ -0,0 +1,26 @@ +import axios from '@/request/http'; // 导入http中创建的axios实例 +import qs from 'qs'; // 根据需求是否导入qs模块 + +const authority = { + // Menu + getMenuList() { + return axios.get(`/apaas/backmgt/menu/list`); + }, + addMenu(params) { + return axios.post(`/apaas/backmgt/menu`, params); + }, + delMenu(params) { + return axios.delete(`/apaas/backmgt/menu/id/${params.id}`); + }, + getMenu(params) { + return axios.get(`/apaas/backmgt/menu/id/${params.id}`); + }, + positionMenu(params) { + return axios.post(`/apaas/backmgt/menu/menuOrder`, params); + }, + editMenu(params) { + return axios.put(`/apaas/backmgt/menu`, params); + } +} + +export default authority; diff --git a/src/request/api/service_shop.js b/src/request/api/service_shop.js index 0baf0e9..b0c6c6a 100644 --- a/src/request/api/service_shop.js +++ b/src/request/api/service_shop.js @@ -3,6 +3,42 @@ import qs from 'qs'; // 根据需求是否导入qs模块 const serviceShop = { + // service list + getServiceShopFilter(params) { + // 5:数据 6:时空 7:视频 10:感知 + return axios.get(`/apaas/serviceapp/v3/servicemarket/profileInfo?serviceType=${params.type}`); + }, + getServiceShopList(params) { + return axios.get(`/apaas/serviceapp/v3/servicemarket/list? +serviceName=${params.serviceName}&serviceType1=${params.serviceType1}& +serviceType2s=${params.serviceType2s}&dataDomains=${params.dataDomains}& +organizeIds=${params.organizeIds}&orderBy=${params.orderBy}& +Page=${params.Page}&Size=${params.Size}`); + }, + getServiceShopDetail(params) { + return axios.get(`/apaas/serviceapp/v3/servicemarket/detail?serviceId=`) + }, + + // shopping cart + addShoppingCart(params) { + return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params); + }, + delShoppingCart(params) { + // note: if parans is empty, it will delete all data. + return axios.post(`/apaas/serviceapp/v3/shopcart/del`, params); + }, + getShoppingCart() { + return axios.get(`/apaas/serviceapp/v3/shopcart/list`); + }, + updateShoppingCart(params) { + return axios.post(`/apaas/serviceapp/v3/shopcart/update`, params); + }, + getSystemList() { + return axios.get(`/apaas/serviceapp/v3/shopcart/systems`); + }, + submitShoppingCart() { + return axios.post(`/apaas/serviceapp/v3/shopcart/apply`, params); + }, } export default serviceShop; diff --git a/src/request/api/user.js b/src/request/api/user.js index bff624a..f958044 100644 --- a/src/request/api/user.js +++ b/src/request/api/user.js @@ -2,7 +2,9 @@ import axios from '@/request/http'; // 导入http中创建的axios实例 import qs from 'qs'; // 根据需求是否导入qs模块 const user = { - + orderList(params) { + return axios.get(`/apaas/serviceapp/v3/order/list?serviceName=${params.select}&orderStatus=${params.status}&serviceTypes=${params.types.join(',')}&Page=${params.page}&Size=${params.limit}`); + }, } export default user; diff --git a/src/request/http.js b/src/request/http.js index 440437f..0598ab2 100644 --- a/src/request/http.js +++ b/src/request/http.js @@ -5,9 +5,11 @@ import axios from 'axios'; import router from '../router'; import store from '../store/index'; +import ElementUI from 'element-ui'; const tip = msg => { - console.log(msg) + console.log(msg); + ElementUI.Message.error(msg); } /** @@ -67,8 +69,8 @@ instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlenco */ instance.interceptors.request.use( config => { - const token = store.state.token; - token && (config.headers.Authorization = token); + // const token = store.state.token; + // token && (config.headers.Authorization = token); return config; }, error => Promise.error(error)) diff --git a/src/router/index.js b/src/router/index.js index 32914e6..68acf7b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -16,6 +16,11 @@ export default new Router({ path: "/", redirect: "/index", }, + { + path: "/login", // 登录注册 + name: "login", + component: () => import("@/pages/login"), + }, { path: "/index", name: "index", @@ -115,27 +120,27 @@ export default new Router({ { path: "/shop/data_service_list", // 数据服务列表页 name: "shopDataList", - component: () => import("@/pages/service_shop/shop_list_data"), + component: () => import("@/pages/service_shop/shop_list"), }, { path: "/shop/space_time_service_list", // 时空服务列表页 name: "shopSpaceTimeList", - component: () => import("@/pages/service_shop/shop_list_space_time"), + component: () => import("@/pages/service_shop/shop_list"), }, { path: "/shop/video_service_list", // 视频服务列表页 name: "shopVideoList", - component: () => import("@/pages/service_shop/shop_list_video"), + component: () => import("@/pages/service_shop/shop_list"), }, { path: "/shop/perception_service_list", // 感知服务列表页 name: "shopPerceptionList", - component: () => import("@/pages/service_shop/shop_list_perception"), + component: () => import("@/pages/service_shop/shop_list"), }, { path: "/shop/comprehensive_app_list", // 综合应用列表页 name: "shopComAppList", - component: () => import("@/pages/service_shop/shop_list_comprehensive_app"), + component: () => import("@/pages/service_shop/shop_list"), }, { path: "/shop/cloud", // 云资源服务 @@ -150,7 +155,7 @@ export default new Router({ { path: "/shop/app_store_list", // 应用商店列表页 name: "shopAppStoreList", - component: () => import("@/pages/service_shop/shop_list_app_store"), + component: () => import("@/pages/service_shop/shop_list"), }, { path: "/shop/shopping_cart", // 购物车页 diff --git a/src/services/cookie.js b/src/services/cookie.js new file mode 100644 index 0000000..2632cad --- /dev/null +++ b/src/services/cookie.js @@ -0,0 +1,40 @@ + +// 取得cookie +function getCookie(name) { + var nameEQ = name + '=' + var ca = document.cookie.split(';') // 把cookie分割成组 + for (var i = 0; i < ca.length; i++) { + var c = ca[i] // 取得字符串 + while (c.charAt(0) == ' ') { // 判断一下字符串有没有前导空格 + c = c.substring(1, c.length) // 有的话，从第二位开始取 + } + if (c.indexOf(nameEQ) == 0) { // 如果含有我们要的name + return unescape(c.substring(nameEQ.length, c.length)) // 解码并截取我们要值 + } + } + return false + } + + // 清除cookie +function clearCookie(name) { + setCookie(name, "", -1); +} + +// 设置cookie +function setCookie(name, value, seconds) { + seconds = seconds || 0; //seconds有值就直接赋值，没有为0，这个根php不一样。 + var expires = ""; + if (seconds != 0 ) { //设置cookie生存时间 + var date = new Date(); + date.setTime(date.getTime()+(seconds*1000)); + expires = "; expires="+date.toGMTString(); + } + document.cookie = name+"="+escape(value)+expires+"; path=/"; //转码并赋值 + } + + +export { + getCookie, + clearCookie, + setCookie, +} diff --git a/src/services/helper.js b/src/services/helper.js index ae03ac6..942c810 100644 --- a/src/services/helper.js +++ b/src/services/helper.js @@ -14,28 +14,6 @@ module.exports.GetProperty = function (obj, prop) { return res; } -module.exports.ymhdateFormat = function (timestamp) { - let date = new Date(timestamp); - let ret; - const opt = { - "Y+": date.getFullYear().toString(), // 年 - "m+": (date.getMonth() + 1).toString(), // 月 - "d+": date.getDate().toString(), // 日 - "H+": date.getHours().toString(), // 时 - "M+": date.getMinutes().toString(), // 分 - "S+": date.getSeconds().toString() // 秒 - // 有其他格式化字符需求可以继续添加，必须转化成字符串 - }; - var fmt="YYYY-mm-dd HH:MM:SS" - for (let k in opt) { - ret = new RegExp("(" + k + ")").exec(fmt); - if (ret) { - fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0"))) - }; - }; - return fmt; -} - module.exports.dateFormat = function (fmt, timestamp) { let date = new Date(timestamp); let ret; @@ -55,4 +33,4 @@ module.exports.dateFormat = function (fmt, timestamp) { }; }; return fmt; -} \ No newline at end of file +} -- 2.26.0