app优化

ghsApp/src/admin/home/components/OrderItem.vue

@@ -1,13 +1,16 @@
 <template>
     <view  @click="pageTo({url:'/pagesOrder/detail',query: {id: item.id}})">
-        <view class="order-top_box">
-        
-        <image style="width: 38upx;height:38upx;border-radius:38upx;" mode="aspectFit" :src="item.customAvatarUrl"></image>
+        <view class="order-top_box" style="position:relative;">
+
+        <image style="width:105upx;position:absolute;top:80upx;right:12upx;" v-if="item.status == 1"
+        @click.stop="pageTo({url:'/admin/billing/toPay',query: {orderId:item.id,orderSn:item.orderSn,actPrice:item.actPrice}})"
+         mode="widthFix" :src="`${constant.imgUrl}/icon/codePay8.png`"></image>
 
-        <view class="tit"> {{ item.customName || "" }}</view>
-        <view class="other-refund" v-if="item.refund==2">有退款</view>
-        <view class="other-status" v-if="item.debt == 1">欠款</view>
-        <view :class="['status',item.status == '3' ? 'buleColor' : item.status == '6' ? 'defColor' : '']">{{ statusFormat(item.status) }}</view>
+        <image style="width: 38upx;height:38upx;border-radius:38upx;" mode="aspectFit" :src="item.customAvatarUrl"></image>
+          <view class="tit"> {{ item.customName || "" }}</view>
+          <view class="other-refund" v-if="item.refund==2">有退款</view>
+          <view class="other-status" v-if="item.debt == 1">欠款</view>
+          <view :class="['status',item.status == '3' ? 'buleColor' : item.status == '6' ? 'defColor' : '']">{{ statusFormat(item.status) }}</view>
         </view>
         <view class="order-list_info">
         <view class="order-info_box">
@@ -71,7 +74,7 @@ export default {
     statusFormat(status) {
         switch (status) {
             case "1":
-            return "待确认";
+            return "待付款";
             break;
             case "2":
             return "待配送";

ghsApp/src/admin/home/order.vue

@@ -107,7 +107,7 @@ export default {
           id: 0,
         },
         {
-          name: "待确认",
+          name: "待付款",
           value: 0,
           id: 1,
         },

ghsApp/src/api/order/index.js

@@ -188,3 +188,6 @@ export const cancel = data => https.get("/order/cancel", data);
 
 //微信和支付宝付款码支付
 export const codePay = data => https.get("/order/code-pay", data);
+
+//微信和支付宝付款码支付复查
+export const codePayCheck = data => https.get("/order/code-pay-check", data);

ghsApp/src/components/app-wrapper-empty.vue

@@ -18,9 +18,7 @@
 			<slot v-else>
 				<div>
 					<div class="foot-layout" v-if="finished">
-						<!-- <div class='foot-divider'></div> -->
 						<div class="foot-text">{{finishedText}}</div>
-						<!-- <div class='foot-divider'></div> -->
 					</div>
 					<div class="foot-layout" v-if="isLoading">
 						<div class="foot-text">
@@ -38,16 +36,10 @@
 export default {
 	name: 'AppWrapperEmpty',
 	props: {
-		/**
-			 * type()
-			 * search (搜索)
-			 * noData (无数据)
-			 */
 		type: {
 			type: String,
 			default: 'noData'
 		},
-
 		// 图片宽度
 		pictureWidth: {
 			type: String,
@@ -124,11 +116,12 @@ export default {
 		& .app-empty__img {
 			width: 100%;
 			text-align: center;
-			margin: 116upx auto 50upx;
+			margin: 116upx auto 20upx;
 			& image {
-				width: 500upx;
+				width: 180upx;
 				max-width: 100%;
 				height: auto;
+				margin:0 auto;
 			}
 		}
 
@@ -137,8 +130,7 @@ export default {
 			flex-direction: column;
 			align-items: center;
 			font-size: 32upx;
-			color: #666666;
-
+			color: #8b8b8b;
 			& span {
 				font-weight: 400;
 

ghsApp/src/manifest.json

@@ -25,7 +25,11 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "permissions" : [],
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>"
+                ],
                 "autoSdkPermissions" : false
             },
             /* ios打包配置 */

ghsApp/src/pagesOrder/detail.vue

@@ -57,7 +57,7 @@
 				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
-					<view>{{ detailInfo.status==1?'待确认':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
+					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
 				<view v-if="detailInfo.status==1" class="order-info_box">
 					<view>过期时间：</view>

ghsApp/src/pagesPurchase/order.vue

@@ -39,7 +39,7 @@ export default {
 					value: "25"
 				},
 				{
-					name: "待确认",
+					name: "待付款",
 					key: "1",
 					value: "25"
 				},

ghsApp/src/pagesPurchase/orderItem.vue

@@ -56,7 +56,7 @@ export default {
 
 			switch (this.info.status) {
 				case PURCHASE_ORDER_STATUS.CONFIRM:
-					statusName = "待确认";
+					statusName = "待付款";
 					break;
 				case PURCHASE_ORDER_STATUS.UNDIS:
 					statusName = "待配送";

ghsApp/src/utils/declare.js

@@ -24,7 +24,7 @@ export const OUT_STATUS = {
 	CANCEL: "3"
 };
 
-//采购订单状态：1待确认，2待配送，3配送中，4已完成
+//采购订单状态：1待付款，2待配送，3配送中，4已完成
 export const PURCHASE_ORDER_STATUS = {
 	CONFIRM: "1",
 	UNDIS: "2",