小菊ok

ghsApp/src/admin/billing/index.vue

@@ -267,12 +267,9 @@ export default {
 				//超过库存时 设置为库存最大值 1
 				if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
 					uni.showToast({
-						title: '库存不足',
+						title: '库存只有'+bigNum,
 						icon: "none"
 					});
-					this.customData.bigCount = 0;
-					this.customData.smallCount = 0;
-					this.delAllEvent(this.customData)
 				} else {
 					this.updateItemEvent(this.customData);
 					this.modalCancel();

ghsApp/src/pagesOrder/detail.vue

@@ -117,14 +117,13 @@
 								<view class="info-line">
 									<text class="item-name">{{ s.name }}</text>
 									<text class="item-price">
-										<text class="unit">¥</text>
-
-										<text class="price">{{s.userPrice>0?s.userPrice:s.price }}</text>
+										<text class="unit"></text>
+										<text class="price"><text v-if="s.bigNum>0">{{s.bigNum}}扎*{{s.unitPrice}}</text> <text v-if="s.smallNum>0" style="margin-left:10rpx;">{{s.smallNum}}支*{{s.smallUnitPrice}}</text></text>
 									</text>
 								</view>
 								<view class="info-line">
 									<text class="item-type">{{ s.property }}</text>
-									<text class="item-count"><text v-if="s.bigNum>0">{{s.bigNum}}扎*{{s.unitPrice}}</text> <text v-if="s.smallNum>0" style="margin-left:10rpx;">{{s.smallNum}}支*{{s.smallUnitPrice}}</text></text>
+									<text class="item-count">¥{{s.userPrice>0?s.userPrice:s.price }}</text>
 								</view>
 							</view>
 						</view>
@@ -632,13 +631,14 @@ export default {
 						align-items: flex-end;
 						.item-name {
 							color: #666;
-							font-size: 28px;
+							font-size: 30px;
+							font-weight: 700;
 						}
 						.item-price {
 							color: #333;
 							font-size: 22px;
 							.price {
-								font-size: 32px;
+								font-size: 30px;
 								font-weight: bold;
 							}
 						}

hdApp/src/admin/billing/affirmGhs.vue

@@ -414,10 +414,6 @@ export default {
 	},
 	countAllPrices(e){
 		this.allPrices = this.allPrices+Number(this.form.sendCost)
-		console.log('e',e)
-		console.log('this.form.sendCost',Number(this.form.sendCost))
-		console.log('this.form.sendCost',this.form.sendCost)
-		console.log('this.allPrices',this.allPrices)
 	},
 	_getDet() {
 		let data = uni.getStorageSync("modifyShopB");

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -408,14 +408,11 @@ export default {
 						title: '库存还剩'+bigNum,
 						icon: "none"
 					});
-					this.customData.bigCount = 0;
-					this.customData.smallCount = 0;
-					this.delAllEvent(this.customData)
 				} else {
-					this.updateItemEvent(this.customData);
-					this.modalCancel();
+					this.updateItemEvent(this.customData)
+					this.modalCancel()
 				}
-				
+
 			})
 
 		},

hdApp/src/pagesPurchase/purDetails.vue

@@ -121,14 +121,13 @@
                 <view class="info-line">
                   <text class="item-name">{{ s.name }}</text>
                   <text class="item-price">
-                    <text class="unit">¥</text>
-
-                    <text class="price">{{ s.totalPrice }}</text>
+                    <text class="unit"></text>
+                    <text class="price"><text v-if="s.bigNum >0">{{s.bigNum}}扎*{{s.price}}</text><text v-if="s.smallNum>0" style="margin-left:10rpx;">{{s.smallNum}}支*{{s.smallPrice}}</text></text>
                   </text>
                 </view>
                 <view class="info-line">
                   <text class="item-type">{{ s.property }}</text>
-                  <text class="item-count"><text v-if="s.bigNum >0">{{s.bigNum}}扎*{{s.price}}</text><text v-if="s.smallNum>0" style="margin-left:10rpx;">{{s.smallNum}}支*{{s.smallPrice}}</text></text>
+                  <text class="item-count">¥{{ s.totalPrice }}</text>
                 </view>
               </view>
             </view>
@@ -412,13 +411,14 @@ export default {
             align-items: flex-end;
             .item-name {
               color: #666;
-              font-size: 28px;
+              font-size: 30px;
+              font-weight: 700;
             }
             .item-price {
               color: #333;
               font-size: 22px;
               .price {
-                font-size: 32px;
+                font-size: 30px;
                 font-weight: bold;
               }
             }