gjy 2 years ago
parent
commit
ae1a6f846d

+ 2 - 2
config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 1 - 1
pages/goodSource/fk.vue

@@ -21,7 +21,7 @@
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
-		<view class="row3" @click="submit">提交</view>
+		<view class="row3" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>

+ 3 - 2
pages/goodSource/index.vue

@@ -33,7 +33,8 @@
 						}" :class="scrollTop>1200?'fixed':''"></u-tabs>
 			<view class="tab-right" @click="selectType">
 				<view>{{pickerSelect}}</view>
-				<u-icon name="arrow-down" size="20"></u-icon>
+				<image style='width:8px;height:8px;margin-left:5px;' :src="!showMenu?'../../static/images/order/xiala.png':'../../static/images/order/shangla.png'" mode=""></image>
+				<!-- <u-icon name="arrow-down" size="20"></u-icon> -->
 			</view>
 		</view>
 		<u-picker :show="show" :columns="columns" :closeOnClickOverlay='true' @close='selectTypeClose'
@@ -116,7 +117,7 @@
 		</mescroll-body>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>

+ 1 - 1
pages/goodSource/jb.vue

@@ -21,7 +21,7 @@
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
-		<view class="row3" @click="submit">提交</view>
+		<view class="row3" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>

+ 1 - 1
pages/goodSource/shippingDetails.vue

@@ -122,7 +122,7 @@
 			</view>
 			 <u-toast ref="uToast"></u-toast>
 			<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-				confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		</view>
 	</view>
 </template>

+ 1 - 1
pages/mine/driverCertificationNext.vue

@@ -774,7 +774,7 @@
 			},
 			btnBClick() {
 							// 此处用法为在js中调用,需要写uni.$u.throttle()
-				uni.$u.throttle(this.submit(), 500)
+				uni.$u.throttle(this.submit(), 5000)
 			},
 			submit() {
 	

+ 1 - 1
pages/mine/editDriverCertificationNext.vue

@@ -766,7 +766,7 @@
 			},
 			btnBClick() {
 							// 此处用法为在js中调用,需要写uni.$u.throttle()
-				uni.$u.throttle(this.submit(), 500)
+				uni.$u.throttle(this.submit(), 5000)
 			},
 			submit() {
 				if (!this.consentStatus) {

+ 0 - 2
pages/mine/index.vue

@@ -30,7 +30,6 @@
 					<view class="top">司机认证</view>
 					<view class="bottom">{{hasLogin? statusVal : '你还没有完成身份认证' }}</view>
 				</view>
-
 			</view>
 			<view @click="goDetailPage('/pages/mine/evaluate')" class="right">
 				<view class="icon">
@@ -41,7 +40,6 @@
 					<view class="top">货主评价</view>
 					<view class="bottom">看看货主对你的评价吧</view>
 				</view>
-
 			</view>
 		</view>
 		<view class="content2">

+ 1 - 1
pages/mine/manageBankCards/addBankCard.vue

@@ -60,7 +60,7 @@
 		</view>
 
 		<u-toast ref="uToast"></u-toast>
-		<view class="submit-btn" @click="submit">提交</view>
+		<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>

+ 1 - 1
pages/mine/manageBankCards/editBankCard.vue

@@ -50,7 +50,7 @@
 		</view>
 
 		<u-toast ref="uToast"></u-toast>
-		<view class="submit-btn" @click="submit">提交</view>
+		<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>

+ 1 - 1
pages/mine/manageBankCards/index.vue

@@ -33,7 +33,7 @@
 					<view class="default-card">设为默认收款账户</view>
 				</view>
 				<view>
-					<u-icon name="trash" size="24" @click="del(item,index)"></u-icon>
+					<u-icon name="trash" size="24" @click="$u.throttle(del(item,index), 5000)"></u-icon>
 				</view>
 			</view>
 		</view>

+ 1 - 1
pages/mine/manageVehicles/addVehicle.vue

@@ -363,7 +363,7 @@
 			<!-- <view class="level1-title">证件信息</view> -->
 		</view>
 		<view class='submit-btn-wrap'>
-			<view class="submit-btn" @click="submit">提交</view>
+			<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
 		</view>
 		
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"

+ 19 - 5
pages/mine/manageVehicles/editVehicle.vue

@@ -300,18 +300,18 @@
 				</view>
 
 				<view class="flex row">
-					<view class="left-text">车辆所属车主</view>
+					<view class="left-text">挂车车辆所属车主</view>
 					<u--input placeholder="输入车主姓名" inputAlign='right' border="none" v-model="dataDetails.guaOwner">
 					</u--input>
 				</view>
 				<view class="flex row">
-					<view class="left-text">整备质量(千克)</view>
+					<view class="left-text">挂车整备质量(千克)</view>
 					<u--input placeholder="输入总质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaServicingWeight">
 					</u--input>
 				</view>
 				<view class="flex row">
-					<view class="left-text">核定载质量(千克)</view>
+					<view class="left-text">挂车核定载质量(千克)</view>
 					<u--input placeholder="输入核定载质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaCarApprovedWeight">
 					</u--input>
@@ -354,7 +354,7 @@
 			<!-- <view class="level1-title">证件信息</view> -->
 		</view>
 		<view class='submit-btn-wrap'>
-			<view class="submit-btn" @click="submit">提交</view>
+			<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
 		</view>
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
@@ -1050,7 +1050,14 @@
 					})
 					return true
 				}
-				
+				if (uni.$u.test.isEmpty(this.dataDetails.carApprovedWeight)&& this.sign == '非挂车' && this.dataDetails.carApprovedWeight<500||
+				uni.$u.test.isEmpty(this.dataDetails.carApprovedWeight) && this.sign == '非挂车' && this.dataDetails.carApprovedWeight>60000) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "核定载质量输入错误!",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.servicingWeight) && this.sign == '挂车') {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1259,6 +1266,13 @@
 						})
 						return true
 					} 
+					if (this.dataDetails.guaCarApprovedWeight<500||this.dataDetails.guaCarApprovedWeight>60000) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车核定载质量输入错误!",
+						})
+						return true
+					} 
 					if (uni.$u.test.isEmpty(this.dataDetails.guaCarLong) || uni.$u.test.isEmpty(this.dataDetails.guaCarWidth) || uni.$u.test.isEmpty(this.dataDetails.guaCarHeight)) {
 						this.$refs.uToast.show({
 							type: 'error',

+ 2 - 2
pages/order/confirmLoading.vue

@@ -88,8 +88,8 @@
 
 		</view>
 		<view class="bottom-btn">
-			<view class="store" @click="submit(1)">暂存</view>
-			<view class="submit" @click="submit(3)">提交</view>
+			<view class="store" @click="$u.throttle(submit(1), 5000)">暂存</view>
+			<view class="submit" @click="$u.throttle(submit(3), 5000)">提交</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"

+ 2 - 2
pages/order/confirmUnloading.vue

@@ -81,8 +81,8 @@
 			</view>
 		</view>
 		<view class="bottom-btn">
-			<view class="store" @click="submit(1)">暂存</view>
-			<view class="submit" @click="submit(3)">提交</view>
+			<view class="store" @click="$u.throttle(submit(1), 5000)">暂存</view>
+			<view class="submit" @click="$u.throttle(submit(3), 5000)">提交</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"

+ 2 - 2
pages/order/index.vue

@@ -170,7 +170,7 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
 			@cancel="cancelClick">
 			
 			<view style="margin: 0 auto;">
@@ -206,7 +206,7 @@
 			           <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
 			           	v-if='isShowTerminationReason'>
 			           </u--textarea>
-					   <view class='termination' :class="{'active':value2.length>0}" @click='confirmClick'>终止</view>
+					   <view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(confirmClick, 5000)'>终止</view>
 				</view>
 			           
 			</u-popup>

+ 2 - 2
pages/order/orderDetails.vue

@@ -202,7 +202,7 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="confirmClick" @close="cancelClick"
+			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
 			@cancel="cancelClick" class="modal">
 			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
 				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
@@ -233,7 +233,7 @@
 		           <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
 		           	v-if='isShowTerminationReason'>
 		           </u--textarea>
-				   <view class='termination' :class="{'active':value2.length>0}" @click='confirmClick'>终止</view>
+				   <view class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(confirmClick, 5000)'>终止</view>
 			</view>
 		           
 		</u-popup>

+ 6 - 1
pages/order/signContract.vue

@@ -163,7 +163,7 @@
 					:class="[selectColor === 'red' ? 'color_select' : '', 'black-select']"></image> -->
 
 				<!-- <button @click="saveCanvasAsImg" class="saveBtn">保存</button> -->
-				<view @click="submit" class="saveBtn">提交</view>
+				<view @click="$u.throttle(submit(), 5000)" class="saveBtn">提交</view>
 				<!-- <button @click="previewCanvasImg" class="previewBtn">预览</button> -->
 				<!-- <button @click="subCanvas" class="subBtn">完成</button> -->
 			</view>
@@ -495,6 +495,10 @@
 				_obj.carNumber = that.dataDetails.carrierInfo.carNo
 				_obj.weight = that.dataDetails.weight
 				_obj.advanceCharge = that.dataDetails.advanceCharge
+				_obj.bankCard = that.dataDetails.bankCard
+				_obj.bankDeposit = that.dataDetails.bankDeposit
+				_obj.bankDepositBranch = that.dataDetails.bankDepositBranch
+				_obj.payeeName = that.dataDetails.payeeName
 				_obj.typeFlag = 2
 				uni.canvasToTempFilePath({
 					canvasId: 'handWriting',
@@ -523,6 +527,7 @@
 															filePath: filePath,
 															showMenu: true,
 															success: function(res) {
+		
 																console.log('打开文档成功');
 															}
 														});

+ 14 - 0
pages/public/login.vue

@@ -145,6 +145,20 @@
 			},
 			passlogin(e) {
 				var that = this
+				if(this.phone==''){
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "请输入手机号!"
+					})
+					return
+				}
+				if(this.password==''){
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "请输入密码!"
+					})
+					return
+				}
 				that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 					driverPhone: this.phone,
 				}).then(res => {

+ 1 - 1
pages/riders/fleetSee.vue

@@ -97,7 +97,7 @@
 		</chunLei-popups> -->
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="quitShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

+ 1 - 1
pages/riders/report.vue

@@ -19,7 +19,7 @@
 			<u-toast ref="uToast"></u-toast>
 			<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 				confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-			<u-button type="primary" text="提交" class="btn_css" @click="submit"></u-button> 
+			<u-button type="primary" text="提交" class="btn_css" @click="$u.throttle(submit, 5000)"></u-button> 
 	</view>
 </template>