chenjj 14 ore fa
parent
commit
d20a6a2df5
4 ha cambiato i file con 21 aggiunte e 5 eliminazioni
  1. 1 1
      .gitignore
  2. 7 0
      components/CustomTabBar/index.vue
  3. 6 1
      pages/common/orderList/userItem.vue
  4. 7 3
      pages/mine.vue

+ 1 - 1
.gitignore

@@ -8,4 +8,4 @@ node_modules
 .idea
 .vscode
 project.private.config.json
-.VSCodeCounter
+.VSCodeCounter

+ 7 - 0
components/CustomTabBar/index.vue

@@ -66,6 +66,13 @@ export default {
                         "text": "分类",
                         key: 'class'
                     },
+                    {
+                    "pagePath": "/pages/chat",
+                    "iconPath": "/static/images/tabbar/class.png",
+                    "selectedIconPath": "/static/images/tabbar/class_.png",
+                    "text": "消息",
+                    key: 'chat'
+                    },
                     {
                         "pagePath": "/pages/classify",
                         "iconPath": "/static/images/tabbar/work.png",

+ 6 - 1
pages/common/orderList/userItem.vue

@@ -53,7 +53,12 @@ const order_status = inject('order_status');
 const btns = [
     {
         name: '沟通',
-        onClick: () => { },
+        onClick: (e) => {
+		console.log("TCL: e", e)
+        uni.navigateTo({
+            url: `/pages_orderuser/pages/talk/pages/index/index?orderId=${e.mainOrderId}`
+        });
+         },
         type: 'primary'
     },
     {

+ 7 - 3
pages/mine.vue

@@ -221,9 +221,13 @@ const userList = ref([
 ]);
 const onLogin = () => {
 	const token = getToken();
-	!token && store.dispatch('LogOut').then(res => {
-		uni.reLaunch({ url: '/pages/login' })
-	})
+	!token && showConfirm('您还未登陆系统,是否前往登陆?').then(res => {
+			if (res.confirm) {
+				store.dispatch('LogOut').then(res => {
+				uni.reLaunch({ url: '/pages/login' })
+				})
+			}
+        })
 }
 
 const onLogou = () => {