Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

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.json

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

pages/mine/helpDescription.vue

@@ -1,9 +1,42 @@
 <!-- 帮助说明 -->
 <template>
 	<view class="content">
-		<image src="@/static/images/mine/banner@2x.png" mode="widthFix" class="banner"></image>
-		<view class="content1">
-			<image src="@/static/images/mine/content.png" mode="widthFix" class="content-img"></image>
+		<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/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,8 +45,14 @@
 	export default {
 		data() {
 			return {
-
+				isShowType: true
 			};
+		},
+		methods: {
+			btnClick(type) {
+				console.log(type)
+				this.isShowType = !type
+			}
 		}
 	}
 </script>
@@ -28,11 +67,19 @@
 	}
 
 	.content1 {
-		margin: 20rpx;
-		padding: 20rpx;
-		background: #F4F8FF;
-		border-radius: 20rpx;
+		width: 100%;
 		display: flex;
-		justify-content: center;
+		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

@@ -107,7 +107,7 @@
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/icon-help@2x.png" mode='widthFix' style="top: 6rpx;">
 					</image>
-					<view>帮助说明</view>
+					<view>操作流程</view>
 				</view>
 				<view>
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
@@ -298,9 +298,9 @@
 					},
 					method: 'GET',
 					success: (res) => {
-						console.log("查看1111",this.version)
-						console.log("查看11111",res)
-						if (!res.data.data.version) {//有返回值证明需要更新   没有则不需要
+						console.log("查看1111", this.version)
+						console.log("查看11111", res)
+						if (!res.data.data.version) { //有返回值证明需要更新   没有则不需要
 							this.version = "当前为最新版" + this.version
 						} else {
 							this.version = "发现新版本，立即更新"

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/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>