|
|
@@ -26,8 +26,8 @@
|
|
|
position:absolute;
|
|
|
top:25px;
|
|
|
z-index:1000;
|
|
|
- width:450px;
|
|
|
- min-height:310px;
|
|
|
+ width:550px;
|
|
|
+ min-height:210px;
|
|
|
border:1px solid #2fa4e7;
|
|
|
padding:10px 0;
|
|
|
background: #fff
|
|
|
@@ -79,7 +79,7 @@
|
|
|
line-height: 28px;
|
|
|
}
|
|
|
.mobile-select .ng-table-pager {
|
|
|
- margin-right: 60px!important;
|
|
|
+ margin-right: 20px!important;
|
|
|
background: #fff;
|
|
|
}
|
|
|
|
|
|
@@ -192,10 +192,9 @@
|
|
|
<td></td>
|
|
|
<td class="tdcenter">
|
|
|
<div style="position:relative;display: inline-flex;align-items: center">
|
|
|
- <input type="text" style="width:248px;height:29px;" ng-model="brandMap.enName" readonly="readonly">
|
|
|
- <span style="background:url('static/img/product/cart/up-map.png')no-repeat 3px 10px;width:16px;height:29px;display:inline-block;border:1px solid #c0c6ca;" ng-click="showStoreFrame()"></span>
|
|
|
+ <input type="text" ng-click="showStoreFrame()" style="width:248px;height:29px;background:url('static/img/product/cart/up-map.png')no-repeat 230px 10px;padding-right:20px;" ng-model="brandMap.enName" readonly="readonly">
|
|
|
<div class="mobile-select" ng-if="showStore">
|
|
|
- <form style="display: inline-flex; align-items:center;">
|
|
|
+ <form style="display: inline-flex; align-items:center;padding-bottom:10px;">
|
|
|
<span style="margin-left:2px;margin-right:2px;color:#2fa4e7;font-weight: bold">类型选择</span>
|
|
|
<label class="radio-inline" ng-click="chooseTypeInStore('ORIGINAL_FACTORY')">
|
|
|
<input type="radio" name="type_radio">原厂商
|
|
|
@@ -206,10 +205,12 @@
|
|
|
<label class="radio-inline" ng-click="chooseTypeInStore('DISTRIBUTION')">
|
|
|
<input type="radio" name="type_radio">经销商
|
|
|
</label>
|
|
|
- <div style="display: inline-flex;align-items: center;margin-left:3px;width:170px;height:21px;">
|
|
|
+ <div style="display: inline-flex;align-items: center;margin-left:5px;width:170px;height:21px;">
|
|
|
<input type="text" style="padding:0 20px 0 3px;" ng-model="wordInStore" ng-change="changeTextInStore(wordInStore)">
|
|
|
<i class="fa fa-search" style="color:#fff;width:20px;height:20px;display:inline-block;margin-left:-20px;background: #2fa4e7;padding:3px;" ng-click="showStoreFrame()"></i>
|
|
|
</div>
|
|
|
+ <button ng-click="fitStoreInMap()" style="border:1px solid #2fa4e7;background: #2fa4e7;color:#fff;font-size: 12px;width:34px;height:24px;line-height: 24px;border-radius: 3px;margin:0 5px;">确定</button>
|
|
|
+ <button ng-click="fitStoreInMap()" style="border:1px solid #2fa4e7;background: #2fa4e7;color:#fff;font-size: 12px;width:34px;height:24px;line-height: 24px;border-radius: 3px;margin:0 5px;">取消</button>
|
|
|
</form>
|
|
|
<table class="table table-striped table-condensed" ng-table="storeInfoTableParams">
|
|
|
<thead>
|
|
|
@@ -229,7 +230,6 @@
|
|
|
</tr>
|
|
|
</tbody>
|
|
|
</table>
|
|
|
- <button ng-click="fitStoreInMap()" style="border:1px solid #2fa4e7;background: #2fa4e7;color:#fff;position:absolute;right:20px;font-size: 12px;width:34px;height:24px;line-height: 24px;border-radius: 3px;">确定</button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</td>
|
|
|
@@ -238,12 +238,13 @@
|
|
|
<td><input type="text" style="width:115px;height:29px;" ng-model="brandMap.nameChildEn"/></td>
|
|
|
<td class="tdcenter">
|
|
|
<div style="position:relative;display: inline-flex;align-items: center">
|
|
|
- <input type="text" style="width:96px;height:29px;" ng-model="brandMap.nameStandardCn" readonly="readonly">
|
|
|
- <span style="background:url('static/img/product/cart/up-map.png')no-repeat 3px 10px;width:16px;height:29px;display:inline-block;border:1px solid #c0c6ca;" ng-click="showBrandFrame()"></span>
|
|
|
+ <input type="text" ng-click="showBrandFrame()" style="width:96px;height:29px;background:url('static/img/product/cart/up-map.png')no-repeat 80px 10px;padding-right:20px;" ng-model="brandMap.nameStandardCn" readonly="readonly">
|
|
|
<div class="mobile-select" ng-if="showBrand">
|
|
|
<div style="margin-bottom:10px;display: inline-flex;align-items: center">
|
|
|
- <input type="text" ng-model="wordInBrand" ng-change="changeTextInBrand(wordInBrand)" style="width:395px;height:20px;line-height:20px;padding:0 20px 0 10px;border:1px solid #2fa4e7" placeholder="输入品牌中文/英文名称">
|
|
|
- <i ng-click="searchBrand()" class="fa fa-search" style="color:#fff;width:20px;height:20px;display:inline-block;margin-left:-20px;background: #2fa4e7;padding:3px;" ng-click="showStoreFrame()"></i>
|
|
|
+ <input type="text" ng-model="wordInBrand" ng-change="changeTextInBrand(wordInBrand)" style="width:395px;height:20px;line-height:20px;padding:0 20px 0 10px;border:1px solid #2fa4e7;" placeholder="输入品牌中文/英文名称">
|
|
|
+ <i ng-click="searchBrand()" class="fa fa-search" style="color:#fff;width:20px;height:20px;display:inline-block;margin-left:-20px;background: #2fa4e7;padding:3px;" ng-click="showStoreFrame()"></i>
|
|
|
+ <button ng-click="fitStoreInMap()" style="border:1px solid #2fa4e7;background: #2fa4e7;color:#fff;font-size: 12px;width:34px;height:24px;line-height: 24px;border-radius: 3px;margin:0 5px 0 10px;">确定</button>
|
|
|
+ <button ng-click="fitStoreInMap()" style="border:1px solid #2fa4e7;background: #2fa4e7;color:#fff;font-size: 12px;width:34px;height:24px;line-height: 24px;border-radius: 3px;margin:0 5px;">取消</button>
|
|
|
</div>
|
|
|
<ul>
|
|
|
<li>字母索引：</li>
|
|
|
@@ -288,8 +289,10 @@
|
|
|
</div>
|
|
|
</td>
|
|
|
<td><input type="text" style="width:115px;height:29px;" ng-model="brandMap.nameStandardEn"/></td>
|
|
|
+ <td></td>
|
|
|
<td>
|
|
|
- <button style="width:43px;color:#fff;background: #50b2eb;border:0;" ng-click="ensureAdd()">保存</button>
|
|
|
+ <button style="width:43px;color:#fff;background: #50b2eb;border:0;margin-right:20px;" ng-click="ensureAdd()">保存</button>
|
|
|
+ <button style="width:43px;color:#fff;background: #50b2eb;border:0;" ng-click="ensureAdd()">取消</button>
|
|
|
</td>
|
|
|
</tr >
|
|
|
|
wangcz