shish 4 лет назад
Родитель
Сommit
6235c6fdbe

+ 0 - 1
ghsApp/src/admin/item/list.vue

@@ -99,7 +99,6 @@ export default {
 
 	methods: {
 		downloadTable(){
-			
 
 			let level = 0
 			let levelList = ['普通价', '青铜价', '白银价','黄金价','钻石价']

+ 1 - 1
ghsApp/src/admin/itemClass/list.vue

@@ -165,7 +165,7 @@ export default {
 			this._list()
 		},
 		_list() {
-			return getList().then(res => {
+			return getList({page: this.list.page}).then(res => {
 				this.completes(res)
 			})
 		},

+ 2 - 0
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -295,6 +295,8 @@ export default {
 		},
 		init(){
 
+			this.init = false
+
 			//扫码采购 shish 20210614
 			if(this.option.scene){
 				console.log('scene',this.option.scene)

+ 2 - 2
hdApp/src/pagesPurchase/order.vue

@@ -160,8 +160,8 @@ export default {
           font-size: 28upx;
           color: white;
           border: 1px solid #3385FF;
-          border-radius: 80px;
-          padding: 12upx 32upx;
+          border-radius: 70px;
+          padding: 15upx 35upx;
           position: absolute;
           top:60rpx;
           right:70rpx;

+ 20 - 15
hdApp/src/pagesPurchase/xj.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="billing_box_bg">
     	<view class="input-wrap">
-			<text>剩余:{{option.stock}}扎</text><text style="margin-left:50rpx;">单价:{{option.price}}</text>
+			<text>剩余:{{parseFloat(option.stock)}}扎</text><text style="margin-left:50rpx;">单价:¥{{parseFloat(option.price)}}</text>
 		</view>
 		<view class="scroll-middle_bx">
 			<block>
-				<view class="item_list_bx"  style="width: 100%">
+				<view class="item_list_bx"  style="width: 100%;">
 					<view v-for="(xjItem,xjIndex) in xjList" :key="xjIndex">
 						<view>
 							<view class="item-cmd_bx">
@@ -17,22 +17,21 @@
 									<view class="kc"></view>
 									<view class="num-open_bx">
 										<view class="open-bx warn">
-											数量:<input class="change-input" @focus="xjNum = ''" 
-											placeholder-style="color:#CCCCCC" v-model="numList[xjItem.id]" type="digit" placeholder="请填写" />
+											数量:<input class="change-input" placeholder-style="color:#CCCCCC" v-model="numList[xjItem.id]" type="digit" placeholder="请填写" />
 										</view>
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
-					<view>
-						<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
-						<button class="admin-button-com big default" @click="goBack()" style="margin-left:58rpx;padding:30rpx 55rpx 30rpx 55rpx;">返回</button>
-						<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
-					</view>
 				</view>
 			</block>
 		</view>
+		<div class="app-footer footer-button">
+			<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
+			<button class="admin-button-com big default" @click="goBack()" style="margin-left:58rpx;padding:30rpx 55rpx 30rpx 55rpx;">不修改</button>
+			<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
+		</div>
 	</view>
 </template>
 <script>
@@ -122,7 +121,7 @@ export default {
 			}
 
 			if(totalNum > Number(this.option.stock)){
-				this.$msg("数量超过库存")
+				this.$msg("数量超过库存")
 				return false
 			}
 
@@ -150,6 +149,7 @@ export default {
 .billing_box_bg {
 	height: 100%;
 	display: flex;
+	margin-bottom:120rpx;
 	flex-direction: column;
 	.input-wrap {
 		font-size:30rpx;
@@ -172,10 +172,7 @@ export default {
 		}
 	}
 	.scroll-middle_bx {
-		flex: 1;
-		display: flex;
-		width: 100%;
-		height: 100%;
+		margin-bottom:110rpx;
 	}
 	.tab-view {
 		height: 100%;
@@ -233,7 +230,6 @@ export default {
 		padding: 10px 40px;
 	}
 	.item_list_title {
-		margin-bottom: 20px;
 		font-size: 24px;
 		font-weight: 600;
 		color: #666666;
@@ -340,4 +336,13 @@ export default {
 	left:120rpx;
 	top:-36rpx;
 }
+.footer-button{
+	height:120rpx;
+	& > button:nth-child(1){
+		color:#999999;
+	}
+	& > button:nth-child(2){
+		color:#999999;
+	}
+}
 </style>