zc

pages/views/login/accountLogin.vue

@@ -105,14 +105,14 @@
 					data
 				} = await login(obj)
 				if (data.code == 200) {
-					if(data.data.userType == 0 || data.data.userType == 1 || data.data.userType == 2){
+					if(data.data.userType == 0 || data.data.userType == 1 || data.data.userType == 2 || data.data.userType == 5){
 						uni.setStorageSync('dataBoardType', false);
 						uni.setStorageSync('token', data.data.token);
 						uni.setStorageSync('userId', data.data.userId);
 						uni.setStorageSync('isInitPwd', true);
 						// userType 0-系统 1-教职工 2-学生 3-大屏
 						uni.setStorageSync('userType', data.data.userType == 0 || data.data.userType == 1 ? '1' :
-							(data.data.userType == 2 ? '2' : (data.data.userType == 3 ? '3' : 'none')));
+							(data.data.userType == 2 ? '2' : (data.data.userType == 3 ? '3' : (data.data.userType == 5 ? '5' : 'none'))));
 						if (this.checkedType) {
 							uni.setStorageSync('userName', this.username)
 							uni.setStorageSync('password', this.password)

pages/views/pupilPage/pupilHome.vue

@@ -34,6 +34,10 @@
 				<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 				<view class="button-name">危废回收</view>
 			</view>
+			<view class="button-min" @click="goPage('securityGasManage')" style="margin:23rpx 65rpx 0;">
+				<img class="button-img" :src="imagesUrl('home/icon_sy_aqzrr@1x.png')">
+				<view class="button-name">气瓶管理</view>
+			</view>
 		</view>
 		<view class="button-two-box">
 			<view class="button-big-box" @click="goPage('facilityReservationPupil')" 
@@ -199,6 +203,11 @@
 				}else if(type == 'hazardousWasteRecyclingPupil'){
 					//危废回收
 					this.systemUserGetPost();
+				}else if(type == 'securityGasManage'){
+					//气瓶管理
+					uni.navigateTo({
+						url: '/pages_student/views/gasBottle/gasManage/gasManage',
+					});
 				}
 			},
 			async systemUserGetPost(){

pages/views/supplierWorkbenchPage/supplierWorkbench.vue

@@ -49,7 +49,7 @@
             </view>
           </view>
         </view>
-        <img class="null-img" v-if="!dataList[0]" :src="imagesUrl('supplier/null-data-1.png')">
+        <!-- <img class="null-img" v-if="!dataList[0]" :src="imagesUrl('supplier/null-data-1.png')"> -->
       </scroll-view>
       <img class="supernatant"  @click="handleClick('recycle')" :src="imagesUrl('supplier/icon_glpt_gqhsjl.png')">
     </view>
@@ -121,15 +121,15 @@ export default {
     goInfo(d){
       if(d.remark=='gq'){
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageAirDetail?item='+encodeURIComponent(JSON.stringify(d))
+          url:'/pages_supplier/views/backlogManage/backlogManageAirDetail?item='+encodeURIComponent(JSON.stringify(d))
         });
       }else if(d.remark=='hs'){
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageRecycleDetail?item='+encodeURIComponent(JSON.stringify(d))
+          url:'/pages_supplier/views/backlogManage/backlogManageRecycleDetail?item='+encodeURIComponent(JSON.stringify(d))
         });
       }else if(d.remark=='wt'){
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageIssueDetail?item='+encodeURIComponent(JSON.stringify(d))
+          url:'/pages_supplier/views/backlogManage/backlogManageIssueDetail?item='+encodeURIComponent(JSON.stringify(d))
         });
       }
 
@@ -137,27 +137,27 @@ export default {
     handleClick(doType) {
       if(doType=='people'){
         uni.navigateTo({
-          url:'/pages_supplier/transportPerson/transportPerson'
+          url:'/pages_supplier/views/transportPerson/transportPerson'
         });
       }else if(doType=='car'){
         uni.navigateTo({
-          url:'/pages_supplier/transportCar/transportCar'
+          url:'/pages_supplier/views/transportCar/transportCar'
         });
       }else if(doType=='bottle'){
         uni.navigateTo({
-          url:'/pages_supplier/gasManage/gasManage'
+          url:'/pages_supplier/views/gasManage/gasManage'
         });
       }else if(doType=='mine'){
         uni.navigateTo({
-          url: '/pages_supplier/mine/mine?state='+this.state
+          url: '/pages_supplier/views/mine/mine?state='+this.state
         });
       }else if(doType=='backlog'){//待办清单
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManage'
+          url:'/pages_supplier/views/backlogManage/backlogManage'
         });
       }else if(doType=='recycle'){//供气回收
         uni.navigateTo({
-          url:'/pages_supplier/gasRecycle/gasRecycle'
+          url:'/pages_supplier/views/gasRecycle/gasRecycle'
         });
       }
 
@@ -192,7 +192,7 @@ export default {
       let _this = this;
       const {data} = await storageListTaskIndex(_this.getData);
       if(data.code==200){
-        let res=data.rows;
+        let res=data.data;
         _this.dataList=res;
         if(_this.dataList.length<=0){
           _this.emptyList=4

pages/views/teacherPage/teacherHome.vue

@@ -41,6 +41,10 @@
 					<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 					<view class="button-name">危废回收</view>
 				</view>
+				<view class="button-min" @click="goPage('gasManage')" style="margin:23rpx 65rpx 0;">
+					<img class="button-img" :src="imagesUrl('home/icon_sy_aqzrr@1x.png')">
+					<view class="button-name">气瓶管理</view>
+				</view>
 				<!-- <view class="button-min" @click="goPage('cageSiteManagement')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
 					<view class="button-name">笼位管理</view>
@@ -302,6 +306,11 @@
 				}else if(type == 'hazardousWasteRecycling'){
 					//危废回收
 					this.systemUserGetPost();
+				}else if(type == 'gasManage'){
+					//气瓶管理
+					uni.navigateTo({
+						url: '/pages_manage/views/gasBottle/gasManage/gasManage',
+					});
 				}
 			}, 
 			async systemUserGetPost(){

pages_manage/views/gasBottle/aptitudeAudit/aptitudeAudit.vue

@@ -95,7 +95,7 @@
 				const {data} = await auditList(this.params)
 				if(data.code == 200){
 					let _this=this;
-					let res=data.rows
+					let res=data.data
 					if(res && res.length>0){
 						if(_this.params.pageNum==1){
 							_this.dataList=res;

pages_manage/views/gasBottle/examination/examination.vue

@@ -65,7 +65,7 @@
 				const {data} = await qualificationList()
 				if(data.code == 200){
 					let _this=this;
-					let res=data.rows
+					let res=data.data.records
 					if(_this.getData.pageNum==1){
 						_this.dataList=res;
 						if(res.length>0){

pages_manage/views/gasBottle/examination/examinationAdd.vue

@@ -251,7 +251,7 @@
 							self.form.applyCertificate=res.data.url
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_manage/views/gasBottle/examination/examinationSelect.vue

@@ -108,7 +108,7 @@
 				    let _this = this;
 				    const {data} = await taskListGood(this.params);
 				    if(data.code==200){
-						let res=data.rows;
+						let res=data.data;
 						if(res){
 							let arr=[];
 							res.forEach(function(item){

pages_manage/views/gasBottle/gasApply/gasApply.vue

@@ -71,7 +71,7 @@
 				   let _this=this;
 				    const {data} = await gasApplyList(this.getData);
 				    if(data.code==200){
-						let res=data.rows;
+						let res=data.data.records;
 						if(_this.getData.pageNum==1){
 							_this.dataList=res;
 							if(res.length>0){

pages_manage/views/gasBottle/gasApply/gasApplyAdd.vue

@@ -136,7 +136,7 @@
 
 				    const {data} = await taskListGood(this.params);
 				    if(data.code==200){
-						let res=data.rows;
+						let res=data.data;
 						if(res){
 
 							if(_this.params.pageNum==1){

pages_manage/views/gasBottle/gasApply/gasApplyList.vue

@@ -132,7 +132,7 @@
 				const {data} = await gasApplyDetailYrk({id:_this.id});
 				if(data.code==200){
 					if(data.code==200){
-						let res = data.rows;
+						let res = data.data;
 						_this.dataList=res
 					}
 				}
@@ -143,7 +143,7 @@
 				const {data} = await gasApplyDetailYjs({id:_this.id});
 				if(data.code==200){
 					if(data.code==200){
-						let res = data.rows;
+						let res = data.data;
 						_this.dataList=res
 					}
 				}

pages_manage/views/gasBottle/gasApply/gasApplyReject.vue

@@ -92,7 +92,7 @@
 
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_manage/views/gasBottle/gasList/gasList.vue

@@ -70,7 +70,7 @@
 
 				    const {data} = await gasList(_this.getData);
 				    if(data.code==200){
-						let res = data.rows;
+						let res = data.data;
 						if(res && res.length>0){
 							if(_this.getData.pageNum==1){
 								_this.dataList=res;

pages_manage/views/gasBottle/gasList/gasListDetail.vue

@@ -124,7 +124,7 @@
 				let _this = this;
 				const {data} = await gasDetailRecord(this.getData);
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList=res
 					if(_this.dataList.length<=0){
 						_this.pageType=4

pages_manage/views/gasBottle/gasManage/gasManage.vue

@@ -166,7 +166,7 @@
 				let _this = this;
 				const {data} = await useRecordList(_this.getData)
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList=res
 				}
 			},
@@ -175,7 +175,7 @@
 				let _this = this;
 				const {data} = await listuseRecordByUserId(_this.getData)
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList2=res
 				}
 			},

pages_manage/views/gasBottle/leaveConfirm/leaveConfirm.vue

@@ -146,7 +146,7 @@
 				let _this = this;
 				const {data} = await gasDetailRecord(this.getData);
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					if(res){
 						_this.form2=res[0]
 					}
@@ -157,7 +157,7 @@
 				let _this = this;
 				const {data} = await gasBottleErrorList(this.getData);
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					if(res){
 						_this.form3=res[0]
 

pages_manage/views/gasBottle/useGasApply/useGasApply.vue

@@ -67,7 +67,7 @@
 				const {data} = await useAgsApplyList(this.getData)
 				if(data.code == 200){
 					let _this=this;
-					let res=data.rows
+					let res=data.data.records
 					if(_this.getData.pageNum==1){
 						_this.dataList=res;
 						if(res.length>0){

pages_manage/views/gasBottle/useGasApply/useGasApplyAdd.vue

@@ -124,7 +124,7 @@
 			    const {data} = await googsList({id:this.id})
 			    if(data.code==200){
 					let _this=this;
-					let res=data.rows
+					let res=data.data.records
 					_this.pickerArrayList2=res;
 					res.forEach(function(item){
 						_this.pickerArray2.push(item.goodsName);
@@ -246,7 +246,7 @@
 							self.form.applyCertificate=res.data.url
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_manage/views/gasBottle/useRecord/useRecord.vue

@@ -71,7 +71,7 @@
 				let _this = this;
 				const {data} = await useRecordList({id:this.id})
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList=res
 				}
 			},

pages_manage/views/gasBottle/useRegister/giveRegister.vue

@@ -120,7 +120,7 @@
 
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_manage/views/gasBottle/useRegister/useRegister.vue

@@ -171,7 +171,7 @@
 
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_student/views/gasBottle/examination/examination.vue

@@ -65,7 +65,7 @@
 				const {data} = await qualificationList(this.getData)
 				if(data.code == 200){
 					let _this=this;
-					let res=data.rows
+					let res=data.data.records
 					if(_this.getData.pageNum==1){
 						_this.dataList=res;
 						if(res.length>0){

pages_student/views/gasBottle/examination/examinationAdd.vue

@@ -251,7 +251,7 @@
 							self.form.applyCertificate=res.data.url
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_student/views/gasBottle/examination/examinationSelect.vue

@@ -113,7 +113,7 @@
 				    let _this = this;
 				    const {data} = await taskListGood(this.params);
 				    if(data.code==200){
-						let res=data.rows;
+						let res=data.data;
 						if(res){
 							let arr=[];
 							res.forEach(function(item){

pages_student/views/gasBottle/gasApply/gasApply.vue

@@ -71,7 +71,7 @@
 				   let _this=this;
 				    const {data} = await gasApplyList(this.getData);
 				    if(data.code==200){
-						let res=data.rows;
+						let res=data.data.records;
 						if(_this.getData.pageNum==1){
 							_this.dataList=res;
 							if(res.length>0){

pages_student/views/gasBottle/gasApply/gasApplyAdd.vue

@@ -136,7 +136,7 @@
 
 				    const {data} = await taskListGood(this.params);
 				    if(data.code==200){
-						let res=data.rows;
+						let res=data.data;
 						if(res){
 
 							if(_this.params.pageNum==1){

pages_student/views/gasBottle/gasApply/gasApplyList.vue

@@ -132,7 +132,7 @@
 				const {data} = await gasApplyDetailYrk({id:_this.id});
 				if(data.code==200){
 					if(data.code==200){
-						let res = data.rows;
+						let res = data.data;
 						_this.dataList=res
 					}
 				}
@@ -143,7 +143,7 @@
 				const {data} = await gasApplyDetailYjs({id:_this.id});
 				if(data.code==200){
 					if(data.code==200){
-						let res = data.rows;
+						let res = data.data;
 						_this.dataList=res
 					}
 				}

pages_student/views/gasBottle/gasApply/gasApplyReject.vue

@@ -92,7 +92,7 @@
 
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_student/views/gasBottle/gasList/gasList.vue

@@ -69,7 +69,7 @@
 
 				    const {data} = await gasList(_this.getData);
 				    if(data.code==200){
-						let res = data.rows;
+						let res = data.data;
 						if(res && res.length>0){
 							if(_this.getData.pageNum==1){
 								_this.dataList=res;

pages_student/views/gasBottle/gasList/gasListDetail.vue

@@ -124,7 +124,7 @@
 				let _this = this;
 				const {data} = await gasDetailRecord(this.getData);
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList=res
 					if(_this.dataList.length<=0){
 						_this.pageType=4

pages_student/views/gasBottle/gasManage/gasManage.vue

@@ -153,7 +153,7 @@
 				let _this = this;
 				const {data} = await useRecordList(_this.getData)
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList=res
 				}
 			},
@@ -162,7 +162,7 @@
 				let _this = this;
 				const {data} = await listuseRecordByUserId(_this.getData)
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList2=res
 				}
 			},

pages_student/views/gasBottle/leaveConfirm/leaveConfirm.vue

@@ -146,7 +146,7 @@
 				let _this = this;
 				const {data} = await gasDetailRecord(this.getData);
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					if(res){
 						_this.form2=res[0]
 					}
@@ -157,7 +157,7 @@
 				let _this = this;
 				const {data} = await gasBottleErrorList(this.getData);
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					if(res){
 						_this.form3=res[0]
 

pages_student/views/gasBottle/useGasApply/useGasApply.vue

@@ -70,7 +70,7 @@
 				} = await useAgsApplyList(this.getData)
 				if (data.code == 200) {
 					let _this = this;
-					let res = data.rows
+					let res = data.data.records
 					if (_this.getData.pageNum == 1) {
 						_this.dataList = res;
 						if (res.length > 0) {

pages_student/views/gasBottle/useGasApply/useGasApplyAdd.vue

@@ -124,7 +124,7 @@
 			    const {data} = await googsList({id:this.id})
 			    if(data.code==200){
 					let _this=this;
-					let res=data.rows
+					let res=data.data.records
 					_this.pickerArrayList2=res;
 					res.forEach(function(item){
 						_this.pickerArray2.push(item.goodsName);
@@ -246,7 +246,7 @@
 							self.form.applyCertificate=res.data.url
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_student/views/gasBottle/useRecord/useRecord.vue

@@ -71,7 +71,7 @@
 				let _this = this;
 				const {data} = await useRecordList({id:this.id})
 				if(data.code==200){
-					let res=data.rows
+					let res=data.data
 					_this.dataList=res
 				}
 			},

pages_student/views/gasBottle/useRegister/giveRegister.vue

@@ -120,7 +120,7 @@
 
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_student/views/gasBottle/useRegister/useRegister.vue

@@ -171,7 +171,7 @@
 
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_supplier/views/backlogManage/backlogManage.vue

@@ -118,7 +118,7 @@
 				const {data} = await supplierBacklogList(_this.getData);
 				if(data.code==200){
 					let _this = this;
-					let res=data.rows
+					let res=data.data.records
 					if(res && res.length>0){
 						if(_this.getData.pageNum==1){
 							_this.dataList=res;

pages_supplier/views/gasManage/gasManage.vue

@@ -1,149 +1,176 @@
 <!-- 气瓶管理 -->
 <template>
-    <view id="register">
+	<view id="register">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="register_li"  @click="goPage(item)" v-for="(item,index) in dataList" :key="index">
-		    	<view class="register_li_min" :style="index2===item.configVos.length-1?'border:none':''" v-for="(item2,index2) in item.configVos" :key="index2">
-		    		<view class="register_li_min_t">
-		    			<img class="right-img" :src="imagesUrl('supplier/icon_qpgl_qp.png')">
-		    			<text>{{item.airName}}</text>
-		    		</view>
-		    		<view class="register_li_min_b" >
-		    			<text >{{item2.configName}}</text>
-		    		</view>
-		    	</view>
-		    </view>
+			<view class="register_li" @click="goPage(item)" v-for="(item,index) in dataList" :key="index">
+				<view class="register_li_min" :style="index2===item.configVos.length-1?'border:none':''"
+					v-for="(item2,index2) in item.configVos" :key="index2">
+					<view class="register_li_min_t">
+						<img class="right-img" :src="imagesUrl('supplier/icon_qpgl_qp.png')">
+						<text>{{item.airName}}</text>
+					</view>
+					<view class="register_li_min_b">
+						<text>{{item2.configName}}</text>
+					</view>
+				</view>
+			</view>
 		</scroll-view>
 		<view class="empty" v-if="pageType==4">
 			<img class="for-back-img" :src="imagesUrl('commonality/img_ysrygl_zwsj.png')">
-			<view>暂无数据</view>
+			<view class="text-null">暂无数据</view>
 		</view>
 
-		<view class="sub_btn" @click="subBtn()"><img class="right-img" :src="imagesUrl('supplier/icon_gysqpgl_xzqp.png')">新增气瓶</view>
+		<view class="sub_btn" @click="subBtn()"><img class="right-img"
+				:src="imagesUrl('supplier/icon_gysqpgl_xzqp.png')">新增气瓶</view>
 	</view>
 </template>
 
 <script>
-    import {bottleList} from '@/api/apiDemo/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				pageType:0,
+	import {
+		bottleList
+	} from '@/api/apiDemo/index.js'
+	import {
+		config
+	} from '@/api/request/config.js'
+	export default {
+		data() {
+			return {
+				pageType: 0,
 				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:20,
+				getData: {
+					pageNum: 1,
+					pageSize: 20,
 				},
-				dataList:[],
-            }
-        },
-        onLoad(option) {
+				dataList: [],
+			}
+		},
+		onLoad(option) {
 
-        },
-        onShow(){
+		},
+		onShow() {
 
 
 
-        },
+		},
 
-        methods: {
+		methods: {
 			//滚动加载事件
-			scrollGet(){
-			    this.getData.pageNum += 1;
-			    this.getList();
+			scrollGet() {
+				this.getData.pageNum += 1;
+				this.getList();
 			},
-			subBtn(){
+			subBtn() {
 				uni.redirectTo({
-				    url:'/pages_supplier/views/gasManage/gasManageAdd?status=0'
+					url: '/pages_supplier/views/gasManage/gasManageAdd?status=0'
 				});
 			},
-			goPage(d){
+			goPage(d) {
 				uni.redirectTo({
-				    url:'/pages_supplier/views/gasManage/gasManageDetail?status=1&id='+d.id
+					url: '/pages_supplier/views/gasManage/gasManageDetail?status=1&id=' + d.id
 				});
 			},
 			//获取列表数据
-			async getList(){
-			    let _this = this;
-			    const {data} = await bottleList(this.getData)
-			    if(data.code==200){
-					let res =data.rows
-					if(_this.getData.pageNum==1){
-						_this.dataList=res;
-						if(res.length>0){
-							_this.pageType=0;
-						}else{
-							_this.pageType=4;
+			async getList() {
+				let _this = this;
+				const {
+					data
+				} = await bottleList(this.getData)
+				if (data.code == 200) {
+					let res = data.data.records
+					if (_this.getData.pageNum == 1) {
+						_this.dataList = res;
+						if (res.length > 0) {
+							_this.pageType = 0;
+						} else {
+							_this.pageType = 4;
 						}
-					}else{
-						_this.dataList=_this.dataList.concat(res);
+					} else {
+						_this.dataList = _this.dataList.concat(res);
 					}
-			    }
+				}
 			},
-        },
+		},
 		mounted() {
 			this.getList()
 		}
-    }
+	}
 </script>
 
 <style lang="stylus" scoped>
-    #register{
-        height:100%;
-        width:100%;
-        display flex;
-        flex-direction column;
-
-		.scroll-box{
-		// flex:1;
-		 overflow-y scroll;
-		 padding-top: 30rpx;
-		 padding-bottom: 180rpx;
-		 .register_li{
-			 overflow: hidden;
-		 	background #fff;
-		 	margin: 20rpx;
-		 	border-radius: 20rpx;
-		 	.register_li_min{
-		 		height: auto;
-		 		margin:20rpx;
-		 		border-bottom: 1px solid #F5F5F5;
-		 		.register_li_min_t{
-		 			display flex;
-		 			align-items center;
-		 			>img{
-		 				width: 34rpx;
-		 				height: 34rpx;
-		 			}
-		 			>text{
-		 				font-size: 28rpx;
-		 				font-family: PingFang SC;
-		 				font-weight: 500;
-		 				color: #333333;
-		 				line-height: 28rpx;
-		 				margin-left: 14rpx;
-		 			}
-		 		}
-		 		.register_li_min_b{
-		 			margin-top: 24rpx;
-		 			display: flex;
-		 			justify-content: flex-start;
-					flex-wrap: wrap;
-		 			margin-bottom: 20rpx;
-		 			>text{
-		 				font-size: 26rpx;
-		 				font-family: PingFang SC;
-		 				font-weight: 500;
-		 				color: #999999;
-		 				line-height: 26rpx;
-		 			}
-		 		}
-		 	}
-		 }
-		 }
+	#register {
+		height: 100%;
+		width: 100%;
+		display flex;
+		flex-direction column;
+
+		.empty {
+			.for-back-img {
+				margin: auto;
+			}
+			.text-null {
+				text-align: center;
+				line-height: 200rpx;
+				color:#999;
+			}
+		}
+
+		.scroll-box {
+			// flex:1;
+			overflow-y scroll;
+			padding-top: 30rpx;
+			padding-bottom: 180rpx;
+
+			.register_li {
+				overflow: hidden;
+				background #fff;
+				margin: 20rpx;
+				border-radius: 20rpx;
+
+				.register_li_min {
+					height: auto;
+					margin: 20rpx;
+					border-bottom: 1px solid #F5F5F5;
+
+					.register_li_min_t {
+						display flex;
+						align-items center;
+
+						>img {
+							width: 34rpx;
+							height: 34rpx;
+						}
+
+						>text {
+							font-size: 28rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #333333;
+							line-height: 28rpx;
+							margin-left: 14rpx;
+						}
+					}
+
+					.register_li_min_b {
+						margin-top: 24rpx;
+						display: flex;
+						justify-content: flex-start;
+						flex-wrap: wrap;
+						margin-bottom: 20rpx;
+
+						>text {
+							font-size: 26rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 26rpx;
+						}
+					}
+				}
+			}
+		}
+
 		/* 按钮 */
-		.sub_btn{
+		.sub_btn {
 			width: 650rpx;
 			height: 100rpx;
 			background: #0183FA;
@@ -156,12 +183,13 @@
 			text-align: center;
 			margin-left: 50rpx;
 			position: fixed;
-			bottom:30rpx;
+			bottom: 30rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			z-index: 1000;
-			>img{
+
+			>img {
 				width: 28rpx;
 				height: 28rpx;
 				margin-right: 12rpx;
@@ -169,5 +197,4 @@
 		}
 
 	}
-
-</style>
+</style>

pages_supplier/views/gasManage/gasManageAdd.vue

@@ -78,7 +78,7 @@
 			    let _this = this;
 			    const {data} = await googsList()
 			    if(data.code==200){
-					let res=data.rows;
+					let res=data.data.records;
 					_this.googsArray=res;
 					if(res){
 						res.forEach(function(item){
@@ -171,7 +171,7 @@
 					    });
 					    setTimeout(function(){
 					       uni.redirectTo({
-					       	url: '/pages/views/supplierWorkbench',
+					       	url: '/pages/views/home/home',
 					       });
 					    },2000);
 					}
@@ -186,7 +186,7 @@
 					    });
 					    setTimeout(function(){
 					       uni.redirectTo({
-					       	url: '/pages/views/supplierWorkbench',
+					       	url: '/pages/views/home/home',
 					       });
 					    },2000);
 					}

pages_supplier/views/gasManage/gasManageDetail.vue

@@ -75,7 +75,7 @@
 			    let _this = this;
 			    const {data} = await googsList()
 			    if(data.code==200){
-					let res=data.rows;
+					let res=data.data.records;
 					_this.googsArray=res;
 					if(res){
 						res.forEach(function(item){

pages_supplier/views/gasRecycle/gasRecycle.vue

@@ -129,7 +129,7 @@
 				const {data} = await gasRecycleList(_this.getData);
 				if(data.code==200){
 					let _this = this;
-					let res=data.rows
+					let res=data.data.records
 					if(res && res.length>0){
 						if(_this.getData.pageNum==1){
 							_this.dataList=res;

pages_supplier/views/register/registerTow.vue

@@ -82,7 +82,7 @@
 							item.naturalUrl=res.data.url;
 						}else{
 							uni.showToast({
-								title: res.msg,
+								title: res.message,
 								icon:"none",
 								mask:true,
 								duration: 2000

pages_supplier/views/transportCar/transportCarAdd.vue

@@ -93,7 +93,7 @@
        						item.naturalUrl=res.data.url;
        					}else{
        						uni.showToast({
-       							title: res.msg,
+       							title: res.message,
        							icon:"none",
        							mask:true,
        							duration: 2000
@@ -268,7 +268,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/views/supplierWorkbench',
+						       	url: '/pages/views/home/home',
 						       });
 						    },2000);
 						}
@@ -284,7 +284,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/views/supplierWorkbench',
+						       	url: '/pages/views/home/home',
 						       });
 						    },2000);
 						}

pages_supplier/views/transportPerson/transportPersonAdd.vue

@@ -10,7 +10,7 @@
 			<view class="register_li_min" style="border: none;">
 			    <view>*</view>
 				<view>联系方式：</view>
-				<input v-model="form.phone"   type="text" placeholder-style="color:#999;" placeholder="请输入联系方式">
+				<input v-model="form.phone" maxlength="11" type="text" placeholder-style="color:#999;" placeholder="请输入联系方式">
 			</view>
 		</view>
 		<view class="register_li2"  v-for="(item,index) in userCredentialsDtos" :key="index">
@@ -96,7 +96,7 @@
        						item.naturalUrl=res.data.url;
        					}else{
        						uni.showToast({
-       							title: res.msg,
+       							title: res.message,
        							icon:"none",
        							mask:true,
        							duration: 2000
@@ -288,7 +288,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/views/supplierWorkbench',
+						       	url: '/pages/views/home/home',
 						       });
 						    },2000);
 						}
@@ -304,7 +304,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/views/supplierWorkbench',
+						       	url: '/pages/views/home/home',
 						       });
 						    },2000);
 						}