Merge branch 'permission' of http://106.52.242.177:3000/askqvn/crm-app

pages.json

@@ -302,6 +302,33 @@
 				"navigationBarBackgroundColor": "#108cff",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/inquiry/index",
+			"style": {
+				"navigationBarTitleText": "询价中心",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#108cff",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/inquiry/add",
+			"style": {
+				"navigationBarTitleText": "询价中心-新增",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#108cff",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/verification/index",
+			"style": {
+				"navigationBarTitleText": "核价中心",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#108cff",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {
@@ -317,40 +344,63 @@
 		"height": "70px",
 		"fontSize": "12px",
 		"list": [
-		{
-			"text": "首页",
-			"pagePath": "pages/index/index",
-			"iconPath": "static/tabs/home.png",
-			"selectedIconPath": "static/tabs/home1.png"
-		},
-		{
-			"text": "线索公海",
-			"pagePath": "pages/publicClue/index",
-			"iconPath": "static/tabs/public.png",
-			"selectedIconPath": "static/tabs/public1.png"
-		}, 
-		{
-			"text": "仓库",
-			"pagePath": "pages/wareHouse/index",
-			"iconPath": "static/tabs/warehouse.png",
-			"selectedIconPath": "static/tabs/warehouse-active.png"
-		}, 
-		{
-			"text": "销售线索",
-			"pagePath": "pages/privateClue/index",
-			"iconPath": "static/tabs/private.png",
-			"selectedIconPath": "static/tabs/private1.png"
-		}, {
-			"text": "接单中心",
-			"pagePath": "pages/order/index",
-			"iconPath": "static/tabs/order.png",
-			"selectedIconPath": "static/tabs/order1.png"
-		},{
-			"text": "我的",
-			"pagePath": "pages/person/index",
-			"iconPath": "static/tabs/user.png",
-			"selectedIconPath": "static/tabs/user1.png"
-		}]
+			{
+				"text": "首页",
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabs/home.png",
+				"selectedIconPath": "static/tabs/home1.png",
+				"visible": false
+			},
+			{
+				"text": "线索公海",
+				"pagePath": "pages/publicClue/index",
+				"iconPath": "static/tabs/public.png",
+				"selectedIconPath": "static/tabs/public1.png",
+				"visible": false
+			},
+			{
+				"text": "仓库",
+				"pagePath": "pages/wareHouse/index",
+				"iconPath": "static/tabs/warehouse.png",
+				"selectedIconPath": "static/tabs/warehouse1.png",
+				"visible": false
+			},
+			{
+				"text": "询价中心",
+				"pagePath": "pages/inquiry/index",
+				"iconPath": "static/tabs/xunjia.png",
+				"selectedIconPath": "static/tabs/xunjia1.png",
+				"visible": false
+			},
+			{
+				"text": "核价中心",
+				"pagePath": "pages/verification/index",
+				"iconPath": "static/tabs/hejia.png",
+				"selectedIconPath": "static/tabs/hejia1.png",
+				"visible": false
+			},
+			{
+				"text": "销售线索",
+				"pagePath": "pages/privateClue/index",
+				"iconPath": "static/tabs/private.png",
+				"selectedIconPath": "static/tabs/private1.png",
+				"visible": false		
+			}, 
+			{
+				"text": "接单中心",
+				"pagePath": "pages/order/index",
+				"iconPath": "static/tabs/order.png",
+				"selectedIconPath": "static/tabs/order1.png",
+				"visible": false
+			}, 
+			{
+				"text": "我的",
+				"pagePath": "pages/person/index",
+				"iconPath": "static/tabs/user.png",
+				"selectedIconPath": "static/tabs/user1.png",
+				"visible": true
+			}
+		]
 	},
 	"uniIdRouter": {},
 	"easycom": {

pages/clue/mixins/clue.js

@@ -270,6 +270,7 @@ export default {
 					v.repetitionOperWeixinName = result;
 				}
 			})
+			
 			return rows;
 		}
 	}

pages/clue/post/index.vue

@@ -26,11 +26,14 @@
 			</view>
 			<view class="info">
 				<view class="createTime">{{ item.createTime }}</view>
+			</view>
+			<view class="info">
 				<view>{{ item.appName }}</view>
 			</view>
 			<view class="info">
-				<view class="owner" style="margin-right: 20px;">所属人 {{ item.clueOwnerName ? item.clueOwnerName : "-" }}
-				</view>
+				<view class="owner">所属人 {{ item.clueOwnerName ? item.clueOwnerName : "-" }}</view>
+			</view>
+			<view class="info">
 				<view class="operation">运营人 {{ item.clueOperationName ? item.clueOperationName : "-" }}</view>
 			</view>
 		</view>
@@ -47,6 +50,10 @@
 				</view>
 			</view>
 		</view>
+		<view class="sendOrder inquiry" @click.stop="handleInquiry(item)">
+			<image src='/static/publicClue/inquiry.png' mode="aspectFit" class="sendOrder_img"></image>
+			<view>询价</view>
+		</view>
 		<view class="sendOrder" @click.stop="handleSendOrder(item)">
 			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
 			<view>发单</view>
@@ -146,6 +153,12 @@ export default {
 				}
 			}
 		},
+		// 询价
+		async handleInquiry(item) {
+			uni.navigateTo({
+				url: `/pages/inquiry/add?clueId=${item.id}`
+			})
+		},
 	},
 }
 </script>
@@ -222,6 +235,7 @@ export default {
 	}
 
 
+
 	.sendOrder {
 		width: 50px;
 		height: 50px;
@@ -247,5 +261,11 @@ export default {
 			height: 20px;
 		}
 	}
+	.inquiry {
+		right: 140rpx;
+		color: #2563eb;
+		border: 1px solid #2563eb;
+		background-color: #fff;
+	}
 }
 </style>

pages/inquiry/add.vue

@@ -0,0 +1,25 @@
+<template>
+    <view class="add_wrap">
+        <view class="container">
+			新增
+        </view>
+    </view>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                clueId: ''
+            }
+        },
+        onLoad(options) {
+            console.log(options);
+            
+            this.clueId = options.clueId
+        }
+    }
+</script>
+
+<style lang="scss">
+    @import "./styles/index.scss";
+</style>

pages/inquiry/index.vue

@@ -0,0 +1,12 @@
+<template>
+    <view class="inquiry_wrap">
+        <view class="container">
+			<u-navbar class="nav-bar" title="询价中心" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
+        </view>
+    </view>
+</template>
+<script></script>
+
+<style lang="scss">
+    @import "./styles/index.scss";
+</style>

pages/publicClue/index.vue

@@ -75,7 +75,7 @@
 		mixins: [clue],
 		onLoad() {
 			this.queryParams.type = 1;
-		},
+		}
 	}
 </script>
 

pages/verification/index.vue

@@ -0,0 +1,12 @@
+<template>
+    <view class="verification_wrap">
+        <view class="container">
+			<u-navbar class="nav-bar" title="核价中心" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
+        </view>
+    </view>
+</template>
+<script></script>
+
+<style lang="scss">
+	@import "./styles/index.scss";
+</style>

store/modules/user.js

@@ -52,6 +52,10 @@ export default {
 		},
 		SET_USERINFO: (state, data) => {
 			state.userInfo = data;
+			// 动态设置 tabBar
+			setTimeout(() => {
+				setupTabBar(data);
+			}, 100);
 		},
 		SET_TOKEN: (state, data) => {
 			state.token = data;
@@ -162,4 +166,27 @@ export default {
 			})
 		},
 	}
+}
+
+function setupTabBar(userInfo) {
+		if (!userInfo || !userInfo.roles) {
+			return tabBarDefault;
+		}
+	
+		const roles = userInfo.roles;
+		// 我的 是所有用户都有的
+		// 如果是销售经理SALESMAN，则也展示询价中心、核价中心、仓库
+		// 如果是其他角色，则也展示首页、线索公海、接单中心
+		// 下标index从0开始
+		const hasSalesmanRole = roles.some(role => role.roleKey === 'SALESMAN');
+		if (hasSalesmanRole) {
+			uni.setTabBarItem({ index: 2,visible: true });//仓库
+			uni.setTabBarItem({ index: 3,visible: true });//询价中心
+			uni.setTabBarItem({ index: 4,visible: true });//核价中心
+		}else{
+			uni.setTabBarItem({ index: 0,visible: true });//首页
+			uni.setTabBarItem({ index: 1,visible: true });//线索公海
+			uni.setTabBarItem({ index: 5,visible: true });//销售线索
+			uni.setTabBarItem({ index: 6,visible: true });//接单中心
+		}
 }