diff --git a/application/plugins/view/freightfee/admin/index.html b/application/plugins/view/freightfee/admin/index.html
index 236036c53..aef05efb0 100755
--- a/application/plugins/view/freightfee/admin/index.html
+++ b/application/plugins/view/freightfee/admin/index.html
@@ -57,6 +57,7 @@
首费(元) |
续件数(件) |
续费(元) |
+ 满(免运费) |
{{else /}}
@@ -67,6 +68,7 @@
首费(元) |
续件数(kg) |
续费(元) |
+ 满(免运费) |
{{/if}}
@@ -84,6 +86,7 @@
{{$v.first_price}} |
{{$v.continue}} |
{{$v.continue_price}} |
+ {{$v.free_shipping_price}} |
{{/foreach}}
diff --git a/application/plugins/view/freightfee/admin/saveinfo.html b/application/plugins/view/freightfee/admin/saveinfo.html
index f7d5f8835..35d9125f5 100755
--- a/application/plugins/view/freightfee/admin/saveinfo.html
+++ b/application/plugins/view/freightfee/admin/saveinfo.html
@@ -41,11 +41,12 @@
{{if empty($data['data'])}}
- | 运送到 |
- 首件数(件) |
- 首费(元) |
- 续件数(件) |
- 续费(元) |
+ 运送到* |
+ 首件数(件)* |
+ 首费(元)* |
+ 续件数(件)* |
+ 续费(元)* |
+ 满(免运费) |
操作 |
@@ -68,6 +69,9 @@
|
+
+
+ |
|
@@ -75,11 +79,12 @@
{{if isset($data['valuation']) and $data['valuation'] eq 0}}
- | 运送到 |
- 首件数(件) |
- 首费(元) |
- 续件数(件) |
- 续费(元) |
+ 运送到* |
+ 首件数(件)* |
+ 首费(元)* |
+ 续件数(件)* |
+ 续费(元)* |
+ 满(免运费) |
操作 |
@@ -110,6 +115,9 @@
|
+
+
+ |
{{if $v['region'] eq 'default'}}
|
{{else /}}
@@ -123,11 +131,12 @@
{{else /}}
- | 运送到 |
- 首件数(kg) |
- 首费(元) |
- 续件数(kg) |
- 续费(元) |
+ 运送到* |
+ 首件数(kg)* |
+ 首费(元)* |
+ 续件数(kg)* |
+ 续费(元)* |
+ 满(免运费) |
操作 |
@@ -158,6 +167,9 @@
|
+
+
+ |
{{if $v['region'] eq 'default'}}
|
{{else /}}
diff --git a/public/static/plugins/css/freightfee/admin.css b/public/static/plugins/css/freightfee/admin.css
index e185ea510..cf438692a 100755
--- a/public/static/plugins/css/freightfee/admin.css
+++ b/public/static/plugins/css/freightfee/admin.css
@@ -37,6 +37,10 @@
position: absolute;
margin-left: -1000000px;
}
+.freightfee-rules .am-form-group-label-tips-must {
+ vertical-align: middle;
+ margin-left: 5px !important;
+}
/**
* 弹窗
diff --git a/public/static/plugins/css/petscms/pets.detail.css b/public/static/plugins/css/petscms/pets.detail.css
index ee8239de6..f603bcb4d 100644
--- a/public/static/plugins/css/petscms/pets.detail.css
+++ b/public/static/plugins/css/petscms/pets.detail.css
@@ -10,7 +10,7 @@
#ai-topsearch {
background: #03A9F4 none repeat scroll 0% 0%;
}
-.goods-category-title, .navigation-user, .navigation-user .nav-user {
+.goods-category-title, .navigation-user, .navigation-user .nav-user, .shop-navigation .am-btn {
background: #03A9F4;
}
.navigation-user * {
@@ -19,8 +19,8 @@
.am-footer-default {
border-top: 2px solid #03A9F4;
}
-.am-slider-a1 .am-control-nav li a.am-active {
- background-color: #03A9F4;
+.shop-navigation .am-btn, .shop-navigation .navigation-search input {
+ border-color: #03A9F4;
}
.shop-navigation .am-topbar-nav > li > a:hover, a:hover, a:focus {
color: #03A9F4;
@@ -35,6 +35,9 @@
.pets-detail {
margin-top: 10px;
}
+.pets-detail .am-slider-a1 .am-control-nav li a.am-active {
+ background-color: #03A9F4;
+}
.provide-submit, .base-share {
margin-top: 20px;
}
diff --git a/public/static/plugins/js/freightfee/admin.js b/public/static/plugins/js/freightfee/admin.js
index 7ee36f2b9..d0ef81c93 100644
--- a/public/static/plugins/js/freightfee/admin.js
+++ b/public/static/plugins/js/freightfee/admin.js
@@ -23,11 +23,12 @@ $(function()
$this.parents('.am-form-group').attr('data-value', valuation);
var thead = '';
- thead += '| 运送到 | ';
- thead += '首件数('+unit+') | ';
- thead += '首费(元) | ';
- thead += '续件数('+unit+') | ';
- thead += '续费(元) | ';
+ thead += '运送到* | ';
+ thead += '首件数('+unit+')* | ';
+ thead += '首费(元)* | ';
+ thead += '续件数('+unit+')* | ';
+ thead += '续费(元)* | ';
+ thead += '满(免运费) | ';
thead += '操作 | ';
thead += '
';
@@ -53,6 +54,9 @@ $(function()
html += '';
html += '';
html += ' | ';
+ html += '';
+ html += '';
+ html += ' | ';
html += ' | ';
html += '';
break;
@@ -76,6 +80,9 @@ $(function()
html += '';
html += '';
html += ' | ';
+ html += '';
+ html += '';
+ html += ' | ';
html += ' | ';
html += '';
break;
@@ -131,6 +138,7 @@ $(function()
$('.freightfee-rules table.am-table').find('tbody tr:last .first-price-name').attr('name', 'data['+index+'][first_price]');
$('.freightfee-rules table.am-table').find('tbody tr:last .continue-name').attr('name', 'data['+index+'][continue]');
$('.freightfee-rules table.am-table').find('tbody tr:last .continue-price-name').attr('name', 'data['+index+'][continue_price]');
+ $('.freightfee-rules table.am-table').find('tbody tr:last .continue-free-shipping-price-name').attr('name', 'data['+index+'][free_shipping_price]');
});
// 行移除