结账

hdApp/src/admin/clear/info.vue

@@ -16,14 +16,18 @@
 						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default" > 复制 </button>
 					</view>
 				</view>
-				<view class="order-info_box">
+				<view class="order-info_box" v-if="detailInfo.status==2">
 					<view>支付方式：</view>
-					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'' }}</view>
+					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'其它' }}</view>
 				</view>
 				<view class="order-info_box">
 					<view>操作人员：</view>
 					<view>{{ detailInfo.operator }}</view>
 				</view>
+				<view class="order-info_box" v-if="detailInfo.status == 1">
+					<view>过期时间：</view>
+					<view>{{ detailInfo.deadline.substr(5,11) }}</view>
+				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
 					<view style="color:red;font-weight:bold;">{{detailInfo.status == 1 ?'待结账':detailInfo.status==2?'已结账':detailInfo.status==3?'已取消':'待结账'}}</view>
@@ -89,10 +93,14 @@
 			</view>
 
 		</view>
+		<view class="app-footer">
+			<button class="admin-button-com default" v-if="detailInfo.status == 1">取消</button>
+			<button class="admin-button-com default" v-if="detailInfo.status == 1" @click="toClear(detailInfo)">付款结清</button>
+		</view>
 	</view>
 </template>
 <script>
-import { getDetail } from "@/api/clear/index";
+import { getDetail,detail } from "@/api/clear/index";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 export default {
@@ -113,10 +121,15 @@ export default {
 			loading: false
 		};
 	},
-	onShow() {
-		console.log('aabbcc')
-	},
 	methods: {
+		toClear(info){
+			let that = this
+			detail({ id:info.id }).then(res => {
+				if(res.code == 1) {
+					that.pageTo({ url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond})
+				}
+			})
+		},
 		copy(val) {
 			const self = this;
 			uni.setClipboardData({

hdApp/src/api/clear/index.js

@@ -12,4 +12,9 @@ export const getDetail = async id => {
  */
 export const getClearList = async data => {
 	return https.get("/clear/list", data);
-};
+};
+
+//订单详情
+export const detail = data => {
+	return https.get('/clear/detail', data)
+}

hdApp/src/pagesPurchase/gatherPay.vue

@@ -49,7 +49,7 @@ export default {
   onLoad (options) {
     this.orderSn = options.orderSn
     this.actPrice = options.actPrice
-    this.orderTime = options.remainSecond - 10 > 0 ? (options.remainSecond - 10) : 10
+    this.orderTime = options.remainSecond - 10 > 0 ? (options.remainSecond - 10) : 0
     this.orderTimeFun();
   },
   computed: {