Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
xingru.liu
60b72fcc 1 parent 4bc94778

修复BUG

Inline Side-by-side
Showing 11 changed files with 49 additions and 35 deletions
...@@ -7,12 +7,14 @@ export function login(loginName, password, rememberMe, equipmentType, userAgent, ...@@ -7,12 +7,14 @@ export function login(loginName, password, rememberMe, equipmentType, userAgent,
7 // password, 7 // password,
8 // rememberMe 8 // rememberMe
9 // } 9 // }
10 +
11 +
10 const data = { 12 const data = {
11 "email": "247908967@qq.com", 13 "email": "247908967@qq.com",
12 - "name": "肖玉兰", 14 + "name": "测试用户",
13 "phone": 18221643976, 15 "phone": 18221643976,
14 "port": "TSN", 16 "port": "TSN",
15 - "purpleId": '肖玉兰', 17 + "purpleId": '测试用户',
16 "role": 170 18 "role": 170
17 } 19 }
18 return request({ 20 return request({
...@@ -20,6 +22,17 @@ export function login(loginName, password, rememberMe, equipmentType, userAgent, ...@@ -20,6 +22,17 @@ export function login(loginName, password, rememberMe, equipmentType, userAgent,
20 method: 'post', 22 method: 'post',
21 data: data 23 data: data
22 }) 24 })
25 +
26 +
27 + // const data = {
28 + // "loginName":loginName,
29 + // "password":password,
30 + // }
31 + // return request({
32 + // url: '/bus-customer/customerLogin',
33 + // method: 'post',
34 + // data: data
35 + // })
23 } 36 }
24 37
25 // 退出方法 38 // 退出方法
......
...@@ -153,26 +153,26 @@ ...@@ -153,26 +153,26 @@
153 153
154 .el-button, 154 .el-button,
155 .el-button.is-disabled { 155 .el-button.is-disabled {
156 - border-top-color: $fedexButton !important; 156 + border-top-color: $fedexBottonColor !important;
157 - border-bottom-color: $fedexButton !important; 157 + border-bottom-color: $fedexBottonColor !important;
158 border-width: 2px; 158 border-width: 2px;
159 } 159 }
160 160
161 .el-button:first-child { 161 .el-button:first-child {
162 height: 100%; 162 height: 100%;
163 - border-left-color: $fedexButton !important; 163 + border-left-color: $fedexBottonColor !important;
164 164
165 span { 165 span {
166 - color: $fedexButton ; 166 + color: $fedexBottonColor ;
167 } 167 }
168 } 168 }
169 169
170 .el-button:last-child { 170 .el-button:last-child {
171 - border-right-color: $fedexButton !important; 171 + border-right-color: $fedexBottonColor !important;
172 - border-left: 1px solid $fedexButton !important; 172 + border-left: 1px solid $fedexBottonColor !important;
173 173
174 .el-dropdown__icon { 174 .el-dropdown__icon {
175 - color: $fedexButton ; 175 + color: $fedexBottonColor ;
176 } 176 }
177 } 177 }
178 178
...@@ -192,30 +192,30 @@ ...@@ -192,30 +192,30 @@
192 192
193 .el-button, 193 .el-button,
194 .el-button.is-disabled { 194 .el-button.is-disabled {
195 - border-top-color: $fedexButton !important; 195 + border-top-color: $fedexBottonColor !important;
196 - border-bottom-color: $fedexButton !important; 196 + border-bottom-color: $fedexBottonColor !important;
197 border-width: 2px; 197 border-width: 2px;
198 } 198 }
199 199
200 .el-button:first-child { 200 .el-button:first-child {
201 height: 100%; 201 height: 100%;
202 - border-left-color: $fedexButton !important; 202 + border-left-color: $fedexBottonColor !important;
203 203
204 span { 204 span {
205 - color: $fedexButton!important ; 205 + color: $fedexBottonColor!important ;
206 206
207 svg { 207 svg {
208 - color: $fedexButton!important ; 208 + color: $fedexBottonColor!important ;
209 } 209 }
210 } 210 }
211 } 211 }
212 212
213 .el-button:last-child { 213 .el-button:last-child {
214 - border-right-color: $fedexButton !important; 214 + border-right-color: $fedexBottonColor !important;
215 - border-left: 1px solid $fedexButton !important; 215 + border-left: 1px solid $fedexBottonColor !important;
216 216
217 .el-dropdown__icon { 217 .el-dropdown__icon {
218 - color: $fedexButton!important ; 218 + color: $fedexBottonColor!important ;
219 } 219 }
220 } 220 }
221 221
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
225 color: $formDisabledColor !important; 225 color: $formDisabledColor !important;
226 226
227 svg { 227 svg {
228 - color: $fedexButton !important; 228 + color: $fedexBottonColor !important;
229 } 229 }
230 } 230 }
231 } 231 }
...@@ -1082,7 +1082,7 @@ input:disabled { ...@@ -1082,7 +1082,7 @@ input:disabled {
1082 .el-dropdown-menu { 1082 .el-dropdown-menu {
1083 min-width: 150px; 1083 min-width: 150px;
1084 padding: 0px; 1084 padding: 0px;
1085 - border: 1px solid $fedexButton; 1085 + border: 1px solid $fedexBottonColor;
1086 1086
1087 .el-dropdown-menu__item { 1087 .el-dropdown-menu__item {
1088 font-size: 12px; 1088 font-size: 12px;
......
...@@ -93,14 +93,14 @@ ...@@ -93,14 +93,14 @@
93 </el-row> 93 </el-row>
94 </el-form> 94 </el-form>
95 <div class="optionButton"> 95 <div class="optionButton">
96 - <el-button 96 + <!-- <el-button
97 class="entrySaveButton" 97 class="entrySaveButton"
98 size="small" 98 size="small"
99 icon="el-icon-download" 99 icon="el-icon-download"
100 @click="downloadData" 100 @click="downloadData"
101 > 101 >
102 导出 102 导出
103 - </el-button> 103 + </el-button> -->
104 </div> 104 </div>
105 <Table 105 <Table
106 class="fedexDetialTable fedexSreachTable" 106 class="fedexDetialTable fedexSreachTable"
......
...@@ -157,14 +157,14 @@ ...@@ -157,14 +157,14 @@
157 </el-button> --> 157 </el-button> -->
158 </div> 158 </div>
159 <div> 159 <div>
160 - <el-button 160 + <!-- <el-button
161 class="entrySaveButton" 161 class="entrySaveButton"
162 size="small" 162 size="small"
163 icon="el-icon-download" 163 icon="el-icon-download"
164 @click="downloadData" 164 @click="downloadData"
165 > 165 >
166 导出 166 导出
167 - </el-button> 167 + </el-button> -->
168 </div> 168 </div>
169 </div> 169 </div>
170 <Table 170 <Table
......
...@@ -88,14 +88,14 @@ ...@@ -88,14 +88,14 @@
88 </el-row> 88 </el-row>
89 </el-form> 89 </el-form>
90 <div class="optionButton"> 90 <div class="optionButton">
91 - <el-button 91 + <!-- <el-button
92 class="entrySaveButton" 92 class="entrySaveButton"
93 size="small" 93 size="small"
94 icon="el-icon-download" 94 icon="el-icon-download"
95 @click="downloadData" 95 @click="downloadData"
96 > 96 >
97 导出 97 导出
98 - </el-button> 98 + </el-button> -->
99 </div> 99 </div>
100 <Table 100 <Table
101 class="fedexDetialTable fedexSreachTable" 101 class="fedexDetialTable fedexSreachTable"
......
...@@ -93,14 +93,14 @@ ...@@ -93,14 +93,14 @@
93 </el-row> 93 </el-row>
94 </el-form> 94 </el-form>
95 <div class="optionButton"> 95 <div class="optionButton">
96 - <el-button 96 + <!-- <el-button
97 class="entrySaveButton" 97 class="entrySaveButton"
98 size="small" 98 size="small"
99 icon="el-icon-download" 99 icon="el-icon-download"
100 @click="downloadData" 100 @click="downloadData"
101 > 101 >
102 导出 102 导出
103 - </el-button> 103 + </el-button> -->
104 </div> 104 </div>
105 <Table 105 <Table
106 class="fedexDetialTable fedexSreachTable" 106 class="fedexDetialTable fedexSreachTable"
......
...@@ -88,14 +88,14 @@ ...@@ -88,14 +88,14 @@
88 </el-row> 88 </el-row>
89 </el-form> 89 </el-form>
90 <div class="optionButton"> 90 <div class="optionButton">
91 - <el-button 91 + <!-- <el-button
92 class="entrySaveButton" 92 class="entrySaveButton"
93 size="small" 93 size="small"
94 icon="el-icon-download" 94 icon="el-icon-download"
95 @click="downloadData" 95 @click="downloadData"
96 > 96 >
97 导出 97 导出
98 - </el-button> 98 + </el-button> -->
99 </div> 99 </div>
100 <Table 100 <Table
101 class="fedexDetialTable fedexSreachTable" 101 class="fedexDetialTable fedexSreachTable"
......
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
214 :tableData="logData" 214 :tableData="logData"
215 :headerData="logHeaderData" 215 :headerData="logHeaderData"
216 /> 216 />
217 - <div class="entryTitle" style="margin-top: 10px">商品明细</div> 217 + <div class="entryTitle" style="margin-top: 10px">运单明细</div>
218 <ProductDetailTable 218 <ProductDetailTable
219 :tableData="detailData" 219 :tableData="detailData"
220 :bodyHeader="detialHeaderData" 220 :bodyHeader="detialHeaderData"
......
...@@ -107,14 +107,14 @@ ...@@ -107,14 +107,14 @@
107 </el-row> 107 </el-row>
108 </el-form> 108 </el-form>
109 <div class="optionButton"> 109 <div class="optionButton">
110 - <el-button 110 + <!-- <el-button
111 class="entrySaveButton" 111 class="entrySaveButton"
112 size="small" 112 size="small"
113 icon="el-icon-download" 113 icon="el-icon-download"
114 @click="downloadData" 114 @click="downloadData"
115 > 115 >
116 导出 116 导出
117 - </el-button> 117 + </el-button> -->
118 </div> 118 </div>
119 <Table 119 <Table
120 class="fedexDetialTable fedexSreachTable" 120 class="fedexDetialTable fedexSreachTable"
......
...@@ -79,14 +79,14 @@ ...@@ -79,14 +79,14 @@
79 </el-button> 79 </el-button>
80 </div> 80 </div>
81 <div> 81 <div>
82 - <el-button 82 + <!-- <el-button
83 class="entrySaveButton" 83 class="entrySaveButton"
84 size="small" 84 size="small"
85 icon="el-icon-download" 85 icon="el-icon-download"
86 @click="downloadData" 86 @click="downloadData"
87 > 87 >
88 导出 88 导出
89 - </el-button> 89 + </el-button> -->
90 </div> 90 </div>
91 </div> 91 </div>
92 <Table 92 <Table
......
...@@ -526,7 +526,8 @@ export default { ...@@ -526,7 +526,8 @@ export default {
526 declareDataUpload(obj) 526 declareDataUpload(obj)
527 .then((res) => { 527 .then((res) => {
528 if (res.code === "200") { 528 if (res.code === "200") {
529 - this.alertSuccessMsg(res.message); 529 + // this.alertSuccessMsg(res.message);
530 + this.alertSuccessMsg("数据已成功提交申报，请等待海关回执。");
530 } else { 531 } else {
531 this.alertWarningMsg(res.message); 532 this.alertWarningMsg(res.message);
532 } 533 }
......