Commit 1df0f126a42eca8605eeceb10776d3cda9e8f11d
1 parent
51a5fe4d8b
Exists in
master
合并冲突
Showing
2 changed files
with
1 additions
and
13 deletions
Show diff stats
src/pages.json
| ... | ... | @@ -19,15 +19,12 @@ |
| 19 | 19 | } |
| 20 | 20 | }, |
| 21 | 21 | { |
| 22 | -<<<<<<< HEAD | |
| 23 | -======= | |
| 24 | 22 | "path" : "pages/purchaseLenses/purchaseLenses", |
| 25 | 23 | "style" : { |
| 26 | 24 | "navigationBarTitleText" : "产品选购" |
| 27 | 25 | } |
| 28 | 26 | }, |
| 29 | 27 | { |
| 30 | ->>>>>>> f0cf57997c2438808bb572407021a3e3a18ee0fb | |
| 31 | 28 | "path" : "pages/lensDetails/lensDetails", |
| 32 | 29 | "style" : { |
| 33 | 30 | "navigationBarTitleText" : "产品详情" |
| ... | ... | @@ -160,4 +157,4 @@ |
| 160 | 157 | } |
| 161 | 158 | ] |
| 162 | 159 | } |
| 163 | 160 | -} |
| 161 | +} | |
| 164 | 162 | \ No newline at end of file | ... | ... |
src/store/modules/myOrder.js
| ... | ... | @@ -88,17 +88,8 @@ const actions = { |
| 88 | 88 | url: myOrderList, |
| 89 | 89 | data: param, |
| 90 | 90 | success: (res) => { |
| 91 | -<<<<<<< HEAD | |
| 92 | - const resData = { | |
| 93 | - ...res, | |
| 94 | - data, | |
| 95 | - } | |
| 96 | - console.log('data.data',res); | |
| 97 | - commit("INIT", resData.data.data); | |
| 98 | -======= | |
| 99 | 91 | // console.log(res.data); |
| 100 | 92 | commit("INIT", res.data.data); |
| 101 | ->>>>>>> f0cf57997c2438808bb572407021a3e3a18ee0fb | |
| 102 | 93 | }, |
| 103 | 94 | }) |
| 104 | 95 | } | ... | ... |