预订 修复bug

ghsApp/src/admin/book/custom.vue

@@ -119,9 +119,8 @@ export default {
 		};
 	},
 	onPullDownRefresh() {
-		this.getStatList().then(res => {
-			uni.stopPullDownRefresh()
-		});
+		this.getStatList()
+		uni.stopPullDownRefresh()
 	},
 	onLoad(){
 
@@ -197,7 +196,7 @@ export default {
 		.space-view {
 			background-color: #fff;
 			.num{
-				font-size:26upx;
+				font-size:27upx;
 			}
 			.finish{
 				color:green;font-weight:bold;

ghsApp/src/admin/book/itemCustom.vue

@@ -19,14 +19,14 @@
                         </t-tr>
                         <template v-if="!$util.isEmpty(bookData)">
                             <view v-for="(item, index) in bookData" :key="index" @click="goAction(item)" style="position: relative;">
-								<text style="position: absolute;top:68upx;left:190upx;font-weight:bold;color:red;font-size:24upx;" v-if="item.hasRemark == 1">{{ item.remark?item.remark:'' }}</text>
+								<text style="position: absolute;top:68upx;left:150upx;font-weight:bold;color:red;font-size:24upx;" v-if="item.hasRemark == 1">{{ item.remark?item.remark:'' }}</text>
                                 <t-tr>
                                     <t-td>
 									<view class="name" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']" style="width:170upx;position: relative;">
 										{{item.name}}
-										<image :src="`${constant.imgUrl}/ghs/book/box1.png`" style="width:35upx;height:35upx;display: inline-block;position: absolute;top:49upx;" 
+										<image :src="`${constant.imgUrl}/ghs/book/box1.png`" style="width:35upx;height:35upx;display: inline-block;position: absolute;top:48upx;" 
 										mode="widthFix" v-if="item.box == 1"></image>
-										<image :src="`${constant.imgUrl}/ghs/book/remark2.png`" style="width:39upx;height:39upx;display: inline-block;position: absolute;top:45upx;left:50upx;" 
+										<image :src="`${constant.imgUrl}/ghs/book/remark2.png`" style="width:39upx;height:39upx;display: inline-block;position: absolute;top:44upx;left:50upx;" 
 										mode="widthFix" v-if="item.hasRemark == 1"></image>
 									</view>
 									</t-td>
@@ -137,9 +137,8 @@ export default {
 		};
 	},
 	onPullDownRefresh() {
-		this.getStatList().then(res => {
-			uni.stopPullDownRefresh();
-		});
+		this.getStatList()
+		uni.stopPullDownRefresh()
 	},
 	onLoad() {
 
@@ -346,10 +345,10 @@ export default {
 		.space-view {
 			background-color: #fff;
 			.num{
-				font-size:25upx;height:60upx;display: flex;align-items: center;
+				font-size:27upx;height:60upx;display: flex;align-items: center;
 			}
 			.name{
-				font-size:25upx;width:170upx;text-align:left;height:60upx;display: flex;align-items: center;
+				font-size:27upx;width:170upx;text-align:left;height:60upx;display: flex;align-items: center;
 			}
 			.custom-item{
 				font-size:24upx;color:#333333;overflow: hidden;width:90upx;

ghsApp/src/admin/order/statBook.vue

@@ -146,9 +146,8 @@ export default {
 		};
 	},
 	onPullDownRefresh() {
-		this.getStatList().then(res => {
-			uni.stopPullDownRefresh()
-		});
+		this.getStatList()
+		uni.stopPullDownRefresh()
 	},
 	onLoad(e) {
 		this.itemId = e.id;
@@ -286,10 +285,10 @@ export default {
 		.space-view {
 			background-color: #fff;
 			.num{
-				font-size:26upx;height:60upx;display: flex;align-items: center;
+				font-size:27upx;height:60upx;display: flex;align-items: center;
 			}
 			.name{
-				font-size:26upx;width:160upx;text-align:left;height:60upx;display: flex;align-items: center;
+				font-size:27upx;width:160upx;text-align:left;height:60upx;display: flex;align-items: center;
 			}
 			.finish{
 				color:green;font-weight:bold;

ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="product">
     <view class="item-cmd_bx" @click="showAddModelFn">
-      <text style="position: absolute;left:245upx;font-weight:bold;color:red;font-size:24upx;top:118upx;" v-if="info.needCgNum && Number(info.needCgNum)>0">待采 {{ info.needCgNum }}</text>
+      <text style="position: absolute;left:260upx;font-weight:bold;color:red;font-size:28upx;top:118upx;" v-if="info.needCgNum && Number(info.needCgNum)>0">待采 {{ info.needCgNum }}</text>
       <view class="img_bx" style="background:#eeeeee">
         <block v-if="info.status == 2">
           <view class="sold-out">

ghsApp/src/pagesPurchase/info.vue

@@ -326,7 +326,14 @@ export default {
 	methods: {
 		changeView(){
 			if(this.showSeat == 0){
-				this.assignOrder()
+				if(this.detailInfo.status == 4){
+					this.initCgData()
+					this.showSeat = 1
+				}else if(this.detailInfo.status == 5){
+					this.$msg('订单已取消')
+				}else{
+					this.assignOrder()
+				}
 			}else{
 				this.showSeat = 0
 			}