diff --git a/src/assets/images/date_picker.png b/src/assets/images/date_picker.png index 276afb32c..68be5758e 100644 Binary files a/src/assets/images/date_picker.png and b/src/assets/images/date_picker.png differ diff --git a/src/assets/images/date_picker_btn.png b/src/assets/images/date_picker_btn.png index 8d61a35a7..68be5758e 100644 Binary files a/src/assets/images/date_picker_btn.png and b/src/assets/images/date_picker_btn.png differ diff --git a/src/assets/images/filter.png b/src/assets/images/filter.png deleted file mode 100644 index 3e5b51eed..000000000 Binary files a/src/assets/images/filter.png and /dev/null differ diff --git a/src/assets/images/product_item1.png b/src/assets/images/product_item1.png deleted file mode 100644 index e87621aa9..000000000 Binary files a/src/assets/images/product_item1.png and /dev/null differ diff --git a/src/assets/images/product_item2.png b/src/assets/images/product_item2.png new file mode 100644 index 000000000..fc432eb92 Binary files /dev/null and b/src/assets/images/product_item2.png differ diff --git a/src/assets/images/productdetailB.png b/src/assets/images/productdetailB.png new file mode 100644 index 000000000..d995a4390 Binary files /dev/null and b/src/assets/images/productdetailB.png differ diff --git a/src/assets/images/productdetailyear.png b/src/assets/images/productdetailyear.png new file mode 100644 index 000000000..55ab66079 Binary files /dev/null and b/src/assets/images/productdetailyear.png differ diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index 5cc56ccbe..8bde30406 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -31,7 +31,8 @@ service.interceptors.request.use( }) } - config.headers['token'] = window.localStorage.getItem('token') + // config.headers['token'] = window.localStorage.getItem('token') + config.headers['token'] = '507e5ff426364e95b22cd4c1e22f427f' return config }, error => { diff --git a/src/assets/sass/utils.scss b/src/assets/sass/utils.scss index 6861eab3a..10036615f 100644 --- a/src/assets/sass/utils.scss +++ b/src/assets/sass/utils.scss @@ -263,7 +263,7 @@ } .bg-green-dark { - background: #4fc6b3 !important; + background: #E9332E !important; } .bg-blue-dark { diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 3738258ee..eab4e9713 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -429,7 +429,7 @@ export default { Dialog.confirm({ title: '提示', message: '确认删除该险种?', - cancelButtonColor: '#4FC6B3', + cancelButtonColor: '#E9332E', confirmButtonColor: '#FFFFFF', className: 'dialog-delete' }) diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index 3c365c783..5609f46ca 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -11,7 +11,7 @@
- 附加 + 附加
{{ addtion.riskName }} @@ -141,7 +141,7 @@ export default { className: 'dialog-delete', title: '提示', message: '您确认要删除该产品信息吗?', - cancelButtonColor: '#4FC6B3', + cancelButtonColor: '#E9332E', confirmButtonColor: '#FFFFFF' }) .then(() => { diff --git a/src/views/ebiz/customer/customerInfo.vue b/src/views/ebiz/customer/customerInfo.vue index d712cb701..e021175f2 100644 --- a/src/views/ebiz/customer/customerInfo.vue +++ b/src/views/ebiz/customer/customerInfo.vue @@ -133,7 +133,7 @@ export default { className: 'dialog-delete', title: '提示', message: '确认删除当前客户?', - cancelButtonColor: '#4FC6B3', + cancelButtonColor: '#E9332E', confirmButtonColor: '#FFFFFF' }) .then(() => { diff --git a/src/views/ebiz/customer/customerList.vue b/src/views/ebiz/customer/customerList.vue index 82c359b29..c3cae2e42 100644 --- a/src/views/ebiz/customer/customerList.vue +++ b/src/views/ebiz/customer/customerList.vue @@ -387,7 +387,7 @@ export default { background: #f5f5f5; color: #333; &.active { - background: #4fc6b3; + background: E9332E; color: #fff; border: none; } @@ -410,7 +410,7 @@ export default { border: none !important; } button:first-child { - color: #4fc6b3; + color: E9332E; background: #bbe2ef !important; } } diff --git a/src/views/ebiz/product/HomeProduct.vue b/src/views/ebiz/product/HomeProduct.vue index 4947c05db..12a6fad4f 100644 --- a/src/views/ebiz/product/HomeProduct.vue +++ b/src/views/ebiz/product/HomeProduct.vue @@ -30,10 +30,10 @@
- +
- +
diff --git a/src/views/ebiz/product/ProductList.vue b/src/views/ebiz/product/ProductList.vue index 06da24e43..881a6eb39 100644 --- a/src/views/ebiz/product/ProductList.vue +++ b/src/views/ebiz/product/ProductList.vue @@ -29,9 +29,9 @@
确定 - 重置 + 重置
@@ -120,6 +120,10 @@ export default { console.log(res) if (res.result == 0) { this.risks = res.categorys + this.risks[0].content.push({ + name:"全部", + code:'' + }) // this.label = res.categorys[0].label } }, @@ -142,7 +146,11 @@ export default { // 根据选中险别对产品列表进行筛选 this.list = this.proList.filter(item => { - return item.categoryCode.indexOf(this.risk) != -1 + if(this.risk==''){ + return item + }else{ + return item.categoryCode.indexOf(this.risk) != -1 + } }) }, toggleActive(item, idx) { @@ -211,7 +219,7 @@ export default { } /deep/.van-button--default { background-color: #d4f4ec; - color: #4fc6b3; + color: #E9332E; } } } diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index 0b507c86f..280a18b6b 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -32,7 +32,7 @@
- + 被保险人信息
@@ -47,7 +47,7 @@
- + 投保险种信息
@@ -79,14 +79,14 @@
- + 产品特色
- + 利益演算
@@ -119,7 +119,7 @@ { diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index afed45cb3..f3fcd1f31 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -2,7 +2,7 @@