调整发货单物流信息查询

App.vue

@@ -36,7 +36,12 @@
 				// 			success: modalRes => {
 				// 				if (modalRes.confirm) {  
 				// 					if (plus.os.name == "Android") {
-				// 					    plus.runtime.openURL(res.info.download);
+				// 					    plus.runtime.openURL(res.info.download, err => {
+				// 							uni.showToast({
+				// 								title: err,
+				// 								icon : 'none'
+				// 							})
+				// 						});
 				// 					} else{
 				// 						uni.showToast({
 				// 							title: 'IOS应用暂未上架，请打开测试(TestFlight)工具点击更新',

apis/interfaces/store.js

@@ -55,12 +55,10 @@ const companiesCode = () => {
 }
 
 // 退货单列表
-const storeReturn = (state) => {
+const storeReturn = data => {
 	return request({
 		url: 'manages/refunds',
-        data: {
+        data
-            state
-        }
 	})
 }
 

components/store-order/store-order.vue

@@ -26,8 +26,7 @@
 				</view>
 				<view class="actions">
 					<view v-if="item.can">
-						<view v-if="item.can.audit"
+						<view v-if="item.can.audit" @click="$Router.push({name: 'storeExamine', params: {id: item.refund_id}})"
-							@click="$Router.push({name: 'Examine', params: {id: item.refund_id}})"
 							class="nowPay actions-color">订单审核</view>
 						<view v-if="item.can.sign" @click="goSigns(item.refund_id, index)" class="nowPay actions-color">
 							订单签收</view>

pages.json

@@ -798,6 +798,13 @@
 				"navigationBarTitleText": "操作日志",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
+		}, {
+			"path": "pages/store/examine",
+			"name": "storeExamine",
+			"style": {
+				"navigationBarTitleText": "订单审核",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
 		}
     ],
 	"globalStyle": {

pages/store/examine.vue

@@ -65,11 +65,14 @@
                     state : newState,
                     remark: newRemark
                 }).then(res=>{
-                    uni.showToast({
+					uni.showModal({
-                        icon: 'none',
+						title		: '提示',
-                        title: '审核成功'
+						content		: '订单已审核',
-                    })
+						showCancel	: false,
-                    this.$Router.back()
+						success   	: ()=> {
+							this.$Router.back()
+						}
+					})
                 })
             }
 		}
@@ -106,9 +109,9 @@
         }
     }
     .submit {
-        background: #e93340;
+        background: $mian-color;
         color: white;
-        border-color: #e93340;
+        border-color: $mian-color;
-        margin: $margin*4 $margin 0;
+        margin: $margin;
     }
 </style>

pages/store/logistic.vue

@@ -3,22 +3,14 @@
         <!-- 物流状态 start -->
         <view class="state" v-if="logistic.length > 0">
             <view class="take">
-                <view class="take-tips">
+                <view class="take-name">收件人：{{express.courier_name}}<text>{{express.mobile}}</text></view>
-                    收
+                <view class="take-address">收货地址：{{express.full_address}}</view>
-                </view>
-                <view class="take-text">
-                    收货地址：发接口返回绝对是放假客户端上看见发货数据库大黄蜂教科书的浩丰科技
-                </view>
             </view>
             <view class="list">
-                <!-- v-for="(item, index) in logistic" :key="index" -->
+                <view v-for="(item, index) in logistic" :key="index" class="list-label">
-                <view class="list-label">
+					<view class="list-status">{{item.status}}</view>
-                    <view class="list-name">
+                    <view class="list-text">{{item.context}}</view>
-                        <text>发货中</text> 2020-15-12
+                    <view class="list-time">{{item.time}}</view>
-                    </view>
-                    <view class="list-time">
-                        华东师范邯郸市科技发货圣诞节客服
-                    </view>
                 </view>
             </view>
         </view>
@@ -35,12 +27,14 @@
         data() {
         	return {
         		message : '',
-                logistic: ''
+				express	: {},
+                logistic: []
         	}
         },
         created() {
             deliverLogistic(this.$Route.query.id).then(res=>{
-                console.log(res)
+				this.express  = res.express
+				this.logistic = res.logistics
             }).catch(err => {
                 this.message = err.message
 			})
@@ -58,92 +52,70 @@
     
     // 物流状态
     .state {
-        background-color: $uni-bg-color;
         margin-top: $margin;
-        padding: $padding;
-        font-size: $title-size-m;
-        color: $text-gray;
         .take {
-            display: flex;
+            background: white;
-            padding-bottom: $padding;
+			padding: $padding;
-            position: relative;
+			.take-name{
-            &::before {
+				font-weight: bold;
-                position: absolute;
+				font-size: $title-size + 4;
-                content: '';
+				text{
-                left: $uni-img-size-sm / 3 + 2;
+					font-weight: normal;
-                top: $margin;
+					padding-left: 10rpx;
-                background-color: $uni-text-color-grey;
+				}
-                width: 2rpx;
+			}
-                height: 100%;
-            }
-            .take-tips {
-                background-color: $mian-color;
-                width: $uni-img-size-sm;
-                height: $uni-img-size-sm;
-                border-radius: $uni-border-radius-circle;
-                font-size: $title-size-sm;
-                transform: scale(.9);
-                text-align: center;
-                color: $uni-text-color-inverse;
-                margin-top: 10rpx;
-                margin-left: -4rpx;
-            }
-            .take-text {
-                margin-left: $margin;
-                line-height: 40rpx;
-                margin-top: $margin - 10;
-                width: calc(100% - #{$uni-img-size-sm} + #{$margin});
-            }
-        }
-        .list {
-            font-size: $title-size-sm;
-            .list-label {
-                padding-left: $padding * 3;
-                padding-bottom: $padding;
-                padding-top: $padding - 10;
-                position: relative;
-                &::after {
-                    position: absolute;
-                    content: '';
-                    left: $uni-img-size-sm / 3 - 4;
-                    top: $margin;
-                    background-color: $uni-text-color-grey;
-                    width: $uni-img-size-sm / 3;
-                    height: $uni-img-size-sm / 3;
-                    border-radius: $uni-border-radius-circle;
-                    z-index: 9;
-                }
-                &::before {
-                    position: absolute;
-                    content: '';
-                    left: $uni-img-size-sm / 3 + 2;
-                    top: $margin;
-                    background-color: $uni-text-color-grey;
-                    width: 2rpx;
-                    height: 100%;
-                }
-                &:first-child {
-                    color: $mian-color;
-                }
-                &:last-child::before {
-                    background-color: $uni-bg-color;
-                }
-                &:first-child::after {
-                    background-color: $mian-color;
-                }
-                .list-name {
-                    margin-bottom: $margin - 10;
-                    text {
-                        font-weight: 600;
-                        padding-right: $padding;
-                    }
-                }
-                .list-time {
-                     font-size: $uni-font-size-sm;
-                     line-height: 34rpx;
-                }
-            }
         }
+		.list{
+			padding: $padding;
+			margin-top: $margin;
+			background: white;
+			.list-label{
+				position: relative;
+				padding-left: 50rpx;
+				padding-bottom: $padding;
+				&::before{
+					position: absolute;
+					content: " ";
+					left: 0;
+					top: 16rpx;
+					background: $border-color;
+					height: 25rpx;
+					width: 25rpx;
+					border:solid 5rpx rgba($color: white, $alpha: 1);
+					box-sizing: border-box;
+					border-radius: 50%;
+					z-index: 1;
+				}
+				&::after{
+					width: 2rpx;
+					background: $border-color;
+					content: " ";
+					position: absolute;
+					height: 100%;
+					top: 30rpx;
+					left: 12rpx;
+				}
+				&:first-child::before{
+					background: $mian-color;
+					border:solid 5rpx rgba($color: white, $alpha: .5);
+				}
+				&:last-child::after{
+					display: none;
+				}
+				.list-status{
+					line-height: 50rpx;
+					font-weight: bold;
+					font-size: $title-size;
+				}
+				.list-text{
+					color: $text-gray;
+				}
+				.list-time{
+					color: $text-gray-m;
+					font-size: $title-size-sm;
+				}
+			}
+		}
     }
     
     // 暂无订单

pages/store/return.vue

@@ -82,7 +82,7 @@
 
 			// 签收订单
 			goSign(info) {
-				let id = info.id
+				let id    = info.id
 				let index = info.index
 				uni.showModal({
 					title: '是否签收此订单？',