diff --git a/src/pages.json b/src/pages.json
index 0c74409..8cf8654 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,90 +1,99 @@
{
"pages" : [
{
- "path" : "pages/index/index",
+ "path" : "pages/user/user",
"style" : {
- "navigationBarTitleText" : "商城一览"
+ "navigationBarTitleText" : "我的"
}
},
{
- "path" : "pages/myOrder/myOrder",
+ "path" : "pages/detailsChoiceArgs/detailsChoiceArgs",
"style" : {
- "navigationBarTitleText" : "我的订单"
+ "navigationBarTitleText" : "镜片名称名称"
}
},
{
- "path" : "pages/cart/cart",
+ "path" : "pages/purchaseLenses/purchaseLenses",
"style" : {
- "navigationBarTitleText" : "购物车"
+ "navigationBarTitleText" : "产品选购"
}
},
{
- "path" : "pages/frameDetail/frameDetail",
+ "path" : "pages/lensDetails/lensDetails",
"style" : {
"navigationBarTitleText" : "产品详情"
}
},
{
- "path" : "pages/lensDetails/lensDetails",
+ "path" : "pages/myOrderPaying/myOrderPaying",
"style" : {
- "navigationBarTitleText" : "产品详情"
+ "navigationBarTitleText" : "我的订单"
}
},
{
- "path" : "pages/purchaseLenses/purchaseLenses",
+ "path" : "pages/myOrder/myOrder",
"style" : {
- "navigationBarTitleText" : "产品选购"
+ "navigationBarTitleText" : "我的订单"
}
},
{
- "path" : "pages/refundProgress/refundProgress",
+ "path" : "pages/index/index",
"style" : {
- "navigationBarTitleText" : "申请退款"
+ "navigationBarTitleText" : "商城一览"
}
},
{
- "path" : "pages/addAddress/addAddress",
+ "path" : "pages/cart/cart",
"style" : {
- "navigationBarTitleText" : "新增地址"
+ "navigationBarTitleText" : "购物车"
}
},
{
- "path" : "pages/confirmOrder/confirmOrder",
+ "path" : "pages/frameDetail/frameDetail",
"style" : {
- "navigationBarTitleText" : "确认订单"
+ "navigationBarTitleText" : "产品详情"
}
},
{
- "path" : "pages/user/user",
+ "path" : "pages/refundProgress/refundProgress",
"style" : {
- "navigationBarTitleText" : "我的"
+ "navigationBarTitleText" : "申请退款"
}
},
{
- "path" : "pages/refundment/refundWays"
+ "path" : "pages/addAddress/addAddress",
+ "style" : {
+ "navigationBarTitleText" : "新增地址"
+ }
},
{
- "path" : "pages/refundment/refundment"
+ "path" : "pages/confirmOrder/confirmOrder",
+ "style" : {
+ "navigationBarTitleText" : "确认订单"
+ }
},
{
- "path" : "pages/predelivery/predelivery"
+ "path" : "pages/refundment/refundWays",
+ "style" : {
+ "navigationBarTitleText" : "退款方式"
+ }
},
{
- "path" : "pages/customerService/customerService",
+ "path" : "pages/refundment/refundment",
"style" : {
- "navigationBarTitleText" : "在线客服"
+ "navigationBarTitleText" : "申请退款"
}
},
{
- "path" : "pages/myOrderPaying/myOrderPaying",
+ "path" : "pages/predelivery/predelivery",
"style" : {
- "navigationBarTitleText" : "我的订单"
+ "navigationBarTitleText" : "待发货"
}
},
{
- "path" : "pages/detailsChoiceArgs/detailsChoiceArgs",
+ "path" : "pages/customerService/customerService",
"style" : {
- "navigationBarTitleText" : "镜片名称名称"
+ "navigationBarTitleText" : "在线客服"
}
},
{
@@ -98,7 +107,12 @@
"style" : {
"navigationBarTitleText" : "镜框选购页"
}
- }
+ }
+ ,{
+ "path" : "pages/addOpticsData/addOpticsData",
+ "style" : {
+ "navigationBarTitleText" : "验光数据"}
+ }
],
"globalStyle" : {
"navigationBarTextStyle" : "black",
diff --git a/src/pages/addOpticsData/addOpticsData.vue b/src/pages/addOpticsData/addOpticsData.vue
new file mode 100644
index 0000000..8c3b35f
--- /dev/null
+++ b/src/pages/addOpticsData/addOpticsData.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/myOrder/components/OrderCard.vue b/src/pages/myOrder/components/OrderCard.vue
index adbb338..d8de011 100644
--- a/src/pages/myOrder/components/OrderCard.vue
+++ b/src/pages/myOrder/components/OrderCard.vue
@@ -1,61 +1,75 @@
-
+
-
-
+
+
- {{order.name}}
- 规格：玫瑰金 / 钛合金 / 防日光防紫外线
+ {{orderInfo.p_name}}
+ {{orderInfo.p_name}}
- {{order.price}}
- X{{order.buyNum}}
+ {{orderInfo.nowPrice}}
+ X {{orderInfo.num}}
- 实付：{{order.price}}
-
- 申请退款
+ 实付：{{order.total_fee}}
+
+
+ 取消订单
去支付
-
- 再次购买
+
+ 确认收货
+
+ 再次购买
+
+
-
+
-
-
+
+
- {{order.name}}
- 规格：玫瑰金 / 钛合金 / 防日光防紫外线
+ {{orderInfo.p_name}}
+ {{orderInfo.p_name}}
- {{order.price}}
- X{{order.buyNum}}
+ {{orderInfo.nowPrice}}
+ X {{orderInfo.num}}
- 实付：{{order.price}}
-
- 申请退款
+ 实付：{{order.total_fee}}
+
+ 取消订单
去支付
-
- 再次购买
+
+ 确认收货
+
+
+ 再次购买
+
@@ -67,13 +81,72 @@
* 订单数据
*/
order: {
- orderId: Number,
- img: String,
- name: String,
- originCost:String,
- price: String,
- orderType:Number,
- buyNum:Number
+ // orderId: Number,
+ // img: String,
+ // name: String,
+ // originCost:String,
+ // price: String,
+ // orderType:Number,
+ // buyNum:Number,
+ finished_time: null,
+ is_refound: String,
+ mch_id: String,
+ money_of_dcw: String,
+ money_of_partner: String,
+ money_of_shop: String,
+ orderJudge: Boolean,
+ order_info: {
+ address:{
+ cityName: String,
+ countyName: String,
+ detailInfo: String,
+ errMsg: String,
+ nationalCode: String,
+ postalCode: String,
+ provinceName: String,
+ telNumber: String,
+ userName: String,
+ },
+ cartinfo: ["127"],
+ keyname: "330_1588911391",
+ lefttime: Number,
+ list:[
+ {
+ cart_id: "127",
+ imgUrl: String,
+ img_index_url: null,
+ memo: String,
+ mp_id: String,
+ nowPrice: String,
+ num: String,
+ oldPrice: Number,
+ p_discount: String,
+ p_name: String,
+ p_root_index: String,
+ p_sale_price: String,
+ peopleName: String,
+ pics: ["79_0_D122D2.jpg","79_1_E0A1ED.jpg","79_2_B00B3D.jpg","79_3_B2CF21.jpg","79_4_33AD1B.jpg"],
+ pid: String,
+ sk_id: String,
+ }
+ ],
+ orderDesc: String,
+ total_fee: Number,
+ },
+ partner_uid: String,
+ pay_cate: String,
+ pay_id: String,
+ pay_time: String,
+ pay_wood_desc: String,
+ pay_wood_id: String,
+ prepay_id: String,
+ re_check_staus: String,
+ shopid: String,
+ split_userid: String,
+ status: String,
+ // status0待付款 1已付款 待收货 2 已收货待评价 3 已评价
+ total_fee: String,
+ uid: String,
},
/**
* 当前选择
@@ -81,9 +154,18 @@
current:Number
},
- onLoad() {
- // console.log('dd');
- console.log('order', this.props.order);
+ created() {
+ console.log(this.order);
+ // console.log(this.order.status );
+ // console.log(this.current);
+ },
+ computed:{
+ status(){
+ return this.order.status
+ },
+ orderInfoList(){
+ return this.order.order_info[0]
+ }
},
data() {
return {
@@ -97,6 +179,43 @@
fail: () => {},
complete: () => {}
});
+ },
+ toOrderInfo(status,payId){
+ console.log(status,payId)
+ switch(status){
+ // 0待付款 1待收货 2已收货 3 已评价
+ case '0':
+ uni.navigateTo({
+ url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId,
+ fail(errMsg) {
+ console.log(errMsg)
+ }
+ })
+ break;
+ case '1':
+ uni.navigateTo({
+ url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId,
+ fail(errMsg) {
+ console.log(errMsg)
+ }
+ })
+
+ break;
+ case '2 || 3':
+ uni.navigateTo({
+ url:`../myOrderPaying/myOrderPaying?status=`+status+`&payId=`+payId,
+ fail(errMsg) {
+ console.log(errMsg)
+ }
+ })
+
+ break;
+
+
+ default:
+ break;
+
+ }
}
}
}
@@ -147,24 +266,34 @@
justify-content: space-between;
align-items: flex-start;
height: 188rpx;
+ width: 368rpx;
}
.orderName{
font-size: 14px;
color: #333333;
+ display: -webkit-box;
+ overflow: hidden;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.orderDescrib{
font-size: 12px;
color: #999999;
+ display: -webkit-box;
+ overflow: hidden;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.infoText-bottom{
display: flex;
flex-direction: row;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
width: 100%;
.markPrice{
font-size: 14px;
color: #FF6B4A;
+ margin-right: 20rpx;
}
.buy-num{
font-size: 12px;
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index fa44b35..5e825af 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -2,10 +2,10 @@