gjy 3 vuotta sitten
vanhempi
commit
43f388976e
4 muutettua tiedostoa jossa 34 lisäystä ja 10 poistoa
  1. 1 1
      pages.json
  2. 27 6
      pages/mine/company/addcompany.vue
  3. 2 2
      pages/order/addEvaluation.vue
  4. 4 1
      pages/release/release.vue

+ 1 - 1
pages.json

@@ -39,7 +39,7 @@
 			{
 			{
 				"pagePath": "pages/mine/index",
 				"pagePath": "pages/mine/index",
 				"iconPath": "static/mine/wode.png",
 				"iconPath": "static/mine/wode.png",
-				"selectedIconPath": "static/mine/tongzhi_check.png",
+				"selectedIconPath": "static/mine/wode_check.png",
 				"text": "我的"
 				"text": "我的"
 			}
 			}
 		],
 		],

+ 27 - 6
pages/mine/company/addcompany.vue

@@ -94,12 +94,12 @@
 				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
 				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
 					<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
 					<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
 				</view>
 				</view>
-				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" class="preview-card-img picture">
+				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" style='position:relative;' class="preview-card-img picture">
 					<view @click.stop="delCard(2)">
 					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 						</image>
 					</view>
 					</view>
-					<image class="uploadimage" :src="dataDetails.propertyAddressUrl" mode="aspectFit"></image>
+					<image class="uploadimage uploadimage-small" :src="dataDetails.propertyAddressUrl" mode="aspectFit"></image>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -235,6 +235,25 @@
 			...mapState(['hasLogin', 'userInfo']),
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		},
 		methods: {
 		methods: {
+			// getList(){
+			// 	uni.showLoading({
+			// 		title: '加载中',
+			// 		mask:true
+			// 	})
+			// 	var _this=this
+			// 	this.$request.baseRequest('get', '/companyInfo/getCompanyInfo', {id:this.dataDetails.id}).then(res => {
+			// 		uni.hideLoading()
+			// 		_this.dataDetails=res.data
+			// 	})
+			// 	.catch(res => {
+			// 		uni.hideLoading()
+			// 		uni.showToast({
+			// 			title: res.message,
+			// 			icon: 'none',
+			// 			duration: 2000
+			// 		})
+			// 	});
+			// },
 			companyNameBlur(){
 			companyNameBlur(){
 				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
 				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
 						commonId: this.userInfo.id,
 						commonId: this.userInfo.id,
@@ -297,7 +316,7 @@
 					})
 					})
 					return true
 					return true
 				}
 				}
-				if (this.dataDetails.companyName.length<4||this.dataDetails.companyName.length<25) {
+				if (this.dataDetails.companyName.length<4||this.dataDetails.companyName.length>25) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
 						message: "企业名称字数在4-25个字!",
 						message: "企业名称字数在4-25个字!",
@@ -447,7 +466,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
+							uploadImage(res.tempFilePaths[0], 'appData/',
 								result => {
 								result => {
 									// 上传成功回调函数
 									// 上传成功回调函数
 									console.log('图片地址', result)
 									console.log('图片地址', result)
@@ -476,7 +495,7 @@
 						sourceType: ['camera'],
 						sourceType: ['camera'],
 						success: function(res) {
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
+							uploadImage(res.tempFilePaths[0], 'appData/',
 								result => {
 								result => {
 									// 上传成功回调函数
 									// 上传成功回调函数
 									console.log('图片地址', result)
 									console.log('图片地址', result)
@@ -555,7 +574,9 @@
 	page {
 	page {
 		background: #F5F6FA;
 		background: #F5F6FA;
 	}
 	}
-
+/deep/uni-image.uploadimage-small{
+	width:100% !important;
+}
 	.next {
 	.next {
 		color: #2772FB;
 		color: #2772FB;
 		font-size: 13px;
 		font-size: 13px;

+ 2 - 2
pages/order/addEvaluation.vue

@@ -123,7 +123,7 @@
 			}
 			}
 		},
 		},
 		onNavigationBarButtonTap() {
 		onNavigationBarButtonTap() {
-			debugger
+			// debugger
 			let _data = {
 			let _data = {
 				evaluatoredId: this.objData.commonId,
 				evaluatoredId: this.objData.commonId,
 				evaluatorId: this.objData.cargoCommonId,
 				evaluatorId: this.objData.cargoCommonId,
@@ -202,7 +202,7 @@
 
 
 			},
 			},
 			getVal(e) {
 			getVal(e) {
-				debugger
+				// debugger
 				this.starIndex = e.value
 				this.starIndex = e.value
 				console.log(e)
 				console.log(e)
 			},
 			},

+ 4 - 1
pages/release/release.vue

@@ -586,7 +586,7 @@
 								}
 								}
 								// #endif
 								// #endif
 				this.isShowAlert = false
 				this.isShowAlert = false
-				if (this.validate()) return
+				
 				if (this.dataObj.billingMethod == '元/吨') {
 				if (this.dataObj.billingMethod == '元/吨') {
 					this.dataObj.billingMethod = 0
 					this.dataObj.billingMethod = 0
 				} else {
 				} else {
@@ -843,7 +843,10 @@
 				this.dataDetails.type = n
 				this.dataDetails.type = n
 			},
 			},
 			submit() {
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true;
 				this.isShowAlert = true;
+				
+				
 			},
 			},
 		}
 		}
 	}
 	}