diff --git a/docs/shopping_cart_list.json b/docs/shopping_cart_list.json new file mode 100644 index 0000000000000000000000000000000000000000..47fcbc17694c5737d615d0623ccf755b35f047bc --- /dev/null +++ b/docs/shopping_cart_list.json @@ -0,0 +1,41 @@ +{ + "data": { + "list": [ + { + "id": 0, + "name": "水路货物周转量情况", + "type": "基础数据服务", + "creator": "贵州省交通运输厅0", + "state": 1, + "mapService": 1, + "num": 2, + "checkedSubscription": false, + "specification": 1, + "specificationApplication": 2 + }, + { + "id": 1, + "name": "水路货物周转量情况水路货物周水路货物周转量情况水路货物周", + "type": "基础数据服务", + "creator": "贵州省交通运输厅1", + "state": 1, + "num": 2, + "checkedSubscription": false, + "specification": 1, + "specificationApplication": 2 + }, + { + "id": 2, + "name": "水路货物周转量情况水路货物周转量情况", + "type": "基础数据服务", + "creator": "贵州省交通运输厅2", + "state": 1, + "mapService": 1, + "num": 2, + "checkedSubscription": true, + "specification": 1, + "specificationApplication": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 20d1917d1da341c45e3a4e502a1b7bb86297eae0..c406821fa4cb2dd135634e1eb397d1841702ca4d 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -102,6 +102,15 @@ div{ word-break: break-all; white-space: nowrap; } +.text_clip_2 { + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + line-clamp: 2; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} .map_container { background-color: #eee; } @@ -404,8 +413,11 @@ width: 620px!important; .el-button { border-radius: 8px; } -/* 下拉选样式 */ -/* .el-select-dropdown { +/* + 下拉选样式 + 此处勿删，apaasV3下拉选择样式统一用这个 + */ +.el-select-dropdown { border-radius: 8px; } .el-select-dropdown__list { @@ -437,7 +449,7 @@ width: 620px!important; } .el-popper[x-placement^=top] .popper__arrow::after { border-top-color: transparent; -} */ +} /* 单选激活样式 */ .el-radio__input.is-checked .el-radio__inner { border-color: #838383; @@ -474,4 +486,20 @@ width: 620px!important; } .bread_crumb1 .is-link { color: #898d9e !important; +} + +/* 应用超市详情页公共样式 */ +.sevice_detail { + max-width: 1200px; + margin: 0 auto; +} +.sevice_breadcrumb > .el-breadcrumb .el-breadcrumb__inner { + font-size: 14px; + font-weight: bold; + color: #898d9e; + line-height: 42px; +} +.sevice_breadcrumb > .el-breadcrumb .el-breadcrumb__item:last-child .el-breadcrumb__inner { + color: #242c43; + font-weight: normal; } \ No newline at end of file diff --git a/src/assets/imgs/shop_ic_fuwuqqcs.png b/src/assets/imgs/shop_ic_fuwuqqcs.png new file mode 100644 index 0000000000000000000000000000000000000000..70dd9a220b1a7ef6583b427409079e8dba6acb69 Binary files /dev/null and b/src/assets/imgs/shop_ic_fuwuqqcs.png differ diff --git a/src/assets/imgs/shop_ic_fuwuzs.png b/src/assets/imgs/shop_ic_fuwuzs.png new file mode 100644 index 0000000000000000000000000000000000000000..48ed8b6676b999457a4d6253dcd82707eda65047 Binary files /dev/null and b/src/assets/imgs/shop_ic_fuwuzs.png differ diff --git a/src/assets/imgs/shop_ic_huoqu.png b/src/assets/imgs/shop_ic_huoqu.png new file mode 100644 index 0000000000000000000000000000000000000000..7cb9a91a533a88db1db4ebb7656f3f51d1720856 Binary files /dev/null and b/src/assets/imgs/shop_ic_huoqu.png differ diff --git a/src/assets/imgs/shop_ic_jierujg.png b/src/assets/imgs/shop_ic_jierujg.png new file mode 100644 index 0000000000000000000000000000000000000000..42f7a48493622d2a2724cbd5d16f8d466cdba3dd Binary files /dev/null and b/src/assets/imgs/shop_ic_jierujg.png differ diff --git a/src/assets/imgs/shop_ic_jieruxt.png b/src/assets/imgs/shop_ic_jieruxt.png new file mode 100644 index 0000000000000000000000000000000000000000..2ddb4908c6f83529056e83570555cfdd1af07e8d Binary files /dev/null and b/src/assets/imgs/shop_ic_jieruxt.png differ diff --git a/src/assets/imgs/shop_ic_star.png b/src/assets/imgs/shop_ic_star.png new file mode 100644 index 0000000000000000000000000000000000000000..ed474653fec68021a9594b8997fb1a437631af17 Binary files /dev/null and b/src/assets/imgs/shop_ic_star.png differ diff --git a/src/assets/imgs/shop_ic_updatetime.png b/src/assets/imgs/shop_ic_updatetime.png new file mode 100644 index 0000000000000000000000000000000000000000..6dc80b6452da12425c6400cad1f0397f3596e493 Binary files /dev/null and b/src/assets/imgs/shop_ic_updatetime.png differ diff --git a/src/assets/imgs/shop_ic_yonghuzs.png b/src/assets/imgs/shop_ic_yonghuzs.png new file mode 100644 index 0000000000000000000000000000000000000000..f8a20c5f40060302d447c6315e7785bc46ba22b4 Binary files /dev/null and b/src/assets/imgs/shop_ic_yonghuzs.png differ diff --git a/src/assets/imgs/shop_icon_liulan.png b/src/assets/imgs/shop_icon_liulan.png new file mode 100644 index 0000000000000000000000000000000000000000..6c966c360643420b16f291e66754eee3a7e8bf14 Binary files /dev/null and b/src/assets/imgs/shop_icon_liulan.png differ diff --git a/src/assets/imgs/shop_img_banner_test.png b/src/assets/imgs/shop_img_banner_test.png new file mode 100644 index 0000000000000000000000000000000000000000..ef890c93811e525cdcf81c58b48db565e4802a97 Binary files /dev/null and b/src/assets/imgs/shop_img_banner_test.png differ diff --git a/src/components/application-info.vue b/src/components/application-info.vue index e1100e07043bc210b7f2b1d170ad8b774c7878f8..4e41ab80cc8a773e2fe95b2d3298cb9cba8804d2 100644 --- a/src/components/application-info.vue +++ b/src/components/application-info.vue @@ -1,62 +1,66 @@ @@ -73,13 +77,6 @@ export default { specification: 0, }, }), - computed: { - specificationDescription() { - let obj = - this.data.specifications[this.commodityData.specification] || {}; - return obj.description || ""; - }, - }, methods: { changeSpecification({ value }) { this.commodityData.specification = value; @@ -111,28 +108,29 @@ export default { .main_container-left { padding: 3px; background-color: #f9fafc; - margin-right: 30px; + margin-right: 10px; } .main_container-right { flex-grow: 1; } -.application_title { - display: flex; - justify-content: flex-start; - align-items: center; -} .application_title > .application_name { font-size: 22px; font-weight: bold; color: #0d1847; line-height: 36px; } -.application_base_info { - padding: 18px; +.application_base_container { + display: flex; + justify-content: flex-start; + align-items: flex-end; background-color: #f9fafc; + padding: 18px; + margin-top: 15px; } -.application_base_info > li, -.commodity_information { +.application_base_info:not(:last-child) { + margin-right: 50px; +} +.application_base_info > li { display: flex; justify-content: flex-start; align-items: flex-start; @@ -140,39 +138,37 @@ export default { color: #242c43; line-height: 20px; } -.application_base_info > li:not(:first-child) { - margin-top: 18px; -} -.application_base_info > li > span:first-child, -.commodity_information > span:first-child { +.application_base_info > li > span:first-child { + width: 6em; flex-shrink: 0; white-space: nowrap; color: #8890a7; + text-align: right; +} +.application_base_info > li:not(:first-child) { + margin-top: 20px; } .application_base_info > li > span:nth-child(2) { color: #242c43; } .commodity_information { + display: flex; + justify-content: flex-start; + align-items: flex-start; margin-top: 30px; } -.commodity_information > span:nth-child(2) { - color: #58617a; -} .commodity_information > span:first-child { + flex-shrink: 0; + width: 6em; + font-size: 14px; + color: #8890a7; line-height: 40px; } -.commodity_information > .commodity_text { - flex-grow: 1; - padding: 13px 18px; - background-color: #f9fafc; - border-radius: 5px; -} .commodity_information > .btn_container { margin-bottom: -15px; } -.commodity_information > .btn_container > .el-button, -.commodity_information > .btn_container > .el-input-number { - margin: 0 20px 15px 0; +.commodity_information > .btn_container > .el-button { + margin: 0 30px 15px 0; } .commodity_action { margin-top: 50px; diff --git a/src/components/codes.vue b/src/components/codes.vue index cf64cf7fbf14afc3c44155e1ced2494a01093f71..c31bf4ea6fcfe4f350efb010020f8d54be4b4301 100644 --- a/src/components/codes.vue +++ b/src/components/codes.vue @@ -30,7 +30,9 @@ export default { tabSize: 4, highlightActiveLine: false }); - this.getValue(); + if (this.url) { + this.getValue(); + } }, watch: {}, methods: { @@ -38,7 +40,7 @@ export default { this.$http .get(this.url) .then(response => { - this.aceEditor.setValue(JSON.stringify(response.data, null, "\t")); + this.aceEditor.setValue(response.data); }) .catch(function(response) { console.log(response); @@ -46,6 +48,9 @@ export default { }, parentHandleclick() { this.$emit("getEditValue", this.aceEditor.getValue()); + }, + getCodesVal() { + return this.aceEditor.getValue(); } } }; diff --git a/src/components/commodity-cell.vue b/src/components/commodity-cell.vue index 52587233d3c1964a9a15e7551311c48ae029ce8d..d7b56054f256e1886b3eb7d12e7cfb2124dfc191 100644 --- a/src/components/commodity-cell.vue +++ b/src/components/commodity-cell.vue @@ -150,7 +150,7 @@ export default { font-size: 12px; font-weight: 500; line-height: 12px; - border-radius: 15px; + border-radius: 4px; position: relative; top: -2px; } diff --git a/src/components/menu.vue b/src/components/menu.vue index 0c7d2f4c64ade37648aa692d70dfa74387e944d3..e113f15dbcc4f271acd81f5aa78e122a02472839 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -1,140 +1,397 @@ \ No newline at end of file + diff --git a/src/components/service-tab-detail.vue b/src/components/service-tab-detail.vue index a3ccd2277ea865b5547dd26a8c2cca938552a2d9..c4323c52146f44a857282203811d60c5090429b5 100644 --- a/src/components/service-tab-detail.vue +++ b/src/components/service-tab-detail.vue @@ -14,8 +14,13 @@

+
diff --git a/src/components/shop-card.vue b/src/components/shop-card.vue new file mode 100644 index 0000000000000000000000000000000000000000..49af668015c9ff324d188c49dea34d64c8c71589 --- /dev/null +++ b/src/components/shop-card.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/components/shop-list.vue b/src/components/shop-list.vue new file mode 100644 index 0000000000000000000000000000000000000000..e1eacd253b646c3bdff332ab00db38165e5921e9 --- /dev/null +++ b/src/components/shop-list.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue index 3a0eaa6cfccb8fd985093ca4baf7522a4dcee0ff..703d5a95f0f3fddcb97c1d04f4646a5d8f6b4c2e 100644 --- a/src/components/shopping-cart/shopping-cart-cell.vue +++ b/src/components/shopping-cart/shopping-cart-cell.vue @@ -15,18 +15,18 @@ />
- {{ cellItem.name }} + {{ cellItems.name }} mapService - 共享 - 受限 + 共享 + 受限 敏感
-
{{ cellItem.type }}
-
{{ cellItem.creator }}
+
{{ cellItems.type }}
+
{{ cellItems.creator }}
@@ -34,10 +34,19 @@
-
规格：{{ specificationBtns[specification] }}
-
申请方式：{{ specificationApplicationBtns[specificationApplication] }}
+
规格：{{ specificationBtns[cellItems.specification] }}
+
申请方式：{{ specificationApplicationBtns[cellItems.specificationApplication] }}
- +
规格：
@@ -56,7 +65,7 @@ :key="'specification' + index" :class="specificationApplicationPop == index ? 'shopping_cell_specification_btn active' : 'shopping_cell_specification_btn'" size="mini" - @click="changeSpecificationApplication(index)" + @click="changeSpecificationApplication(index)" >{{ item }}购买
@@ -82,12 +91,22 @@
- + - 订阅该服务 + 订阅该服务
- 删除 + 删除
@@ -112,16 +131,20 @@ export default { watch: { cellCheck: function(val) { this.checkedItem = val; + }, + cellItem: { + immediate: true, // 这句重要 + handler(val) { + this.cellItems = val; + } } }, data: () => ({ + cellItems: {}, checkedItem: false, - numItem: 1, specificationEdit: require("../../assets/imgs/ic_edit.png"), checkedSubscription: false, visible: false, - specification: 1, - specificationApplication: 0, specificationPop: 1, specificationApplicationPop: 0, specificationBtns: [ @@ -143,13 +166,32 @@ export default { this.specificationApplicationPop = val; }, submitPop() { - this.specification = this.specificationPop; - this.specificationApplication = this.specificationApplicationPop; + this.cellItems.specification = this.specificationPop; + this.cellItems.specificationApplication = this.specificationApplicationPop; this.visible = false; + this.changeCellItem(); }, setSpecificationPop() { - this.specificationPop = this.specification; - this.specificationApplicationPop = this.specificationApplication; + this.specificationPop = this.cellItems.specification; + this.specificationApplicationPop = this.cellItems.specificationApplication; + }, + changeSubscription(val) { + this.changeCellItem(); + }, + changeNum(val) { + this.changeCellItem(); + }, + changeCellItem() { + this.$emit("changeCellMsg", { + index: this.cellIndex, + data: this.cellItems + }); + }, + delCellItem() { + this.$emit("deleteItem", { + index: this.cellIndex, + data: this.cellItems + }); } }, mounted() {} @@ -229,7 +271,7 @@ export default { font-size: 12px; font-weight: 500; line-height: 12px; - border-radius: 15px; + border-radius: 4px; position: relative; top: -2px; } diff --git a/src/components/shopping-cart/shopping-cart-com.vue b/src/components/shopping-cart/shopping-cart-com.vue index f931e9ef8cb670f62fa13a4fb0c87ac4e06e74eb..de27abb870c038b84cf481ba249dbfd467039861 100644 --- a/src/components/shopping-cart/shopping-cart-com.vue +++ b/src/components/shopping-cart/shopping-cart-com.vue @@ -8,7 +8,7 @@ 服务信息 规格 - 数量 + 购买时长 操作
@@ -19,6 +19,8 @@ :checkList="checkList" :readOnly="false" @changeState="changeState" + @changeCellMsg="changeCellMsg" + @deleteItem="deleteItem" class="shopping_all_list" />
@@ -45,8 +47,12 @@ {{ getNum }} 项 - 一键申请 - 一键申请 + 一键申请 + 一键申请 @@ -71,14 +77,22 @@ export default { type: "基础数据服务", creator: "贵州省交通运输厅0", state: 1, - mapService: 1 + mapService: 1, + num: 2, + checkedSubscription: false, + specification: 1, + specificationApplication: 2 }, { id: 1, name: "水路货物周转量情况水路货物周水路货物周转量情况水路货物周", type: "基础数据服务", creator: "贵州省交通运输厅1", - state: 1 + state: 1, + num: 2, + checkedSubscription: false, + specification: 1, + specificationApplication: 2 }, { id: 2, @@ -86,7 +100,11 @@ export default { type: "基础数据服务", creator: "贵州省交通运输厅2", state: 1, - mapService: 1 + mapService: 1, + num: 2, + checkedSubscription: true, + specification: 1, + specificationApplication: 2 } ] }), @@ -119,6 +137,19 @@ export default { console.log(this.list[index]); } }); + }, + changeCellMsg(val) { + console.log(val); + }, + deleteItem(val) { + console.log(val); + }, + oneClickApplication() { + this.checkList.forEach((item, index) => { + if (item === true) { + console.log(this.list[index]); + } + }); } } }; @@ -194,7 +225,7 @@ export default { .shopping_all_head { background-color: #e5f0ff; height: 48px; - padding: 0 20px; + padding: 0; font-weight: 700; line-height: 48px; } diff --git a/src/components/shopping-cart/shopping-cart-list.vue b/src/components/shopping-cart/shopping-cart-list.vue index c99d996752a457d1dea271610e005e483aeb1da1..9485f9ee92e0d41a5fb9ccdf72ab3bf9d1d67852 100644 --- a/src/components/shopping-cart/shopping-cart-list.vue +++ b/src/components/shopping-cart/shopping-cart-list.vue @@ -9,6 +9,8 @@ :key="item.id" :readOnly="readOnly" @changeState="changeState" + @changeCellMsg="changeCellMsg" + @deleteItem="deleteItem" /> @@ -58,6 +60,12 @@ export default { for (let i = 0; i < this.checkLists.length; i++) { this.$set(this.checkLists, i, val) } + }, + changeCellMsg(val) { + this.$emit("changeCellMsg", val) + }, + deleteItem(val) { + this.$emit("deleteItem", val) } } }; diff --git a/src/components/side-nav-bar.vue b/src/components/side-nav-bar.vue index d66d85469e78735932005b02467329cd82bea8a9..c4af1a35c4bec8286dbb9f64ecc1253739d8d9e8 100644 --- a/src/components/side-nav-bar.vue +++ b/src/components/side-nav-bar.vue @@ -9,9 +9,9 @@