1

main.js

@@ -23,6 +23,9 @@ import httpApi from '@/utils/api.js';
 import { showLoading } from './utils/loading'
 Vue.use(httpApi, app);
 
+import hideNav from "@/utils/hideNav.js";
+Vue.use(hideNav,app);
+
 Vue.prototype.$getDicts = function (dictType,customFlag = true) {
   return store.dispatch('dict/getDicts', {dictType,customFlag})
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "时与",
     "appid" : "__UNI__0C0EF72",
     "description" : "",
-    "versionName" : "1.1.6",
-    "versionCode" : 116,
+    "versionName" : "1.1.7",
+    "versionCode" : 117,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -31,22 +31,24 @@
 			"style": {
 				"navigationBarTitleText": "首页",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-				// ,"navigationStyle": "custom"
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/setting/index",
 			"style": {
 				"navigationBarTitleText": "我的设置",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/message/index",
 			"style": {
 				"navigationBarTitleText": "消息",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -54,14 +56,16 @@
 			"style": {
 				"navigationBarTitleText": "销售",
 				"enablePullDownRefresh": true,
-				"onReachBottomDistance": 100
+				"onReachBottomDistance": 100,
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/messageList/index",
 			"style": {
 				"navigationBarTitleText": "提醒消息",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -75,7 +79,7 @@
 		{
 			"path": "pages/circumstances/index",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "环境监测",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -84,7 +88,8 @@
 			"path": "pages/about/index",
 			"style": {
 				"navigationBarTitleText": "关于",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -99,14 +104,16 @@
 			"path": "pages/changePw/index",
 			"style": {
 				"navigationBarTitleText": "修改密码",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/updateDynamic/index",
 			"style": {
 				"navigationBarTitleText": "更新动态",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		}
 		,
@@ -114,7 +121,8 @@
 			"path": "pages/clue/index",
 			"style": {
 				"navigationBarTitleText": "线索",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -148,7 +156,8 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "线索公海",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -156,7 +165,24 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "销售线索",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/auth/auth",
+			"style" : 
+			{
+			    "navigationBarTitleText": "",
+			    "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/bindSuccess/index",
+			"style" : 
+			{
+				"navigationStyle": "custom"
 			}
 		}
 	],

pages/about/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="about_wrap">
+		<u-navbar title="关于" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="about_top">
 			<view class="box">
 				<image src="@/static/about/logo.png" mode=""></image>

pages/auth/auth.vue

@@ -0,0 +1,43 @@
+<template>
+	<u-loading-page loading-color="#000000" :loading="true" loadingText="正在请求微信授权"></u-loading-page>
+</template>
+
+<script>
+	import qs from 'qs';
+	export default {
+		data() {
+			return {
+			}
+		},
+		onLoad(option){
+			let { shiYuWxLogin , username : userName } = option;
+			if(shiYuWxLogin){
+				uni.redirectTo({
+					url : "/pages/login/index?shiYuWxLogin=" + shiYuWxLogin,
+				})
+			}else if(userName){
+				uni.$u.api.shiYuWxLoginGetInfo({userName}).then((res)=>{
+					const { access_token } = res.data;
+					this.$store.commit("user/SET_TOKEN", access_token);
+					this.$store.dispatch("user/getUserInfo").then(()=>{
+						uni.reLaunch({
+							url:"/pages/bindSuccess/index",
+						});
+						// uni.switchTab({
+						// 	url: `/pages/person/index`,
+						// 	success: () => {
+						// 		this.$store.dispatch("app/register");
+						// 		uni.$u.toast("登录成功");
+						// 	}
+						// })
+					})
+				})
+			}else{
+				window.location.href = "https://crm.nanjingshiyu.com/prod-api/auth/shiYuWxLogin";
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>

pages/bindSuccess/index.vue

@@ -0,0 +1,123 @@
+<template>
+  <view class="success-container">
+    <!-- 成功图标 -->
+    <view class="success-icon">
+      <view class="check-mark"></view>
+    </view>
+    <!-- 成功提示文字 -->
+    <view class="success-text">
+      <view class="title">绑定成功</view>
+      <view class="desc">您的账号已完成绑定，可正常使用相关功能</view>
+    </view>
+    <!-- 操作按钮 -->
+<!--    <view class="btn-group">
+      <button class="btn home-btn" @click="handleClose">关闭</button>
+    </view> -->
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    // 前往首页（可替换为你的首页地址）
+    handleClose() {
+		window.close();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+/* 页面容器：全屏居中 */
+.success-container {
+  width: 100vw;
+  min-height: 100vh;
+  padding: 0 20px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background-color: #f8f9fa;
+}
+
+/* 成功图标：绿色圆形+对勾 */
+.success-icon {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  background-color: #e6f4ea;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 30px;
+
+  .check-mark {
+    width: 16px;
+    height: 30px;
+    border-right: 4px solid #38a169;
+    border-bottom: 4px solid #38a169;
+    transform: rotate(45deg);
+  }
+}
+
+/* 文字区域：标题粗体+描述浅灰 */
+.success-text {
+  text-align: center;
+  margin-bottom: 40px;
+
+  .title {
+    font-size: 24px;
+    font-weight: 600;
+    color: #2d3748;
+    margin-bottom: 10px;
+  }
+
+  .desc {
+    font-size: 16px;
+    color: #718096;
+    max-width: 300px;
+    margin: 0 auto;
+  }
+}
+
+/* 按钮组：横向排列+间距 */
+.btn-group {
+  width: 100%;
+  max-width: 320px;
+  display: flex;
+  gap: 15px;
+}
+
+/* 按钮样式：绿色主按钮+白色次按钮 */
+.btn {
+  flex: 1;
+  height: 46px;
+  border-radius: 8px;
+  font-size: 16px;
+  font-weight: 500;
+  border: none;
+  cursor: pointer;
+  transition: opacity 0.2s;
+}
+
+.btn:hover {
+  opacity: 0.9;
+}
+
+/* 次要按钮（返回）：白色边框+浅灰文字 */
+.back-btn {
+  background-color: #fff;
+  color: #2d3748;
+  border: 1px solid #e2e8f0;
+}
+
+/* 主要按钮（首页）：绿色背景+白色文字 */
+.home-btn {
+  background-color: #38a169;
+  color: #fff;
+}
+</style>

pages/changePw/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="changePw_wrap">
+		<u-navbar title="修改密码" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="ps_wrap">
 			<u-icon name="error" color="#409eff" size="16"></u-icon>
 			<text class="text">为保障您的账号安全，修改密码前请填写原密码</text>

pages/circumstances/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="cirumstances_wrap">
-		<u-navbar placeholder :autoBack="true" title="环境监测">
+		<u-navbar placeholder :autoBack="true" title="环境监测" v-hideNav>
 			<view class="u-nav-slot right_btn" slot="right">
 				<view class="reset" @click="handleReset">
 					<u-icon name="reload" color="#108CFF"></u-icon>刷新

pages/clue/components/filterQuery.vue

@@ -583,7 +583,7 @@
 				});
 
 				// 获取所有线索标签
-				uni.$u.api.getClueTagGroupVoList().then(({
+				uni.$u.api.getClueTagGroupVoList({ tagGroupApplication : '1' }).then(({
 					data
 				}) => {
 					this.clueTagGroupVoList = data.reduce((acc, cur) => {

pages/clue/mixins/clue.js

@@ -184,7 +184,7 @@ export default {
 			this.$getDicts('clue_entrance_type').then(res => {
 				this.dicts.clueEntranceType = res;
 			});
-			uni.$u.api.getClueTagGroupVoList().then(({
+			uni.$u.api.getClueTagGroupVoList({ tagGroupApplication : '1' }).then(({
 				data
 			}) => {
 				this.clueTagGroupVoList = data;
@@ -239,6 +239,22 @@ export default {
 				pageSize,
 				pageNum
 			}, params);
+			rows.forEach(v=>{
+				if(v.repetitionOperationName){
+					// 按逗号分割成数组
+					const parts = v.repetitionOperationName.split(',');
+					// 对每个部分提取 '-' 前面的内容
+					const result = parts.map(part => part.split('-')[0]).join(',');
+					v.repetitionOperationName = result;
+				}
+				if(v.repetitionOperWeixinName){
+					// 按逗号分割成数组
+					const parts = v.repetitionOperWeixinName.split(',');
+					// 对每个部分提取 '-' 前面的内容
+					const result = parts.map(part => part.split('-')[0]).join(',');
+					v.repetitionOperWeixinName = result;
+				}
+			})
 			return rows;
 		}
 	}

pages/clueDetail/index.vue

@@ -1,10 +1,9 @@
 <template>
 	<view>
-		<u-navbar placeholder :autoBack="true">
+		<u-navbar placeholder :autoBack="true" v-hideNav>
 			<template slot="center">
 				<view class="navbar_center_wrap">
 					<text class="name">{{name}}</text>
-					<text class="pinyin">{{$chineseToPinYin(name)}}</text>
 				</view>
 			</template>
 		</u-navbar>

pages/clueDetail/page/clueDetail.vue

@@ -287,7 +287,7 @@ import {
 				this.$getDicts('crm_clue_phase').then((res => {
 					this.crmCluePhaseDict = res.filter(v => v.dictValue !== '6');
 				}))
-				uni.$u.api.getClueTagGroupVoList().then(({data})=>{
+				uni.$u.api.getClueTagGroupVoList({ tagGroupApplication : '1' }).then(({data})=>{
 					this.clueTagGroupVoList = data;
 				});
 				this.getDetail();

pages/index/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<u-sticky class="sticky_wrap"  bgColor="#fff">
+		<u-navbar title="首页" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
+		<u-sticky class="sticky_wrap" :customNavHeight="isWeixin ? 0 : undefined"  bgColor="#fff">
 			<view class="header_wrap">
 				<view class="header_top_wrap" @click="toPerson">
 					<view class="header_info_left">
@@ -38,6 +39,7 @@
 	import dayjs from "dayjs";
 	import personage from "./personage/index.vue";
 	import team from "./team/index.vue";
+	import { is_weixin } from "../../utils/util";
 	export default {
 		components : { personage , team },
 		data() {
@@ -50,7 +52,7 @@
 					value: "personage"
 				}],
 				activeTab: "team",
-
+				isWeixin : is_weixin(),
 				userInfo: this.$store.state.user.userInfo,
 			};
 		},

pages/login/index.vue

@@ -39,6 +39,7 @@
 	export default {
 		data() {
 			return {
+				firstLoginState : "",
 				// systemList,
 				prefixIconStyle: {
 					width: "16px",
@@ -92,6 +93,10 @@
 			this.systemChange(this.form.systemCode);
 			this.getUserByCache();
 		},
+		onLoad(option){
+			const { shiYuWxLogin } = option;
+			this.firstLoginState = shiYuWxLogin;
+		},
 		methods: {
 			changeRemember(value){
 				if (value.length > 0) {
@@ -137,7 +142,24 @@
 						uni.removeStorageSync('username');
 						uni.removeStorageSync('password');
 					}
-					this.$store.dispatch("user/login", this.form).then(() => {
+					this.$store.dispatch("user/login", this.form).then(async (userId) => {
+						// #ifdef H5
+						if(this.firstLoginState){
+							// 有state要绑定一下用户
+						  	await uni.$u.api.firstLogin({ userId , firstLoginState : this.firstLoginState });
+							
+							uni.reLaunch({
+								url:"/pages/bindSuccess/index",
+								success: () => {
+									uni.$u.toast("绑定成功");
+								}
+							});
+						}else{
+							uni.$u.toast("授权失败，无法绑定");
+						}
+						// #endif
+						
+						// #ifdef  APP-PLUS
 						uni.switchTab({
 							url: `/pages/person/index`,
 							success: () => {
@@ -145,8 +167,10 @@
 								uni.$u.toast("登录成功");
 							}
 						})
-					}).catch(() => {
-						uni.$u.toast("请检查您是否有该系统权限");
+						// #endif
+						
+					}).catch((res) => {
+						uni.$u.toast(res);
 					})
 				})
 			},

pages/message/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="message_wrap">
+		<u-navbar title="我的消息" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="message_list" v-if="isShow">
 			<view class="message_item" v-for="(item,index) in list" :key="index" @click="handleToList(item)">
 				<view class="item_left">

pages/messageList/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="messageList_wrap">
+		<u-navbar title="提醒消息" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="message_item" v-for="item in listData" :key="item.id">
 			<view class="message_top" :class="{ status_0 : item.status === '0' }">
 				{{handleMessage(item)}}

pages/person/index.vue

@@ -32,11 +32,11 @@
 				</view>
 				<view class="parson_menu_wrap">
 					<view class="parson_menu_list">
-						<navigator url="/pages/market/index" open-type="switchTab" class="menu_item" hover-class="none">
+						<navigator url="/pages/publicClue/index" open-type="switchTab" class="menu_item" hover-class="none">
 							<image src="@/static/parson/icon-wf.png" mode=""></image>
-							<text>我的销售</text>
+							<text>销售公海</text>
 						</navigator>
-						<navigator url='/pages/message/index' open-type="switchTab" class="menu_item" hover-class="none">
+						<navigator url='/pages/message/index' open-type="navigate" class="menu_item" hover-class="none">
 							<image src="@/static/parson/icon-myMessage.png" mode=""></image>
 							<text>我的消息</text>
 						</navigator>
@@ -44,9 +44,9 @@
 							<image src="@/static/parson/icon-mycase.png" mode=""></image>
 							<text>个人资料</text>
 						</navigator>
-						<navigator url='/pages/clue/index?type=2' open-type="navigate" class="menu_item" hover-class="none">
+						<navigator url='/pages/privateClue/index' open-type="switchTab" class="menu_item" hover-class="none">
 							<image src="@/static/parson/clue.png" mode=""></image>
-							<text>我的线索</text>
+							<text>销售线索</text>
 						</navigator>
 					</view>
 				</view>

pages/privateClue/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar title="销售线索" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="case_top_wrap">
 			<ld-select :list="options" label-key="label" value-key="value" placeholder="选择搜索类型"
 				v-model="queryParams.condition" class="conditionSelect" @change="handleConditionChange" :isShowIcon="true"></ld-select>

pages/publicClue/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar title="线索公海" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="case_top_wrap">
 			<ld-select :list="options" label-key="label" value-key="value" placeholder="选择搜索类型"
 				v-model="queryParams.condition" class="conditionSelect" @change="handleConditionChange" :isShowIcon="true"></ld-select>

pages/setting/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="setting_wrap">
+		<u-navbar title="我的设置" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="option_list">
 			<view class="option_item" @click="toPersonal">
 				<view class="item_left">

static/MP_verify_ajPW8XyRre1CNFvh.txt

@@ -0,0 +1 @@
+ajPW8XyRre1CNFvh

store/modules/user.js

@@ -28,17 +28,22 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			ip : "http://47.122.23.214", // ip
-			// ip: "http://172.16.7.101", // ip
-			port: "9500", // 端口
+			ip : "https://crm.nanjingshiyu.com/prod-api", // ip
+			// ip: "http://172.16.7.200", // ip
+			port: "", // 端口
 			isCallOff : "2", // 开关
 			folder: "", // 文件夹
 			webRtcIp : "", // 呼叫中心的ip
 			webRtcPort : "", // 呼叫中心的端口
 		},
 		systemList: [],
+		
+		redirectUrl : null,
 	},
 	mutations: {
+		SET_REDIRECTURL(state,data){
+			state.redirectUrl = data;
+		},
 		SET_USER_ONLINE_STATUS:(state,data)=>{
 		    state.userInfo.onlineStatus = data;
 		},
@@ -107,11 +112,7 @@ export default {
 					commit("SET_BELONGSYSTEM", {
 						code: state.system.value,
 						callback: (flag) => {
-							if (flag) {
-								resolve();
-							} else {
-								reject();
-							}
+							resolve(res.user);
 						}
 					});
 				});
@@ -126,8 +127,9 @@ export default {
 				uni.$u.api.login(form).then((loginRes) => {
 					const token = loginRes.data.access_token;
 					commit("SET_TOKEN", token);
-					dispatch("getUserInfo").then(() => {
-						resolve();
+					dispatch("getUserInfo").then((userInfo) => {
+						const { userId } = userInfo;
+						resolve(userId);
 					}).catch(() => {
 						commit("SET_TOKEN", "");
 						commit("SET_USERINFO", {});

utils/api.js

@@ -52,7 +52,7 @@ const install = (Vue, vm) => {
 		statisticsAddClueCount : (data,config = {})=>http.post(store.state.user.path + '/clueMainInfo/statisticsAddClueCount',data), // 统计添加阶段
 		getClueMainInfoList : (params = {},data = {})=> http.post(store.state.user.path + '/clueMainInfo/getClueMainInfoList?' + qs.stringify(params),data), // 线索列表
 		getUserByUserIds : (params)=>http.get('/system/user/getUserByUserIds',{params}), //
-		getClueTagGroupVoList : ()=>http.get(store.state.user.path + "/clueTagGroup/getClueTagGroupVoList"), // 获取线索标签；
+		getClueTagGroupVoList : (params = {})=>http.get(store.state.user.path + "/clueTagGroup/getClueTagGroupVoList",{ params }), // 获取线索标签；
 		getClueMainInfoVoById : (params = {},config = {})=>http.get(store.state.user.path + "/clueMainInfo/getClueMainInfoVoById",{ params , custom : { loading: false },timeout: 1500}), // 获取线索详情；
 		updateClueFixedFieldsClueState:(data,config = {})=>http.post(store.state.user.path + '/clueFixedFields/updateClueFixedFieldsClueState',data),
 		updateClueFixedFieldsAllTags:(data,config = {})=>http.post(store.state.user.path + '/clueFixedFields/updateClueFixedFieldsAllTags',data),
@@ -68,7 +68,9 @@ const install = (Vue, vm) => {
 		addClueMainInfo : (data,config = {})=>http.post(store.state.user.path + '/clueMainInfo/addClueMainInfo',data),
 		saveLog:(data,config={})=>http.post("/system/access/saveLog",data,{ custom : { loading: false } }),
 		updateClueMainInfo:(data,config={})=>http.post(store.state.user.path + '/clueMainInfo/updateClueMainInfo',data),
-		selectPromotionStats:(data,config={})=>http.post(store.state.user.path + '/promotionStats/selectPromotionStats',data)
+		selectPromotionStats:(data,config={})=>http.post(store.state.user.path + '/promotionStats/selectPromotionStats',data),
+		firstLogin : (data)=> http.post('/system/user/firstLogin',data),
+		shiYuWxLoginGetInfo : (params)=> http.get('/auth/shiYuWxLoginGetInfo',{params, custom : { noAuth: true }}),
 	}
 }
 

utils/hideNav.js

@@ -0,0 +1,14 @@
+import { is_weixin } from "@/utils/util.js";
+const hideNav = {
+    install (Vue){
+        Vue.directive('hideNav', {
+            inserted: function (el,binding) {
+				if(is_weixin()){
+					// TODO 后面要改成用配置隐藏
+					el.remove();
+				}
+            },
+        })
+    }
+}
+export default hideNav;

utils/request.js

@@ -26,7 +26,7 @@ const install = (Vue, vm) => {
     // 请求拦截
     uni.$u.http.interceptors.request.use((config) => { // 可使用async await 做异步操作
 		const { ip, port, folder } = store.state.user.netConfig;
-		const baseURL = ip + ":" + port + folder; /* 根域名 */
+		const baseURL = ip + (port ? ":" + port : "") + folder; /* 根域名 */
 		// 处理请求url的逻辑
 		config.url = baseURL + config.url;
 		

utils/util.js

@@ -15,6 +15,20 @@ export function mapRoutePlan(data) {
 }
 
 
+// 在需要的页面中写方法，判断是否在微信浏览器中
+export function is_weixin() {
+	let flag = false;
+	// #ifdef H5
+	flag = String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger";
+	// #endif
+	
+	// #ifdef  APP-PLUS
+	flag = false;
+	// #endif
+	return flag;
+}
+
+
 /**
  * 获取Androoid设备mac地址
  * */