Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

App.vue

@@ -351,7 +351,7 @@
 										}
 										this.$helper.gjList.push(_data)
 										uni.setStorageSync('mapGJ', this.$helper.gjList);
-										if (uni.getStorageSync('mapGJ').length > 100) {
+										if (uni.getStorageSync('mapGJ').length > 10) {
 											this.$request.baseRequest('post',
 													'/hyOrderTravelPath/api/addInfo', {
 														orderId: that.id,
@@ -536,5 +536,11 @@
 </script>
 
 <style>
+/* 	.uni-input-input{
+		filter: blur(4px);
+	}
+	uni-image{
+		filter: blur(4px);
+	} */
 	/*每个页面公共css */
 </style>

config/index.js

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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "畅运通",
     "appid" : "__UNI__9C76CB6",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.2.4",
+    "versionCode" : 124,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/goodSource/shippingDetails.vue

@@ -24,10 +24,10 @@
 			<view class="content1">
 				<view class="row1 flex flex-space-between">
 					<view class="left flex">
-						<u--image
+						<u-image
 							:src="detailData.cargoOwnerPortrait?detailData.cargoOwnerPortrait:'../../static/images/mine/tx.png'"
 							width='122rpx' height='122rpx' shape="circle">
-						</u--image>
+						</u-image>
 						<view class="fontsize-46 ml20">{{detailData.cargoOwnerCall}}</view>
 					</view>
 					<view class="right">
@@ -124,11 +124,11 @@
 					<view class="left">车型</view>
 					<!-- carModel -->
 					<view class="right">
-						<text v-if="detailData.carModel.indexOf('1') != -1">不限</text>
+						<text>{{this.carModel}}</text>
+						<!-- <text v-show="detailData.carModel.indexOf('1') != -1">不限</text>
 						<text v-show="detailData.carModel.indexOf('2') != -1">高栏 | </text>
 						<text v-show="detailData.carModel.indexOf('3') != -1">集装箱 | </text>
-						<text v-show="detailData.carModel.indexOf('4') != -1">自卸车</text>
-					
+						<text v-show="detailData.carModel.indexOf('4') != -1">自卸车</text> -->
 					</view>
 					<!-- <view class="right" v-else>不限</view> -->
 				</view>
@@ -176,6 +176,7 @@
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				id: '',
 				detailData: {},
+				carModel:""
 			};
 		},
 		onLoad(options) {
@@ -198,6 +199,23 @@
 				console.log(length)
 				return length
 			},
+			
+			carWeight() {
+				this.detailData.loadWeightSmall
+				this.detailData.loadWeight
+				let weight = ''
+				if (this.detailData.loadWeightSmall && this.detailData.loadWeight) {
+					weight = this.detailData.loadWeightSmall + '~' + this.detailData.loadWeight + '吨'
+				} else if (this.detailData.loadWeightSmall) {
+					weight = "大于" + this.detailData.loadWeightSmall + '吨'
+				} else if (this.detailData.loadWeight) {
+					weight = "小于" + this.detailData.loadWeight + '吨'
+				}
+				console.log(weight)
+				return weight
+			},
+		},
+		methods: {
 			carType() {
 				let _val = '';
 				if (!this.detailData.carModel) this.detailData.carModel = ''
@@ -215,24 +233,8 @@
 					}
 				}
 				console.log(_val)
-				return _val
+				this.carModel = _val
 			},
-			carWeight() {
-				this.detailData.loadWeightSmall
-				this.detailData.loadWeight
-				let weight = ''
-				if (this.detailData.loadWeightSmall && this.detailData.loadWeight) {
-					weight = this.detailData.loadWeightSmall + '~' + this.detailData.loadWeight + '吨'
-				} else if (this.detailData.loadWeightSmall) {
-					weight = "大于" + this.detailData.loadWeightSmall + '吨'
-				} else if (this.detailData.loadWeight) {
-					weight = "小于" + this.detailData.loadWeight + '吨'
-				}
-				console.log(weight)
-				return weight
-			},
-		},
-		methods: {
 			share() {
 				console.log('share')
 			},
@@ -249,14 +251,15 @@
 				// 		uni.$u.toast(res.message);
 				// 	});
 			},
-			async init() {
-				await this.$request.baseRequest('get', '/publishTaskInfo/seeTask', {
+			init() {
+				this.$request.baseRequest('get', '/publishTaskInfo/seeTask', {
 						id: this.id,
 						// id: '8f1f3c624d7946d79a9d44a4057d9623',
 					}).then(res => {
 						if (res.code == 200) {
-							this.detailData = res.data
-						}
+							this.detailData = res.data	
+												this.carType()
+					}
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);

pages/mine/set.vue

@@ -48,13 +48,13 @@
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view>
 
-			<!-- <u-line color="#EEEEEE" class="line"></u-line>
+			<u-line color="#EEEEEE" class="line"></u-line>
 			<view class='flex flex-space-between' @click='clearStorage'>
 				<view>
-					<text>清除缓存</text>
+					<text>注销账号</text>
 				</view>
 				<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
-			</view> -->
+			</view>
 		</view>
 		<view class='exitloginwrap'>
 			<button @click='logout()' class='exitlogin'>退出登录</button>

pages/order/confirmLoading.vue

@@ -782,7 +782,7 @@
 								// console.log(this.$helper.gjList)
 								console.log("条数", uni.getStorageSync('mapGJ').length)
 								// console.log("条数", uni.getStorageSync('mapGJ'))
-								if (uni.getStorageSync('mapGJ').length > 100) {
+								if (uni.getStorageSync('mapGJ').length > 10) {
 									// console.log(JSON.stringify(uni.getStorageSync('mapGJ')))
 									// that.send()
 									that.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {

pages/public/register.vue

@@ -54,7 +54,7 @@
 					width="17px" height="17px"></u--image>
 				已阅读并同意
 				<navigator
-					url="/pages/sale/webview?can_share=false&url=http://liangxin.zthymaoyi.com/cytUserAgreement.html"
+					url="/pages/sale/webview?can_share=false&url=http://liangxin.zthymaoyi.com/cythzUserAgreement.html"
 					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
 					url="/pages/sale/webview?can_share=false&url=http://liangxin.zthymaoyi.com/cytScrectAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>