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 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ };
+ }
+ }
+</script>
+
+<style lang="scss">
+
+</style>
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 @@
<template>
<view>
- <view class="card" v-if="current === order.orderType" >
+ <view class="card" v-if="current == status" @click="toOrderInfo(status,order.pay_id)">
<view class="cardHeader">
- <text class="orderId">订单号：{{order.orderId}}</text>
- <text class="orderType" v-if="order.orderType===1">待付款</text>
- <text class="orderType" v-if="order.orderType===2">待发货</text>
- <text class="orderType" v-if="order.orderType === 3">待收货</text>
- <text class="orderType" v-if="order.orderType === 4">退款售后</text>
- <text class="orderType" v-if="order.orderType === 5">已完成</text>
+ <text class="orderId" v-if="status == '0'||status == '1'">订单号：{{order.mch_id}}</text>
+ <text class="orderId" v-if="status == '2'||status == '3'">下单时间：{{order.pay_time}}</text>
+ <text class="orderType" v-if="status=='0'">待付款</text>
+ <text class="orderType" v-if="status=='1'">待收货</text>
+ <text class="orderType" v-if="status == '2'||status == '3'">已完成</text>
+ <!-- <text class="orderType" v-if="status == '3'">已评价</text> -->
</view>
- <view class="orderCardInfo">
- <image :src="order.img" mode="aspectFill"></image>
+ <view class="orderCardInfo" v-for="(orderInfo) in orderInfoList.list" :key="orderInfo">
+ <image :src="orderInfo.imgUrl" mode="aspectFill"></image>
<view class="infoText">
- <view class="orderName">{{order.name}}</view>
- <view class="orderDescrib">规格：玫瑰金 / 钛合金 / 防日光防紫外线</view>
+ <view class="orderName">{{orderInfo.p_name}}</view>
+ <view class="orderDescrib">{{orderInfo.p_name}}</view>
<view class="infoText-bottom">
- <view class="markPrice">{{order.price}}</view>
- <view class="buy-num">X{{order.buyNum}}</view>
+ <view class="markPrice">{{orderInfo.nowPrice}}</view>
+ <view class="buy-num">X {{orderInfo.num}}</view>
</view>
</view>
</view>
- <view class="payPrice">实付：<text class="priceNum">{{order.price}}</text> </view>
- <view class="btns" v-if="order.orderType === 1">
- <view class="btn-type1">申请退款</view>
+ <view class="payPrice">实付：<text class="priceNum">{{order.total_fee}}</text> </view>
+ <!-- 0待付款 1 已付款 待收货 2 已收货待评价 3 已评价 -->
+ <view class="btns" v-if="status == '0'">
+ <view class="btn-type1" >取消订单</view>
<view class="btn-type2">去支付</view>
</view>
- <view class="btns" v-if="order.orderType === 0">
- <view class="btn-type1">再次购买</view>
+ <view class="btns" v-if="status == '1'">
+ <view class="btn-type2">确认收货</view>
</view>
+ <view class="btns" v-if="status == '2'">
+ <view class="btn-type2">再次购买</view>
+ </view>
+ <!-- <view class="btns" v-if="status == '3'">
+ <view class="btn-type2">再次购买</view>
+ </view> -->
</view>
- <view class="card" v-if="current === 0" >
+ <view class="card" v-if="current == '10'" @click="toOrderInfo(status,order.pay_id)">
<view class="cardHeader">
- <text class="orderId">订单号：{{order.orderId}}</text>
- <text class="orderType" v-if="order.orderType===1">待付款</text>
- <text class="orderType" v-if="order.orderType===2">待发货</text>
- <text class="orderType" v-if="order.orderType === 3">待收货</text>
- <text class="orderType" v-if="order.orderType === 4">退款售后</text>
+ <text class="orderId" v-if="status == '0'||status == '1'">订单号：{{order.mch_id}}</text>
+ <text class="orderId" v-if="status == '2'||status == '3'">下单时间：{{order.pay_time}}</text>
+ <text class="orderType" v-if="status=='0'">待付款</text>
+ <text class="orderType" v-if="status=='1'">待收货</text>
+ <text class="orderType" v-if="status == '2'||status == '3'">已完成</text>
+ <!-- <text class="orderType" v-if="status == '3'">已评价</text> -->
</view>
- <view class="orderCardInfo">
- <image :src="order.img" mode="aspectFill"></image>
+ <view class="orderCardInfo" v-if v-for="(orderInfo) in orderInfoList.list" :key="orderInfo">
+ <image :src="orderInfo.imgUrl" mode="aspectFill"></image>
<view class="infoText">
- <view class="orderName">{{order.name}}</view>
- <view class="orderDescrib">规格：玫瑰金 / 钛合金 / 防日光防紫外线</view>
+ <view class="orderName">{{orderInfo.p_name}}</view>
+ <view class="orderDescrib">{{orderInfo.p_name}}</view>
<view class="infoText-bottom">
- <view class="markPrice">{{order.price}}</view>
- <view class="buy-num">X{{order.buyNum}}</view>
+ <view class="markPrice">{{orderInfo.nowPrice}}</view>
+ <view class="buy-num">X {{orderInfo.num}}</view>
</view>
</view>
</view>
- <view class="payPrice">实付：<text class="priceNum">{{order.price}}</text> </view>
- <view class="btns" v-if="order.orderType === 1">
- <view class="btn-type1" @click="toRefundment">申请退款</view>
+ <view class="payPrice">实付：<text class="priceNum">{{order.total_fee}}</text> </view>
+ <view class="btns" v-if="status == '0'">
+ <view class="btn-type1" >取消订单</view>
<view class="btn-type2">去支付</view>
</view>
- <view class="btns" v-if="order.orderType === 0">
- <view class="btn-type1">再次购买</view>
+ <view class="btns" v-if="status == '1'">
+ <view class="btn-type2">确认收货</view>
+ </view>
+ <view class="btns" v-if="status == '2'">
+ <view class="btn-type2">再次购买</view>
</view>
+ <!-- <view class="btns" v-if="status == '3'">
+ <view class="btn-type2">再次购买</view>
+ </view> -->
</view>
</view>
</template>
@@ -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 @@
<view class="content">
<view class="header">
<!-- 搜索-->
- <view class="searchBar">
+ <!-- <view class="searchBar">
<icon class="searchIcon" type="search" size="14"></icon>
<input class="searchIpt" placeholder="搜索订单关键字..." confirm-type="search"/>
- </view>
+ </view> -->
<view class="screenBar">
<view v-for="item in screenItems" :key="item.current" @click="onClickItem(item.current)" >
<view class="screenItem" v-bind:class="{ active: current === item.current }">{{ item.text }}</view>
@@ -20,7 +20,7 @@
<OrderCard :order = "order" :current="current"></OrderCard>
</view>
</view>
- <view class="footer">已显示全部</view>
+ <view class="footer" >没有更多订单了，去商城看看吧~</view>
</view>
</template>
<script>
@@ -33,47 +33,43 @@
},
data() {
return {
+ //顶部筛选项
screenItems: [
- {current:0,text:'全部'},
- {current:1,text:'待付款'},
- {current:2,text:'待发货'},
- {current:3,text:'待收货'},
- {current:4,text:'退款售后'},
+ {current:"10",text:'全部'},
+ {current:"0",text:'待付款'},
+ {current:"1",text:'待收货'},
+ {current:"2",text:'已完成'},
+ // {current:"3",text:'已评价'},
+ // {current:"4",text:'退款'},
],
- current: 0,
- //订单数据
- // orderList:[
- // { orderId: 0, img: '/static/img/goods/p1.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:1 ,buyNum:1},
- // { orderId: 2, img: '/static/img/goods/p3.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:1 ,buyNum:1},
- // { orderId: 3, img: '/static/img/goods/p4.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:2 ,buyNum:1},
- // { orderId: 4, img: '/static/img/goods/p5.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:3 ,buyNum:1},
- // { orderId: 5, img: '/static/img/goods/p6.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:3 ,buyNum:1},
- // { orderId: 6, img: '/static/img/goods/p7.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:4 ,buyNum:1},
- // { orderId: 7, img: '/static/img/goods/p8.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:4 ,buyNum:1},
- // { orderId: 8, img: '/static/img/goods/p9.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:5 ,buyNum:1},
- // { orderId: 9, img: '/static/img/goods/p10.jpg', name: '商品名称',originCost:'￥198',price: '￥168', orderType:5 ,buyNum:1}
- // ],
+ //当前所在item 默认10-->全部
+ current: "10",
};
},
- onLoad: function() {
+ onLoad: function(option) {
+ //获取订单列表
store.dispatch('myOrder/getList', {
uid: "1",
- way: "0",
- });
+ way: "",
+ });
+ //从user过来传的status，给current，以显示对应item
+ this.current = option.status
},
computed: {
orderList() {
- console.log('orderList', this.$store.state.myOrder.orderlist);
- return this.$store.state.myOrder.orderlist;
+ // console.log('orderList', this.$store.state.myOrder.orderList);
+ return this.$store.state.myOrder.orderList;
}
},
methods:{
+ //tab点击事件
onClickItem(e) {
if (this.current !== e) {
this.current = e;
}
}
+
}
}
</script>
@@ -88,27 +84,28 @@
.header{
background-color: #ffffff;
width: 100%;
- height: 232rpx;
- padding: 40rpx 40rpx 36rpx 40rpx;
+ // height: 232rpx;
+ padding: 20rpx 40rpx 16rpx 40rpx;
box-sizing: border-box;
position: fixed;
top: 0;
left: 0;
- .searchBar {
- width: 670rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- box-sizing: border-box;
- padding: 0rpx 16rpx;
- border: 1px solid #FF6B4A;
- border-radius: 8rpx;
- background-color: #ffffff;
- }
+ // .searchBar {
+ // width: 670rpx;
+ // display: flex;
+ // justify-content: center;
+ // align-items: center;
+ // box-sizing: border-box;
+ // padding: 0rpx 16rpx;
+ // border: 1px solid #FF6B4A;
+ // border-radius: 8rpx;
+ // background-color: #ffffff;
+ // }
.screenBar{
width: 670rpx;
- height: 110rpx;
+ // height: 110rpx;
+ height: 70rpx;
display: flex;
flex-direction: row;
justify-content: space-between;
@@ -138,7 +135,8 @@
}
}
.orderList{
- margin-top: 232rpx;
+ // margin-top: 232rpx;
+ margin-top: 132rpx;
}
.footer{
font-size: 14px;
diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue
index d7ade1b..8ce0e82 100644
--- a/src/pages/myOrderPaying/myOrderPaying.vue
+++ b/src/pages/myOrderPaying/myOrderPaying.vue
@@ -1,35 +1,45 @@
+<!-- 订单待付款 待收货 -->
<template>
-
- <view class="content">
- <view class="order-hr"></view>
- <view class="order-time">
+ <view class="content">
+ <!-- 待付款 -->
+ <view class="order-time" v-if="status == '0'">
<text>请在</text>
- <!-- <text class="p2"></text> -->
<uni-countdown color="#EC5D3B" splitor-color="#EC5D3B" :show-day="false"
- :hour="0" :minute="59" :second="58" style="margin: 36rpx 20rpx 0 20rpx"></uni-countdown>
+ :hour="0" :second="getTime" @timeup=timeup ></uni-countdown>
<text>内完成付款</text>
+ </view>
+ <!-- 待收货 -->
+ <view class="headerBanner" v-if="status == '1'">
+ <view class="bannerLeft">
+ <view class="T1">卖家已发货</view>
+ <view class="T2">还剩 确认收货</view>
+ </view>
+ <image src="../../static/car.png" mode="aspectFill"></image>
</view>
<view class="order">
<view class="order-user">
<view class="order-user-head">
- <text class="p1">钱大大</text>
- <text class="p2">18823749843</text>
+ <text class="p1">{{orderAddressInfo.userName}}</text>
+ <text class="p2">{{orderAddressInfo.telNumber}}</text>
</view>
<view class="order-user-body">
<image src="../../static/myorder-paying-location.png"></image>
- <text class="p3">四川省 德阳市 旌阳区\n黄河西路碧桂园3期 4单元 202</text>
+ <text class="p3">{{orderAddressInfo.provinceName}} {{orderAddressInfo.cityName}} {{orderAddressInfo.countyName}}\n{{orderAddressInfo.detailInfo}}</text>
</view>
</view>
<view class="order-info">
- <view class="order-info-head">
- <image src="../../static/myorder-paying-pic.png"></image>
+ <view class="order-info-head" v-for="(orderInfoListItem,index) in orderInfoList" :key="index" >
+ <image :src="orderInfoListItem.imgUrl" mode="aspectFill"></image>
<view class="order-info-head-r">
- <text class="p1">眼镜名称眼镜名称眼镜名称眼镜名称…</text>
+ <text class="p1">{{orderInfoListItem.p_name}}</text>
<view class="p2" style="margin: 0;">
规格：玫瑰金 / 钛合金 / 防日光防紫外线 / 超薄超轻
<!-- <view class="arrow"></view> -->
+ </view>
+ <view class="infoText-bottom">
+ <view class="markPrice">{{orderInfoListItem.nowPrice}}</view>
+ <view class="buy-num">X {{orderInfoListItem.num}}</view>
</view>
- <text class="p3"><span>￥180</span><span class="p4">X1</span></text>
</view>
</view>
<!-- <view class="order-info-goodsnum">
@@ -37,21 +47,21 @@
</view> -->
<text class="order-info-freight">
<text class="p1">运费</text>
- <text class="p2">0.00</text>
+ <text class="p2">{{orderInfo.trans_price}}</text>
</text>
<text class="order-info-discount">
<text class="p1">优惠</text>
- <text class="p2">-￥70.00</text>
+ <text class="p2">-￥{{totalDiscount}}</text>
</text>
<text class="order-info-price">
<text class="p1">实付</text>
- <text class="p2">￥110</text>
+ <text class="p2">￥{{orderInfo.order_info.total_fee}}</text>
</text>
<text class="order-info-num">
- <text>订单号：203486795859605849</text>
+ <text>订单号：{{orderInfo.prepay_id}}</text>
</text>
<text class="order-info-time">
- <text>下单时间：2020-10-22 14:32:42</text>
+ <text>下单时间：{{orderInfo.pay_time}}</text>
</text>
<view class="order-info-hr"></view>
<view class="order-info-contact">
@@ -60,59 +70,158 @@
</view>
</view>
</view>
- <view class="order-confim">
- <button class="b1">取消订单</button>
- <button class="b2">立即支付</button>
+ <view class="order-confim" v-if="status == '0'">
+ <button class="b1" @click="cancleOrder">取消订单</button>
+ <button class="b2" @click="paylog">立即支付</button>
+ </view>
+
+ <view class="order-confim" v-if="status == '1'">
+ <!-- <button class="b1">取消订单</button> -->
+ <button class="b2" @click="confirmOrder">确认收货</button>
</view>
</view>
</template>
-<script>
+<script>
+ import store from '@/store';
import UniCountdown from '../../components/UniCountdown/UniCountdown.vue'
export default {
components: {
UniCountdown
},
data() {
- return {
- scrollHeight: false,
+ return {
+ // orderInfo:{},
+ payId:'',
+ status:'',
+ uid:'',
+ openid:'',
+ lefttime:0,
+
}
+ },
+ onLoad: function(option) {
+ console.log(option);
+ this.payId = option.payId;
+ this.status = option.status
+ const openid = uni.getStorageSync('openid');
+ const uid = this.$store.state.user.uid
+ this.uid = uid
+ this.openid = openid
+ store.dispatch('orderRead/getOrderInfo',{
+ pay_id:this.payId,
+ uid:'1',
+ openid:openid
+ })
+
+
+
+ // this.orderInfo = this.$store.state.orderRead.orderInfo
+ },
+ computed: {
+ //获取订单详细信息
+ orderInfo() {
+ console.log(this.$store.state.orderRead.orderInfo)
+ return this.$store.state.orderRead.orderInfo || {}
+ },
+ orderInfoList(){
+ const orderInfoList =this.orderInfo.order_info[0].list
+ return orderInfoList
+ },
+ //获取订单地址信息
+ orderAddressInfo(){
+ return this.orderInfo.order_info[0].address
+ },
+ //订单付款时间
+ getTime(){
+ return this.orderInfo.order_info[0].lefttime
+ },
+ // 计算总优惠额
+ totalDiscount(){
+ const discountInfoList = this.orderInfo.discount_info
+ let totalDiscount = 0;
+ if(discountInfoList){
+ discountInfoList.map((discountItem,index)=>{
+ totalDiscount += Number(discountItem.value)
+ })
+ }
+ // console.log(totalDiscount)
+ return totalDiscount
+ },
},
- methods: {
-
+ methods: {
+ //取消订单
+ timeup(){
+ this.cancleOrder()
+ },
+ cancleOrder(){
+ const uid = this.uid
+ const openid = this.openid
+ uni.showModal({
+ title: '提示',
+ content: '现在取消，订单不可恢复哦，确认取消吗？',
+ success: function (res) {
+ if (res.confirm) {
+ store.dispatch('cancelOrder/cancel',{
+ keyname:'1',
+ uid:uid,
+ openid:openid
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ })
+ },
+ paylog(){
+
+ },
+ confirmOrder(){
+ store.dispatch('statusConfirm/confirm',{
+ uid:this.uid,
+ openid:this.openid,
+ oldway:'1',
+ way:'2',
+ pay_id:this.payId,
+ judgeContent:'',
+ orderInfo:this.orderInfo.order_info,
+ })
+ }
}
}
</script>
<style lang="scss" scoped>
- .content{
+ .content{
+ min-height: 100vh;
display: flex;
flex-direction: column;
- justify-content: center;
+ justify-content: flex-start;
align-items: center;
background-color: #f2f2f2;
}
.order {
- min-height: 1196rpx;
margin-bottom: 112rpx;
- background: #F2F2F2;
- }
- .order-hr {
- width: 100%;
- height: 1px;
- background-color: #E9E9E9;
+ background: #F2F2F2;
+ margin-top: 140rpx;
+ width: 670rpx;
}
+
.order-time {
width: 100%;
height: 140rpx;
background-color: #fff;
display: flex;
- justify-content: center;
+ justify-content: center;
+ align-items: center;
+ position: fixed;
+ top: 0 ;
+ left: 0;
text {
// font-family: PingFangSC-Regular;
- margin-top: 48rpx;
+ // margin-top: 48rpx;
font-size: 14px;
color: #333333;
letter-spacing: -0.26px;
@@ -125,9 +234,36 @@
letter-spacing: -0.34px;
}
}
-
+ .headerBanner{
+ width: 100%;
+ height: 140rpx;
+ background: #4A90E2;
+ padding: 26rpx 60rpx 24rpx 60rpx;
+ box-sizing: border-box;
+ color: #FFFFFF;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ position: fixed;
+ top: 0 ;
+ left: 0;
+ .bannerLeft{
+ font-size: 36rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ .T2{
+ font-size: 24rpx;
+ }
+ }
+ image{
+ height: 56rpx;
+ width: 72rpx;
+ }
+ }
+
.order-user {
- width: 670rpx;
height: 228rpx;
background: #FFFFFF;
border-radius: 14rpx;
@@ -137,7 +273,6 @@
.order-user-head {
display: flex;
height: 108rpx;
- width: 100%;
align-items: center;
margin-left: 126rpx;
.p1 {
@@ -172,7 +307,6 @@
}
.order-info {
- width: 670rpx;
background-color: #fff;
box-shadow: 0 0 20rpx 0 rgba(177,128,128,0.06);
border-radius: 16rpx;
@@ -236,19 +370,24 @@
font-size: 12px;
color: #999999;
letter-spacing: -0.23px;
- }
- .p3 {
- height: 20px;
- // font-family: PingFangSC-Regular;
- font-size: 14px;
- color: #FF6B4A;
- letter-spacing: -0.26px;
- }
- .p4{
- font-size: 12px;
- color: #999999;
- letter-spacing: -0.23px;
- margin-left: 10px;
+ }
+ .infoText-bottom{
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: center;
+ width: 100%;
+ margin-left: 0;
+ .markPrice{
+ font-size: 14px;
+ color: #FF6B4A;
+ margin-right: 20rpx;
+ margin-left: 0rpx;
+ }
+ .buy-num{
+ font-size: 12px;
+ color: #999999;
+ }
}
}
@@ -369,8 +508,9 @@
.order-confim {
display: flex;
- align-items: center;
- z-index: 999;
+ align-items: center;
+ justify-content: flex-end;
+ // z-index: 999;
width: 100%;
height: 112rpx;
position: fixed;
@@ -388,7 +528,7 @@
.b1 {
// font-family: PingFangSC-Regular;
color: #FF6B4A;
-
+ background-color: #FFFFFF;
}
.b2 {
// font-family: PingFangSC-Regular;
diff --git a/src/pages/predelivery/predelivery.vue b/src/pages/predelivery/predelivery.vue
index 87274e2..99f7ccc 100644
--- a/src/pages/predelivery/predelivery.vue
+++ b/src/pages/predelivery/predelivery.vue
@@ -1,3 +1,4 @@
+<!-- 待发货 尹聃-->
<template>
<view class="container">
<view v-for="(items) in form" :key="items.key" class="order">
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 5cd014e..9bdbce5 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -8,35 +8,72 @@
<text class="userName">{{nickName}}</text>
</view>
</view>
- <view class="service">
+ <!-- <view class="service">
<image src="../../static/serviceLogo.png" mode="aspectFill"></image>
+ </view> -->
+ </view>
+ <view class="myOpticsData">
+ <view class="left">
+ <image src="../../static/img/user/dataWrite.png" mode="aspectFit"></image>
+ <text>验光数据</text>
</view>
+ <image src="../../static/right.png" mode="aspectFit"></image>
</view>
<view class="myOrder">
<view class="orderHeader">
<text>全部订单</text>
- <view class="btn" @click="toMyOrder">
+ <view class="btn" @click="toMyOrder('10')">
全部
- <image src="../../static/right.png" mode="aspectFill"></image>
+ <image src="../../static/right.png" mode="aspectFit"></image>
</view>
</view>
<view class="orderBody">
- <view class="item waitPay" @click="toMyOrderPaying">
- <image src="../../static/waitDeliver.png" mode="aspectFill"></image>
+ <view class="item waitPay" @click="toMyOrder('0')">
+ <image src="../../static/img/user/waitDeliver.png" mode="aspectFit"></image>
<text>待付款</text>
</view>
- <view class="item waitDeliver" @click="toPredelivery" >
- <image src="../../static/waitPay.png" mode="aspectFill"></image>
- <text>待发货</text>
- </view>
- <view class="item waitReceive" @click="torefunProgress">
- <image src="../../static/waitReceive.png" mode="aspectFill"></image>
+ <view class="item waitDeliver" @click="toMyOrder('1')" >
+ <image src="../../static/img/user/waitPay.png" mode="aspectFit"></image>
<text>待收货</text>
</view>
- <view class="item service" @click="torefundment">
- <image src="../../static/service.png" mode="aspectFill"></image>
- <text>退换/售后</text>
+ <view class="item waitReceive" @click="toMyOrder('2')">
+ <image src="../../static/img/user/waitReceive.png" mode="aspectFit"></image>
+ <text>已完成</text>
</view>
+ <!-- <view class="item service" @click="toMyOrder('3')">
+ <image src="../../static/img/user/refound.png" mode="aspectFit"></image>
+ <text>已评价</text>
+ </view> -->
+ </view>
+ </view>
+ <view class="someItem">
+ <view class="item">
+ <view class="left">
+ <image src="../../static/img/user/shouyi.png" mode="aspectFit"></image>
+ <text>推广记录与收益</text>
+ </view>
+ <image src="../../static/right.png" mode="aspectFit"></image>
+ </view>
+ <view class="item">
+ <view class="left">
+ <image src="../../static/img/user/introduce.png" mode="aspectFit"></image>
+ <text>系统介绍</text>
+ </view>
+ <image src="../../static/right.png" mode="aspectFit"></image>
+ </view>
+ <view class="item">
+ <view class="left">
+ <image src="../../static/img/user/joinUs.png" mode="aspectFit"></image>
+ <text>加入我们</text>
+ </view>
+ <image src="../../static/right.png" mode="aspectFit"></image>
+ </view>
+ <view class="item">
+ <view class="left">
+ <image src="../../static/img/user/service.png" mode="aspectFit"></image>
+ <text>联系客服</text>
+ </view>
+ <image src="../../static/right.png" mode="aspectFit"></image>
</view>
</view>
<view class="recommend">
@@ -139,40 +176,14 @@
this.isAuth = true
}
},
- toMyOrder(){
- uni.navigateTo({
- url: '../myOrder/myOrder?current=0',
- success: res => {},
- fail: () => {},
- complete: () => {}
- });
- },
- toPredelivery(){
+ toMyOrder(status){
uni.navigateTo({
- url: '../myOrder/myOrder?current=2',
+ url: `../myOrder/myOrder?status=`+status,
success: res => {},
fail: () => {},
complete: () => {}
});
},
- toMyOrderPaying(){
- uni.navigateTo({
- url: '../myOrder/myOrder?current=1',
- success: res => {},
- fail: () => {},
- complete: () => {}
- });
- },
- torefundment(){
- uni.navigateTo({
- url:'../refundment/refundment',
- })
- },
- torefunProgress(){
- uni.navigateTo({
- url:'../refundProgress/refundProgress'
- })
- }
}
}
</script>
@@ -228,18 +239,47 @@
}
}
}
- .service{
- margin-top: 20rpx;
+ // .service{
+ // margin-top: 20rpx;
+ // image{
+ // height: 36rpx;
+ // width: 36rpx;
+ // }
+ // }
+ }
+ .myOpticsData{
+ width: 670rpx;
+ height: 120rpx;
+ background-color: #FFFFFF;
+ border-radius: 6px;
+ box-shadow: 1px 1px 7px 0 rgba(133,107,107,0.10);
+ position: relative;
+ bottom: 44rpx;
+ padding: 40rpx;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .left{
+ font-size: 14px;
+ color: #333333;
+ display: flex;
+ align-items: center;
image{
- height: 36rpx;
- width: 36rpx;
+ margin-right: 32rpx;
+ width: 30rpx;
+ height: 34rpx;
}
}
+ image{
+ height: 16px;
+ width: 8px;
+ }
}
.myOrder{
width: 100%;
height: 296rpx;
- margin-top: 20rpx;
+ // margin-top: 116rpx;
margin-bottom: 20rpx;
padding: 0 40rpx;
box-sizing: border-box;
@@ -265,10 +305,12 @@
.btn{
font-size: 12px;
color: #999999;
+ display: flex;
+ align-items: center;
image{
margin-left: 20rpx;
- height: 16rpx;
- width: 8rpx;
+ height: 32rpx;
+ width: 16rpx;
}
}
}
@@ -276,14 +318,14 @@
width: 100%;
display: flex;
flex-direction: row;
- justify-content: space-between;
+ justify-content: space-around;
align-items: center;
.item{
display: flex;
flex-direction: column;
align-items: center;
image{
- width: 46rpx;
+ width: 62rpx;
height: 46rpx;
}
text{
@@ -294,6 +336,46 @@
}
}
}
+ .someItem{
+ width: 100%;
+ height: 336rpx;
+ background: #FFFFFF;
+ box-shadow: 0 0 4px 0 rgba(133,107,107,0.10);
+ border-radius: 6px;
+ border-radius: 6px;
+ margin-bottom: 18rpx;
+ box-sizing: border-box;
+ padding: 21rpx 48rpx 21rpx 42rpx;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+ .item{
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 1px solid #F2F2F2;;
+ align-items: center;
+ height: 72rpx;
+ width: 100%;
+ .left{
+ font-size: 14px;
+ color: #333333;
+ display: flex;
+ align-items: center;
+ image{
+ margin-right: 32rpx;
+ width: 30rpx;
+ height: 34rpx;
+ }
+ }
+ image{
+ height: 16px;
+ width: 8px;
+ }
+ }
+
+ }
.recommend{
background: #FFFFFF;
box-shadow: 0 0 4px 0 rgba(133,107,107,0.10);
diff --git a/src/static/car.png b/src/static/car.png
new file mode 100644
index 0000000000000000000000000000000000000000..89ca693e31da363e6e428c0e7d3b659535df0d74
GIT binary patch
literal 1593
zcmV-92FCe`P)<h;3K|Lk000e1NJLTq002S&001-y1^@s6J}>Sx000I6Nkl<ZXo2lo
zdrVtZ7(cx&rMy}mEsp^*o#>Wz(}CMuFf)N=I4GGsltlM1YBDp8Y!2DT;;_+8#K|kN
z%>R7-;TC})Y&a6;0wG2eHbk;HqHeUj)|QU)Y71@6SGaI{N88)G-dkGvC4HUO@9Xd0
z^L^hr_i!v03nC)3N^t~v5SI$#D?Pz(BLs-BA%>rllN6G-A;uqt24aZA;V^0d@ZX;{
zqnpD9RM$Q6!_8r1heyN!L*SKFJy3L^b9`pbWVUz;!2SKN<C9<uZWmiG>sv<Uz!5OO
zV+xP}wt!7+3W33NcueB=blx)|L9E}7b^x}3O>Fur9=zoxhaBW$OTJ)ad=8bjXzF3U
znk~r0qyZQQaltRWw>u&`T4Xf`fh}ND*-v9PnB*qH%Dgew-=?s-b*!mx$k@h~)5@$;
zn5tXH{LbV=%J4F>O-uuW@xubSHZ*;MhITeRH*ob08QO_uWSf|V^^PD;3&5Ni8CkUg
zI8C;kxJ|D3iHEs(Jh~m(z@>ut3THI>Su+~c&Y|}H>3caf${@p>Wr~g<*h&?FDg=HQ
zS{KPjucd@Wp5Gt+aYBUOCOXl^>xCd9QpiK4xsumoLwQfSDuz!90T2dok^Du;TfzWL
z?1~sG+DBwoDULd86B>v`y}Dg=B4cy#Vp)uchf1=<CyQ%U#UKV1pRuBaKolYY{Lz}9
zwMV%asz{eEiLpM$9~GvDe{$xs#;KUd7p4X-)E8H^h1c)uZR%1I1JN7LiOy1)B0k|G
zKnz$4oW86sxudpCfpU_C+|13vZ#xsiXPhO7F=MpoN*dIkYbI@%M~9vdeSGU$fy|K@
zJ{2`U4E3Z*`QeYMuV;+r#d63}kMD^{bF`xMx$p^M{G*z^QQE9&F`1Wk-vam;lJAuq
z6bEzTmJ`G0gg^^o{C-E@eEypDFJgIk5Ese!ijM{GIYP1+D?WVM1N;#l7x7cq2knEa
zOm6ndb|HdkQs1pJWhV(2m$GZcd~`BHEI-wtDkSC@UMmEkC_Um+2$2pD*3mzW;6-e=
zB|(7RNew$&-Kt&8F}!+eBqazawfXFdruf#d!KNINua~!m6ysCGtA*$$B~bR-%$ks1
z-l#r3e1FcS?!XRF<d#SLcUz|!gLX2GvMZY7sdx3u`Un8{h^x1zzJu?&8MFFSgX&y)
ze&pd0!Mw|WXEytu745k`aIeK{g&?d!${e*T*cHC`9j^RGjq3Wcm!h)qvUL)^_0uQA
zr#;N?jT+mC)qcGBEy4el5RR}a!~#}@Siq_f3!oh}oUQMfen8}IewT&74R|WvKW*m|
zfih{VKZ*#NkIR}V6Z&(|fZA?PH)U2SXc^=wewTy*Bi4lS65mY=JG?3G!SptckD<6Q
zKlFk$Sk|l5%c@(o=csO;dYYfIkAML;uHo-2&yQNx2r{4zw1qzIc)ZUvKP4gXEAc^=
zBs)Yv-M>Ox=mUKpMhrIiDNhZ!9mz((e5~!#wf2u1yWn?X6hApPS(qjzJkp0g(Dy{G
ziqf{ar}*s(K~xYN6Zv+$(5ajH_LuPz3qmG*4nm*b{?#|{-yxFcZxb$_z=6In2JXOI
z0gTBC|H4@%m(Z)!TQVyLj@dhp1a;7cDY%;-G@zAG)phBv!IiLA4|Q<M(ixiy8ha)>
z+|5r*i2hMyr=ySrb@;qx0)MNFJ?`eGC4_}S8z!MQS|;5+ywzDcd+Pk<f#?cIRB(WI
zc9f_<-L^*s$;2|Hb`~A_W`tJcV1u7W<!Lj7DWV||qQE=b>%&2a3vGyHFb1NLa<j!x
zDUWEsJ>3LpEB+heG=wNwl>(8&7Z?F`Qqu82$p5KuEr&K1_#Zf(zZ`&|G*?nVj^$Jm
z8bGg7k07C;yXIhnpK@ji3mC}ViP;?xN@FE(3#QrYH=#FM`%>lc7(dlR+mLj;e{rNv
zH)Eols6boj<BkL7Fh<eEQO5XPHs;N*hHCy$%s4dy+CW=(p0a0>pOTLtg6hUdkHTQh
r>^!wG<0`+)LXZuz2d~<yLkRr`#Aj;g1RCb-00000NkvXXu0mjfMs5Ge
literal 0
HcmV?d00001
diff --git a/src/static/img/user/dataWrite.png b/src/static/img/user/dataWrite.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f8fd8b9b75ec3c609d4c6168d6ff0d2bdeca901
GIT binary patch
literal 382
zcmV-^0fGLBP)<h;3K|Lk000e1NJLTq0015U001Hg1^@s6NQh~400001b5ch_0Itp)
z=>Px$I7vi7R9FdP{GaXhpJ4z13)oI(CU3?`TeiXMhdG9E>NZB07&$aHbN=Ugdo%p|
zzl8~8AhM-k3m6&Sg6RLb0m@)L83bG})GU}0jFY!+1+gJMhKVBR?LcM>!@u9>|L1tW
zM+lR^`uAH9sv2Y#2EcAH2U{`2_g`{AKie_<XW+%qMYI6pAqJ3HSO8Xw8GF{h0;;wD
zUl=OH@b3o?7JY<;m^i*L_OE`2OCeT^VTz#|acYLCBZmejE^;(ds%PX`j5m(|XL|$l
z+<!0ff|YR_<J7I*xb)I4s2PD75f8xYV|*^gV<u5jwDU0m>qjjn5J1$E9<ZRso2p0i
zG4*1YfnmVnc+_HQMk8Lc1}vyY^D#=ijMm2}!9gKsz*05XVsO`yLLU&T9cC9JtPe}9
cMrx@80D{6-_Gt(vIsgCw07*qoM6N<$g8lWMq5uE@
literal 0
HcmV?d00001
diff --git a/src/static/img/user/introduce.png b/src/static/img/user/introduce.png
new file mode 100644
index 0000000000000000000000000000000000000000..aef739a3df43c0c19c25071d1e036fe3742bb498
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000~S001Be1^@s60ks%H00001b5ch_0Itp)
z=>Px$qDe$SR7ef&m%mHHKorNnFI7-F2s*ksxcFmmbZ~KN(n;zh=;ENQg*u3fn@cAl
zX%|79y4Xo<G8FwQbo1{}u-ZId(hd?X5>2i{X#yd6+`Z3z?|tvM5SInfXvD@SW&
zyDvJqTs2qG=Vy#kVZbtUs#4{i09CV+DmHLwBn6jE7vMr9{Krr7sOg%~PWoy{P_A#K
zLe<EkBmM8UK7}zO8h@a&h7*^@_#shv{7o}*g-VwuDuy)TT4^4iZ`S}7z&x9zUn(Ga
z@3ug81f7Hxwn+yBTVa-*u}pU7HIB*^>kRDILHJ4u#9RRR9cCU6VB~}7K&xqF$J&?L
zHipWN$mz7S0l8w91auQjfZV6laK&7J79f|4mMCk9nQ}t7poVu9z=A7tAXlwzpx>6<
z(=ez`j&~W7hL22va=PAx@83)A8IjT?$36cE3*IvW$~11sQQng!nU|W~!gf!hu*`s5
zE3Sb2t|XLYLU-889}<yrHwYDmKN_mxB#rg_M={BQG=ISQ;vVg``*B?<yPp|)g0W<h
e<9x)yg7`Npd3&Gd6~2A|0000<MNUMnLSTYQ71<I1
literal 0
HcmV?d00001
diff --git a/src/static/img/user/joinUs.png b/src/static/img/user/joinUs.png
new file mode 100644
index 0000000000000000000000000000000000000000..7801232c2a58d5eebc4f60bc1dafadc30f1c88e1
GIT binary patch
literal 2017
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
literal 0
HcmV?d00001
diff --git a/src/static/img/user/refound.png b/src/static/img/user/refound.png
new file mode 100644
index 0000000000000000000000000000000000000000..b199d61290f8cb10ac4b0c5cf1f02b2781c2fd24
GIT binary patch
literal 3463
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
literal 0
HcmV?d00001
diff --git a/src/static/img/user/service.png b/src/static/img/user/service.png
new file mode 100644
index 0000000000000000000000000000000000000000..742cfee8f6c25e8112b951ae060537ef4f11a480
GIT binary patch
literal 1194
zcmV;b1XcTqP)<h;3K|Lk000e1NJLTq001Na0015c1^@s6MB%(s00001b5ch_0Itp)
z=>Px(WJyFpR9FeUS6gUYRTN$O+@xunRH9C_Qt&ON)Z(iVsUHzUl)MmWs-;9*g{XA$
zvelyXWBjoCA(CVgA0LW>QfWh>jmeLt21F2RD^-btLcpe|d5~6G&12?n*FASeGB=aS
zWM=Gz<lcSG-fOM1@40915#(@bYwc#Z`XC_pGyFOzDj;xpAESL124C`i3|Ceimq^6r
zbJmw+>#325!T5<Li0&rw#;oE*Mku-qp;hll<j`z3F<A-HaD64zeIL-x7E~}wqEDHX
zAsF)m%*t`Z*19Mf2_cS3X0IBmTj_gi!haazJT1}wua^?Fq#$jrc^EGGn3Yn3ouQBy
zQBl>$R}squuBw8z+J_LAH@T1vjEnPCHcNEigG_N51!+s&7G~xE#S}s0079#qnfeQv
z0E2V-UUM<NKl?gG?e^!SLwW}~gMLYSQ9;_$a3?hW6;r>8tNVmmd1AR6G)dy!HC(fw
z3wwzRb77=jx<4D7Kc9R~D@Y?dR$^j&m|||QVyag^DO(T4lR>%Obyw|cl=d=3orB|4
zO4rdpgIFdwVC~7VJywj!DHKSIhs#&BkN=MlyBzU2#Vx!R2-24Am%)|2bXCB4rVyD)
zp*1C8iu#*lJGHg$mXtXf3k1Rai=V5O@smC#Jx9L{2IOl?^zbOLKW3H;;<_V<mm)}8
z>hA^IcHc>U(SwanFd$#s9<YiDizB*I!wvV%$F!ST+aD>%+*}_s^T7N`Zoa7W478?<
z<!NZRwwu{$Nr4d@N11GqHwLC8aZY?gF?Y~unj-pG9>#bWKF`#~5GpOr_SjD$Nn>cF
zaRnwWUbN?$!CO$dioA`qOUQc~8`o7C{5blY6(ceUQ+ziw(j?JA{}A&I#HpFf(_rT|
z<Y9T3ygUw%3sQU+#Y{45w|iO)RX%RfMfXYc$Z&2<xkve&@`^=JY@;CDW(`v`lsjym
zk&gMoBB*TOSEg$caOd)b%_ls;t!q*~`+N`!6?<s~t%#+qotQUnxWj+*SEtt&YL$!P
z%oed6rMae!&&|fq%g{;d5_h+yalJ%C>T@f;Gwe-z$?7R@({Npz*Xi+iw`YY_<CZL|
zNzb@~c~~BYS4P;9w3FSh2I6%3r6XL^$-y=Y=JhIy->Gpu?J?;cygDPvGACI&{@@`<
zO!<kG;2J)cCwOg{vYT3Z2HPR#DLPI04iqDpVFSNwnS4vT3tsh|$l-|*jI-x>Hd!-M
zcD=2{=TEN3oO=_b<dkg{mZr$sLpvI7#%%0!23*g@|H|#M9o_vWMC8BCo+2n~<QyEi
zKObXj^ES7`6%0SapGDQu(?1e~`rifdm&-kTHGBE@s3rHRx|Gx{mi>YX(mhS3_~*hp
z6wRzf%xr@2C{b+kg|L-@yo*r93ljNoI+&THT`)n~QF|k1ahhLeSrR;PpW~+e2<q%l
z_lg3(es2;S%*mc}xa#<MW<hO(2l<&eLvYMN>FQ5ZgQb!G1^xhq2DE||x&QzG07*qo
IM6N<$g37NxtpET3
literal 0
HcmV?d00001
diff --git a/src/static/img/user/shouyi.png b/src/static/img/user/shouyi.png
new file mode 100644
index 0000000000000000000000000000000000000000..78fa47fdfafee21fc571beb4311be20c940f0732
GIT binary patch
literal 1546
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
literal 0
HcmV?d00001
diff --git a/src/static/img/user/waitDeliver.png b/src/static/img/user/waitDeliver.png
new file mode 100644
index 0000000000000000000000000000000000000000..d165bffdd6286d3555a2fe949d7ddb0b60775ac3
GIT binary patch
literal 1959
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
literal 0
HcmV?d00001
diff --git a/src/static/img/user/waitPay.png b/src/static/img/user/waitPay.png
new file mode 100644
index 0000000000000000000000000000000000000000..a04cee789464a05175b7f9269f4493c1c2f502be
GIT binary patch
literal 2238
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
M07*qoM6N<$f?Bv~CjbBd
literal 0
HcmV?d00001
diff --git a/src/static/img/user/waitReceive.png b/src/static/img/user/waitReceive.png
new file mode 100644
index 0000000000000000000000000000000000000000..bda2d0c8453917fffb41058b2a51ad0e93f4db75
GIT binary patch
literal 2057
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
literal 0
HcmV?d00001
diff --git a/src/static/joinUs (2).png b/src/static/joinUs (2).png
new file mode 100644
index 0000000000000000000000000000000000000000..aef739a3df43c0c19c25071d1e036fe3742bb498
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000~S001Be1^@s60ks%H00001b5ch_0Itp)
z=>Px$qDe$SR7ef&m%mHHKorNnFI7-F2s*ksxcFmmbZ~KN(n;zh=;ENQg*u3fn@cAl
zX%|79y4Xo<G8FwQbo1{}u-ZId(hd?X5>2i{X#yd6+`Z3z?|tvM5SInfXvD@SW&
zyDvJqTs2qG=Vy#kVZbtUs#4{i09CV+DmHLwBn6jE7vMr9{Krr7sOg%~PWoy{P_A#K
zLe<EkBmM8UK7}zO8h@a&h7*^@_#shv{7o}*g-VwuDuy)TT4^4iZ`S}7z&x9zUn(Ga
z@3ug81f7Hxwn+yBTVa-*u}pU7HIB*^>kRDILHJ4u#9RRR9cCU6VB~}7K&xqF$J&?L
zHipWN$mz7S0l8w91auQjfZV6laK&7J79f|4mMCk9nQ}t7poVu9z=A7tAXlwzpx>6<
z(=ez`j&~W7hL22va=PAx@83)A8IjT?$36cE3*IvW$~11sQQng!nU|W~!gf!hu*`s5
zE3Sb2t|XLYLU-889}<yrHwYDmKN_mxB#rg_M={BQG=ISQ;vVg``*B?<yPp|)g0W<h
e<9x)yg7`Npd3&Gd6~2A|0000<MNUMnLSTYQ71<I1
literal 0
HcmV?d00001
diff --git a/src/static/joinUs (3).png b/src/static/joinUs (3).png
new file mode 100644
index 0000000000000000000000000000000000000000..742cfee8f6c25e8112b951ae060537ef4f11a480
GIT binary patch
literal 1194
zcmV;b1XcTqP)<h;3K|Lk000e1NJLTq001Na0015c1^@s6MB%(s00001b5ch_0Itp)
z=>Px(WJyFpR9FeUS6gUYRTN$O+@xunRH9C_Qt&ON)Z(iVsUHzUl)MmWs-;9*g{XA$
zvelyXWBjoCA(CVgA0LW>QfWh>jmeLt21F2RD^-btLcpe|d5~6G&12?n*FASeGB=aS
zWM=Gz<lcSG-fOM1@40915#(@bYwc#Z`XC_pGyFOzDj;xpAESL124C`i3|Ceimq^6r
zbJmw+>#325!T5<Li0&rw#;oE*Mku-qp;hll<j`z3F<A-HaD64zeIL-x7E~}wqEDHX
zAsF)m%*t`Z*19Mf2_cS3X0IBmTj_gi!haazJT1}wua^?Fq#$jrc^EGGn3Yn3ouQBy
zQBl>$R}squuBw8z+J_LAH@T1vjEnPCHcNEigG_N51!+s&7G~xE#S}s0079#qnfeQv
z0E2V-UUM<NKl?gG?e^!SLwW}~gMLYSQ9;_$a3?hW6;r>8tNVmmd1AR6G)dy!HC(fw
z3wwzRb77=jx<4D7Kc9R~D@Y?dR$^j&m|||QVyag^DO(T4lR>%Obyw|cl=d=3orB|4
zO4rdpgIFdwVC~7VJywj!DHKSIhs#&BkN=MlyBzU2#Vx!R2-24Am%)|2bXCB4rVyD)
zp*1C8iu#*lJGHg$mXtXf3k1Rai=V5O@smC#Jx9L{2IOl?^zbOLKW3H;;<_V<mm)}8
z>hA^IcHc>U(SwanFd$#s9<YiDizB*I!wvV%$F!ST+aD>%+*}_s^T7N`Zoa7W478?<
z<!NZRwwu{$Nr4d@N11GqHwLC8aZY?gF?Y~unj-pG9>#bWKF`#~5GpOr_SjD$Nn>cF
zaRnwWUbN?$!CO$dioA`qOUQc~8`o7C{5blY6(ceUQ+ziw(j?JA{}A&I#HpFf(_rT|
z<Y9T3ygUw%3sQU+#Y{45w|iO)RX%RfMfXYc$Z&2<xkve&@`^=JY@;CDW(`v`lsjym
zk&gMoBB*TOSEg$caOd)b%_ls;t!q*~`+N`!6?<s~t%#+qotQUnxWj+*SEtt&YL$!P
z%oed6rMae!&&|fq%g{;d5_h+yalJ%C>T@f;Gwe-z$?7R@({Npz*Xi+iw`YY_<CZL|
zNzb@~c~~BYS4P;9w3FSh2I6%3r6XL^$-y=Y=JhIy->Gpu?J?;cygDPvGACI&{@@`<
zO!<kG;2J)cCwOg{vYT3Z2HPR#DLPI04iqDpVFSNwnS4vT3tsh|$l-|*jI-x>Hd!-M
zcD=2{=TEN3oO=_b<dkg{mZr$sLpvI7#%%0!23*g@|H|#M9o_vWMC8BCo+2n~<QyEi
zKObXj^ES7`6%0SapGDQu(?1e~`rifdm&-kTHGBE@s3rHRx|Gx{mi>YX(mhS3_~*hp
z6wRzf%xr@2C{b+kg|L-@yo*r93ljNoI+&THT`)n~QF|k1ahhLeSrR;PpW~+e2<q%l
z_lg3(es2;S%*mc}xa#<MW<hO(2l<&eLvYMN>FQ5ZgQb!G1^xhq2DE||x&QzG07*qo
IM6N<$g37NxtpET3
literal 0
HcmV?d00001
diff --git a/src/static/joinUs.png b/src/static/joinUs.png
new file mode 100644
index 0000000000000000000000000000000000000000..7801232c2a58d5eebc4f60bc1dafadc30f1c88e1
GIT binary patch
literal 2017
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
literal 0
HcmV?d00001
diff --git a/src/static/shouyi.png b/src/static/shouyi.png
new file mode 100644
index 0000000000000000000000000000000000000000..78fa47fdfafee21fc571beb4311be20c940f0732
GIT binary patch
literal 1546
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
literal 0
HcmV?d00001
diff --git a/src/static/waitReceive.png b/src/static/waitReceive.png
index 0c175fabc784929cc2b400a1779caa8228d1bb60..bda2d0c8453917fffb41058b2a51ad0e93f4db75 100644
GIT binary patch
literal 2057
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
literal 789
zcmV+w1M2*VP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008qNkl<ZSV!$w
zO-K}R9DQ%}5Z&q^9r9F0R+qX&UeW?{XHqB%6Ffwi#m<&Q1kp)P9XbfDvxU?tA+s*2
zJG+O#Bs7W;1L;zbbcpgIbO-`>UhJ;>p*w!8uGzu44fFeW^ZxJm@h3L<;U?$D{{ujw
zhT1i=K~69n`?VH-DrB996ah4~mH=rVRznzO#BD1!24!30VB!vY;;)N!&bOCs3Wl~Z
z9Q#vD93~y<xa-z}?7#@9u3~?rv;da-b#astw{x*cX#r4O*#t61K(8+E{U(4Pbll7N
zAW9A(a|DZzR>As8uzUgr&oUf+lL7J103;JC7-$CB505+fAUd0>pN$gXQgLMmx&iE>
z6KmNN04XMHa}2@@M%?ZVWdMc_G93G~SoyLWj{u2xFc>HufS}olG7V%BruqW7VtX$c
zfMU8|#x|vsQi*U2z!n1~XF%<Z+fkml1>!KE_n^j?8?_1s24E<XZzJ2f1b9b5R=~p~
z=F0A|cj)(uRiJBu1MrL|poWmpB*^_BTOlR8SHVb4cejQ6fNZM|P$i`2FpQs&&OxYx
zcrr5wGG+J`39pV1<I{P_J^<{c6YX8N^;lC&fyf6S+q@32olf-70{<jS#4MfImHCz|
zDrjDWffjgpn>8kabli%<7TRzOG#q#sEI4!OIK<KPiii%tGwH;0G3Om*n==q1AnVhn
zsWE9)18U9&HBieQ*SC$Pc0VDvc=)N0=%C~7@cWcvDhZVQ4iB#ic0mQ3_JVWcz6^w{
zCdj)%CzjiEe6q+kKLXy>r5Px%VPx=2mVrX5lY_)~>Z<|hHXV0(xw2EpybH0>R|5vO
zv&TK1-H3c?N?uZA^nrMkt^(`^c>&-wooMT7YF@VW7*Z98XCP+)oq(_hWkwtC4}V)0
zK(-n}fo6bbAbf@}#)unVP4b+-bqYcafPDa7(uwvj_FwmXpcp{@dR=dXb^8AW9OSfl
TJplq500000NkvXXu0mjfe6U?N
diff --git a/src/store/modules/cancelOrder.js b/src/store/modules/cancelOrder.js
new file mode 100644
index 0000000..c2e7da8
--- /dev/null
+++ b/src/store/modules/cancelOrder.js
@@ -0,0 +1,36 @@
+import urlAlias from '../url';
+import request from '../request';
+
+const {
+ cancelOrder
+} = urlAlias;
+
+const state = {
+ orderList: [],
+};
+
+const mutations = {
+ INIT: (state, data) => {
+ state.orderList = data;
+ },
+};
+
+const actions = {
+ cancel({ commit }, param) {
+ request({
+ url: cancelOrder,
+ data: param,
+ success: (res) => {
+ console.log(res.data);
+ // commit("INIT", res.data.data);
+ },
+ })
+ }
+}
+
+export default {
+ namespaced: true,
+ state,
+ mutations,
+ actions,
+}
\ No newline at end of file
diff --git a/src/store/modules/myOrder.js b/src/store/modules/myOrder.js
index ed076ae..1964af3 100644
--- a/src/store/modules/myOrder.js
+++ b/src/store/modules/myOrder.js
@@ -2,98 +2,94 @@ import urlAlias from '../url';
import request from '../request';
const {
- orderList
+ myOrderList
} = urlAlias;
-const data = {
- data: [
- {
- finished_time: null,
- is_refound: "0",
- mch_id: "1436019502",
- money_of_dcw: "0",
- money_of_partner: "0",
- money_of_shop: "0",
- orderJudge: false,
- order_info: {
- address:{
- cityName: "镇江市",
- countyName: "丹阳市",
- detailInfo: "延陵镇柳茹村卫生室附近秀野堂农业发展有限公司",
- errMsg: "chooseAddress:ok",
- nationalCode: "321181",
- postalCode: "212300",
- provinceName: "江苏省",
- telNumber: "15896379277",
- userName: "点餐汪客服",
- },
- cartinfo:['11', '12'],
- keyname: "1_1587129366",
- lefttime: 179995,
- list:[
- {
- cart_id: "11",
- imgUrl: "https://glass.xiuyetang.com//upload_jk/4/4_0_3FDA03.jpg",
- img_index_url: null,
- memo: "志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流，01-8701",
- mp_id: "1",
- nowPrice: 100,
- num: "2",
- oldPrice: "0",
- p_discount: "1",
- p_name: "01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流",
- p_root_index: "1",
- p_sale_price: "0",
- peopleName: "me",
- pics: '',
- pid: "4",
- sk_id: "38",
- },
- ],
- orderDesc: "总共包括有：01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流在内的1件商品",
- total_fee: 100
- },
- partner_uid: "0",
- pay_cate: "2020",
- pay_id: "3",
- pay_time: "2020-04-17 21:16:12",
- pay_wood_desc: "在【非常戴镜】的微信付款凭证",
- pay_wood_id: "fcdj-1-1_1587129366",
- prepay_id: "wx172116124528226bf1a8adad1662456500",
- re_check_staus: "0",
- shopid: "0",
- split_userid: "0",
- status: "1",
- total_fee: "100",
- uid: "1",
- }
- ],
- msg: "订单列表",
- status: 0,
-}
+// const data = {
+// data: [
+// {
+// finished_time: null,
+// is_refound: "0",
+// mch_id: "1436019502",
+// money_of_dcw: "0",
+// money_of_partner: "0",
+// money_of_shop: "0",
+// orderJudge: false,
+// order_info: {
+// address:{
+// cityName: "镇江市",
+// countyName: "丹阳市",
+// detailInfo: "延陵镇柳茹村卫生室附近秀野堂农业发展有限公司",
+// errMsg: "chooseAddress:ok",
+// nationalCode: "321181",
+// postalCode: "212300",
+// provinceName: "江苏省",
+// telNumber: "15896379277",
+// userName: "点餐汪客服",
+// },
+// cartinfo:['11', '12'],
+// keyname: "1_1587129366",
+// lefttime: 179995,
+// list:[
+// {
+// cart_id: "11",
+// imgUrl: "https://glass.xiuyetang.com//upload_jk/4/4_0_3FDA03.jpg",
+// img_index_url: null,
+// memo: "志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流，01-8701",
+// mp_id: "1",
+// nowPrice: 100,
+// num: "2",
+// oldPrice: "0",
+// p_discount: "1",
+// p_name: "01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流",
+// p_root_index: "1",
+// p_sale_price: "0",
+// peopleName: "me",
+// pics: '',
+// pid: "4",
+// sk_id: "38",
+// },
+// ],
+// orderDesc: "总共包括有：01-8701志平防蓝光-防辐射电脑网课眼镜，TR90弹性漆，近视镜，青春潮流在内的1件商品",
+// total_fee: 100
+// },
+// partner_uid: "0",
+// pay_cate: "2020",
+// pay_id: "3",
+// pay_time: "2020-04-17 21:16:12",
+// pay_wood_desc: "在【非常戴镜】的微信付款凭证",
+// pay_wood_id: "fcdj-1-1_1587129366",
+// prepay_id: "wx172116124528226bf1a8adad1662456500",
+// re_check_staus: "0",
+// shopid: "0",
+// split_userid: "0",
+// status: "1",
+// total_fee: "100",
+// uid: "1",
+// }
+// ],
+// msg: "订单列表",
+// status: 0,
+// }
const state = {
- orderList: [],
+ orderList: [],
};
const mutations = {
INIT: (state, data) => {
- state.orderList = data;
+ state.orderList = data;
},
};
const actions = {
getList({ commit }, param) {
request({
- url: orderList,
+ url: myOrderList,
data: param,
success: (res) => {
- const resData = {
- ...res,
- data,
- }
- console.log('data.data', resData.data.data);
- commit("INIT", resData.data.data);
+ // console.log(res.data);
+ commit("INIT", res.data.data);
},
})
}
diff --git a/src/store/modules/orderRead.js b/src/store/modules/orderRead.js
new file mode 100644
index 0000000..0639069
--- /dev/null
+++ b/src/store/modules/orderRead.js
@@ -0,0 +1,35 @@
+ import urlAlias from '../url';
+ import request from '../request';
+
+ const {
+ orderRead
+ } = urlAlias;
+
+const state = {
+ orderInfo: {},
+};
+
+const mutations = {
+ INIT: (state, orderInfo) => {
+ state.orderInfo = orderInfo;
+ },
+};
+
+const actions = {
+ getOrderInfo({ commit }, param) {
+ request({
+ url: orderRead,
+ data: param,
+ success: (res) => {
+ commit("INIT", res.data.data);
+ },
+ })
+ },
+};
+
+export default {
+ namespaced: true,
+ state,
+ mutations,
+ actions,
+};
diff --git a/src/store/modules/payLog.js b/src/store/modules/payLog.js
new file mode 100644
index 0000000..3f234f3
--- /dev/null
+++ b/src/store/modules/payLog.js
@@ -0,0 +1,27 @@
+import urlAlias from '../url';
+import request from '../request';
+
+const {
+ payLog
+} = urlAlias;
+
+
+const actions = {
+ payLog({ commit }, param) {
+ request({
+ url: payLog,
+ data: param,
+ success: (res) => {
+ // console.log(res.data);
+ commit("INIT", res.data.data);
+ },
+ })
+ }
+}
+
+export default {
+ namespaced: true,
+ // state,
+ // mutations,
+ actions,
+}
\ No newline at end of file
diff --git a/src/store/modules/statusConfirm.js b/src/store/modules/statusConfirm.js
new file mode 100644
index 0000000..90ba15d
--- /dev/null
+++ b/src/store/modules/statusConfirm.js
@@ -0,0 +1,37 @@
+import urlAlias from '../url';
+import request from '../request';
+
+const {
+ statusConfirm
+} = urlAlias;
+
+// const openid = uni.getStorageSync('openid');
+const actions = {
+ confirm({ commit }, param) {
+ request({
+ url: statusConfirm,
+ data: param|| { },
+ success: (res) => {
+ console.log(res.data);
+ if(res.data.code === 1){
+ uni.showToast({
+ title:'已确认',
+ mask:true,
+ duration:1500,
+ icon:'success'
+ })
+ }else{
+ uni-uni.showToast({
+ title: '服务器错误，确认失败!',
+ mask:true
+ });
+ }
+ },
+ })
+ }
+}
+
+export default {
+ namespaced: true,
+ actions,
+}
\ No newline at end of file
diff --git a/src/store/url.js b/src/store/url.js
index 1b16f69..2c09e2f 100644
--- a/src/store/url.js
+++ b/src/store/url.js
@@ -15,8 +15,12 @@ const urlAlias = {
login: '/app/glass/getOpenId', // 登陆
getUserInfo: '/app/glass/userinfo', // 获取用户信息
- // 我的订单
- orderList: '/app/order/list', // 获取订单列表
+ // 我的订单
+ myOrderList: '/app/order/list3', // 获取订单列表
+ orderRead: '/app/order/read', // 获取订单详情
+ cancelOrder: '/app/order/wait/del',//取消订单
+ statusConfirm: '/app/order/statusConfirm',//订单操作
+ payLog:'/app/pay/log',//调起支付
// 购物车
cartList: '/app/cart/list', // 获取购物车列表