fix：兼容微信浏览器和安卓套壳，二维码过期时间设置为10年，自动登录。

App.vue

@@ -5,9 +5,14 @@
 
 <script>
 	export default {
+
+        globalData: {
+            isWxBrowser:false
+        },
+
 		onLaunch: function() {
             // #ifdef H5
-            var ua = window.navigator.userAgent.toLowerCase();
+            let ua = window.navigator.userAgent.toLowerCase();
             console.log('+++++++浏览器++++++',ua)
             // if(ua.match(/windowswechat/i)=="windowswechat") {
             //     console.log('这windos的微信浏览器');
@@ -16,21 +21,64 @@
             // }
             if (ua.match(/MicroMessenger/i) == 'micromessenger') {
                 console.log('这是微信浏览器');
+                getApp().globalData.isWxBrowser = true
             }else {
+                getApp().globalData.isWxBrowser = false
                 // uni.showModal({
                 //     title:'温馨提示',
                 //     content:'请在手机微信客户端打开连接',
                 // })
             }
             // #endif
+            setTimeout(() => {
+            let isRegister = uni.getStorageSync('isRegister')
+            console.log('是否是扫码进的注册页面===>',isRegister)
+            if (!isRegister){
+                let form ={
+                    username:'',
+                    password:''
+                }
+                form.username = uni.getStorageSync('username')
+                form.password = uni.getStorageSync('password')
+
+                if (form.username && form.password){
 
+                    let startDate = new Date().getTime()
+                    console.log("+++++++++++++++++自动登录开始时间+++++++++++++++++++++",startDate )
+                    this.$api.login.expandLogin(form).then(res => {
+                        uni.setStorageSync('accessToken', res.data.data.access_token)
+                        this.$api.user.getUserInfo().then(res=>{
+                            console.log('获取到的用户信息：',res.data.data,'获取到的用户头像',res.data.data.img)
+                            this.userInfo = res.data.data
+                            uni.setStorageSync('spreadUserInfo', this.userInfo)
+                        })
+                        let endDate = new Date().getTime()
+                        console.log("+++++++++++++++++自动登录结束时间+++++++++++++++++++++",endDate)
+                        console.log("+++++++++++++++++自动登录耗时+++++++++++++++++++++",endDate-startDate,'毫秒')
 
+                        uni.switchTab({
+                            url: "/pages/index/index"
+                        })
+                    }).catch(err=>{
+                        uni.navigateTo({
+                            url: "/pages/login/login"
+                        })
+                    })
+                }else {
+                    uni.navigateTo({
+                        url: "/pages/login/login"
+                    })
+                }
 
+            }
+            },1000)
+            uni.removeStorageSync('isRegister');
 			console.log('App Launch')
 
 		},
 		onShow: function() {
-			console.log('App Show')
+            console.log('App Show')
+
 		},
 		onHide: function() {
 			console.log('App Hide')

common/js/request.js

@@ -27,7 +27,7 @@ function service(options = {}) {
 						title: '登录过期，即将跳转登录页'
 					});
 					setTimeout(()=>{
-						uni.navigateTo({
+						uni.reLaunch({
 							url:'/pages/login/login'
 						})
 					},3000)

main.js

@@ -33,7 +33,9 @@ Vue.prototype.$tkUrl = 'https://jje.xinyuekj.com.cn/tk/register';
 
 //微信授权回调地址 -- 微信浏览器调起微信登录使用（现在没用了，暂时保留）--- 测试地址
 Vue.prototype.$callbackUrl = 'http://tk.gzzzyd.com';
-Vue.prototype.$api = api;
+Vue.prototype.$api = api;``
+Vue.prototype.$isWxBrowser = () => getApp().globalData.isWxBrowser;
+
 Vue.use(uView);
 Vue.config.productionTip = false
 App.mpType = 'app'

manifest.json

@@ -1,122 +1,126 @@
 {
-	"name": "娇骄儿拓客",
-	"appid": "__UNI__0AD3309",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"schemes": "jjeSpreadUniapp"
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx0c80b1524229c640",
-		"setting": {
-			"urlCheck": false,
-			"postcss": false,
-			"minified": true
-		},
-		"usingComponents": true,
-		"lazyCodeLoading": "requiredComponents"
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2",
-	"h5": {
-		"router": {
-			"base": "./",
-			"mode": "hash"
-		},
-		"devServer": {
-			"https": false
-		}
-	}
-}
+    "name" : "娇骄儿拓客",
+    "appid" : "__UNI__0AD3309",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "schemes" : "jjeSpreadUniapp"
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false,
+                "idfa" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "common"
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx0c80b1524229c640",
+        "setting" : {
+            "urlCheck" : false,
+            "postcss" : false,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "lazyCodeLoading" : "requiredComponents"
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "https" : false
+        }
+    }
+}

pages.json

@@ -6,9 +6,10 @@
 
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText" : "登录",
+			"path" : "pages/welcome/welcome",
+			"style" :
+			{
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -19,6 +20,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText" : "登录",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path" : "pages/my/my",
 			"style" :
@@ -177,6 +185,7 @@
 				"navigationBarTitleText" : ""
 			}
 		}
+
 	],
 	"tabBar": {
 		"color": "#999999",
@@ -202,7 +211,7 @@
 		"navigationStyle": "custom",
 		// #endif
 
-		"navigationBarTextStyle": "black",
+		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "加载中",
 		"navigationBarBackgroundColor": "#FFE05C",
 		"backgroundColor": "#ffffff"

pages/addGroup/addGroup.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="新增分组" @clickLeft="back" />
+		<!-- #endif -->
 		<view>
 				<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
 
@@ -28,7 +31,7 @@
 			<text>新增</text>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 
 

pages/agreement/agreement.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="page  flex-col" :style="{'height':height}">
+
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" :title="title" @clickLeft="back" />
+		<!-- #endif -->
+
 		<scroll-view scroll-y="true" class="scroll-y ">
 			<view class="content-box flex-col">
 				<!--				<web-view  src="http://www.gzqcdj.cn/doc/2.html"></web-view>-->
@@ -10,7 +15,7 @@
 		</scroll-view>
 
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()"  @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>
@@ -22,18 +27,20 @@
 			return {
 				name: '',
 				height: '',
-				type:''
+				type:'',
+				title:''
 
 			};
 		},
 		mounted() {
 		},
 		onLoad(option) {
+			this.title = option.name;
 			let sysInfo = uni.getSystemInfoSync();
 			this.height = sysInfo.windowHeight + 'px';
 			console.log("获取到的高度", this.height)
 			uni.setNavigationBarTitle({
-				title: option.name
+				title: this.title
 
 			})
 			this.type = option.type

pages/cooperation/cooperation.vue

@@ -1,11 +1,14 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="合作伙伴" @clickLeft="back" />
+		<!-- #endif -->
 		<view :style="{height:height}" class="list">
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/directPromotionList/directPromotionList.vue

@@ -1,11 +1,14 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="我的直推" @clickLeft="back" />
+		<!-- #endif -->
 		<view :style="{height:height}" class="list">
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/earningsList/earningsList.vue

@@ -1,11 +1,15 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="我的收益" @clickLeft="back" />
+		<!-- #endif -->
+
 		<view :style="{height:height}" class="list">
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/forgetPassword/forgetPassword.vue

@@ -1,6 +1,9 @@
 <template>
 	<view class="page">
-		<view :style="{'marginTop':'10rpx'}">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="找回密码" @clickLeft="back" />
+		<!-- #endif -->
+		<view class="formView">
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
 
 				<u-form-item :labelWidth="80" label="手机号：" prop="username" ref="item1">
@@ -30,7 +33,7 @@
 		</view>
 		<u-code ref="uCode" @change="codeChange" seconds="60" @start="disabled1 = true" @end="disabled1 = false"></u-code>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/forgetPassword/index.rpx.css

@@ -3,6 +3,9 @@
 	background-color: #f7f7f7;
 	padding: 0 32rpx;
 }
+.formView{
+	padding-top: 10rpx;
+}
 .updatePasswordButton{
 	text-align: center;
 	background: #4cd964;

pages/groupDetail/groupDetail.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="分组详情" @clickLeft="back" />
+		<!-- #endif -->
 		<view>
 
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
@@ -58,7 +61,7 @@
 			<text>提交</text>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 		<uni-popup ref="selectPersonPopup" type="bottom">
 			<view class="selectMemberPopup">

pages/index/attach/attach.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page" :style="{height:height}">
+	<view class="page">
 
 <!--		<view class="roleNameView">-->
 <!--			<text>当前身份：<text class="roleName">{{userInfo.roleName}}</text></text>-->
@@ -128,7 +128,7 @@
 				let data = {
 					expandUserId:this.userInfo.id,
 					ruleId:'',
-					timestamp:new Date().getTime() + (5 * 60 * 1000)
+					timestamp:new Date().getTime() + (60 * 1000 * 60 * 24 * 365 * 10)
 				};
 				this.roleBindRuleList.forEach(item=>{
 					if (item.select){

pages/index/attach/index.rpx.css

@@ -1,6 +1,7 @@
 .page{
     background: #F7F7F7;
-    padding: 1rpx 32rpx;
+    padding: 0rpx 32rpx;
+    overflow: auto;
 }
 .scroll-Y{
     height: 900rpx;

pages/index/index.rpx.css

@@ -0,0 +1,3 @@
+.page{
+    background: #F7F7F7;
+}

pages/index/index.vue

@@ -1,10 +1,18 @@
 <template>
-	<view class="page">
-		<manager :height="height" v-if="userInfo.isManager === 1"></manager>
-		<attach :height="height" v-if="userInfo.isManager === 0 && userInfo.roleTag == '0'"></attach>
-		<view v-if="userInfo.isManager === 0 && userInfo.roleTag == '1'">
-			<text>合作伙伴</text>
-		</view>
+	<view class="page" :style="{height:height}">
+
+		<!-- #ifdef H5-->
+		<uni-nav-bar v-if="!$isWxBrowser()"  :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"   title="首页"/>
+		<!-- #endif -->
+
+			<manager v-if="isManager == '1'"></manager>
+			<attach  v-else-if="isManager == '0' && roleTag == '0'"></attach>
+			<view :style="{height:height}" v-else-if="isManager == '0' && roleTag == '1'" class="flex-col justify-center">
+				<view class="flex-row justify-center">
+					<text>合作伙伴相关功能正在建设中...</text>
+				</view>
+			</view>
+
 	</view>
 </template>
 
@@ -18,6 +26,8 @@
 		},
 		data() {
 			return {
+				isManager:'',
+				roleTag:'',
 				height: '',
 				ruleList: [],
 				roleList: [],
@@ -27,11 +37,15 @@
 		},
 		onLoad() {
 			let sysInfo = uni.getSystemInfoSync()
-			this.height = sysInfo.windowHeight + 'px'
+			this.height = sysInfo.windowHeight  + 'px'
+
+			this.userInfo = uni.getStorageSync('spreadUserInfo')
+			this.isManager = this.userInfo.isManager
+			this.roleTag = this.userInfo.roleTag
 		},
 		onShow() {
 			this.userInfo = uni.getStorageSync('spreadUserInfo')
-			console.log('时间戳',new Date().getTime())
+			console.log('时间戳', new Date().getTime())
 		},
 		methods: {
 			// 微信支付

pages/index/manager/index.rpx.css

@@ -1,7 +1,5 @@
 .page{
-    background: #F7F7F7;
-    min-height: 100vh;
-    padding: 1rpx 32rpx;
+    padding: 0rpx 32rpx;
 }
 .outView{
     background: #FFFFFF;

pages/index/manager/manager.vue

@@ -1,10 +1,11 @@
 <template>
-	<view class="page" :style="{height:height}">
-		<view class="flex-row justify-between outView" :style="{marginTop:'24rpx'}" v-if="roleList.length>0" @click="selectRole">
+	<view class="page">
+		<view class="flex-row justify-between outView" :style="{marginTop:'24rpx'}" v-if="roleList.length>0"
+			@click="selectRole">
 			<view class="roleName">
 				<text>角色</text>
 			</view>
-			<view class="flex-row" >
+			<view class="flex-row">
 				<text class="roleName">{{roleList[confirmRoleIndex].name}}</text>
 				<u-icon name="arrow-right" color="#666" size="18"></u-icon>
 			</view>
@@ -14,44 +15,45 @@
 			<view class="flex-row justify-center">
 				<image class="dataNullImage" src="/static/zhanwu.png"></image>
 			</view>
-			<text v-if="roleList[confirmRoleIndex]" class="roleName1">{{roleList[confirmRoleIndex].name}}<text class="roleHint">角色没有拓客规则，点击下方“添加规则”按钮可添加拓客规则</text></text>
+			<text v-if="roleList[confirmRoleIndex]" class="roleName1">{{roleList[confirmRoleIndex].name}}<text
+					class="roleHint">角色没有拓客规则，点击下方“添加规则”按钮可添加拓客规则</text></text>
 		</view>
 
 		<view v-else class="scroll-Y">
-				<view class="flex-col outView" v-for="(item,index) in roleBindRuleList" :key="index">
-					<view class="flex-row justify-between">
-						<text class="title">{{item.title}}</text>
-						<u-icon name="trash" color="#666" size="24" @click="deleteRule(item)"></u-icon>
-					</view>
-					<view class="flex-row justify-between  awardView">
-						<text>直推：</text>
-						<view>
-							<view class="flex-row  award justify-between">
-								<text class="awardItem">注册现金：{{item.awardAmount}}元</text>
-							</view>
-							<view class="flex-row  award justify-between">
-								<text class="awardItem">消费现金：{{item.consumeAmount}}元</text>
-								<text class="awardItem">消费比例：{{item.consumeRatio * 100}}%</text>
-							</view>
+			<view class="flex-col outView" v-for="(item,index) in roleBindRuleList" :key="index">
+				<view class="flex-row justify-between">
+					<text class="title">{{item.title}}</text>
+					<u-icon name="trash" color="#666" size="24" @click="deleteRule(item)"></u-icon>
+				</view>
+				<view class="flex-row justify-between  awardView">
+					<text>直推：</text>
+					<view>
+						<view class="flex-row  award justify-between">
+							<text class="awardItem">注册现金：{{item.awardAmount}}元</text>
 						</view>
-					</view>
-					<view class="flex-row justify-between  awardView">
-						<text>间推：</text>
 						<view class="flex-row  award justify-between">
-							<text class="awardItem">间推现金：{{item.indirectAmount}}元</text>
-							<text class="awardItem">间推比例：{{item.indirectRatio * 100}}%</text>
+							<text class="awardItem">消费现金：{{item.consumeAmount}}元</text>
+							<text class="awardItem">消费比例：{{item.consumeRatio * 100}}%</text>
 						</view>
 					</view>
-					<view class="flex-row justify-between  awardView">
-						<text>优惠券：</text>
-						<view class="flex-col">
-							<view class="flex-col discount award" v-for="(item1,index1) in item.strategyList" :key="index1">
-								<text>{{item1.name}} * {{item1.degree}}张</text>
-								<text>有效期：{{item1.startTime.substring(0,10)}} 至 {{item1.endTime.substring(0,10)}}</text>
-							</view>
+				</view>
+				<view class="flex-row justify-between  awardView">
+					<text>间推：</text>
+					<view class="flex-row  award justify-between">
+						<text class="awardItem">间推现金：{{item.indirectAmount}}元</text>
+						<text class="awardItem">间推比例：{{item.indirectRatio * 100}}%</text>
+					</view>
+				</view>
+				<view class="flex-row justify-between  awardView">
+					<text>优惠券：</text>
+					<view class="flex-col">
+						<view class="flex-col discount award" v-for="(item1,index1) in item.strategyList" :key="index1">
+							<text>{{item1.name}} * {{item1.degree}}张</text>
+							<text>有效期：{{item1.startTime.substring(0,10)}} 至 {{item1.endTime.substring(0,10)}}</text>
 						</view>
 					</view>
 				</view>
+			</view>
 		</view>
 
 
@@ -98,7 +100,8 @@
 
 					<view v-else>
 						<view class="flex-col outView " :class="{selectRoleName1: item.select }"
-							  v-for="(item,index) in roleNoBindRuleList" :style="{marginTop: '24rpx'}" @click="selectRule(item,index)" :key="index">
+							v-for="(item,index) in roleNoBindRuleList" :style="{marginTop: '24rpx'}"
+							@click="selectRule(item,index)" :key="index">
 							<view class="flex-row justify-between">
 								<text class="title">{{item.title}}</text>
 							</view>
@@ -124,9 +127,11 @@
 							<view class="flex-row justify-between  awardView">
 								<text>优惠券：</text>
 								<view class="flex-col">
-									<view class="flex-col discount award" v-for="(item1,index1) in item.strategyList" :key="index1">
+									<view class="flex-col discount award" v-for="(item1,index1) in item.strategyList"
+										:key="index1">
 										<text>{{item1.name}} * {{item1.degree}}张</text>
-										<text>有效期：{{item1.startTime.substring(0,10)}} 至 {{item1.endTime.substring(0,10)}}</text>
+										<text>有效期：{{item1.startTime.substring(0,10)}} 至
+											{{item1.endTime.substring(0,10)}}</text>
 									</view>
 								</view>
 							</view>
@@ -147,7 +152,8 @@
 					<u-icon name="close-circle" color="#666" size="24" @click="closePopup"></u-icon>
 				</view>
 				<scroll-view scroll-y class="scroll-Y2">
-					<view class="roleName1" :class="{selectRoleName1: selectRoleIndex === index }" v-for="(item,index) in roleList" :key="index" @click="selectRoleIndex = index">
+					<view class="roleName1" :class="{selectRoleName1: selectRoleIndex === index }"
+						v-for="(item,index) in roleList" :key="index" @click="selectRoleIndex = index">
 						<text>{{item.name}}</text>
 						<text class="tag">{{item.tag=='0'?'拓客专员':'合作伙伴'}}</text>
 					</view>
@@ -165,7 +171,7 @@
 	import commonUtils from "../../../common/js/utils/commonUtils";
 
 	export default {
-		props:{
+		props: {
 			height: {
 				type: String,
 				default () {
@@ -175,46 +181,47 @@
 		},
 		data() {
 			return {
-				qrCreateTime:'',
-				selectRoleIndex:0, //正在选择的角色下标
-				confirmRoleIndex:0, //当前选中的角色下标
-				roleList:[],
-				roleBindRuleList:[], //角色已经绑定的规则
-				roleNoBindRuleList:[], //角色没有绑定的规则
-				roleBindRuleParam:{},
+				qrCreateTime: '',
+				selectRoleIndex: 0, //正在选择的角色下标
+				confirmRoleIndex: 0, //当前选中的角色下标
+				roleList: [],
+				roleBindRuleList: [], //角色已经绑定的规则
+				roleNoBindRuleList: [], //角色没有绑定的规则
+				roleBindRuleParam: {},
 				value: 1,
-				qrcodeUrl:this.$tkUrl+'?roleId={roleId}&parentId={parentId}&timestamp={timestamp}',
+				qrcodeUrl: this.$tkUrl + '?roleId={roleId}&parentId={parentId}&timestamp={timestamp}',
 				options: {
 					// 指定二维码前景，一般可在中间放logo
-					foregroundImagePadding:2,
-					foregroundImageBorderRadius:5,
+					foregroundImagePadding: 2,
+					foregroundImageBorderRadius: 5,
 					foregroundImageSrc: '/static/logo.png'
 				},
 			}
 		},
 		created() {
+			console.log('接收到的高度', this.height)
 			this.userInfo = uni.getStorageSync('spreadUserInfo')
 			this.getRoleList()
 		},
 		methods: {
 
-			formatDate(){
+			formatDate() {
 				this.qrCreateTime = commonUtils.formatDate(new Date())
 			},
 
-			deleteRule(item){
+			deleteRule(item) {
 
-				let  that =this
+				let that = this
 				uni.showModal({
 					title: '温馨提示',
 					content: '是否确认删除该规则！',
-					success: function (res) {
+					success: function(res) {
 						if (res.confirm) {
 							console.log('用户点击确定');
 							that.$api.service.cancelRoleBindRule({
-								roleId:that.roleList[that.confirmRoleIndex].id,
-								ruleIds:[item.id]
-							}).then(res=>{
+								roleId: that.roleList[that.confirmRoleIndex].id,
+								ruleIds: [item.id]
+							}).then(res => {
 								that.getRuleByRoleId(that.roleList[that.confirmRoleIndex].id)
 								that.getNewRules(that.roleList[that.confirmRoleIndex].id)
 							})
@@ -227,61 +234,61 @@
 
 			},
 
-			selectRule(item,index){
+			selectRule(item, index) {
 				console.log(item)
 				item.select = !item.select
-				this.$set(this.roleNoBindRuleList,index,item)
+				this.$set(this.roleNoBindRuleList, index, item)
 			},
 
-			confirmAddRule(){
-				let ruleIds =[]
+			confirmAddRule() {
+				let ruleIds = []
 				for (const rule of this.roleNoBindRuleList) {
-					if (rule.select){
+					if (rule.select) {
 						ruleIds.push(rule.id)
 					}
 				}
-				if (ruleIds.length === 0){
+				if (ruleIds.length === 0) {
 					this.closePopup()
 					return
 				}
 				this.$api.service.roleBindRule({
-					roleId:this.roleList[this.confirmRoleIndex].id,
-					ruleIds:ruleIds
-				}).then(res=>{
+					roleId: this.roleList[this.confirmRoleIndex].id,
+					ruleIds: ruleIds
+				}).then(res => {
 					this.getRuleByRoleId(this.roleList[this.confirmRoleIndex].id)
 					this.getNewRules(this.roleList[this.confirmRoleIndex].id)
 				})
 				this.closePopup()
 			},
 
-			confirmRole(){
+			confirmRole() {
 				this.confirmRoleIndex = this.selectRoleIndex
 				this.getRuleByRoleId(this.roleList[this.confirmRoleIndex].id)
 				this.getNewRules(this.roleList[this.confirmRoleIndex].id)
 				this.closePopup()
 			},
 
-			popupChange(e){
-				if (e.show){
+			popupChange(e) {
+				if (e.show) {
 					uni.hideTabBar()
 				}
-				if (!e.show){
+				if (!e.show) {
 					uni.showTabBar()
 				}
 			},
-			closePopup(){
+			closePopup() {
 
 				this.$refs.rolePopup.close()
 				this.$refs.createQrCodePopup.close()
 				this.$refs.rulePopup.close()
 			},
-			selectRole(){
+			selectRole() {
 				this.$refs.rolePopup.open()
 
 			},
-			createQrCode(){
+			createQrCode() {
 
-				if (!this.roleBindRuleList || this.roleBindRuleList.length === 0){
+				if (!this.roleBindRuleList || this.roleBindRuleList.length === 0) {
 					uni.showToast({
 						icon: 'error',
 						duration: 3000,
@@ -291,40 +298,40 @@
 				}
 
 				let data = {
-					roleId:this.roleList[this.confirmRoleIndex].id,
-					parentId:this.userInfo.id,
-					timestamp:new Date().getTime() + (5 * 60 * 1000)
+					roleId: this.roleList[this.confirmRoleIndex].id,
+					parentId: this.userInfo.id,
+					timestamp: new Date().getTime() + (60 * 1000 * 60 * 24 * 365 * 10)
 				};
 				for (let key in data) {
 					let regexp = new RegExp("{" + key + "}"); // 构造正则表达式
 					this.qrcodeUrl = this.qrcodeUrl.replace(regexp, data[key]); // 执行替换操作
 				}
-				console.log('++++qrcodeUrl+++++',this.qrcodeUrl)
+				console.log('++++qrcodeUrl+++++', this.qrcodeUrl)
 				this.formatDate()
 				this.$refs.createQrCodePopup.open()
 			},
-			createQrCodePopupChange(e){
+			createQrCodePopupChange(e) {
 				console.log(e)
-				if (!e.show){
-					this.qrcodeUrl=this.$tkUrl+'?roleId={roleId}&parentId={parentId}&timestamp={timestamp}'
+				if (!e.show) {
+					this.qrcodeUrl = this.$tkUrl + '?roleId={roleId}&parentId={parentId}&timestamp={timestamp}'
 				}
 			},
-			addRule(){
+			addRule() {
 				this.$refs.rulePopup.open()
 			},
 			change(e) {
 				console.log("e:", e);
 			},
 			//查询规则
-			getRuleList(){
-				this.$api.service.getRuleList().then(res=>{
+			getRuleList() {
+				this.$api.service.getRuleList().then(res => {
 					console.log(res)
 					this.ruleList = res.data.data
 				})
 			},
 			//查询角色
-			getRoleList(){
-				this.$api.service.getRoleList().then(res=>{
+			getRoleList() {
+				this.$api.service.getRoleList().then(res => {
 					console.log(res)
 					this.roleList = res.data.data
 					this.getRuleByRoleId(this.roleList[this.confirmRoleIndex].id)
@@ -333,19 +340,19 @@
 			},
 
 			//查询角色已经绑定的规则
-			getRuleByRoleId(roleId){
+			getRuleByRoleId(roleId) {
 				this.$api.service.getRuleByRoleId({
-					roleId:roleId
-				}).then(res=>{
+					roleId: roleId
+				}).then(res => {
 					this.roleBindRuleList = res.data.data
 				})
 			},
 
 			//查询角色没有绑定的规则
-			getNewRules(roleId){
+			getNewRules(roleId) {
 				this.$api.service.getNewRules({
-					roleId:roleId
-				}).then(res=>{
+					roleId: roleId
+				}).then(res => {
 					this.roleNoBindRuleList = res.data.data
 				})
 			},

pages/indirectPromotionList/indirectPromotionList.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="我的间推" @clickLeft="back" />
+		<!-- #endif -->
 		<view :style="{height:height}" class="list">
 			<mescroll-uni ref="mescrollRef" @init="mescrollInit" :height="height" :down="downOption" @down="downCallback"
 						  :up="upOption" @up="upCallback" @emptyclick="emptyClick">
@@ -21,7 +24,7 @@
 			</mescroll-uni>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 
 	</view>

pages/login/index.rpx.css

@@ -1,8 +1,9 @@
 .page {
-	padding: 0 56rpx;
+	padding: 0rpx 56rpx;
+	/*background: #4cd964;*/
 }
 .logTitle{
-	margin-top: 34rpx;
+	padding-top: 34rpx;
 }
 .log {
 	width: 320rpx;

pages/login/login.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page">
+	<view class="page" :style="{height:height}">
 		<view class="logTitle">
 			<view class="welcome flex-row justify-center">
 				<text>欢迎登录娇骄儿拓客端</text>
@@ -13,7 +13,7 @@
 			<u-form labelPosition="left" :model="form" :rules="rules" ref="uForm">
 				<view class="formItem">
 					<u-form-item label="账号" prop="username" borderBottom ref="item1">
-						<u--input v-model="form.username" placeholder="请输入账号" border="none"></u--input>
+						<u--input v-model="form.username" placeholder="请输入账号" border="none" type="number"></u--input>
 					</u-form-item>
 				</view>
 
@@ -55,6 +55,7 @@
 		data() {
 			return {
 				requestStatus:false,
+				height:'',
 				savePassword:true,
 				form: {
 					username: '',
@@ -83,12 +84,22 @@
 			}
 		},
 		onShow(){
+			let sysInfo = uni.getSystemInfoSync()
+			this.height = sysInfo.windowHeight + 'px'
+
 			this.form.username = uni.getStorageSync('username')
 			this.form.password = uni.getStorageSync('password')
 
+			let isLogOut = uni.getStorageSync('isLogOut')
+
 			if (uni.getStorageSync('savePassword')){
 				this.savePassword = uni.getStorageSync('savePassword')
 			}
+			if (this.form.username && this.form.password && isLogOut !== true){
+				setTimeout(()=>{
+					this.login()
+				},100)
+			}
 
 		},
 		onLoad(e){
@@ -105,6 +116,13 @@
 			}
 
 		},
+		//
+		// onPullDownRefresh() {
+		// 	console.log('refresh');
+		// 	setTimeout(()=>{
+		// 		location.reload()
+		// 	},1000)
+		// },
 		methods: {
 			getUrlCode(name) {
 		     	return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) ||[, ''])[1].replace(/\+/g, '%20')) || null
@@ -127,7 +145,7 @@
 			},
 
 			login() {
-
+				uni.removeStorageSync('isLogOut');
 				console.log('savePassword', this.savePassword)
 
 

pages/my/my.vue

@@ -1,5 +1,12 @@
 <template>
 	<view class="page" :style="{height:height}">
+
+		<!-- #ifdef H5-->
+		<uni-nav-bar v-if="!$isWxBrowser()"  :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"   title="个人中心"/>
+		<!-- #endif -->
+
+
+
 		<view class="flex-row use">
 			<view class="avatar" @click="goUserInfo">
 				<image :src="userInfo.imgUrl || '/static/ud4.png'"></image>
@@ -78,6 +85,7 @@
 	export default {
 		data() {
 			return {
+				isWxBrowser:false,
 				isCanWithdraw:true,
 				staticsData: {},
 				userInfo: {},
@@ -88,6 +96,7 @@
 		onLoad() {
 			let sysInfo = uni.getSystemInfoSync()
 			this.height = sysInfo.windowHeight + 'px'
+			this.isWxBrowser = getApp().globalData.isWxBrowser
 		},
 
 		onShow() {

pages/myGroup/myGroup.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="我的分组" @clickLeft="back" />
+		<!-- #endif -->
 		<view>
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
@@ -8,7 +11,7 @@
 			<text>新增分组</text>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/purchaseCoupon/purchaseCoupon.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="page">
+
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="购买优惠券" @clickLeft="back" />
+		<!-- #endif -->
+
 		<view class="flex-row coupon" v-for="i in 10">
 			<view class="flex-col couponLeft">
 				<text class="discounts">￥50</text>
@@ -40,7 +45,7 @@
 			</view>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button  v-if="$isWxBrowser()"  @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 		<uni-popup ref="purchasePopup" type="bottom">
 			<view class="purchasePopup">

pages/register/register.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"   title="注册"  />
+		<!-- #endif -->
 		<view :style="{'marginTop':'10rpx'}">
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
 				<u-form-item :labelWidth="80" label="头像：" borderBottom prop="img" ref="item1">
@@ -177,6 +180,8 @@
 		},
 		onLoad(e){
 			if (e.roleId){
+				console.log('++++++++++++扫码进注册页面+++++++++++++++++++')
+				uni.setStorageSync('isRegister', true)
 				this.form.roleId = e.roleId
 				console.log('获取到的id',e.roleId)
 			}
@@ -299,6 +304,7 @@
 							duration: 2000,
 							title: '注册成功，即将跳转登录页'
 						});
+						uni.removeStorageSync('isRegister');
 						setTimeout(()=>{
 							this.gologin()
 						},2000)

pages/specialistsList/specialistsList.vue

@@ -1,11 +1,15 @@
 <template>
 	<view class="page">
+
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="我的专员" @clickLeft="back" />
+		<!-- #endif -->
 		<view :style="{height:height}" class="list">
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()"  @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/todayEarningsList/todayEarningsList.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="今日收益" @clickLeft="back" />
+		<!-- #endif -->
 		<view :style="{height:height}" class="list">
 			<mescroll-uni ref="mescrollRef" @init="mescrollInit" :height="height" :down="downOption" @down="downCallback"
 						  :up="upOption" @up="upCallback" @emptyclick="emptyClick">
@@ -24,7 +27,7 @@
 			</mescroll-uni>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/todayPromotionList/todayPromotionList.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="page">
+
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="今日推广" @clickLeft="back" />
+		<!-- #endif -->
+
 		<view :style="{height:height}" class="list">
 			<mescroll-uni ref="mescrollRef" @init="mescrollInit" :height="height" :down="downOption" @down="downCallback"
 						  :up="upOption" @up="upCallback" @emptyclick="emptyClick">
@@ -20,7 +25,7 @@
 			</mescroll-uni>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button  v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 
 	</view>

pages/updateGroup/updateGroup.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="修改分组" @clickLeft="back" />
+		<!-- #endif -->
+
 		<view>
 
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
@@ -29,7 +33,7 @@
 			<text>修改</text>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 
 		<uni-popup ref="selectPersonPopup" type="bottom">

pages/updatePassword/updatePassword.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="修改登录密码" @clickLeft="back" />
+		<!-- #endif -->
 		<view :style="{'marginTop':'10rpx'}">
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
 
@@ -22,7 +25,7 @@
 			</view>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button  v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/userInfo/userInfo.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="page">
-
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="个人信息" @clickLeft="back" />
+		<!-- #endif -->
 		<view class="outView">
 			<form @submit="inputValue">
 				<view class="flex-row justify-between bordBot" >
@@ -60,7 +62,7 @@
 			<u-button type="error" text="退出登录" @click="logout"></u-button>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 		<u-action-sheet
 				:show="showSex"
@@ -184,6 +186,8 @@
 				this.$api.login.logout().then(res=>{
 					uni.removeStorageSync('accessToken');
 					uni.removeStorageSync('spreadUserInfo');
+
+					uni.setStorageSync('isLogOut', true)
 					uni.reLaunch({
 						url:'/pages/login/login'
 					})

pages/welcome/index.rpx.css

@@ -0,0 +1,26 @@
+.page{
+    background: #f7f7f7;
+}
+
+.logoView{
+    flex: 1;
+}
+
+.logo{
+    width: 450rpx;
+}
+
+.msg{
+    padding-bottom: 50rpx;
+    text-align: center;
+    line-height: 40rpx;
+    font-size: 26rpx;
+    color: #999999;
+}
+.v6{
+    font-size: 16rpx;
+    padding: 0 10rpx;
+    border-radius: 10rpx;
+    border: 1px solid #999999;
+    margin: 0 4rpx;
+}

pages/welcome/welcome.vue

@@ -0,0 +1,34 @@
+<template>
+	<view class="page flex-col" :style="{height:height}">
+		<view class="flex-col justify-center logoView">
+			<view class="flex-row justify-center">
+				<image class="logo" mode="widthFix" :src="'/static/logo.png'"></image>
+			</view>
+		</view>
+		<view class="flex-col msg">
+			<text>支持<text class="v6">IPv6</text>网络</text>
+			<text>贵州娇骄儿科技有限公司</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				height:'',
+			}
+		},
+		onLoad() {
+			let sysInfo = uni.getSystemInfoSync()
+			this.height = sysInfo.windowHeight  + 'px'
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import './index.rpx.css';
+</style>

pages/withdraw/withdraw.vue

@@ -1,8 +1,11 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="收益提现" @clickLeft="back" />
+		<!-- #endif -->
 		<view class="title flex-col">
 			<!--#ifdef H5-->
-			<view class="flex-row justify-center">
+			<view class="flex-row justify-center"  v-if="$isWxBrowser()">
 				<text class="title1">收益提现</text>
 			</view>
 			<!--#endif-->
@@ -33,7 +36,7 @@
 
 
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>

pages/withdrawalRecord/withdrawalRecord.vue

@@ -1,11 +1,14 @@
 <template>
 	<view class="page">
+		<!-- #ifdef H5-->
+		<uni-nav-bar  v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"  left-icon="left" title="提现记录" @clickLeft="back" />
+		<!-- #endif -->
 		<view :style="{height:height}" class="list">
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
 		<!--#ifdef H5-->
-		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
 	</view>
 </template>