Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/pages/index/order.vue

@@ -301,6 +301,7 @@
 						+ "&categoryId=" + item.categoryId 
 						+ "&orderServiceType=" + item.orderServiceType
 						+ "&inGuaranteePeriod=" + item.inGuaranteePeriod
+						+ "&partnerCompanyId=" + item.partnerCompanyId
 						+ "&auditResultsId=" + (item.auditResults?Object.keys(item.auditResults)[Object.keys(item.auditResults).length - 1]:'')
 				})
 			},

src/pages/order/complete.vue

@@ -632,7 +632,8 @@
             // 获取拍照规范
             photograph(){
 				let self = this
-				let param = {"partnerCompanyId":this.partnerCompanyId,
+				let param = {
+                    "partnerCompanyId":this.partnerCompanyId || '',
 					"categoryId":this.categoryId,
 					"brandId":this.brandId || '',
 					"fieldName":this.photoItem.fieldsName}
@@ -650,7 +651,7 @@
 				if(getApp().globalData.photo.waterSetting){
 					return
 				}
-				var data={partnerCompanyId:this.partnerCompanyId}
+				var data={partnerCompanyId:this.partnerCompanyId || ''}
 				this.$u.api.getWatermark(data).then((res) => {
 					if (res.code == 200) {
 						getApp().globalData.photo.waterSetting = res.data
@@ -667,7 +668,6 @@
                 if (this.arr.length == 0) {
                     await this.getMenuItemTop();
                 }
-                console.log("index, this.current", index, this.current)
                 if (index == this.current) return;
                 this.scrollRightTop = this.oldScrollTop;
                 this.$nextTick(function() {

src/plugins/uploader/index.js

@@ -184,7 +184,7 @@ uploader.requestError = function(e) {
 		throw e;
 	} else {
 		uni.showToast({
-			title: "当前网络信号较差，请耐心等待；或者尝试切换网络环境",
+			title: "当前网络信号较差，请耐心等待或尝试切换网络环境",
 			icon: "none"
 		});
 	}