Commit 1df0f126a42eca8605eeceb10776d3cda9e8f11d
1 parent
51a5fe4d8b
Exists in
master
合并冲突
Showing
2 changed files
with
1 additions
and
13 deletions
Show diff stats
src/pages.json
| 1 | { | 1 | { |
| 2 | "pages" : [ | 2 | "pages" : [ |
| 3 | { | 3 | { |
| 4 | "path" : "pages/index/index", | 4 | "path" : "pages/index/index", |
| 5 | "style" : { | 5 | "style" : { |
| 6 | "navigationBarTitleText" : "商城一览" | 6 | "navigationBarTitleText" : "商城一览" |
| 7 | } | 7 | } |
| 8 | }, | 8 | }, |
| 9 | { | 9 | { |
| 10 | "path" : "pages/user/user", | 10 | "path" : "pages/user/user", |
| 11 | "style" : { | 11 | "style" : { |
| 12 | "navigationBarTitleText" : "我的" | 12 | "navigationBarTitleText" : "我的" |
| 13 | } | 13 | } |
| 14 | }, | 14 | }, |
| 15 | { | 15 | { |
| 16 | "path" : "pages/detailsChoiceArgs/detailsChoiceArgs", | 16 | "path" : "pages/detailsChoiceArgs/detailsChoiceArgs", |
| 17 | "style" : { | 17 | "style" : { |
| 18 | "navigationBarTitleText" : "镜片名称名称" | 18 | "navigationBarTitleText" : "镜片名称名称" |
| 19 | } | 19 | } |
| 20 | }, | 20 | }, |
| 21 | { | 21 | { |
| 22 | <<<<<<< HEAD | ||
| 23 | ======= | ||
| 24 | "path" : "pages/purchaseLenses/purchaseLenses", | 22 | "path" : "pages/purchaseLenses/purchaseLenses", |
| 25 | "style" : { | 23 | "style" : { |
| 26 | "navigationBarTitleText" : "产品选购" | 24 | "navigationBarTitleText" : "产品选购" |
| 27 | } | 25 | } |
| 28 | }, | 26 | }, |
| 29 | { | 27 | { |
| 30 | >>>>>>> f0cf57997c2438808bb572407021a3e3a18ee0fb | ||
| 31 | "path" : "pages/lensDetails/lensDetails", | 28 | "path" : "pages/lensDetails/lensDetails", |
| 32 | "style" : { | 29 | "style" : { |
| 33 | "navigationBarTitleText" : "产品详情" | 30 | "navigationBarTitleText" : "产品详情" |
| 34 | } | 31 | } |
| 35 | }, | 32 | }, |
| 36 | { | 33 | { |
| 37 | "path" : "pages/myOrderPaying/myOrderPaying", | 34 | "path" : "pages/myOrderPaying/myOrderPaying", |
| 38 | "style" : { | 35 | "style" : { |
| 39 | "navigationBarTitleText" : "我的订单" | 36 | "navigationBarTitleText" : "我的订单" |
| 40 | } | 37 | } |
| 41 | }, | 38 | }, |
| 42 | { | 39 | { |
| 43 | "path" : "pages/myOrder/myOrder", | 40 | "path" : "pages/myOrder/myOrder", |
| 44 | "style" : { | 41 | "style" : { |
| 45 | "navigationBarTitleText" : "我的订单" | 42 | "navigationBarTitleText" : "我的订单" |
| 46 | } | 43 | } |
| 47 | }, | 44 | }, |
| 48 | { | 45 | { |
| 49 | "path" : "pages/cart/cart", | 46 | "path" : "pages/cart/cart", |
| 50 | "style" : { | 47 | "style" : { |
| 51 | "navigationBarTitleText" : "购物车" | 48 | "navigationBarTitleText" : "购物车" |
| 52 | } | 49 | } |
| 53 | }, | 50 | }, |
| 54 | { | 51 | { |
| 55 | "path" : "pages/frameDetail/frameDetail", | 52 | "path" : "pages/frameDetail/frameDetail", |
| 56 | "style" : { | 53 | "style" : { |
| 57 | "navigationBarTitleText" : "产品详情" | 54 | "navigationBarTitleText" : "产品详情" |
| 58 | } | 55 | } |
| 59 | }, | 56 | }, |
| 60 | { | 57 | { |
| 61 | "path" : "pages/refundProgress/refundProgress", | 58 | "path" : "pages/refundProgress/refundProgress", |
| 62 | "style" : { | 59 | "style" : { |
| 63 | "navigationBarTitleText" : "申请退款" | 60 | "navigationBarTitleText" : "申请退款" |
| 64 | } | 61 | } |
| 65 | }, | 62 | }, |
| 66 | { | 63 | { |
| 67 | "path" : "pages/addAddress/addAddress", | 64 | "path" : "pages/addAddress/addAddress", |
| 68 | "style" : { | 65 | "style" : { |
| 69 | "navigationBarTitleText" : "新增地址" | 66 | "navigationBarTitleText" : "新增地址" |
| 70 | } | 67 | } |
| 71 | }, | 68 | }, |
| 72 | { | 69 | { |
| 73 | "path" : "pages/confirmOrder/confirmOrder", | 70 | "path" : "pages/confirmOrder/confirmOrder", |
| 74 | "style" : { | 71 | "style" : { |
| 75 | "navigationBarTitleText" : "确认订单" | 72 | "navigationBarTitleText" : "确认订单" |
| 76 | } | 73 | } |
| 77 | }, | 74 | }, |
| 78 | { | 75 | { |
| 79 | "path" : "pages/refundment/refundWays", | 76 | "path" : "pages/refundment/refundWays", |
| 80 | "style" : { | 77 | "style" : { |
| 81 | "navigationBarTitleText" : "退款方式" | 78 | "navigationBarTitleText" : "退款方式" |
| 82 | } | 79 | } |
| 83 | }, | 80 | }, |
| 84 | { | 81 | { |
| 85 | "path" : "pages/refundment/refundment", | 82 | "path" : "pages/refundment/refundment", |
| 86 | "style" : { | 83 | "style" : { |
| 87 | "navigationBarTitleText" : "申请退款" | 84 | "navigationBarTitleText" : "申请退款" |
| 88 | } | 85 | } |
| 89 | }, | 86 | }, |
| 90 | { | 87 | { |
| 91 | "path" : "pages/predelivery/predelivery", | 88 | "path" : "pages/predelivery/predelivery", |
| 92 | "style" : { | 89 | "style" : { |
| 93 | "navigationBarTitleText" : "待发货" | 90 | "navigationBarTitleText" : "待发货" |
| 94 | } | 91 | } |
| 95 | }, | 92 | }, |
| 96 | { | 93 | { |
| 97 | "path" : "pages/customerService/customerService", | 94 | "path" : "pages/customerService/customerService", |
| 98 | "style" : { | 95 | "style" : { |
| 99 | "navigationBarTitleText" : "在线客服" | 96 | "navigationBarTitleText" : "在线客服" |
| 100 | } | 97 | } |
| 101 | }, | 98 | }, |
| 102 | { | 99 | { |
| 103 | "path" : "pages/detailStandard/detailStandard_sun", | 100 | "path" : "pages/detailStandard/detailStandard_sun", |
| 104 | "style" : { | 101 | "style" : { |
| 105 | "navigationBarTitleText" : "太阳镜选购页" | 102 | "navigationBarTitleText" : "太阳镜选购页" |
| 106 | } | 103 | } |
| 107 | }, | 104 | }, |
| 108 | { | 105 | { |
| 109 | "path" : "pages/detailStandard/detailStandard_k", | 106 | "path" : "pages/detailStandard/detailStandard_k", |
| 110 | "style" : { | 107 | "style" : { |
| 111 | "navigationBarTitleText" : "镜框选购页" | 108 | "navigationBarTitleText" : "镜框选购页" |
| 112 | } | 109 | } |
| 113 | } | 110 | } |
| 114 | ,{ | 111 | ,{ |
| 115 | "path" : "pages/addOpticsData/addOpticsData", | 112 | "path" : "pages/addOpticsData/addOpticsData", |
| 116 | "style" : { | 113 | "style" : { |
| 117 | "navigationBarTitleText" : "验光数据"} | 114 | "navigationBarTitleText" : "验光数据"} |
| 118 | } | 115 | } |
| 119 | ], | 116 | ], |
| 120 | "globalStyle" : { | 117 | "globalStyle" : { |
| 121 | "navigationBarTextStyle" : "black", | 118 | "navigationBarTextStyle" : "black", |
| 122 | "navigationBarTitleText" : "uni-app", | 119 | "navigationBarTitleText" : "uni-app", |
| 123 | "navigationBarBackgroundColor" : "#F8F8F8", | 120 | "navigationBarBackgroundColor" : "#F8F8F8", |
| 124 | "backgroundColor" : "#F8F8F8" | 121 | "backgroundColor" : "#F8F8F8" |
| 125 | }, | 122 | }, |
| 126 | "tabBar" : { | 123 | "tabBar" : { |
| 127 | "color" : "#C0C4CC", | 124 | "color" : "#C0C4CC", |
| 128 | "selectedColor" : "#fa436a", | 125 | "selectedColor" : "#fa436a", |
| 129 | "borderStyle" : "black", | 126 | "borderStyle" : "black", |
| 130 | "backgroundColor" : "#ffffff", | 127 | "backgroundColor" : "#ffffff", |
| 131 | "list" : [ | 128 | "list" : [ |
| 132 | { | 129 | { |
| 133 | "pagePath" : "pages/index/index", | 130 | "pagePath" : "pages/index/index", |
| 134 | "iconPath" : "static/tab-home.png", | 131 | "iconPath" : "static/tab-home.png", |
| 135 | "selectedIconPath" : "static/tab-home-current.png", | 132 | "selectedIconPath" : "static/tab-home-current.png", |
| 136 | "text" : "首页" | 133 | "text" : "首页" |
| 137 | }, | 134 | }, |
| 138 | { | 135 | { |
| 139 | "pagePath" : "pages/cart/cart", | 136 | "pagePath" : "pages/cart/cart", |
| 140 | "iconPath" : "static/tab-cart.png", | 137 | "iconPath" : "static/tab-cart.png", |
| 141 | "selectedIconPath" : "static/tab-cart-current.png", | 138 | "selectedIconPath" : "static/tab-cart-current.png", |
| 142 | "text" : "购物车" | 139 | "text" : "购物车" |
| 143 | }, | 140 | }, |
| 144 | { | 141 | { |
| 145 | "pagePath" : "pages/user/user", | 142 | "pagePath" : "pages/user/user", |
| 146 | "iconPath" : "static/tab-my.png", | 143 | "iconPath" : "static/tab-my.png", |
| 147 | "selectedIconPath" : "static/tab-my-current.png", | 144 | "selectedIconPath" : "static/tab-my-current.png", |
| 148 | "text" : "我的" | 145 | "text" : "我的" |
| 149 | } | 146 | } |
| 150 | ] | 147 | ] |
| 151 | }, | 148 | }, |
| 152 | "condition" : { | 149 | "condition" : { |
| 153 | //模式配置，仅开发期间生效 | 150 | //模式配置，仅开发期间生效 |
| 154 | "current" : 0, //当前激活的模式(list 的索引项) | 151 | "current" : 0, //当前激活的模式(list 的索引项) |
| 155 | "list" : [ | 152 | "list" : [ |
| 156 | { | 153 | { |
| 157 | "name" : "", //模式名称 | 154 | "name" : "", //模式名称 |
| 158 | "path" : "", //启动页面，必选 | 155 | "path" : "", //启动页面，必选 |
| 159 | "query" : "" //启动参数，在页面的onLoad函数里面得到 | 156 | "query" : "" //启动参数，在页面的onLoad函数里面得到 |
| 160 | } | 157 | } |
| 161 | ] | 158 | ] |
| 162 | } | 159 | } |
| 163 | } | 160 | } |
| 161 |
src/store/modules/myOrder.js
| 1 | import urlAlias from '../url'; | 1 | import urlAlias from '../url'; |
| 2 | import request from '../request'; | 2 | import request from '../request'; |
| 3 | 3 | ||
| 4 | const { | 4 | const { |
| 5 | myOrderList | 5 | myOrderList |
| 6 | } = urlAlias; | 6 | } = urlAlias; |
| 7 | 7 | ||
| 8 | // const data = { | 8 | // const data = { |
| 9 | // data: [ | 9 | // data: [ |
| 10 | // { | 10 | // { |
| 11 | // finished_time: null, | 11 | // finished_time: null, |
| 12 | // is_refound: "0", | 12 | // is_refound: "0", |
| 13 | // mch_id: "1436019502", | 13 | // mch_id: "1436019502", |
| 14 | // money_of_dcw: "0", | 14 | // money_of_dcw: "0", |
| 15 | // money_of_partner: "0", | 15 | // money_of_partner: "0", |
| 16 | // money_of_shop: "0", | 16 | // money_of_shop: "0", |
| 17 | // orderJudge: false, | 17 | // orderJudge: false, |
| 18 | // order_info: { | 18 | // order_info: { |
| 19 | // address:{ | 19 | // address:{ |
| 20 | // cityName: "镇江市", | 20 | // cityName: "镇江市", |
| 21 | // countyName: "丹阳市", | 21 | // countyName: "丹阳市", |
| 22 | // detailInfo: "延陵镇柳茹村卫生室附近秀野堂农业发展有限公司", | 22 | // detailInfo: "延陵镇柳茹村卫生室附近秀野堂农业发展有限公司", |
| 23 | // errMsg: "chooseAddress:ok", | 23 | // errMsg: "chooseAddress:ok", |
| 24 | // nationalCode: "321181", | 24 | // nationalCode: "321181", |
| 25 | // postalCode: "212300", | 25 | // postalCode: "212300", |
| 26 | // provinceName: "江苏省", | 26 | // provinceName: "江苏省", |
| 27 | // telNumber: "15896379277", | 27 | // telNumber: "15896379277", |
| 28 | // userName: "点餐汪客服", | 28 | // userName: "点餐汪客服", |
| 29 | // }, | 29 | // }, |
| 30 | // cartinfo:['11', '12'], | 30 | // cartinfo:['11', '12'], |
| 31 | // keyname: "1_1587129366", | 31 | // keyname: "1_1587129366", |
| 32 | // lefttime: 179995, | 32 | // lefttime: 179995, |
| 33 | // list:[ | 33 | // list:[ |
| 34 | // { | 34 | // { |
| 35 | // cart_id: "11", | 35 | // cart_id: "11", |
| 36 | // imgUrl: "https://glass.xiuyetang.com//upload_jk/4/4_0_3FDA03.jpg", | 36 | // imgUrl: "https://glass.xiuyetang.com//upload_jk/4/4_0_3FDA03.jpg", |
| 37 | // img_index_url: null, | 37 | // img_index_url: null, |
| 38 | // memo: "志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流，01-8701", | 38 | // memo: "志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流，01-8701", |
| 39 | // mp_id: "1", | 39 | // mp_id: "1", |
| 40 | // nowPrice: 100, | 40 | // nowPrice: 100, |
| 41 | // num: "2", | 41 | // num: "2", |
| 42 | // oldPrice: "0", | 42 | // oldPrice: "0", |
| 43 | // p_discount: "1", | 43 | // p_discount: "1", |
| 44 | // p_name: "01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流", | 44 | // p_name: "01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流", |
| 45 | // p_root_index: "1", | 45 | // p_root_index: "1", |
| 46 | // p_sale_price: "0", | 46 | // p_sale_price: "0", |
| 47 | // peopleName: "me", | 47 | // peopleName: "me", |
| 48 | // pics: '', | 48 | // pics: '', |
| 49 | // pid: "4", | 49 | // pid: "4", |
| 50 | // sk_id: "38", | 50 | // sk_id: "38", |
| 51 | // }, | 51 | // }, |
| 52 | // ], | 52 | // ], |
| 53 | // orderDesc: "总共包括有：01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流在内的1件商品", | 53 | // orderDesc: "总共包括有：01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流在内的1件商品", |
| 54 | // total_fee: 100 | 54 | // total_fee: 100 |
| 55 | // }, | 55 | // }, |
| 56 | // partner_uid: "0", | 56 | // partner_uid: "0", |
| 57 | // pay_cate: "2020", | 57 | // pay_cate: "2020", |
| 58 | // pay_id: "3", | 58 | // pay_id: "3", |
| 59 | // pay_time: "2020-04-17 21:16:12", | 59 | // pay_time: "2020-04-17 21:16:12", |
| 60 | // pay_wood_desc: "在【非常戴镜】的微信付款凭证", | 60 | // pay_wood_desc: "在【非常戴镜】的微信付款凭证", |
| 61 | // pay_wood_id: "fcdj-1-1_1587129366", | 61 | // pay_wood_id: "fcdj-1-1_1587129366", |
| 62 | // prepay_id: "wx172116124528226bf1a8adad1662456500", | 62 | // prepay_id: "wx172116124528226bf1a8adad1662456500", |
| 63 | // re_check_staus: "0", | 63 | // re_check_staus: "0", |
| 64 | // shopid: "0", | 64 | // shopid: "0", |
| 65 | // split_userid: "0", | 65 | // split_userid: "0", |
| 66 | // status: "1", | 66 | // status: "1", |
| 67 | // total_fee: "100", | 67 | // total_fee: "100", |
| 68 | // uid: "1", | 68 | // uid: "1", |
| 69 | // } | 69 | // } |
| 70 | // ], | 70 | // ], |
| 71 | // msg: "订单列表", | 71 | // msg: "订单列表", |
| 72 | // status: 0, | 72 | // status: 0, |
| 73 | // } | 73 | // } |
| 74 | 74 | ||
| 75 | const state = { | 75 | const state = { |
| 76 | orderList: [], | 76 | orderList: [], |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | const mutations = { | 79 | const mutations = { |
| 80 | INIT: (state, data) => { | 80 | INIT: (state, data) => { |
| 81 | state.orderList = data; | 81 | state.orderList = data; |
| 82 | }, | 82 | }, |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | const actions = { | 85 | const actions = { |
| 86 | getList({ commit }, param) { | 86 | getList({ commit }, param) { |
| 87 | request({ | 87 | request({ |
| 88 | url: myOrderList, | 88 | url: myOrderList, |
| 89 | data: param, | 89 | data: param, |
| 90 | success: (res) => { | 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 | // console.log(res.data); | 91 | // console.log(res.data); |
| 100 | commit("INIT", res.data.data); | 92 | commit("INIT", res.data.data); |
| 101 | >>>>>>> f0cf57997c2438808bb572407021a3e3a18ee0fb | ||
| 102 | }, | 93 | }, |
| 103 | }) | 94 | }) |
| 104 | } | 95 | } |
| 105 | } | 96 | } |
| 106 | 97 | ||
| 107 | export default { | 98 | export default { |
| 108 | namespaced: true, | 99 | namespaced: true, |
| 109 | state, | 100 | state, |
| 110 | mutations, | 101 | mutations, |
| 111 | actions, | 102 | actions, |
| 112 | } | 103 | } |