zc

pages/views/home/home.vue

@@ -1,8 +1,8 @@
 <template>
 	<view id="home">
-		<!-- <teacherHome class="flex-box-page" v-if="userType==1"></teacherHome>
-		<pupilHome class="flex-box-page" v-if="userType==2"></pupilHome> -->
-		<supplierWorkbench class="flex-box-page"></supplierWorkbench>
+		<teacherHome class="flex-box-page" v-if="userType==1"></teacherHome>
+		<pupilHome class="flex-box-page" v-if="userType==2"></pupilHome>
+		<supplierWorkbench v-if="userType==5" class="flex-box-page"></supplierWorkbench>
 	</view>
 </template>
 <script>

pages/views/login/login.vue

@@ -6,8 +6,8 @@
 		<view class="null-p"></view>
 		<img class="login-img" @click="verificationButton(2)" :src="imagesUrl('commonality/img_tyrzdl_ch%402x.png')">
 		<view class="ssoButton" @click="goPage('ssoLogin')">统一身份认证登录</view>
-		<view class="accountButton" v-if="!weChatProgramVersion"
-		@click="goPage('accountLogin')">账号密码登录</view>
+		<view class="accountButton" v-if="!weChatProgramVersion" @click="goPage('accountLogin')">账号密码登录</view>
+		<view class="accountButton" v-if="!weChatProgramVersion" @click="goPage('register')">供应商注册</view>
 		<view class="position-top-right-box"></view>
 		<view class="position-bottom-left-box" @click="verificationButton(5)"></view>
 	</view>
@@ -45,6 +45,11 @@
 					uni.navigateTo({
 						url: '/pages/views/login/accountLogin'
 					});
+				}else if(type == 'register'){
+					console.log('type',type)
+					uni.navigateTo({
+						url: '/pages_supplier/views/register/register?pageStatus=0'
+					});
 				}
 			},
 			//查询公共配置

pages_basics/views/earlyWarningManage/earlyWarningDetail.vue

@@ -457,7 +457,7 @@
 							this.$set(this,'videoType',false);
 							return
 						}
-						let url = uni.getStorageSync('cameraExtranetAgent')+'?cameraIndexCode='+newData.cameraIndexCode+'&startTime='+newData.startTime+'&endTime='+newData.endTime
+						let url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=1&cameraIndexCode='+newData.cameraIndexCode+'&startTime='+newData.startTime+'&endTime='+newData.endTime
 						this.$set(this,'webViewUrl',url);
 						this.$set(this,'videoType',true);
 					}else{

pages_manage/views/laboratory/videoPlayer.vue

@@ -18,9 +18,9 @@
 						let obj = JSON.parse(decodeURIComponent(option.item))
 						let url = '';
 						if(obj.type == 4){
-							url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+							url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=1&source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 						}else if(obj.type == 5){
-							url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+							url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=1&source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 						}
 						this.$set(this,'webViewUrl',url);
 						this.$set(this,'pageType',true);

pages_supplier/views/backlogManage/backlogManage.vue

@@ -94,15 +94,15 @@
 			goInfo(d){
 				if(d.remark=='gq'){
 					uni.redirectTo({
-					    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.redirectTo({
-					    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.redirectTo({
-					    url:'/pages_supplier/backlogManage/backlogManageIssueDetail?item='+encodeURIComponent(JSON.stringify(d))
+					    url:'/pages_supplier/views/backlogManage/backlogManageIssueDetail?item='+encodeURIComponent(JSON.stringify(d))
 					});
 				}
 

pages_supplier/views/backlogManage/backlogManageIssueDetail.vue

@@ -129,7 +129,7 @@
 				    });
 				   setTimeout(function(){
 				       uni.redirectTo({
-				            url: '/pages_supplier/backlogManage/backlogManage'
+				            url: '/pages_supplier/views/backlogManage/backlogManage'
 				        });
 				    },2000);
 				}

pages_supplier/views/backlogManage/backlogManageRecycleDetail.vue

@@ -195,7 +195,7 @@
 				    });
 				   setTimeout(function(){
 				       uni.redirectTo({
-				            url: '/pages_supplier/backlogManage/backlogManage'
+				            url: '/pages_supplier/views/backlogManage/backlogManage'
 				        });
 				    },2000);
 				}

pages_supplier/views/gasManage/gasManage.vue

@@ -55,12 +55,12 @@
 			},
 			subBtn(){
 				uni.redirectTo({
-				    url:'/pages_supplier/gasManage/gasManageAdd?status=0'
+				    url:'/pages_supplier/views/gasManage/gasManageAdd?status=0'
 				});
 			},
 			goPage(d){
 				uni.redirectTo({
-				    url:'/pages_supplier/gasManage/gasManageDetail?status=1&id='+d.id
+				    url:'/pages_supplier/views/gasManage/gasManageDetail?status=1&id='+d.id
 				});
 			},
 			//获取列表数据

pages_supplier/views/gasManage/gasManageAdd.vue

@@ -171,7 +171,7 @@
 					    });
 					    setTimeout(function(){
 					       uni.redirectTo({
-					       	url: '/pages/supplierWorkbench',
+					       	url: '/pages/views/supplierWorkbench',
 					       });
 					    },2000);
 					}
@@ -186,7 +186,7 @@
 					    });
 					    setTimeout(function(){
 					       uni.redirectTo({
-					       	url: '/pages/supplierWorkbench',
+					       	url: '/pages/views/supplierWorkbench',
 					       });
 					    },2000);
 					}

pages_supplier/views/gasManage/gasManageDetail.vue

@@ -124,7 +124,7 @@
 			//提交
 			async submitForm(){
 				uni.redirectTo({
-				    url:'/pages_supplier/gasManage/gasManageAdd?status=1&id='+this.id
+				    url:'/pages_supplier/views/gasManage/gasManageAdd?status=1&id='+this.id
 				});
 			},
 

pages_supplier/views/gasRecycle/gasRecycle.vue

@@ -105,15 +105,15 @@
 			goInfo(d){
 				if(d.remark=='gq'){
 					uni.redirectTo({
-					    url:'/pages_supplier/gasRecycle/gasRecycleAirDetail?item='+encodeURIComponent(JSON.stringify(d))+'&status='+this.curTab
+					    url:'/pages_supplier/views/gasRecycle/gasRecycleAirDetail?item='+encodeURIComponent(JSON.stringify(d))+'&status='+this.curTab
 					});
 				}else if(d.remark=='hs'){
 					uni.redirectTo({
-					    url:'/pages_supplier/gasRecycle/gasRecycleRecycleDetail?item='+encodeURIComponent(JSON.stringify(d))+'&status='+this.curTab
+					    url:'/pages_supplier/views/gasRecycle/gasRecycleRecycleDetail?item='+encodeURIComponent(JSON.stringify(d))+'&status='+this.curTab
 					});
 				}else if(d.remark=='wt'){
 					uni.redirectTo({
-					    url:'/pages_supplier/gasRecycle/gasRecycleIssueDetail?item='+encodeURIComponent(JSON.stringify(d))+'&status='+this.curTab
+					    url:'/pages_supplier/views/gasRecycle/gasRecycleIssueDetail?item='+encodeURIComponent(JSON.stringify(d))+'&status='+this.curTab
 					});
 				}
 

pages_supplier/views/gasRecycle/gasRecycleAirDetail.vue

@@ -199,7 +199,7 @@
 				    });
 				   setTimeout(function(){
 				       uni.redirectTo({
-				            url: '/pages_supplier/gasRecycle/gasRecycle'
+				            url: '/pages_supplier/views/gasRecycle/gasRecycle'
 				        });
 				    },2000);
 				}

pages_supplier/views/gasRecycle/gasRecycleIssueDetail.vue

@@ -134,7 +134,7 @@
 				    });
 				   setTimeout(function(){
 				       uni.redirectTo({
-				            url: '/pages_supplier/gasRecycle/gasRecycle'
+				            url: '/pages_supplier/views/gasRecycle/gasRecycle'
 				        });
 				    },2000);
 				}

pages_supplier/views/gasRecycle/gasRecycleRecycleDetail.vue

@@ -208,7 +208,7 @@
 				    });
 				   setTimeout(function(){
 				       uni.redirectTo({
-				            url: '/pages_supplier/gasRecycle/gasRecycle'
+				            url: '/pages_supplier/views/gasRecycle/gasRecycle'
 				        });
 				    },2000);
 				}

pages_supplier/views/mine/changePassword.vue

@@ -143,7 +143,7 @@
 				    });
 				    setTimeout(function(){
 				       uni.redirectTo({
-				       	url: '/pages/login',
+				       	url: '/pages/views/login/login',
 				       });
 				    },2000);
 				}

pages_supplier/views/mine/mine.vue

@@ -76,7 +76,7 @@
 			        uni.removeStorageSync('userId');
 			        uni.removeStorageSync('userType');
 			        uni.redirectTo({
-			            url: '/pages/login',
+			            url: '/pages/views/login/login',
 			        });
 			    }
 			},

pages_supplier/views/register/register.vue

@@ -37,7 +37,7 @@
 			<view class="register_li_min" >
 				<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 class="register_li_min" style="border-bottom:0;">
 				 <view style="margin-left: 12rpx;"></view>
@@ -231,9 +231,7 @@
 						this.form.phone='';
 						return
 					}
-
 				}
-
 				uni.navigateTo({
 				    url: '/pages_supplier/views/register/registerTow?form='+encodeURIComponent(JSON.stringify(this.form))+'&license='+encodeURIComponent(JSON.stringify(this.license)),//安全检查
 				});

pages_supplier/views/register/registerSuccess.vue

@@ -45,7 +45,7 @@
         methods: {
 			back(){
 				uni.redirectTo({
-					url: '/pages/login?status=3',
+					url: '/pages/views/login/login?status=3',
 				});
 			},
         }

pages_supplier/views/register/registerTow.vue

@@ -199,7 +199,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/login',
+						       	url: '/pages/views/login/login',
 						       });
 						    },2000);
 						}
@@ -214,7 +214,7 @@
 						    });
 						    setTimeout(function(){
 						        uni.redirectTo({
-						            url: '/pages_supplier/register/registerSuccess?form='+encodeURIComponent(JSON.stringify(_this.qpSupplierDto)),//注册
+						            url: '/pages_supplier/views/register/registerSuccess?form='+encodeURIComponent(JSON.stringify(_this.qpSupplierDto)),//注册
 						        });
 						    },2000);
 						}

pages_supplier/views/transportCar/transportCar.vue

@@ -75,13 +75,13 @@
 			},
 			addBtn(){
 				uni.redirectTo({
-				    url:'/pages_supplier/transportCar/transportCarAdd?status=0'
+				    url:'/pages_supplier/views/transportCar/transportCarAdd?status=0'
 				});
 			},
 			detailClick(d){
 				let id=d.id;
 				uni.redirectTo({
-				    url:'/pages_supplier/transportCar/transportCarDetail?id='+id
+				    url:'/pages_supplier/views/transportCar/transportCarDetail?id='+id
 				});
 			},
 			//获取列表数据

pages_supplier/views/transportCar/transportCarAdd.vue

@@ -268,7 +268,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/supplierWorkbench',
+						       	url: '/pages/views/supplierWorkbench',
 						       });
 						    },2000);
 						}
@@ -284,7 +284,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/supplierWorkbench',
+						       	url: '/pages/views/supplierWorkbench',
 						       });
 						    },2000);
 						}

pages_supplier/views/transportCar/transportCarDetail.vue

@@ -77,7 +77,7 @@
 			},
 			subBnt(){
 				uni.redirectTo({
-				    url:'/pages_supplier/transportCar/transportCarAdd?status=1&id='+this.id
+				    url:'/pages_supplier/views/transportCar/transportCarAdd?status=1&id='+this.id
 				});
 			},
 			lookItem(item){

pages_supplier/views/transportPerson/transportPerson.vue

@@ -75,13 +75,13 @@
 			},
 			addBtn(){
 				uni.redirectTo({
-				    url:'/pages_supplier/transportPerson/transportPersonAdd?status=0'
+				    url:'/pages_supplier/views/transportPerson/transportPersonAdd?status=0'
 				});
 			},
 			detailClick(d){
 				let id=d.id;
 				uni.redirectTo({
-				    url:'/pages_supplier/transportPerson/transportPersonDetail?id='+id
+				    url:'/pages_supplier/views/transportPerson/transportPersonDetail?id='+id
 				});
 			},
 			//获取列表数据

pages_supplier/views/transportPerson/transportPersonAdd.vue

@@ -288,7 +288,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/supplierWorkbench',
+						       	url: '/pages/views/supplierWorkbench',
 						       });
 						    },2000);
 						}
@@ -304,7 +304,7 @@
 						    });
 						    setTimeout(function(){
 						       uni.redirectTo({
-						       	url: '/pages/supplierWorkbench',
+						       	url: '/pages/views/supplierWorkbench',
 						       });
 						    },2000);
 						}

pages_supplier/views/transportPerson/transportPersonDetail.vue

@@ -83,7 +83,7 @@
 			},
 			subBnt(){
 				uni.redirectTo({
-				    url:'/pages_supplier/transportPerson/transportPersonAdd?status=1&id='+this.id
+				    url:'/pages_supplier/views/transportPerson/transportPersonAdd?status=1&id='+this.id
 				});
 			},
 			lookItem(item){