Merge branch 'master' of http://192.168.9.26/xiaxr/appweb

.gitignore

-# /node_modules
\ No newline at end of file
+/node_modules
\ No newline at end of file

App.vue

@@ -199,4 +199,15 @@
 		color: #c9c9c9;
 		color: #c9c9c9;
 	}
 	}
 	/*每个页面公共css */
 	/*每个页面公共css */
+	
+	/*弹窗插件样式覆盖*/
+	.dialog-btn {
+		color: #0069FF;
+	}
+	
+	.message .message-dialog.alert .message-content,
+	.message .message-dialog.confirm .message-content,
+	.message .message-dialog.prompt .message-content {
+		border-radius: 25.36upx !important;
+	}
 </style>
 </style>

main.js

@@ -12,11 +12,16 @@ import 'vue-easytable/libs/themes-base/index.css'
 // 导入 table 和 分页组件
 // 导入 table 和 分页组件
 import {VTable,VPagination} from 'vue-easytable'
 import {VTable,VPagination} from 'vue-easytable'
 
 
+//引入弹窗组件
+import MobileMessage from 'mobile-message'
+import 'mobile-message/dist/message.css'
 // 注册到全局
 // 注册到全局
 Vue.component(VTable.name, VTable)
 Vue.component(VTable.name, VTable)
 Vue.component(VPagination.name, VPagination)
 Vue.component(VPagination.name, VPagination)
 Vue.use(VueI18n)
 Vue.use(VueI18n)
 Vue.use(AwesomePicker);
 Vue.use(AwesomePicker);
+console.log('main MobileMessage', MobileMessage)
+Vue.use(MobileMessage)
 Vue.config.productionTip = false
 Vue.config.productionTip = false
 Vue.prototype.echarts=echarts;
 Vue.prototype.echarts=echarts;
 App.mpType = 'app'
 App.mpType = 'app'

pages.json

@@ -20,7 +20,7 @@
             "navigationBarTitleText": "精准客流"
             "navigationBarTitleText": "精准客流"
 		}
 		}
     },{
     },{
-        "path": "pages/my/index",
+        "path": "pages/profile/index",
         "style": {
         "style": {
             "navigationBarTitleText": "我的"
             "navigationBarTitleText": "我的"
 		}
 		}
@@ -150,7 +150,7 @@
             "selectedIconPath": "static/index/manageSelect.png",
             "selectedIconPath": "static/index/manageSelect.png",
             "text": "后台管理"
             "text": "后台管理"
         }, {
         }, {
-            "pagePath": "pages/my/index",
+            "pagePath": "pages/profile/index",
             "iconPath": "static/index/my.png",
             "iconPath": "static/index/my.png",
             "selectedIconPath": "static/index/mySelect.png",
             "selectedIconPath": "static/index/mySelect.png",
             "text": "我的"
             "text": "我的"

pages/login/login.vue

@@ -88,7 +88,7 @@
 								}
 								}
 							})
 							})
 							uni.request({
 							uni.request({
-								url:window.url+"accounts",
+								url:window.url+"/accounts",
 								data:{
 								data:{
 									id:this.id,
 									id:this.id,
 									_t:Date.parse(new Date())/1000
 									_t:Date.parse(new Date())/1000

pages/my/index.vue

-<template>
-	<view>
-		222000
-		<button onclick="model.switchConnectType()">调用swift无参</button>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

pages/profile/index.vue

+<template>
+	<view>
+		<headerComp :title="titleStr"></headerComp>
+		<view style="height: 25.36upx"></view>
+		<view class="profile-item" @tap="switchConnect">
+			<span class="texts">切换服务器地址</span>
+			<img class="arrows" :src="rArrow" alt=""/>
+		</view>
+		<view class="profile-item">
+			<span class="texts">修改密码</span>
+			<img class="arrows" :src="rArrow" alt=""/>
+		</view>
+		<view class="logout">
+			<button type="primary" class="primary logout-btn" @tap="logoutHandle">退出登录</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import headerComp from '../../components/header'
+	import backArrow from '../../static/header/backArrow.png'
+	import rArrow from "../../static/analysis/rArrow.png"
+// 	import MobileMessage from 'mobile-message'
+// 	import 'mobile-message/dist/message.css'
+
+	export default {
+		onLoad(option) {
+			console.log(option)
+		},
+		components: {
+			headerComp
+		},
+		data() {
+			return {
+				titleStr: '我的',
+				backArrow: backArrow,
+				rArrow: rArrow
+			}
+		},
+		methods: {
+			switchConnect() {
+				this.$message.confirm('<div class="dialog-content" style="color: #333; font-size: 17px;text-align: center;">确认切换该服务器地址?</div>', function(res, body) {
+				}, [{
+					className: 'dialog-btn',
+					label: '取消',
+					callback: function(res, $body) {
+						return true;
+					}
+				}, {
+					className: 'dialog-btn',
+					label: '确定',
+					callback: function(res, $body) {
+						console.log(res, $body)
+						// model.switchConnectType() // 调用swift 无参
+					}
+				}], '提示');
+			},
+			logoutHandle() {
+				Object.keys(window.localStorage).forEach(item => {
+					window.localStorage.removeItem(item)
+				})
+				uni.reLaunch({
+				    url: '../login/login',
+				});
+			},
+		},
+	}
+</script>
+
+<style>
+	.profile-item {
+		background: #FFFFFF;
+		position: relative;
+	}
+	.texts {
+		display: block;
+		height: 90.57upx;
+		line-height: 90.57upx;
+		margin-left: 23.55upx;
+		font-size: 28.98upx;
+		color: #333;
+		border-bottom: 1.81upx solid rgba(151, 151, 151, .2);
+		box-sizing: border-box;
+	}
+	.profile-item:last-of-type .texts {
+		border-bottom: none;
+	}
+	.arrows {
+		width: 14.49upx;
+		height: 25.36upx;
+		position: absolute;
+		right: 23.55upx;
+		top: 32.6upx;
+	}
+	.logout {
+		margin-top: 255.43upx;
+		padding: 0 41.66upx;
+	}
+	.logout-btn {
+		background-color: transparent;
+		border: 1px solid #0069FF;
+		color: #0069FF;
+		border-radius: 41.66upx;
+	}
+</style>

static/common.js

 window.url="https://store.keliuyun.com/report"
 window.url="https://store.keliuyun.com/report"
+// window.url="http://192.168.7.228:17070"
 window.pageType="store";
 window.pageType="store";
\ No newline at end of file