heyang

api/index.js

@@ -36,13 +36,22 @@ export const gasDetail  = (data) => {
     })
 };
 //气瓶列表-详情-电子标签解绑更换
+// export const gasTagBinding  = (data) => {
+//     return apiResquest({
+//         url: `/airbottle/storage/binding`,
+//         method: 'GET',
+//         data: data,
+//     })
+// };
+//气瓶列表-详情-电子标签解绑更换
 export const gasTagBinding  = (data) => {
     return apiResquest({
-        url: `/airbottle/storage/binding`,
+        url: `/airbottle/storage/change`,
         method: 'GET',
         data: data,
     })
 };
+
 //气瓶列表-使用记录
 export const gasDetailRecord  = (data) => {
     return apiResquest({

api/request/config.js

@@ -8,7 +8,7 @@ const config = {
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	 base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
+	 base_url: 'https://lab.sxitdlc.com/labAppTest',//43服务器线上
     //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址

pages_student/gasApply/gasApply.vue

@@ -9,7 +9,7 @@
 						<text>申请时间：{{item.createTime}}</text>
 						<text v-if="item.applyNum==item.storageNum">已全部入库</text>
 					</view>
-					<view class="list_li_b" v-if="item.applyNum!=item.storageNum">
+					<view class="list_li_b">
 						<view>申请：<text>{{item.applyNum}}</text></view>
 						<view>入库：<text>{{item.storageNum}}</text></view>
 					</view>
@@ -132,12 +132,15 @@
 						line-height: 28rpx;
 					}
 					>text:nth-of-type(2){
+						width: 220rpx;
+						display: inline-block;
 						font-size: 24rpx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #00CC26;
 						line-height: 24rpx;
-						margin-left:110rpx;
+						text-align: right;
+						
 					}
 				}	
 				.list_li_b{

pages_student/gasList/gasListBinding.vue

@@ -6,7 +6,7 @@
 			<view class="register_li_min">
 				<view>*</view>
 				<view>电子标签：</view>
-				<input v-model="form.electronicTag"   type="text" placeholder="请输入电子标签ID">
+				<input v-model="form.newTag"   type="text" placeholder="请输入电子标签ID">
 				<img @click.stop="saoCode"  class="code_img" src="@/images/Version2.2/icon_aqjc_sm.png">
 			</view>
 		</view>
@@ -23,7 +23,7 @@
 				pageType:0,
 				form:{
 					id:'',
-					electronicTag:'',
+					newTag:'',
 				},
 				item:{},
             }
@@ -56,7 +56,7 @@
 						     url: '/pages_student/gasList/gasListDetail?item='+encodeURIComponent(JSON.stringify(this.item))
 						 });
 					}else{
-						_this.form.electronicTag='';
+						_this.form.newTag='';
 						uni.showModal({
 									showCancel:false,
 									confirmColor:'#0183FA',
@@ -76,7 +76,7 @@
 			    uni.scanCode({
 			        onlyFromCamera: true,
 			        success: function (res) {
-						_this.form.electronicTag=res.result;
+						_this.form.newTag=res.result;
 						_this.getBinding();
 			        }
 			    });

pages_student/gasManage/gasManage.vue

@@ -62,8 +62,8 @@
 				},
 				dataList:[],
 				dataList2:[],
-				yqCount:null,
-				zgCount:null,
+				yqCount:0,
+				zgCount:0,
 				userApplyNumberYq:null,//大于0显示使用人，等于零显示规格
 				userApplyNumberZg:null,//大于0显示使用人，等于零显示规格
 				electronicTag:'',
@@ -71,7 +71,7 @@
             }
         },
         onLoad(option) {
-			
+			this.getCount();
         },
         onShow(){	
 			
@@ -183,7 +183,7 @@
 		mounted() {
 			this.getList();
 			this.getList2();
-			this.getCount();
+			
 		}
     }
 </script>
@@ -280,7 +280,7 @@
 						line-height: 24rpx;
 					}
 					>view:nth-of-type(1){
-						width: 180rpx;
+						width: 230rpx;
 					}
 					>view:nth-child(2){
 					}