前端

components/luo-navBar/components/luo-navBar/luo-navBar.vue

@@ -36,8 +36,8 @@
 		computed:{
 			searchText1:{
 				get(){
-				        return this.searchText;
-				      },
+				    return this.searchText;
+				},
 				set(v) { }
 			}
 		},

pages/mine/cargoowner/cargoowner.vue

@@ -27,11 +27,11 @@
 							:src="personage.authenticationStatus=='已认证'?'../../../static/mine/huozhurenzheng/shenfen2.png':'../../../static/mine/huozhurenzheng/shenfen.png'"
 							width="32px" height="32px"></u--image>
 						<view style='width:100%;'>
-							<view v-if='!datastatus' style='font-size:21px;'>身份信息</view>
+							<view v-if='!personage' style='font-size:21px;'>身份信息</view>
 							<view v-else style='font-size:21px;'>{{personage.name}}</view>
 							<view v-if="personage.authenticationStatus!='已认证'" class='flex flex-space-between'
 								style='width:100%;color:#999999;font-size:14px;'>您的身份信息{{personage.authenticationStatus?personage.authenticationStatus:'未认证'}}状态
-								<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+								<u-icon name="arrow-right" color="#7E7E7E" size="10" v-if="datastatus"></u-icon>
 							</view>
 							<view v-else class='flex flex-space-between' style='width:100%;color:#999999;font-size:14px;'>
 								{{starUserphone}}
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 		<view>
-			<view class="content2-title">所属企业 <text style='color:#999;'>（{{enterprise.length}})</text></view>
+			<view class="content2-title">所属企业 <text style='color:#999;'>({{enterprise.length}})</text></view>
 			<view v-if='enterprise.length>0'>
 				<view v-for='item in enterprise' class='wrap'>
 					<view class='flex flex-space-between'>
@@ -61,7 +61,8 @@
 					</view>
 					<view class="row3">
 						<view class="right">
-							<image @click='edit(item)' 							v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"'
+							<!-- v-if='item.status!="平台审核中"&&item.status!="企业审核中"&&item.status!="企业暂不可用"&&item.status!="企业不存在"&&item.status!="授权已撤销"' -->
+							<image @click='edit(item)'
 								style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png">
 							</image>
 							<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;'
@@ -81,7 +82,6 @@
 				<view @click='goDetailPage("/pages/mine/cargoowner/editpersonalinformation")' class='newlyIncreased' v-if="!datastatus">去认证</view>
 			</view>
 		</view>
-		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -125,12 +125,6 @@
 			toEditPage(){
 				if(this.personage&&this.personage.authenticationStatus=='已认证'){
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
-				}else if(this.personage&&this.personage.authenticationStatus == "审核中"){
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "身份审核中，请耐心等待！",
-					})
-					return 
 				}else{
 					uni.$u.route("/pages/mine/cargoowner/editpersonalinformation",this.personage);
 				}
@@ -230,7 +224,7 @@
 
 <style lang="scss" scoped>
 	.content {
-		padding-bottom: 460rpx;
+		padding-bottom: 320rpx;
 	}
 
 	.identity {

pages/mine/cargoowner/selectcompany.vue

@@ -90,9 +90,7 @@
 						
 						uni.hideLoading()
 						if (res.data) {
-							console.log(111111)
 							if(res.data.name==item.legalPersonName){
-								console.log(22222)
 								uni.showToast({
 									title: '您已经具备该公司货主身份',
 									icon: 'none',
@@ -123,7 +121,6 @@
 							}else{
 								uni.setStorageSync('currectcompany', item)
 								that.goDetailPage('pages/mine/cargoowner/addEnerprise')
-								console.log(4444)
 							}
 						}
 					})

pages/news/index.vue

@@ -104,7 +104,6 @@
 				if (res3.data||res3.data==0) {
 					let name = 'myTip';
 					let value = res3.data
-					console.log(value,111111)
 					if (value == 0) {
 						uni.removeTabBarBadge({
 							index: 2
@@ -172,7 +171,6 @@
 					});
 			},
 			read(val) {
-				uni.$u.route("/pages/news/newsSee?_obj="+JSON.stringify(val))
 				if(val.newsType == "投诉结果" || val.newsType == "举报结果"){
 					uni.$u.route("/pages/news/feedbackResults?id=" + val.bussId + "&type=" + val.newsType)
 				}

pages/order/addEvaluation.vue

@@ -85,31 +85,31 @@
 						name: "司机信用",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
 						name: "运输效率",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
 						name: "运输安全",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
-						name: "运输安全",
+						name: "服务质量",
 						count: "5",
 						value1: '0',
-						level: '非常好'
+						level: ''
 					},
 					{
 						name: "满意度",
 						count: "5",
 						value1: '0',
-						level: '非常满意'
+						level: ''
 					}
 				],
 				button: [{
@@ -123,44 +123,13 @@
 			}
 		},
 		onNavigationBarButtonTap() {
+			// console.log(12121,uni.$u,this)
 			// debugger
-			let _data = {
-				evaluatoredId: this.objData.commonId,
-				evaluatorId: this.objData.cargoCommonId,
-				ownerName: this.checkboxValue1 ? this.objData.cargoOwner : '',
-				driverName: this.objData.driverName,
-				ownerPortrait: this.checkboxValue1 ? this.userInfo.avatarUrl : '',
-				orderId: this.objData.id,
-				orderNumber: this.objData.orderNo,
-				driverCredit: this.rate[0].value1,
-				tranEfficiency: this.rate[1].value1,
-				tranSafety: this.rate[2].value1,
-				serviceQuality: this.rate[3].value1,
-				satisfaction: this.rate[4].value1,
-				ownerContent: this.value3,
-				ownerUrl: this.imageList.toString(),
-				ownerAnonymous: this.checkboxValue1.length != 0 ? 1 : 0
-
-			}
-			that.$request.baseRequest('post', '/evaluateInfo/api/addEvaluateInfo', _data).then(res => {
-				if (res.code == 200) {
-					this.$refs.uToast.show({
-						type: 'success',
-						message: "评价成功",
-						complete() {
-							uni.navigateBack({
-								delta:1
-							})
-						}
-					})
-				} else {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "评价失败",
-					})
-				}
-			})
+			uni.$u.throttle(this.submit, 500)
+			// uni.$u.debounce(this.submit, 500)
+			
 		},
+		
 		onLoad(options) {
 			that = this
 			this.objData = JSON.parse(options.val)
@@ -168,6 +137,45 @@
 			that.imageList = []
 		},
 		methods: {
+			submit(){
+				// console.log(11111111)
+				let _data = {
+					evaluatoredId: this.objData.commonId,
+					evaluatorId: this.objData.cargoCommonId,
+					ownerName: this.checkboxValue1 ? this.objData.cargoOwner : '',
+					driverName: this.objData.driverName,
+					ownerPortrait: this.checkboxValue1 ? this.userInfo.avatarUrl : '',
+					orderId: this.objData.id,
+					orderNumber: this.objData.orderNo,
+					driverCredit: this.rate[0].value1,
+					tranEfficiency: this.rate[1].value1,
+					tranSafety: this.rate[2].value1,
+					serviceQuality: this.rate[3].value1,
+					satisfaction: this.rate[4].value1,
+					ownerContent: this.value3,
+					ownerUrl: this.imageList.toString(),
+					ownerAnonymous: this.checkboxValue1.length != 0 ? 1 : 0
+				
+				}
+				that.$request.baseRequest('post', '/evaluateInfo/api/addEvaluateInfo', _data).then(res => {
+					if (res.code == 200) {
+						this.$refs.uToast.show({
+							type: 'success',
+							message: "评价成功",
+							complete() {
+								uni.navigateBack({
+									delta:1
+								})
+							}
+						})
+					} else {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "评价失败",
+						})
+					}
+				})
+			},
 			clickStar(index) {
 				console.log(index)
 				this.selectStar = index

pages/order/driverDetail.vue

@@ -270,6 +270,7 @@
 								that.total = res.data.total
 								for (let i = 0; i < that.list.length; i++) {
 									if (that.list[i].ownerUrl) {
+										// that.list[i].imgList=[]
 										that.list[i].imgList = that.list[i].ownerUrl.split(',')
 									}
 						

pages/order/index.vue

@@ -50,7 +50,7 @@
 			</u-transition>
 			<view class="modal-black" v-show="showMenu" @click="closeMenu"></view>
 		</view>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
 	<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 10"  @click="evaluationRecord">
 		<view class="left flex flex-space-between">
 			<u-icon size="20" name="edit-pen"></u-icon>
@@ -224,6 +224,15 @@
 					margin:'0 20rpx 0 0',
 					"border-radius": '30rpx'
 				},
+				upOption: {
+					page: {
+												size: 10 // 每页数据的数量,默认10
+											},
+											noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						tip: '暂无相关数据'
+					}
+				},
 				searchKeyWord: '',
 				useSearchList: [],
 				mescroll: null,

pages/order/orderDetails.vue

@@ -179,7 +179,7 @@
 				<view class="row-left-text gray">装车照片</view>
 				<view class="flex">
 					<u--image :showLoading="true" :src="item" width="40px" height="40px"
-						v-for="(item,index) in zcImgList" :key='index' @click='ylImg(item)'></u--image>
+						v-for="(item,index) in zcImgList" :key='index' @click='ylImg(zcImgList)'></u--image>
 				</view>
 			</view>
 			<view class='row-between'>
@@ -196,7 +196,7 @@
 				<view class="row-left-text gray">卸车照片</view>
 				<view class="flex">
 					<u--image :showLoading="true" :src="item" width="40px" height="40px"
-						v-for="(item,index) in xcImgList" :key='index' @click='ylImg(item)'></u--image>
+						v-for="(item,index) in xcImgList" :key='index' @click='ylImg(xcImgList)'></u--image>
 				</view>
 			</view>
 		</view>
@@ -366,7 +366,7 @@
 		methods: {
 			ylImg(src) {
 				uni.previewImage({
-					urls: [src],
+					urls: src,
 					longPressActions: {
 						itemList: ['发送给朋友', '保存图片', '收藏'],
 						success: function(data) {

pages/public/register.vue

@@ -1,46 +1,4 @@
 <template>
-	<!-- <view class="container">
-		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
-		<view class="wrapper">
-			<h2 class="Semibold">手机号注册</h2>
-			<view style='width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'
-				class="flex">
-				<view class="NumberMedium" style='width:15%;border-right:1px solid #E8E9ED;'>+86</view>
-				<view style='width:85%;'>
-					<input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
-						placeholder="请输入手机号码" type="number" class="Regular" />
-				</view>
-				
-			</view>
-			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
-				<view style='width:70%;position:relative;'>
-					<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6"/>
-					
-				</view>
-				<button class='getcode Regular' :class='codestatus?"activeCode":""' @click='getcode'
-					>{{sendText}}</button>
-			</view>
-			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
-				<u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
-					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" />
-				
-			</view>
-			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='register'
-				class='verificationCode'>注册</button>
-			<view
-				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
-				<u--image @click='consent'
-					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
-					width="17px" height="17px" style="margin:0 10rpx"></u--image>
-				已阅读并同意
-				<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
-					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
-					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
-			</view>
-		</view>
-	</view> -->
 	<view class="container">
 		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
 		<view class="wrapper">

pages/release/editRelease.vue

@@ -303,6 +303,28 @@
 		},
 		onShow() {
 			this.getSFList()
+			let _faddress = uni.getStorageSync('storage_faddress');
+			let _saddress = uni.getStorageSync('storage_saddress');
+			if (_faddress) {
+				this.dataObj.sendCity = _faddress.city
+				this.dataObj.sendArea = _faddress.area
+				this.dataObj.sendPrivate = _faddress.province
+				this.dataObj.sendDetailedAddress = _faddress.detailedAddress
+				this.dataObj.sendLongitude = _faddress.longitude
+				this.dataObj.sendLatitude = _faddress.latitude
+				this.dataObj.senderPhone = _faddress.contactPhone
+				this.dataObj.sender = _faddress.contacts
+			}
+			if (_saddress) {
+				this.dataObj.unloadDetailedAddress = _saddress.detailedAddress
+				this.dataObj.unloadCity = _saddress.city
+				this.dataObj.unloadArea = _saddress.area
+				this.dataObj.unloadPrivate = _saddress.province
+				this.dataObj.unsendLongitude = _saddress.longitude
+				this.dataObj.unsendLatitude = _saddress.latitude
+				this.dataObj.receiver = _saddress.contacts
+				this.dataObj.receiverPhone = _saddress.contactPhone
+			}
 		},
 		onLoad(options) {
 			_this = this;
@@ -708,6 +730,7 @@
 				});
 				uni.$u.route('/pages/release/selectAddress', {
 					type: type,
+					status:1
 				});
 			},
 			checkboxChange(n) {

pages/release/release.vue

@@ -713,7 +713,15 @@
 				this.dataObj.carModel = _list.toString()
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('post', '/publishTaskInfo/api/addTask', this.dataObj).then(res => {
-
+						uni.removeStorage({
+							key: 'storage_saddress'
+						});
+						uni.removeStorage({
+							key: 'storage_faddress'
+						});
+						uni.removeStorage({
+							key: 'releaseCargoOwner'
+						});
 						this.$refs.uToast.show({
 							type: 'success',
 							message: "发布成功",

uni_modules/uni-rate/changelog.md

@@ -1,23 +0,0 @@
-## 1.3.0（2021-11-19）
-- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
-- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-rate](https://uniapp.dcloud.io/component/uniui/uni-rate)
-## 1.2.2（2021-09-10）
-- 优化 默认值修改为 0 颗星
-## 1.2.1（2021-07-30）
-- 优化 vue3下事件警告的问题
-## 1.2.0（2021-07-13）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.1.2（2021-05-12）
-- 新增 组件示例地址
-## 1.1.1（2021-04-21）
-- 修复 布局变化后 uni-rate  星星计算不准确的 bug
-- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
-## 1.1.0（2021-04-16）
-- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
-
-## 1.0.9（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-
-## 1.0.8（2021-02-05）
-- 调整为uni_modules目录规范
-- 支持 pc 端

uni_modules/uni-rate/package.json

@@ -1,88 +0,0 @@
-{
-  "id": "uni-rate",
-  "displayName": "uni-rate 评分",
-  "version": "1.3.0",
-  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "评分"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-			"uni-scss",
-			"uni-icons"
-		],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
-}

uni_modules/uni-rate/readme.md

@@ -1,12 +0,0 @@
-
-
-## Rate 评分
-> **组件名：uni-rate**
-> 代码块： `uRate`
-> 关联组件：`uni-icons`
-
-
-评分组件，多用于购买商品后，对商品进行评价等场景
-
-### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-rate)
-#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839