自贡随手拍BUG处理

common/admin.js

@@ -6,8 +6,10 @@ var config = {
 	// sysweburl: "https://www.zgsafesp.cn",
 	sysweburl: "http://110.188.24.28:50200", // 测试
 	// sysweburl: "http://110.188.24.28:50300", // 开发
-	upfileurl: "http://110.188.24.28:50120/file/upload",
-	// upfileurl: "/zg12345/SSP.asmx/WriteFilesNew",
+	upfileurl: "http://110.188.24.28:50120/file/upload", // 测试
+	// upfileurl: "http://171.94.154.2:50105/hlfs/file/upload", // 正式
+	getfileurl: "http://110.188.24.28:50120", // 测试
+	// getfileurl: "http://171.94.154.2:50105/hlfs", // 正式
 	// upuserimgurl: "/zg12345/SSP.asmx/UserImg"
 }
 

manifest.json

@@ -64,7 +64,10 @@
             }
         },
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
-        "plugins" : {}
+        "plugins" : {},
+		"optimization":{
+			"subPackages":true
+		}
     },
     // "chooseLocation": {
     // 	"version": "1.0.10",

pages.json

@@ -238,6 +238,16 @@
 					}
 				}
 			]
+		}, {
+			"root": "pagesPointsBase",
+			"pages": [
+				{
+					"path": "Points/Index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}
+			]
 		}
 	],
 	// "preloadRule": {

pages/BaseTabBar/Home.vue

@@ -116,10 +116,12 @@
 			},
 			// 不同类型隐患上报
 			toWrite(obj) {
-				let strUrl = obj.pageUrl || '/pagesBase/Write/ReportHiddenDanger'
+				// let strUrl = obj.pageUrl || 'comingSoon'
+				// let strUrl = 'comingSoon'
 				// let strUrl = '/pagesBase/Write/ReportHiddenDanger'
 				// let strUrl = '/pagesBase/Write/LivelihoodFacts'
 				// let strUrl = '/pagesBase/Write/WeldingOperations'
+				let strUrl = '/pagesPointsBase/Points/Index'
 				// let strUrl = 'navigateToMiniProgramByAppId?appId=wxc564149bc4d892f3&path=pages/index/index&type=WeldingOperations'
 				// let strUrl = 'navigateToExternalLinks?externalUrl=https://zgyjglyzpt.cn'
 				if (strUrl.indexOf("navigateToMiniProgramByAppId") !== -1){
@@ -168,6 +170,8 @@
 							url: '/pages/ExternalLinks/Index?externalUrl=' + encodeURIComponent(externalUrl)
 						})
 					// });
+				}else if (strUrl.indexOf("comingSoon") !== -1){
+					that.$util.msg("功能即将上线，敬请期待！");
 				}else {
 					if (!that.openID) {
 						that.$util.msg("请先登录", function(){

pages/CareTabBar/Home.vue

@@ -108,7 +108,8 @@
 			},
 			// 不同类型隐患上报
 			toWrite(obj) {
-				let strUrl = obj.pageCareUrl || '/pagesCare/Write/ReportHiddenDanger'
+				let strUrl = obj.pageCareUrl || 'comingSoon'
+				// let strUrl = 'comingSoon'
 				// let strUrl = '/pagesCare/Write/ReportHiddenDanger'
 				// let strUrl = '/pagesCare/Write/LivelihoodFacts'
 				// let strUrl = '/pagesCare/Write/WeldingOperations'
@@ -160,6 +161,8 @@
 							url: '/pages/ExternalLinks/Index?externalUrl=' + encodeURIComponent(externalUrl)
 						})
 					// });
+				}else if (strUrl.indexOf("comingSoon") !== -1){
+					that.$util.msg("功能即将上线，敬请期待！");
 				}else {
 					if (!that.openID) {
 						that.$util.msg("请先登录", function(){

pagesBase/Order/View.vue

@@ -65,7 +65,7 @@
 				</view>
 				<view class="infoItemBox">
 					<text class="infoLable">上报时间</text>
-					<text class="infoText">{{infoData.handleTime || ''}}</text>
+					<text class="infoText">{{infoData.creationTime || ''}}</text>
 				</view>
 				<view class="infoItemBox" v-if="photoList.length > 0">
 					<text class="infoLable">现场图片</text>
@@ -174,7 +174,7 @@
 						if (res.workflow && res.workflow.length > 0){
 							that.onFlowData(res.workflow)
 						}
-						res.handleTime = that.$util.formatTime(new Date(res.handleTime))
+						res.creationTime = that.$util.formatTime(new Date(res.creationTime))
 						that.infoData = res;
 					}
 					typeof fun === 'function' && fun();
@@ -192,7 +192,7 @@
 						if (res.workflow && res.workflow.length > 0){
 							that.onFlowData(res.workflow)
 						}
-						res.handleTime = that.$util.formatTime(new Date(res.handleTime))
+						res.creationTime = that.$util.formatTime(new Date(res.creationTime))
 						that.infoData = res;
 					}
 					typeof fun === 'function' && fun();

pagesBase/Write/WeldingOperations.vue

@@ -15,12 +15,12 @@
 									<view class="fway-form-input-select">
 										<radio-group @change="bindWorkTypeChange">
 											<label class="fway-form-checkbox" v-for="(item, index) in WorkTypeData" :key="index">
-												<radio style="transform:scale(0.8);" color="#3e6ffd" :value="item.dicDataName"></radio>{{item.dicDataName}}
+												<radio style="transform:scale(0.8);" color="#3e6ffd" :value="item.dicDataValue"></radio>{{item.dicDataName}}
 											</label>
 										</radio-group>
 									</view>
 								</view>
-								<view class="fway-form-item" v-show="data.jobType == '气割'">
+								<view class="fway-form-item" v-show="data.jobType == '1'">
 									<view class="fway-form-lable" style="width: 260rpx;"><text class="mustTips">*</text>购气单位/个人名称</view>
 									<view class="fway-form-input-inline" style="width: calc(100% - 290rpx);">
 										<input type="text" class="fway-form-input" placeholder="请填写购气单位/个人名称" v-model="data.companyName" @tap="inputTap" data-focus="companyName" :focus="focusID == 'companyName' ? true : false" />
@@ -473,7 +473,7 @@
 					that.$util.msg("请选择作业类型！");
 					return false;
 				}
-				if(that.data.jobType == '气割' && !that.data.companyName){
+				if(that.data.jobType == '1' && !that.data.companyName){
 					that.$util.msg("请填写购气单位/个人名称！");
 					return false;
 				}
@@ -555,10 +555,9 @@
 				that.data.workplaceName = that.FirstPlaceNameData[that.indexFirstPlaceName].dicDataName + '-' + that.SecondPlaceNameData[that.indexSecondPlaceName].dicDataName;
 				that.data.workArea = that.selectAreaName;
 				that.data.workAreaId = that.AreaData[1][that.indexArea[1]].id;
-				if(that.data.jobType != '气割'){
+				if(that.data.jobType != '1'){
 					that.data.companyName = '';
 				}
-				that.data.jobType = that.data.jobType == '气割' ? '1' : (that.data.jobType == '电焊' ? '0' : null) 
 				let params = that.data;
 				console.log(JSON.stringify(params))
 				that.$admin.req({

pagesCare/Order/View.vue

@@ -65,7 +65,7 @@
 				</view>
 				<view class="infoItemBox">
 					<text class="infoLable">上报时间</text>
-					<text class="infoText">{{infoData.handleTime || ''}}</text>
+					<text class="infoText">{{infoData.creationTime || ''}}</text>
 				</view>
 				<view class="infoItemBox" v-if="photoList.length > 0">
 					<text class="infoLable">现场图片</text>
@@ -174,7 +174,7 @@
 						if (res.workflow && res.workflow.length > 0){
 							that.onFlowData(res.workflow)
 						}
-						res.handleTime = that.$util.formatTime(new Date(res.handleTime))
+						res.creationTime = that.$util.formatTime(new Date(res.creationTime))
 						that.infoData = res;
 					}
 					typeof fun === 'function' && fun();
@@ -192,7 +192,7 @@
 						if (res.workflow && res.workflow.length > 0){
 							that.onFlowData(res.workflow)
 						}
-						res.handleTime = that.$util.formatTime(new Date(res.handleTime))
+						res.creationTime = that.$util.formatTime(new Date(res.creationTime))
 						that.infoData = res;
 					}
 					typeof fun === 'function' && fun();

pagesCare/Write/WeldingOperations.vue

@@ -15,12 +15,12 @@
 									<view class="fway-form-input-select">
 										<radio-group @change="bindWorkTypeChange">
 											<label class="fway-form-radioBox" style="margin-right: 0;" v-for="(item, index) in WorkTypeData" :key="index">
-												<radio style="transform:scale(1)" color="#3e6ffd" :value="item.dicDataName"></radio>{{item.dicDataName}}
+												<radio style="transform:scale(1)" color="#3e6ffd" :value="item.dicDataValue"></radio>{{item.dicDataName}}
 											</label>
 										</radio-group>
 									</view>
 								</view>
-								<view class="fway-form-item" v-show="data.jobType == '气割'">
+								<view class="fway-form-item" v-show="data.jobType == '1'">
 									<view class="fway-form-lable" style="width: 320rpx;"><text class="mustTips">*</text>购气单位/个人名称</view>
 									<view class="fway-form-input-inline" style="width: calc(100% - 350rpx);">
 										<input type="text" class="fway-form-input" placeholder="请填写名称" v-model="data.companyName" @tap="inputTap" data-focus="companyName" :focus="focusID == 'companyName' ? true : false" />
@@ -473,7 +473,7 @@
 					that.$util.msg("请选择作业类型！");
 					return false;
 				}
-				if(that.data.jobType == '气割' && !that.data.companyName){
+				if(that.data.jobType == '1' && !that.data.companyName){
 					that.$util.msg("请填写购气单位/个人名称！");
 					return false;
 				}
@@ -555,10 +555,9 @@
 				that.data.workplaceName = that.FirstPlaceNameData[that.indexFirstPlaceName].dicDataName + '-' + that.SecondPlaceNameData[that.indexSecondPlaceName].dicDataName;
 				that.data.workArea = that.selectAreaName;
 				that.data.workAreaId = that.AreaData[1][that.indexArea[1]].id;
-				if(that.data.jobType != '气割'){
+				if(that.data.jobType != '1'){
 					that.data.companyName = '';
 				}
-				that.data.jobType = that.data.jobType == '气割' ? '1' : (that.data.jobType == '电焊' ? '0' : null)
 				let params = that.data;
 				console.log(JSON.stringify(params))
 				that.$admin.req({