调整

manifest.json

@@ -2,8 +2,8 @@
     "name" : "时与",
     "appid" : "__UNI__0C0EF72",
     "description" : "",
-    "versionName" : "1.2.0",
-    "versionCode" : 120,
+    "versionName" : "1.2.1",
+    "versionCode" : 121,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -158,7 +158,7 @@
         },
         "nativePlugins" : {
             "lemonjk-FileSelect" : {
-                "appid_android" : "",
+                "appid_android" : "uni.UNI0C0EF72",
                 "__plugin_info__" : {
                     "name" : "FileSelect",
                     "description" : "文件选取插件",

pages/addClue/index.vue

@@ -124,6 +124,18 @@
 				<u-form-item label="广告计划ID" prop="adId" borderBottom>
 					<u--input v-model="form.adId" disabledColor="#ffffff" border="none" placeholder="请输入广告计划ID"></u--input>
 				</u-form-item>
+				
+				<u-form-item label="广告计划名称" prop="adName" borderBottom>
+					<u--input v-model="form.adName" disabledColor="#ffffff" border="none" placeholder="请输入广告计划名称"></u--input>
+				</u-form-item>
+				
+				<u-form-item label="广告主ID" prop="advId" borderBottom>
+					<u--input v-model="form.advId" disabledColor="#ffffff" border="none" placeholder="请输入广告主ID"></u--input>
+				</u-form-item>
+				
+				<u-form-item label="广告主名称" prop="advName" borderBottom>
+					<u--input v-model="form.advName" disabledColor="#ffffff" border="none" placeholder="请输入广告主名称"></u--input>
+				</u-form-item>
 					  
 			</u--form>
 		</view>
@@ -267,6 +279,9 @@
 					clueOwnerName: undefined,
 					deptName: undefined,
 					deptId: undefined,
+					advName : undefined,
+					advId : undefined,
+					adName : undefined,
 					clueBizType: '回收',
 					clueObjType: '腕表',
 					clueAdType: '常规',

pages/clue/mixins/clue.js

@@ -143,7 +143,7 @@ export default {
 					windowBottom,
 					windowHeight
 				} = e;
-				this.mapHeight = windowHeight + 'px';
+				this.mapHeight = (windowHeight - 100) + 'px';
 			}
 		});
 		this.getDicts();
@@ -199,11 +199,11 @@ export default {
 				this.$getDicts('crm_clue_type').then(res => {
 					this.dicts.crmClueType = res;
 				});
-			uni.$u.api.getClueTagGroupVoList({ tagGroupApplication : '1' }).then(({
-				data
-			}) => {
-				this.clueTagGroupVoList = data;
-			});
+				uni.$u.api.getClueTagGroupVoList({ tagGroupApplication : '1' }).then(({
+					data
+				}) => {
+					this.clueTagGroupVoList = data;
+				});
 		},
 		getOtherData() {
 			this.statisticsCaseState();

pages/clueDetail/page/clueDetail.vue

@@ -96,7 +96,7 @@
 		<yui-tabs :tabs="tabs" v-model="activeIndex" :lineWidth="'120rpx'" :isLazyRender="false" color="#108cff"
 			titleActiveColor="#108cff" :swipeable="true" :swiper="false" :ellipsis="false" :scroll-threshold="3">
 			<template #clueInfo>
-				<clueInfo :clueId="clueDetail.id" v-if="clueDetail.id" :params="params" ref="clueInfoRef" type="1">
+				<clueInfo :clueId="clueDetail.id" v-if="clueDetail.id" :clueDetailVo="clueDetail" :params="params" ref="clueInfoRef" type="1">
 				</clueInfo>
 			</template>
 			<template #advertising>

pages/clueDetail/tabs/clueInfo/index.vue

@@ -31,6 +31,12 @@
 							<text v-else class="value">{{clueDetail[item.prop]}}</text>
 						</view>
 					</template>
+					<template v-if="parsedRemarkDict && Object.keys(parsedRemarkDict).length > 0">
+						<view class="Info_item" v-for="(value, key) in parsedRemarkDict" :key="key">
+							<text class="label">{{ key }}</text>
+							<text class="value">{{ value }}</text>
+						</view>
+					</template>
 				</view>
 			</view>
 		</template>
@@ -124,6 +130,28 @@
 				type: Object,
 				required: true
 			},
+			clueDetailVo : {
+				type : Object,
+				required : true
+			},
+		},
+		computed : {
+			parsedRemarkDict() {
+			      try {
+			        const remarkDict = this.clueDetailVo.remarkDict
+			        if (!remarkDict) {
+			          return null
+			        }
+			        if (typeof remarkDict === 'string') {
+			          const parsed = JSON.parse(remarkDict)
+			          return typeof parsed === 'object' && parsed !== null ? parsed : null
+			        }
+			        return typeof remarkDict === 'object' && remarkDict !== null ? remarkDict : null
+			      } catch (error) {
+			        console.error('解析remarkDict失败:', error)
+			        return null
+			      }
+			    }
 		},
 		methods: {
 			async updateClueMainInfo() {

pages/commissionForm/index.vue

@@ -231,10 +231,12 @@ export default {
         if (this.commissionForm.id) {
           // 修改
           await uni.$u.api.clueCommissionUpdate(this.commissionForm);
+		  uni.$emit('addCommissionSuccess');
           uni.$u.toast("修改成功");
         } else {
           // 新增
           await uni.$u.api.clueCommissionAdd(this.commissionForm);
+		  uni.$emit('addCommissionSuccess');
           uni.$u.toast("新增成功");
         }
 
@@ -243,8 +245,7 @@ export default {
           uni.navigateBack();
         }, 1500);
       } catch (error) {
-        console.error("保存失败:", error);
-        uni.$u.toast("保存失败，请重试");
+        uni.$u.toast(error);
       } finally {
         this.loading = false;
       }

pages/login/index - 副本 (2).vue

@@ -1,229 +0,0 @@
-<template>
-	<view class="content">
-		<view class="uni-btn-v uni-common-mt">
-			<button type="primary" @click="startListerPhone">注册电话监听</button>
-			<button type="primary" @click="stopListerPhone">注销电话监听</button>
-			<button type="primary" @click="checkIsAutoRecord">是否开启通话自动录音功能</button>
-
-			<button type="primary" @click="toCallAutoRecorderPage">跳转到开启通话自动录音界面</button>
-			<button type="primary" @click="navigateToCallRecordingSettings">跳转到系统的通话录音界面</button>
-			<button type="primary" @click="jumpToPermissionPage">请求所有文件访问权限(主要针对ANDROID 11以上获取录音文件需要的权限)</button>
-			<button type="primary" @click="allRecorderFilesAction">获取通话自动录音文件</button>
-
-
-			<!-- <button type="primary" @click="registerSmsReceiver">注册短信监听</button> -->
-			<button type="primary" @click="makePhoneCall">拨打电话</button>
-		</view>
-		<view class="text-box" scroll-y="true">
-			<text>{{phoneState}}</text>
-		</view>
-		<view v-if="change_pop_show">
-			<view class="status text-center">蓝牙列表（直接点击连接打印机）</view>
-			<view class="divider"></view>
-			<view :class="{ 'popup-height': type === 'left' || type === 'right' }" class="device-list">
-				<scroll-view scroll-y="true" class="p-content underline">
-					<view class="underline p-item device-item" hover-class="list-active"
-						v-for="(item, index) in Filelist" :key="index">
-						<view class="desc">
-							{{item}}
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		startPhoneListener,
-		stopPhoneListener,
-		checkIsAutoRecord,
-		toCallAutoRecorderPage,
-		navigateToCallRecordingSettings,
-		jumpToPermissionPage,
-		makePhoneCall,
-		allRecorderFilesAction
-	} from '@/uni_modules/yao-lister';
-
-
-	export default {
-		data() {
-			return {
-				title: 'Hello',
-				phoneState: '',
-				stateText: '',
-				isAndroid: true,
-				change_pop_show: false,
-				type: 'center',
-				Filelist: [],
-			}
-		},
-		mounted() {
-			this.initPhoneStateListener()
-		},
-		beforeDestroy() {
-			stopListerPhone()
-		},
-		methods: {
-			toggle(type) {
-				const _this = this;
-				_this.type = type;
-				_this.change_pop_show = true;
-			},
-			allRecorderFilesAction() {
-				const _this = this;
-				allRecorderFilesAction(res => {
-					console.log("录音文件输入", JSON.stringify(res));
-					// 录音文件输入,  ["/storage/emulated/0/Recordings/Record/Call/15099989786 2025-11-11 09-41-57.m4a","/storage/emulated/0/Recordings/Record/Call/18925012557 2025-11-11 11-10-33.m4a"]
-					_this.toggle('bottom');
-					_this.Filelist = res
-					uni.showToast({
-						title: JSON.stringify(res),
-						duration: 2000
-					})
-				})
-			},
-			jumpToPermissionPage() {
-				jumpToPermissionPage()
-			},
-			navigateToCallRecordingSettings() {
-				navigateToCallRecordingSettings()
-			},
-			toCallAutoRecorderPage() {
-				toCallAutoRecorderPage()
-			},
-			checkIsAutoRecord() {
-				let checkRecord = checkIsAutoRecord()
-				uni.showToast({
-					title: checkRecord ? "已开启电话录音" : "未开启电话录音",
-					duration: 2000
-				})
-			},
-			makePhoneCall() {
-				makePhoneCall('13417106969')
-				// uni.makePhoneCall({
-				// 	phoneNumber: '13771854499', // 电话号码
-				// 	success: function() {
-				// 		console.log('拨打电话成功！');
-				// 	},
-				// 	fail: function(err) {
-				// 		console.error('拨打电话失败：', err);
-				// 	}
-				// });
-			},
-			startListerPhone() {
-				startPhoneListener(res => {
-					console.log(res,"监听结果==============================")
-				})
-			},
-			stopListerPhone() {
-				stopPhoneListener(res => {
-					console.log(res,"3123123123");
-					uni.showToast({
-						icon: 'success',
-						title: res,
-						duration: 2000
-					});
-				})
-			},
-
-			async initPhoneStateListener() {
-				// 动态申请权限
-				const permissions = [
-					"android.permission.READ_PHONE_STATE",
-					"android.permission.ANSWER_PHONE_CALLS", "android.permission.CALL_PHONE",
-					"android.permission.MANAGE_EXTERNAL_STORAGE",
-					"android.permission.READ_EXTERNAL_STORAGE",
-					"android.permission.READ_CALL_LOG",
-					"android.permission.READ_PHONE_NUMBERS",
-					"android.permission.FOREGROUND_SERVICE"
-				]
-				await plus.android.requestPermissions(permissions, 1001)
-			}
-		},
-	}
-</script>
-
-<style>
-	.text-box {
-		margin-bottom: 40rpx;
-		padding: 40rpx 0;
-		display: flex;
-		min-height: 300rpx;
-		background-color: #FFFFFF;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		font-size: 30rpx;
-		color: #353535;
-		line-height: 1.8;
-		border: 1px #007AFF;
-		height: 200px;
-		width: 200px;
-	}
-
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	button {
-		margin: 10px 0;
-		background-color: #007AFF;
-		color: white;
-	}
-
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
-	}
-
-	.uni-popup {
-		z-index: 9999;
-		/* 根据需要调整 */
-	}
-
-	.p-content {
-		height: calc(70vh - 20px);
-		width: 700rpx;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
-	}
-
-	.text-center {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.desc {
-		padding-left: 10px;
-		margin-top: 10px;
-	}
-</style>

pages/login/index - 副本.vue

@@ -1,349 +0,0 @@
-<template>
-	<view>
-		<view class="loginway">
-			<div class="navigation"></div>
-			<image class="loginimg" mode="widthFix" src="/static/login/logo_word.png"></image>
-			<view class="input_wrap">
-				<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm">
-					<u-form-item label="" prop="username" class="inputFormWrap">
-						<u--input shape="circle" clearable prefixIcon="/static/login/icon-account.png"
-							:prefixIconStyle="prefixIconStyle" v-model="form.username" placeholder="请输入账号"></u--input>
-					</u-form-item>
-					<u-form-item label="" prop="password" class="inputFormWrap">
-						<u--input shape="circle" clearable password prefixIcon="/static/login/icon-password.png"
-							:prefixIconStyle="prefixIconStyle" v-model="form.password" placeholder="请输入密码"></u--input>
-					</u-form-item>
-					<u-form-item label="" prop="" class="inputFormWrap">
-						<u-checkbox-group v-model="checkboxs" placement="column" @change="changeRemember">
-							<u-checkbox :label="'记住密码'" :name="'remember'"></u-checkbox>
-						</u-checkbox-group>
-					</u-form-item>
-					<u-form-item>
-						<u-button type="primary" text="登录" shape="circle" @click="handleLogin"></u-button>
-					</u-form-item>
-					<!-- 			<u-form-item>
-						<view class="network_configuration_box">
-							<view class="netWrokSet" @click="handleToConfiguration">
-								<image src="/static/login/network.png" mode=""></image>
-								<text class="text">呼叫中心配置</text>
-							</view>
-						</view>
-					</u-form-item> -->
-				</u--form>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				firstLoginState : "",
-				// systemList,
-				prefixIconStyle: {
-					width: "16px",
-					height: "16px",
-					marginRight: "4px",
-					marginLeft: "10px"
-				},
-				form: {
-					// password: "Huilong@#$999",
-					password: "",
-					systemCode: "system_crm",
-					username: "",
-					clientFlag: "2",
-					// username: "huihui",
-					code: "996007qa.code",
-					uuid: "123"
-				},
-				checkboxs: [],
-				rules: {
-					username: {
-						type: 'string',
-						required: true,
-						message: '请输入账号',
-						trigger: []
-					},
-					password: {
-						type: 'string',
-						required: true,
-						message: '请输入密码',
-						trigger: []
-					}
-				},
-				// mac: getMacAddress(),
-			};
-		},
-		computed: {
-			systemList() {
-				return this.$store.state.user.systemList;
-			},
-			remember: {
-				get() {
-					return this.checkboxs.length > 0
-				},
-				set(value) {
-					this.checkboxs = value ? ['remember'] : [];
-				}
-			}
-		},
-		mounted() {
-			// 触发水印隐藏
-			this.systemChange(this.form.systemCode);
-			this.getUserByCache();
-		},
-		onLoad(option){
-			const { shiYuWxLogin } = option;
-			this.firstLoginState = shiYuWxLogin;
-		},
-		methods: {
-			changeRemember(value){
-				if (value.length > 0) {
-					uni.setStorageSync('username', this.form.username);
-					uni.setStorageSync('password', this.form.password);
-				} else {
-					uni.removeStorageSync('username');
-					uni.removeStorageSync('password');
-				}
-			},
-			getUserByCache() {
-				const savedUsername = uni.getStorageSync('username');
-				const savedPassword = uni.getStorageSync('password');
-
-				if (savedUsername && savedPassword) {
-					this.form.username = savedUsername;
-					this.form.password = savedPassword;
-					this.remember = true;
-				}
-			},
-			handleToConfiguration() {
-				uni.navigateTo({
-					url: "/pages/configuration/index"
-				})
-			},
-			systemChange(e) {
-				if (!e) return;
-				uni.$u.api.getAppSystemList().then((res) => {
-					const systemCodeList = res.data;
-					this.$store.dispatch("user/setSystemlist", systemCodeList);
-					const system = this.systemList.find(v => v.value === e);
-					this.$store.commit("user/SET_SYSTEM", system);
-				}).catch((e) => {
-					uni.$u.toast("服务网络不通");
-				})
-			},
-			handleLogin() {
-				this.$refs.uForm.validate().then(() => {
-					if (this.remember) {
-						uni.setStorageSync('username', this.form.username);
-						uni.setStorageSync('password', this.form.password);
-					} else {
-						uni.removeStorageSync('username');
-						uni.removeStorageSync('password');
-					}
-					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: () => {
-								this.$store.dispatch("app/register");
-								uni.$u.toast("登录成功");
-							}
-						})
-						// #endif
-						
-					}).catch((res) => {
-						uni.$u.toast(res);
-					})
-				})
-			},
-		},
-	}
-</script>
-
-<style lang="scss">
-	.network_configuration_box {
-		margin: auto;
-
-		.netWrokSet {
-			display: flex;
-			align-items: center;
-
-			image {
-				width: 30rpx;
-				height: 30rpx;
-			}
-
-			.text {
-				margin-left: 10rpx;
-				font-size: 26rpx;
-			}
-		}
-	}
-
-	.systemLabel_wrap {
-		display: flex;
-		align-items: center;
-
-		.label {
-			margin-left: 10rpx;
-		}
-	}
-
-	.systemCode_wrap {
-		position: relative;
-
-		::v-deep .uni-select {
-			border-radius: 100px;
-			border: 1px solid #dadbde;
-			height: 40px;
-			padding: 0px 10px 0px 46px;
-
-			&:before {
-				content: "";
-				display: block;
-				width: 16px;
-				height: 16px;
-				background-image: url("../../static/login/icon-system.png");
-				background-size: 16px 16px;
-				position: absolute;
-				left: 20px;
-				top: 50%;
-				transform: translate(0%, -50%);
-			}
-
-			.uni-select__input-placeholder {
-				font-size: 14px;
-				color: rgb(192, 196, 204);
-			}
-		}
-
-		.system_debt {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		.system_debt_ccb {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		.system_debt_spdb {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		.system_debt_public {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		.system_debt_dfkl {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		.system_debt_cib {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		.system_debt_icbc_h {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		.system_debt_tjxt {
-			::v-deep .uni-select {
-				&:before {
-					background-image: url("../../static/outbound/icon-zycs.png");
-				}
-			}
-		}
-
-		// .systemIcon{
-		// 	width: 16px;
-		// 	height: 16px;
-		// 	position: absolute;
-		// 	left: 20px;
-		// 	top: 50%;
-		// 	transform: translate(0%, -50%);
-		// 	display: none;
-		// }
-	}
-
-	.inputFormWrap {
-		::v-deep .u-border {
-			border: 1px solid #dadbde !important;
-		}
-	}
-
-	.max {
-		width: 500rpx;
-		height: 500rpx;
-	}
-
-	page {
-		background: #fff;
-	}
-
-	.loginway {
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-
-		.navigation {
-			background-color: #108cff;
-			width: 100%;
-			height: 120rpx;
-		}
-
-		.loginimg {
-			display: block;
-			width: 100%;
-			height: 100%;
-		}
-
-		.input_wrap {
-			padding: 20rpx 30rpx;
-		}
-	}
-</style>

pages/login/index.vue

@@ -48,12 +48,12 @@
 					marginLeft: "10px"
 				},
 				form: {
-					password: "Huilong@#$999",
-					// password: "",
+					// password: "Huilong@#$999",
+					password: "",
 					systemCode: "system_crm",
-					// username: "",
+					username: "",
 					clientFlag: "2",
-					username: "huihui",
+					// username: "huihui",
 					code: "996007qa.code",
 					uuid: "123"
 				},

pages/order/components/commission/commissionItem.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="commission_item">
 		<view class="commission_top">
-			<view class="top_left">{{item.item}}</view>
+			<view class="top_left">{{item.receiptItem}}</view>
 			<view class="top_right">
 				<text class="account_type">{{ item.accountType === '1' ? '前端' : '后端' }}</text>
 			</view>

pages/order/components/commission/myCommission.vue

@@ -102,7 +102,7 @@
 						windowBottom,
 						windowHeight
 					} = e;
-					this.mapHeight = windowHeight + 'px';
+					this.mapHeight = (windowHeight - 100) + 'px';
 				}
 			});
 		}

pages/order/components/orderCenter/orderCenter.vue

@@ -11,6 +11,18 @@
 				<u-icon name="arrow-down-fill" color="#aaa" size="10"></u-icon>
 			</view>
 		</view>
+		
+		<view class="send_status_wrap">
+			<scroll-view scroll-x="true">
+				<view class="clue_state_list">
+					<view @click="handleSendStatusClick(item)" v-for="(item, index) in clueSendStatusCountList " :key="index"
+						class="clue_state_item" :class="{ active : queryParams.status === item.status }">
+						<text>{{item.statusName}}</text>
+						<text>({{item.count}})</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
 
 
 		<view class="order_item_wrap">
@@ -65,11 +77,26 @@
 					pageNum: 1,
 					pageSize: 10,
 				},
+				
+				clueSendStatusCountList : [],
 
 				mapHeight: "0px"
 			}
 		},
 		methods: {
+			getOtherData() {
+				this.statisticsSendStatus();
+			},
+			async statisticsSendStatus() {
+				const {
+					data
+				} = await uni.$u.api.statisticsSendStatus(this.queryParams);
+				this.clueSendStatusCountList = data;
+			},
+			handleSendStatusClick(item) {
+				this.queryParams.status = item.status;
+				this.resetData();
+			},
 			handleKeyword() {
 				this.resetData();
 			},
@@ -114,7 +141,7 @@
 						windowBottom,
 						windowHeight
 					} = e;
-					this.mapHeight = windowHeight + 'px';
+					this.mapHeight = (windowHeight - 100) + 'px';
 				}
 			});
 		},
@@ -122,6 +149,36 @@
 </script>
 
 <style lang="scss" scoped>
+	.send_status_wrap {
+		width: 690rpx;
+		padding: 0 30rpx;
+		margin-top: 20rpx;
+		display: flex;
+	
+		.clue_state_list {
+			display: flex;
+	
+			.clue_state_item {
+				font-size: 30rpx;
+				display: inline-flex;
+				/* 关键改动：改为行内弹性盒子 */
+				align-items: center;
+				/* 垂直居中 */
+				background: #fff;
+				margin-right: 30rpx;
+				padding: 8rpx 16rpx;
+				/* 增加内边距 */
+				white-space: nowrap;
+				/* 关键：禁止文本换行 */
+				border-radius: 6rpx;
+	
+				&.active {
+					color: #fff;
+					background: #4c8afe;
+				}
+			}
+		}
+	}
 	.order_center_wrap {
 		box-sizing: border-box;
 		min-height: 100vh;
@@ -154,7 +211,7 @@
 	}
 
 	.order_item_wrap {
-		padding: 20px 20px;
+		padding: 10px 20px;
 	}
 
 	.empty_wrap {

pages/order/index.vue

@@ -76,7 +76,7 @@
 					this.offsetTop = offsetTop;
 				}
 			});
-			this.$getDicts('crm_follow_status').then(res => {
+			this.$getDicts('crm_form_status').then(res => {
 				this.dicts.crmFormStatusDict = res;
 			});
 			this.$getDicts('crm_form_category').then(res => {

pages/orderDetail/tabs/commissionFormList/commissionFormList.vue

@@ -89,12 +89,14 @@
 			}
 		},
 		created() {
-			this.getList()
+			this.getList();
+			uni.$on('addCommissionSuccess',()=>{
+				this.getList();
+			});
+		},
+		beforeDestroy(){
+			uni.$off('addCommissionSuccess');  
 		},
-		// 监听页面显示，刷新列表数据
-		onShow() {
-			this.getList()
-		}
 	}
 </script>
 

pages/orderDetail/tabs/receiptFormList/receiptFormList.vue

@@ -135,7 +135,13 @@ export default {
 		},
 	},
 	created() {
-		this.getList()
+		this.getList();
+		uni.$on('addReceiptFormSuccess',()=>{
+			this.getList();
+		});
+	},
+	beforeDestroy(){
+		uni.$off('addReceiptFormSuccess');  
 	}
 }
 </script>

pages/orderDetail/tabs/sendInfo/index.vue

@@ -1,176 +1,177 @@
 <template>
-  <view class="caseInfo_wrap">
-    <view class="caseInfo_content_wrap">
-      <view class="caseInfo_title">
-        <view>
-          <image src="/static/clueDetail/icon-caseInfo.png" mode=""></image>
-          <text class="info_text">发单信息</text>
-        </view>
-        <u-icon name="edit-pen-fill" color="#2979ff" size="18" @click="handleEdit"></u-icon>
-      </view>
-      <view class="caseInfo_main_wrap">
-        <view class="Info_item" v-for="item in caseInfoColumn" :key="item.prop">
-          <text class="label">{{ item.label }}</text>
-          <text class="value">{{
+	<view class="caseInfo_wrap">
+		<view class="caseInfo_content_wrap">
+			<view class="caseInfo_title">
+				<view>
+					<image src="/static/clueDetail/icon-caseInfo.png" mode=""></image>
+					<text class="info_text">发单信息</text>
+				</view>
+				<u-icon name="edit-pen-fill" color="#2979ff" size="18" @click="handleEdit"></u-icon>
+			</view>
+			<view class="caseInfo_main_wrap">
+				<view class="Info_item" v-for="item in caseInfoColumn" :key="item.prop">
+					<text class="label">{{ item.label }}</text>
+					<text class="value">{{
             item.dictType
               ? $selectDictLabel(item.dictType, receiptDetail[item.prop])
               : receiptDetail[item.prop]
               ? receiptDetail[item.prop]
               : "-"
           }}</text>
-        </view>
-      </view>
-    </view>
-  </view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-const caseInfoColumn = [
-  {
-    prop: "receiptDate",
-    label: "收单日期",
-  },
-  {
-    prop: "item",
-    label: "物品",
-  },
-  {
-    prop: "phone",
-    label: "电话",
-  },
-  {
-    prop: "authenticateNickName",
-    label: "鉴定",
-  },
-  {
-    prop: "category",
-    label: "类别",
-    dictType: "crm_form_category",
-  },
-  {
-    prop: "brand",
-    label: "品牌",
-    dictType: "crm_form_brand",
-  },
-  {
-    prop: "idCard",
-    label: "身份证号码",
-  },
-  {
-    prop: "customName",
-    label: "开户人姓名",
-  },
-  {
-    prop: "bankCardNumber",
-    label: "银行卡号",
-  },
-  {
-    prop: "bankName",
-    label: "银行名称",
-  },
-  {
-    prop: "paymentMethod",
-    label: "付款方式",
-  },
-  {
-    prop: "visitTime",
-    label: "计划上门时间",
-  },
-  {
-    prop: "remarks",
-    label: "补充说明",
-  },
-  {
-    prop: "priceRange",
-    label: "预估价格范围",
-  },
-  {
-    prop: "tactic",
-    label: "采用战术",
-    dictType: "crm_form_tactic",
-  },
-];
-export default {
-  props: {
-    receiptDetail: {
-      type: Object,
-      default: () => {},
-    },
-    sendFormId: {
-      type: [Number, String],
-      required: true,
-    },
-    clueId: {
-      type: [Number, String],
-      required: true,
-    },
-  },
-  data() {
-    return {
-      caseInfoColumn,
-    };
-  },
-  methods: {
-    handleEdit() {
-      uni.navigateTo({
-        url: `/pages/orderForm/index?clueId=${this.clueId}&sendFormId=${this.sendFormId}`,
-      });
-    },
-  },
-};
+	const caseInfoColumn = [{
+			prop: "receiptDate",
+			label: "收单日期",
+		},
+		{
+			prop: "item",
+			label: "物品",
+		},
+		{
+			prop: "phone",
+			label: "电话",
+		},
+		{
+			prop: "authenticateNickName",
+			label: "鉴定",
+		},
+		{
+			prop: "category",
+			label: "类别",
+			dictType: "crm_form_category",
+		},
+		{
+			prop: "brand",
+			label: "品牌",
+			dictType: "crm_form_brand",
+		},
+		{
+			prop: "idCard",
+			label: "身份证号码",
+		},
+		{
+			prop: "customName",
+			label: "开户人姓名",
+		},
+		{
+			prop: "bankCardNumber",
+			label: "银行卡号",
+		},
+		{
+			prop: "bankName",
+			label: "银行名称",
+		},
+		{
+			prop: "paymentMethod",
+			label: "付款方式",
+		},
+		{
+			prop: "visitTime",
+			label: "计划上门时间",
+		},
+		{
+			prop: "remarks",
+			label: "补充说明",
+		},
+		{
+			prop: "priceRange",
+			label: "预估价格范围",
+		},
+		{
+			prop: "tactic",
+			label: "采用战术",
+			dictType: "crm_form_tactic",
+		},
+	];
+	export default {
+		props: {
+			receiptDetail: {
+				type: Object,
+				default: () => {},
+			},
+			sendFormId: {
+				type: [Number, String],
+				required: true,
+			},
+			clueId: {
+				type: [Number, String],
+				required: true,
+			},
+		},
+		data() {
+			return {
+				caseInfoColumn,
+			};
+		},
+		methods: {
+			handleEdit() {
+				uni.navigateTo({
+					url: `/pages/orderForm/index?clueId=${this.clueId}&sendFormId=${this.sendFormId}`,
+				});
+			},
+
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.caseInfo_wrap {
-  min-height: 400px;
-  .caseInfo_title {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 80rpx;
-    background: #f4f4f6;
-    padding: 0 40rpx;
+	.caseInfo_wrap {
+		min-height: 400px;
+
+		.caseInfo_title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 80rpx;
+			background: #f4f4f6;
+			padding: 0 40rpx;
 
-    image {
-      width: 24rpx;
-      height: 24rpx;
-      margin-right: 10rpx;
-    }
+			image {
+				width: 24rpx;
+				height: 24rpx;
+				margin-right: 10rpx;
+			}
 
-    .info_text {
-      font-size: 24rpx;
-      color: #202020;
-    }
+			.info_text {
+				font-size: 24rpx;
+				color: #202020;
+			}
 
-    .edit-btn {
-      font-size: 24rpx;
-      color: #3498db;
-      padding: 8rpx 16rpx;
-      border-radius: 8rpx;
-      background-color: #fff;
-      border: 1rpx solid #3498db;
-    }
-  }
+			.edit-btn {
+				font-size: 24rpx;
+				color: #3498db;
+				padding: 8rpx 16rpx;
+				border-radius: 8rpx;
+				background-color: #fff;
+				border: 1rpx solid #3498db;
+			}
+		}
 
-  .caseInfo_main_wrap {
-    .Info_item {
-      padding: 18rpx 40rpx;
-      display: flex;
-      justify-content: space-between;
+		.caseInfo_main_wrap {
+			.Info_item {
+				padding: 18rpx 40rpx;
+				display: flex;
+				justify-content: space-between;
 
-      .label {
-        color: #999999;
-        font-size: 26rpx;
-        width: 160rpx;
-      }
+				.label {
+					color: #999999;
+					font-size: 26rpx;
+					width: 160rpx;
+				}
 
-      .value {
-        font-size: 26rpx;
-        color: #202020;
-        text-align: right;
-        width: 500rpx;
-      }
-    }
-  }
-}
+				.value {
+					font-size: 26rpx;
+					color: #202020;
+					text-align: right;
+					width: 500rpx;
+				}
+			}
+		}
+	}
 </style>

pages/orderForm/index.vue

@@ -276,6 +276,7 @@
 							tactic: this.form.tactic
 						}
 						await uni.$u.api.updateClueOrderForm(updatedForm);
+						uni.$emit('updateSendFormSuccess');
 						uni.$u.toast('发单记录更新成功');
 					} else {
 						// 合并所有附件

pages/receiptForm/index.vue

@@ -717,10 +717,12 @@ export default {
         if (this.form.id) {
           // 修改
           await uni.$u.api.updateReceiptForm(submitData);
+		  uni.$emit('addReceiptFormSuccess');
           uni.$u.toast("修改成功");
         } else {
           // 新增
           await uni.$u.api.addReceiptForm(submitData);
+		  uni.$emit('addReceiptFormSuccess');
           uni.$u.toast("新增成功");
         }
 

uni_modules/android-keeplive/changelog.md

@@ -1,3 +1,7 @@
+## 1.1.72（2025-11-29）
+优化通知栏发布
+## 1.1.71（2025-11-20）
+优化
 ## 1.1.70（2025-10-31）
 优化鸿蒙保活
 ## 1.1.69（2025-10-27）

uni_modules/android-keeplive/encrypt

@@ -1,2 +1 @@
-Sץ©�FבSכ…›אe|�b₪�]ךQ³g‏T#‰9²ג#ִט�<¹—ֻ״I•–�;ׁ“7.—הד#©
םt¯«ר•סƒא�4†ל”^…›ײc8�'ֶ”?B–Fבr™§�יcNm! ׀ֽ
-Nf@µR�ֻJ”—w׳XUGִ�הׁתֵֽ6¾
9°™yַ
+Sץ©�FבSכ…›אe|�b₪�]ךQ³g‏T#‰9²ג°1[עu)1HB�³�ױק�®@^£‚U€ט‘5o₪­+*5d‎�p�[y¡—W	
ֹשY���gנ˜9½�ƒZ^a׃h¬½[�’ז¶³S¡חן¾/4²ׂ,�fַ¬c�ח[ִˆJ$יaTjטQdA

uni_modules/android-keeplive/package.json

@@ -1,7 +1,7 @@
 {
   "id": "android-keeplive",
-  "displayName": "安卓保活 ios保活 鸿蒙保活 保应用程序稳定后台运行(uniapp，uniappx保活 长期维护）",
-  "version": "1.1.70",
+  "displayName": "安卓保活 ios保活 鸿蒙保活 保应用程序稳定后台运行(2025插件大赛二等奖)",
+  "version": "1.1.72",
   "description": "android保活/ios保活/鸿蒙保活 为应用程序提供一个稳定的后台运行环境，为您的应用程序保驾护航，防止程序后台被杀，程序唤醒，息屏唤醒，增加程序活性,优化代码执行,保活稳定",
   "keywords": [
     "保活",

uni_modules/android-keeplive/readme.md

@@ -55,6 +55,10 @@ keep.onAddScrrenListenerCallback(function(res:boolean){
 	console.log("屏幕开启状态 "+res)
 	
 })	
+keep.onAddNotificationClickListener(function(d:string){
+	// d 为点击通知栏信息 的json字符
+	console.log(d);
+})
 keep.setWakeLock(1,"keeptag");// 设置唤醒类型
 keep.setAutoStartEnable(true)
 
@@ -110,6 +114,10 @@ keep.onAddBackgroundCallback(function(res){
 keep.onAddScrrenListenerCallback(function(res){
 	console.log("屏幕开启状态 "+res)
 	
+})
+keep.onAddNotificationClickListener(function(d){
+	// d 为点击通知栏信息 的json字符
+	console.log(d);
 })	
 keep.setWakeLock(1,"keeptag");// 设置唤醒类型
 
@@ -290,6 +298,21 @@ var ignoring=  keep.isIgnoringBatteryOptimizations();
 keep.setBackgroundMusicEnabled(true);
 ~~~
 
+### 设置安卓通知点击回调（安卓有效,ios 无功能）
+uniappx 
+~~~
+keep.onAddNotificationClickListener(function(d:string){
+	// d 为点击通知栏信息 的json字符
+	console.log(d);
+})
+~~~
+uniapp 
+~~~
+keep.onAddNotificationClickListener(function(d){
+	// d 为点击通知栏信息 的json字符
+	console.log(d);
+})
+~~~
 
 
 ### 是否隐藏通知栏 （弃用，后续删除）
@@ -304,7 +327,10 @@ keep.hideNotification(false);
  ~~~
  keep.setNotifaicationSoundEnable(true);
  ~~~
-
+### 设置通知id
+~~~
+keep.setNotifationId(333);// id 为随意 重复为更新通知  不同为发布新的
+~~~
  
 ### 设置通知栏 ChannelId 默认keeplive（安卓有效,ios 无功能）
 #### setChannelId
@@ -320,6 +346,8 @@ keep.setTitle("Test");
 keep.setContent("test runing");
 keep.updateNotification();
  ~~~
+ 
+ 
 
 ### 设置通知栏标题
 #### setTitle
@@ -336,11 +364,38 @@ keep.updateNotification();
  ~~~
 ### 设置通知重要性（安卓有效,ios 无功能）
 #### setChannelImportance
-参数1 number  0-4 低到高 
+参数1 number  1-3 低到高 
 ~~~
 keep.setChannelImportance(3);
 ~~~
+### 设置通知栏channel 锁屏可见性（安卓有效,ios 无功能）
+~~~
+ keep.setLockscreenVisibility(1); 锁屏可见性，可选范围VISIBILITY_PRIVATE：0、VISIBILITY_PUBLIC：1、VISIBILITY_SECRET：-1、VISIBILITY_NO_OVERRIDE：-1000
+~~~
 
+### 设置通知栏 channel 震动（安卓有效,ios 无功能）
+~~~
+keep.enableVibration(true);// true 开启  false 关闭
+~~~
+
+### 设置通知分组（安卓有效,ios 无功能）
+~~~
+keep.setNotifationMsgGroup("test");// 设置后更新通知 通知在一个分组 通知 setNotifationId需要不同 
+~~~
+### 设置通知栏附属信息（安卓有效,ios 无功能）
+~~~
+keep.setNotifationExterData("data");
+~~~
+
+### 如何发送组通知
+~~~
+ this.id=this.id+1;
+keep.setTitle("Test"+this.id);
+keep.setContent("test runing");
+keep.setNotifationExterData("xxxaa22233"+this.id);
+keep.setNotifationMsgGroup("test");
+keep.updateNotification();
+~~~
 
 ### 设置通知栏小图标（安卓有效,ios 无功能）
 #### setSmallIcon
@@ -356,9 +411,29 @@ keep.setChannelImportance(3);
 参数1 string   插件的res  drawable 目录下 名称
 ~~~
  keep.setLargeIcon("icon");
+~~~
+
+
+
+### 设置通知栏是否点击取消（安卓有效,ios 无功能）
+~~~
+keep.setAutoCancel(false);// false 表示不可取消 true 表示可取消
+~~~
+
+
+### 取消组通知 （安卓有效,ios 无功能）
+~~~
+keep.cancelGroupNotifaon("test")
+~~~
 
+### 取消指定id 的通知（安卓有效,ios 无功能）
+~~~
+keep.cancelNotifation(0)
 ~~~
 
+
+
+
 ### 设置唤醒cpu类型（安卓有效,ios 无功能）
 #### setWakeLock
 参数1 number   

uni_modules/android-keeplive/utssdk/unierror.uts

@@ -1 +1 @@
-団蘏烕燉VUY崂
+4��5���.˲Q�����

utils/api.js

@@ -98,7 +98,7 @@ const install = (Vue, vm) => {
 		selectClueFileByDto:(data,config={})=>http.post(store.state.user.path + '/clueFile/selectClueFileByDto',data,config),
 		updateClueFile:(data,config={})=>http.put(store.state.user.path + '/clueFile/updateClueFile',data),
 		addReceiptForm:(data,config={})=>http.post(store.state.user.path + '/clueReceiptForm',data),
-		updateReceiptForm:(data,config={})=>http.put(store.state.user.path + '/updateReceiptForm',data),
+		updateReceiptForm:(data,config={})=>http.put(store.state.user.path + '/clueReceiptForm',data),
 		listReceiptFormByOrderId:(orderFormId,config={})=>http.get(store.state.user.path + '/clueReceiptForm/listByOrderId/' + orderFormId),
 		getReceiptForm:(id,config={})=>http.get(store.state.user.path + '/clueReceiptForm/' + id),
 		delReceiptForm:(id,config={})=>http.delete(store.state.user.path + '/clueReceiptForm/' + id),
@@ -110,6 +110,7 @@ const install = (Vue, vm) => {
 		clueCommissionRemove: (ids,config={})=>http.post(store.state.user.path + '/clueCommissionForm/remove',ids),
 		getCustomerManagerAllList: ()=>http.post('/system/user/getCustomerManagerAllList'),
 		getClueSendFormVoByOrderId: (params)=>http.get(store.state.user.path + '/clueSendForm/getClueSendFormVoByOrderId?' + qs.stringify(params)),
+		statisticsSendStatus : (data,config = {})=>http.post(store.state.user.path + '/clueSendForm/statisticsSendStatus',data), // 统计线索阶段
 	}
 }