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

pages.json

@@ -179,8 +179,9 @@
 		}, {
 			"path": "pages/mine/helpDescription",
 			"style": {
-				"navigationBarTitleText": "操作说明",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "操作流程",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 
 		},

pages/mine/helpDescription.vue

@@ -1,10 +1,43 @@
 <!-- 帮助说明 -->
 <template>
-	<view class="content flex-center">
-		<image class="img" src="@/static/images/help/banner@2x.png" mode="widthFix"></image>
-		<image class="img" src="@/static/images/help/tu1@2x.png" mode="widthFix"></image>
-	<image class="img" src="@/static/images/help/zy.png" mode="widthFix"></image>
+	<view class="content">
+		<u-navbar leftText="返回" title="操作流程" placeholder titleStyle="font-size:36rpx;font-weight:700" :autoBack="true">
+			<view class="u-nav-slot" slot="left">
+				<u-icon name="arrow-left" size="20" color="#303137"></u-icon>
+			</view>
+			<view class="u-nav-slot" slot="right">
+				<view class="top-right" v-if="!isShowType" @click="btnClick(false)">
+					切换简洁版
+				</view>
+				<view class="top-right" v-if="isShowType" @click="btnClick(true)">
+					切换图示版
+				</view>
 
+			</view>
+		</u-navbar>
+		<image src="@/static/images/mine/tsb/jjb.png" mode="widthFix" class="banner" v-if="isShowType"></image>
+		<view class="content1" v-if="!isShowType">
+			<image src="@/static/images/mine/tsb/1.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/2.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/3.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/4.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/5.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/6.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/7.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/8.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/9.png" mode="widthFix" class="content-img">
+			</image>
+			<image src="@/static/images/mine/tsb/10.png" mode="widthFix" class="content-img">
+			</image>
+		</view>
 	</view>
 </template>
 
@@ -12,14 +45,41 @@
 	export default {
 		data() {
 			return {
-
+				isShowType: true
 			};
+		},
+		methods: {
+			btnClick(type) {
+				console.log(type)
+				this.isShowType = !type
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
-.img{
-	width: 100%;
-}
+<style lang="scss" scoped>
+	.content {
+		background: white;
+	}
+
+	.banner {
+		width: 100%;
+	}
+
+	.content1 {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+
+		.content-img {
+			width: 100%;
+		}
+	}
+
+	.top-right {
+		background: #F7F8FA;
+		padding: 11rpx 23rpx;
+		border-radius: 33px;
+		font-size: 700;
+	}
 </style>

pages/mine/index.vue

@@ -23,7 +23,7 @@
 								class='currectstatus1'> -->
 							<!-- 	<view class="" v-if="CargoOwner.authenticationStatus">{{CargoOwner.authenticationStatus=="已过期"?"身份已过期":CargoOwner.authenticationStatus}}</view>
 								<view class="" v-else>未认证</view> -->
-								<!-- {{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}} -->
+							<!-- {{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}} -->
 							<!-- </view> -->
 						</view>
 						<view class='phone'>{{starUserphone}}</view>
@@ -91,10 +91,11 @@
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/huozhu.png"
 							width="20px" height="20px"></u--image>
-							<view>货主认证</view>
+						<view>货主认证</view>
 					</view>
-					<view >
-						<text class="version_css" v-if="CargoOwner.authenticationStatus">{{CargoOwner.authenticationStatus == '已过期'?'认证已过期':CargoOwner.authenticationStatus}}</text>
+					<view>
+						<text class="version_css"
+							v-if="CargoOwner.authenticationStatus">{{CargoOwner.authenticationStatus == '已过期'?'认证已过期':CargoOwner.authenticationStatus}}</text>
 						<text class="version_css" v-else>未认证</text>
 						<image class='right' src="@/static/mine/right.png" mode=""></image>
 					</view>
@@ -138,7 +139,7 @@
 					@click="goDetailPage('/pages/mine/helpDescription',true)">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true"
-							src="../../static/mine/bangzhushuoming.png" width="20px" height="20px"></u--image>帮助说明
+							src="../../static/mine/bangzhushuoming.png" width="20px" height="20px"></u--image>操作流程
 					</view>
 					<view>
 						<image class='right' src="@/static/mine/right.png" mode=""></image>
@@ -147,8 +148,8 @@
 				</view>
 				<view class="flex flex-space-between content1-item">
 					<view class="flex align-center">
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/images/mine/appUpdate.png"
-							width="20px" height="20px"></u--image>
+						<u--image style='margin-right:8px;' :showLoading="true"
+							src="../../static/images/mine/appUpdate.png" width="20px" height="20px"></u--image>
 						<view>检查更新</view>
 					</view>
 					<view @click="onAPPUpdate">
@@ -326,15 +327,15 @@
 					},
 					method: 'GET',
 					success: (res) => {
-						console.log("查看1111",this.version)
-						console.log("查看11111",res)
+						console.log("查看1111", this.version)
+						console.log("查看11111", res)
 						// var versionNo = plus.runtime.version
 						// if (versionNo == res.data.data.version) {
 						// 	this.version = "当前为最新版" + res.data.data.version
 						// } else {
 						// 	this.version = "发现新版本，立即更新"
 						// }
-						if (!res.data.data.version) {//有返回值证明需要更新   没有则不需要
+						if (!res.data.data.version) { //有返回值证明需要更新   没有则不需要
 							this.version = "当前为最新版" + this.version
 						} else {
 							this.version = "发现新版本，立即更新"

pages/release/editRelease.vue

@@ -354,6 +354,7 @@
 				this.dataObj.sendLatitude = _faddress.latitude
 				this.dataObj.senderPhone = _faddress.contactPhone
 				this.dataObj.sender = _faddress.contacts
+				this.dataObj.sendAdCode = _faddress.adCode
 			}
 			if (_saddress) {
 				this.dataObj.unloadDetailedAddress = _saddress.detailedAddress
@@ -364,6 +365,7 @@
 				this.dataObj.unsendLatitude = _saddress.latitude
 				this.dataObj.receiver = _saddress.contacts
 				this.dataObj.receiverPhone = _saddress.contactPhone
+				this.dataObj.unsendAdCode = _faddress.adCode
 			}
 		},
 		onLoad(options) {