refactor

common/picker.js

@@ -4,7 +4,7 @@ export default {
     install(Vue) {
         Vue.prototype.$pickUser = function (options) {
             uni.navigateTo({
-                url: '/pages/pick/PickUserView',
+                url: '/pages/pick/PickUserPage',
                 events: {
                     pickedUsers: users => {
                         options.successCB && options.successCB(users);

components/main-action-menu/main-action-menu.vue

@@ -82,7 +82,7 @@ export default {
         },
         go2SearchFriend() {
             uni.navigateTo({
-                url: '/pages/contact/SearchUserView',
+                url: '/pages/contact/SearchUserPage',
                 fail: err => {
                 }
             })

main.js

@@ -27,10 +27,22 @@ const i18n = new VueI18n({
     }
 })
 
+Vue.prototype.$navigateToPage = (url, options) => {
+    uni.navigateTo({
+        url: url,
+        success: (res) => {
+            res.eventChannel.emit('options', options);
+        },
+        fail: (e) => {
+            console.log('navigate to WebViewPage error', e)
+        }
+    });
+}
+
 // 如果不存在会话页面，则入栈，如果已经存在会话页面，则返回到该页面
 Vue.prototype.$go2ConversationPage = () => {
     let pages = getCurrentPages();
-    let cvRoute = 'pages/conversation/ConversationView'
+    let cvRoute = 'pages/conversation/ConversationPage'
     let delta = 0;
     let found = false;
     for (let i = pages.length - 1; i >= 0; i--) {
@@ -50,18 +62,18 @@ Vue.prototype.$go2ConversationPage = () => {
         });
     } else {
         uni.navigateTo({
-            url: '/pages/conversation/ConversationView',
+            url: '/pages/conversation/ConversationPage',
             success: () => {
-                console.log('nav to conversationView success');
+                console.log('nav to conversationPage success');
 
             },
             fail: (err) => {
-                console.log('nav to conversationView err', err);
+                console.log('nav to conversationPage err', err);
             }
         })
     }
 }
-Vue.prototype.$scrollToBottom= () => {
+Vue.prototype.$scrollToBottom = () => {
     setTimeout(() => {
         uni.pageScrollTo({
             scrollTop: 999999,

pages.json

@@ -12,13 +12,13 @@
             }
         },
 		{
-			"path": "pages/login/login",
+			"path": "pages/login/LoginPage",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
 		},
 		{
-			"path": "pages/conversationList/ConversationListView",
+			"path": "pages/conversationList/ConversationListPage",
 			"style": {
 				"navigationBarTitleText": "会话列表",
                 "app-plus": {
@@ -40,7 +40,7 @@
 			}
 		},
         {
-            "path": "pages/conversation/ConversationView",
+            "path": "pages/conversation/ConversationPage",
             "style": {
                 "navigationBarTitleText": "会话详情",
                 "enablePullDownRefresh": false,
@@ -66,7 +66,7 @@
             }
         },
         {
-            "path": "pages/conversation/SingleConversationInfoView",
+            "path": "pages/conversation/SingleConversationInfoPage",
             "style": {
                 "navigationBarTitleText": "单人会话信息"
             }
@@ -78,13 +78,13 @@
             }
         },
         {
-            "path": "pages/conversation/GroupConversationInfoView",
+            "path": "pages/conversation/GroupConversationInfoPage",
             "style": {
                 "navigationBarTitleText": "群会话信息"
             }
         },
         {
-            "path": "pages/contact/SearchUserView",
+            "path": "pages/contact/SearchUserPage",
             "style": {
                 "navigationBarTitleText": "搜索用户"
             }
@@ -102,13 +102,13 @@
             }
         },
 		{
-			"path": "pages/contact/UserDetailView",
+			"path": "pages/contact/UserDetailPage",
 			"style": {
 				"navigationBarTitleText": "用户信息"
 			}
 		},
 		{
-			"path": "pages/contact/ContactListView",
+			"path": "pages/contact/ContactListPage",
 			"style": {
 				"navigationBarTitleText": "好友",
                 "app-plus": {
@@ -130,7 +130,7 @@
 			}
 		},
         {
-            "path": "pages/pick/PickUserView",
+            "path": "pages/pick/PickUserPage",
             "style": {
                 "navigationBarTitleText": "选择联系人"
             }
@@ -165,13 +165,13 @@
 		"color": "#7f8389",
 		"list": [
 			{
-				"pagePath": "pages/conversationList/ConversationListView",
+				"pagePath": "pages/conversationList/ConversationListPage",
 				"text": "会话列表",
 				"iconPath": "static/image/tabbar/message_normal.png",
 				"selectedIconPath": "static/image/tabbar/message_press.png"
 			},
 			{
-				"pagePath": "pages/contact/ContactListView",
+				"pagePath": "pages/contact/ContactListPage",
 				"text": "好友列表",
 				"iconPath": "static/image/tabbar/contact_normal.png",
 				"selectedIconPath": "static/image/tabbar/contact_press.png"

pages/SplashPage.vue

@@ -15,14 +15,14 @@ export default {
             this.go2ConversationList();
         } else {
             uni.redirectTo({
-                url: '/pages/login/login',
+                url: '/pages/login/LoginPage',
             })
         }
     },
     methods: {
         go2ConversationList() {
             uni.switchTab({
-                url: '/pages/conversationList/ConversationListView',
+                url: '/pages/conversationList/ConversationListPage',
                 success: () => {
                     console.log('to conversation list success');
                 },

pages/contact/ContactListView.vue → pages/contact/ContactListPage.vue

@@ -50,7 +50,7 @@ import UserListVue from "../user/UserListVue";
 import UniList from "../../components/uni-list/uni-list.vue";
 
 export default {
-    name: "ContactListView",
+    name: "ContactListPage",
     components: {UniList, UserListVue, GroupListVue, FriendRequestListView},
     data() {
         return {
@@ -77,13 +77,13 @@ export default {
         setCurrentUser(userInfo) {
             store.setCurrentFriend(userInfo)
             uni.navigateTo({
-                url: './UserDetailView',
+                url: './UserDetailPage',
                 success: () => {
-                    console.log('nav to userDetailView success');
+                    console.log('nav to UserDetailPage success');
 
                 },
                 fail: (err) => {
-                    console.log('nav to userDetailView err', err);
+                    console.log('nav to UserDetailPage err', err);
                 }
             });
         },

pages/contact/SearchUserView.vue → pages/contact/SearchUserPage.vue

@@ -20,7 +20,7 @@ import wfc from "../../wfc/client/wfc";
 import SearchType from "../../wfc/model/searchType";
 
 export default {
-    name: "SearchUserView",
+    name: "SearchUserPage",
     components: {UserListVue},
     data() {
         return {

pages/contact/UserDetailView.vue → pages/contact/UserDetailPage.vue

@@ -45,7 +45,7 @@ import Conversation from "../../wfc/model/conversation";
 import wfc from "../../wfc/client/wfc";
 
 export default {
-    name: "UserDetailView",
+    name: "UserDetailPage",
     data() {
         return {
             sharedStateContact: store.state.contact,

pages/conversation/ConversationView.vue → pages/conversation/ConversationPage.vue

@@ -53,25 +53,11 @@
                               ref="messageInputView"
             />
             <MultiSelectActionView v-show="sharedConversationState.enableMessageMultiSelection"/>
-            <!--                <SingleConversationInfoView-->
-            <!--                    v-if="showConversationInfo &&  sharedConversationState.currentConversationInfo.conversation.type === 0"-->
-            <!--                    :conversation-info="sharedConversationState.currentConversationInfo"-->
-            <!--                    v-bind:class="{ active: showConversationInfo }"-->
-            <!--                    class="conversation-info-container"-->
-            <!--                />-->
-            <!--                <GroupConversationInfoView-->
-            <!--                    v-if="showConversationInfo &&  sharedConversationState.currentConversationInfo.conversation.type === 1"-->
-            <!--                    :conversation-info="sharedConversationState.currentConversationInfo"-->
-            <!--                    v-bind:class="{ active: showConversationInfo }"-->
-            <!--                    class="conversation-info-container"-->
-            <!--                />-->
         </view>
     </view>
 </template>
 
 <script>
-import SingleConversationInfoView from "@/pages/conversation/SingleConversationInfoView";
-import GroupConversationInfoView from "@/pages/conversation/GroupConversationInfoView";
 import MessageInputView from "@/pages/conversation/MessageInputView";
 import NormalOutMessageContentView from "@/pages/conversation/message/NormalOutMessageContentContainerView";
 import NormalInMessageContentView from "@/pages/conversation/message/NormalInMessageContentContainerView";
@@ -102,6 +88,7 @@ import {getItem, setItem} from "../util/storageHelper";
 
 var amr;
 export default {
+    name: 'ConversationPage',
     components: {
         MultiSelectActionView,
         NotificationMessageContentView,
@@ -109,8 +96,6 @@ export default {
         NormalInMessageContentView,
         NormalOutMessageContentView,
         MessageInputView,
-        GroupConversationInfoView,
-        SingleConversationInfoView,
     },
     // props: ["conversation"],
     data() {
@@ -172,27 +157,27 @@ export default {
     onNavigationBarButtonTap(e) {
         if (this.conversationInfo.conversation.type === ConversationType.Single) {
             uni.navigateTo({
-                url: '/pages/conversation/SingleConversationInfoView',
+                url: '/pages/conversation/SingleConversationInfoPage',
                 success: (res) => {
                     res.eventChannel.emit('conversationInfo', {
                         conversationInfo: this.conversationInfo
                     });
                 },
                 fail: (err) => {
-                    console.log('nav to SingleConversationInfoView err', err);
+                    console.log('nav to SingleConversationInfoPage err', err);
                 }
             });
 
         } else if (this.conversationInfo.conversation.type === ConversationType.Group) {
             uni.navigateTo({
-                url: '/pages/conversation/GroupConversationInfoView',
+                url: '/pages/conversation/GroupConversationInfoPage',
                 success: (res) => {
                     res.eventChannel.emit('conversationInfo', {
                         conversationInfo: this.conversationInfo
                     });
                 },
                 fail: (err) => {
-                    console.log('nav to GroupConversationInfoView err', err);
+                    console.log('nav to GroupConversationInfoPage err', err);
                 }
             });
         } else {

pages/conversation/GroupConversationInfoView.vue → pages/conversation/GroupConversationInfoPage.vue

@@ -68,7 +68,7 @@ import EventType from "../../wfc/client/wfcEvent";
 import appServerApi from "../../api/appServerApi";
 
 export default {
-    name: "GroupConversationInfoView",
+    name: "GroupConversationInfoPage",
     props: {
         conversationInfo: {
             type: ConversationInfo,
@@ -86,7 +86,7 @@ export default {
         }
     },
     onLoad(option) {
-        console.log('GroupConversationInfoView onLoad')
+        console.log('GroupConversationInfoPage onLoad')
         // #ifdef APP-NVUE
         const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
         // #endif
@@ -219,7 +219,7 @@ export default {
                 store.quitGroup(this.conversationInfo.conversation.target)
             }
             uni.switchTab({
-                url: '/pages/conversationList/ConversationListView',
+                url: '/pages/conversationList/ConversationListPage',
                 success: () => {
                     console.log('to conversation list success');
                 },

pages/conversation/SingleConversationInfoView.vue → pages/conversation/SingleConversationInfoPage.vue

@@ -20,7 +20,7 @@ import ConversationInfo from "@/wfc/model/conversationInfo";
 import store from "@/store";
 
 export default {
-    name: "SingleConversationInfoView",
+    name: "SingleConversationInfoPage",
     props: {
         conversationInfo: {
             type: ConversationInfo,
@@ -34,7 +34,7 @@ export default {
         }
     },
     onLoad(option) {
-        console.log('SingleConversationInfoView onLoad')
+        console.log('SingleConversationInfoPage onLoad')
         // #ifdef APP-NVUE
         const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
         // #endif

pages/conversation/message/NormalInMessageContentContainerView.vue

@@ -63,13 +63,13 @@ export default {
         onClickUserPortrait(userId) {
             store.setCurrentFriend(this.message._from);
             uni.navigateTo({
-                url: '/pages/contact/UserDetailView',
+                url: '/pages/contact/UserDetailPage',
                 success: () => {
-                    console.log('nav to UserDetailView success');
+                    console.log('nav to UserDetailPage success');
 
                 },
                 fail: (err) => {
-                    console.log('nav to UserDetailView err', err);
+                    console.log('nav to UserDetailPage err', err);
                 }
             })
         },

pages/conversation/message/NormalOutMessageContentContainerView.vue

@@ -97,13 +97,13 @@ export default {
         onClickUserPortrait(userId) {
             store.setCurrentFriend(this.message._from);
             uni.navigateTo({
-                url: '/pages/contact/UserDetailView',
+                url: '/pages/contact/UserDetailPage',
                 success: () => {
-                    console.log('nav to UserDetailView success');
+                    console.log('nav to UserDetailPage success');
 
                 },
                 fail: (err) => {
-                    console.log('nav to UserDetailView err', err);
+                    console.log('nav to UserDetailPage err', err);
                 }
             })
         },

pages/conversationList/ConversationListView.vue → pages/conversationList/ConversationListPage.vue

@@ -25,7 +25,7 @@ import wfc from "../../wfc/client/wfc";
 import ConnectionStatus from "../../wfc/client/connectionStatus";
 
 export default {
-    name: 'ConversationListView',
+    name: 'ConversationListPage',
     data() {
         return {
             sharedConversationState: store.state.conversation,

pages/login/login.vue → pages/login/LoginPage.vue

@@ -31,6 +31,7 @@ import ConnectionStatus from "../../wfc/client/connectionStatus";
 import appServerApi from "../../api/appServerApi";
 
 export default {
+    name: 'LoginPage',
     data() {
         return {
             focus: false,
@@ -110,7 +111,7 @@ export default {
 
         go2ConversationList() {
             uni.switchTab({
-                url: '/pages/conversationList/ConversationListView',
+                url: '/pages/conversationList/ConversationListPage',
                 success: () => {
                     console.log('to conversation list success');
                 },

pages/me/MePage.vue

@@ -39,13 +39,13 @@ export default {
         showUserInfo() {
             store.setCurrentFriend(this.user)
             uni.navigateTo({
-                url: '/pages/contact/UserDetailView',
+                url: '/pages/contact/UserDetailPage',
                 success: () => {
-                    console.log('nav to UserDetailView success');
+                    console.log('nav to UserDetailPage success');
 
                 },
                 fail: (err) => {
-                    console.log('nav to UserDetailView err', err);
+                    console.log('nav to UserDetailPage err', err);
                 }
             })
 

pages/pick/PickUserView.vue → pages/pick/PickUserPage.vue

@@ -44,7 +44,7 @@ import store from "@/store";
 import CheckableUserListView from "@/pages/user/CheckableUserListView";
 
 export default {
-    name: "PickUserView",
+    name: "PickUserPage",
     props: {
         users: {
             type: Array,
@@ -86,7 +86,7 @@ export default {
     },
 
     onLoad(option) {
-        console.log('PickUserView onLoad')
+        console.log('PickUserPage onLoad')
         // #ifdef APP-NVUE
         const eventChannel = this.$scope.eventChannel; // 兼容APP-NVUE
         // #endif

pages/test/testPage.vue

@@ -16,7 +16,7 @@ export default {
             wfc.disconnect();
             clear();
             uni.navigateTo({
-                url: '../login/login',
+                url: '../login/LoginPage',
                 success: () => {
                     console.log('nav to test-webrtc success');
 

pages/user/UserListVue.vue

@@ -79,13 +79,13 @@ export default {
             } else {
                 store.setCurrentFriend(user)
                 uni.navigateTo({
-                    url: '/pages/contact/UserDetailView',
+                    url: '/pages/contact/UserDetailPage',
                     success: () => {
-                        console.log('nav to userDetailView success');
+                        console.log('nav to UserDetailPage success');
 
                     },
                     fail: (err) => {
-                        console.log('nav to userDetailView err', err);
+                        console.log('nav to UserDetailPage err', err);
                     }
                 });
             }

store.js

@@ -1801,7 +1801,7 @@ function _reset() {
 
     uni.reLaunch(
         {
-            url: '/pages/login/login'
+            url: '/pages/login/LoginPage'
         }
     );
 }