Merge branch 'VERSIONS-huaXuePinSaoMa' into VERSIONS-yinHuanQingDan2

pages/views/pupilPage/pupilHome.vue

@@ -171,13 +171,15 @@
 								codeData[item.split("=")[0]] = item.split("=")[1];
 							})
 							if (codeData.type == 1 || codeData.type == 2 || codeData.type == 3 || codeData.type == 7 ||
-								codeData.type == 8 || codeData.type == 9 || codeData.type == 10 ||
+								codeData.type == 8 || codeData.type == 10 ||
 								codeData.type == 11 || codeData.type == 12 || codeData.type == 13 || codeData.type == 14) {
 								uni.reLaunch({
 									url: '/pages/views/saoCode/saoCode?q=' + encodeURIComponent(res.result)
 								});
 							}else if(codeData.type == 5){
 								self.laboratorySubPassOutIsotopeSubSign(codeData.subId,res.result);
+							}else if(codeData.type == 9){
+								self.chemicalAppletSelectStockInfo(codeData.code);
 							}
 						}else{
 							self.chemicalAppletSelectStockInfo(res.result);

pages/views/teacherPage/teacherHome.vue

@@ -253,13 +253,15 @@
 								codeData[item.split("=")[0]] = item.split("=")[1];
 							})
 							if (codeData.type == 1 || codeData.type == 2 || codeData.type == 3 || codeData.type == 7 ||
-								codeData.type == 8 || codeData.type == 9 || codeData.type == 10 ||
+								codeData.type == 8 || codeData.type == 10 ||
 								codeData.type == 11 || codeData.type == 12 || codeData.type == 13 || codeData.type == 14) {
 								uni.reLaunch({
 									url: '/pages/views/saoCode/saoCode?q=' + encodeURIComponent(res.result)
 								});
 							}else if(codeData.type == 5){
 								self.laboratorySubPassOutIsotopeSubSign(codeData.subId,res.result);
+							}else if(codeData.type == 9){
+								self.chemicalAppletSelectStockInfo(codeData.code);
 							}
 						}else{
 							self.chemicalAppletSelectStockInfo(res.result);

pages_basics/views/chemicalsInfo/chemicalsInfo.vue

@@ -192,7 +192,7 @@
 				<img :src="imagesUrl('commonality/chemicalsInfoNull.png')">
 				<view>暂无数据</view>
 			</view>
-			<view class="get-null-box" v-if="getDataType">仅展示最近三个月使用记录</view>
+			<view class="get-null-box" v-if="dataList[0]">仅展示最近三个月使用记录</view>
 		</scroll-view>
 	</view>
 </template>