commet for commit

manifest.json

@@ -77,7 +77,7 @@
             "urlCheck" : false,
             "es6" : true,
             "postcss" : true,
-            "minified" : false
+            "minified" : true
         },
         "usingComponents" : true,
         "permission" : {},

pages.json

@@ -699,13 +699,5 @@
 		"navigationBarBackgroundColor": "#fff",
 		"navigationBarTitleText": "AI销讲助手",
 		"navigationBarTextStyle": "black"
-	},
-	"condition": { //模式配置，仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [{
-			"name": "访客登记表", //模式名称
-			"path": "pages/mine/registerForm", //启动页面，必选
-			"query": "" //启动参数，在页面的onLoad函数里面得到
-		}]
 	}
 }

pages/center/prohibited/first.vue

@@ -5,21 +5,21 @@
 				{{ showTimeCalender }}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			<view class="items" @tap="jumpPage">
+			<view class="items" style="color: #1890FF;" @tap="jumpPage">
 				明细
 			</view>
 		</view>
 		<view class="wordslist">
 			<!-- block -->
-			<block v-for="(data) in pageData">
-				<view class="item" :key="data.id" @click="jumpPage(data)">
-					<view class="lside">{{ data.words }}</view>
+			<block v-for="(data, index) in pageData">
+				<view class="item" :key="data.id" @click="jumpPage(data, index)">
+					<view :class="{noneColor: index == 0 }" class="lside blue">{{ data.words }}</view>
 					<view class="rside">{{ data.sumNum }}</view>
 				</view>
 			</block>
-			
+
 		</view>
-		
+
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
 	</view>
 </template>
@@ -29,23 +29,33 @@
 		data() {
 			return {
 				pageParams: {
-					statDateStart: '',//开始时间
-					statDateEnd: '',//结束时间
-					projectId: uni.getStorageSync("buildingID").id,//项目id
+					statDateStart: '', //开始时间
+					statDateEnd: '', //结束时间
+					projectId: uni.getStorageSync("buildingID").id, //项目id
 				},
-				showTimeCalender: '选择日期',//
+				showTimeCalender: '选择日期', //
 				totalTimeShow: false, // 自定义时间
-				
+
 				pageData: [], // 页面数据
+				inParams: '', // 入参
 			};
 		},
-		
-		onLoad() {
+
+		onLoad(option) {
+			if (option) {
+				this.inParams = this.params(option)
+			}
+
 			this.findSensitiveWordsData()
 		},
-		
+
 		methods: {
-			// 
+
+			// 对象转url参数F
+			params(json) {
+				return Object.keys(json).map(key => key + '=' + json[key]).join('&');
+			},
+			
 			jumpPage(data) {
 				uni.navigateTo({
 					url: `/pages/center/prohibited/index?refresh=refresh&staTime=${this.pageParams.statDateStart}&endtime=${this.pageParams.statDateEnd}&words=${data.words}`
@@ -65,12 +75,13 @@
 					console.log(this.pageData, '123321s')
 				})
 			},
-			
+
 			// 自定义时间
 			totalTimeChange(e) {
 				console.log(e)
-				this.pageParams.statDateStart = startDate
-				this.pageParams.statDateEnd = endDate
+				this.pageParams.statDateStart = e.startDate
+				this.pageParams.statDateEnd = e.endDate
+				this.showTimeCalender = `${e.startDate}-${e.endDate}`
 				this.findSensitiveWordsData()
 			},
 		}
@@ -83,14 +94,14 @@
 		min-height: 100vh;
 		display: flex;
 		flex-direction: column;
-		
+
 		.header {
 			width: 100%;
 			height: 90rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			
+
 			.items {
 				height: 100%;
 				flex-grow: 1;
@@ -101,28 +112,40 @@
 				font-size: 28rpx;
 			}
 		}
-		
+
 		.wordslist {
 			width: 100%;
 			padding: 20rpx;
-			
+
 			.item {
 				width: 100%;
 				height: 90rpx;
 				font-size: 32rpx;
 				display: flex;
 				align-items: center;
-				
+
+
 				.lside {
 					flex-grow: 1;
+
+					&.blue {
+						color: #1890FF;
+					}
+
+
+					&.noneColor {
+						color: #333;
+					}
 				}
-				
+
 				.rside {
 					flex-shrink: 0;
-					width: 125rpx;
-					text-align: center;
+					width: 200rpx;
+					text-align: right;
 				}
+
+
 			}
 		}
 	}
-</style>
+</style>

pages/center/prohibited/firsts.vue

@@ -7,14 +7,11 @@
 		</view>
 		<view class="wordslist">
 			<!-- block -->
-			<block v-for="(data) in pageData">
-				<view class="item" :key="data.id" @click="jumpPage(data)">
-					<view class="items blue">{{ data.houseName }}</view>
-					<view class="items">{{ data.unTagCustomer || 0 }}</view>
-					<view class="items">{{ data.tagCustomer || 0 }}</view>
-				</view>
-			</block>
-
+			<view v-for="(data, index) in pageData" class="item" :key="data.houseId" @tap="jumpPage(data, index)">
+				<view class="items blue" :class="{noneColor: index == 0 }">{{ data.houseName }}</view>
+				<view class="items">{{ data.unTagCustomer || 0 }}</view>
+				<view class="items">{{ data.tagCustomer || 0 }}</view>
+			</view>
 		</view>
 
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
@@ -63,7 +60,8 @@
 			},
 
 			// 
-			jumpPage(data) {
+			jumpPage(data, index) {
+				if (index == 0) return
 				uni.navigateTo({
 					url: `/pages/center/records/index?${this.inParams}&houseId=${data.houseId}`
 				});
@@ -75,12 +73,11 @@
 					console.log(res)
 					res.unshift({
 						houseName: '项目名称',
-						tagCustomer: '对比上一周',
+						tagCustomer: this.pageParams.messageType == 1 ? '对比昨天' : '对比上一周',
 						unTagCustomer: '未标记数量',
-						id: new Date().getTime()
+						houseId: new Date().getTime(),
 					})
 					this.pageData = res
-					console.log(this.pageData, '123321s')
 				})
 			},
 
@@ -117,10 +114,7 @@
 				justify-content: center;
 				font-size: 32rpx;
 				font-weight: bold;
-				
-				&.blue {
-					color: #1890FF;
-				}
+
 			}
 		}
 
@@ -139,8 +133,16 @@
 					width: 125rpx;
 					text-align: center;
 					font-size: 26rpx;
+
+					&.blue {
+						color: #1890FF;
+					}
+
+					&.noneColor {
+						color: #333;
+					}
 				}
 			}
 		}
 	}
-</style>
+</style>

pages/reportExcel/dayReport.vue

@@ -508,14 +508,26 @@
 					return 0
 				}
 			},
-
+			// 对象转url参数F
+			params(json) {
+				return Object.keys(json).map(key => key + '=' + json[key]).join('&');
+			},
 			// 
 			jumpPage() {
 				console.log(this.weekObj)
 				if (this.weekObj.orgCode) {
+					let obj = {
+						refresh: 'refresh',
+						markAdvisor: 0,
+						validInvalid: 0,
+						messageType: this.weekObj.messageType,
+						staTime: this.weekObj.createTime.split(' ')[0],
+						endtime: this.weekObj.createTime.split(' ')[0],
+						orgCode: this.weekObj.orgCode,
+					}
 					uni.navigateTo({
-						url: `/pages/center/records/index?refresh=refresh&markAdvisor=0&validInvalid=0&messageType=${this.weekObj.messageType}&houseId=${this.building.id}&staTime=${this.weekObj.createTime.split(' ')[0]}&endtime=${this.weekObj.createTime.split(' ')[0]}`
-					});
+						url: `/pages/center/prohibited/firsts?${this.params(obj)}`
+					})
 				}
 			},
 

pages/reportExcel/weekReport.vue

@@ -50,7 +50,7 @@
 				</view>
 			</view>
 
-
+L
 			<!-- 销讲场景执行排名 -->
 			<view class="execution-ranking" v-if="!weekObj.orgCode">
 				<view class="execution-ranking-title">

static/private.wx83fec12ec03d9349.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA32170bII0YGhtBmQBBK28K/nY/W7Y7PPW3xZRGJ1ghp8y5Vg
+0PYpEgn2ppdWhkHpXc2PeE8aZFFB7gcqISYiBkvRzOUPadExMWyZiw3D07vwXqRQ
+EijAJXpFqEz7z8L3sNvadAqlIRiC0DSLcGIgih0/NevUT3L/YpP0rrch08IU7Asv
+dzfS9/uMxyckFBK2LMNaNPV0GnggjJjTprZ2mBrT+j54i+ItnIm1/PuCHCVaSz7s
+b52zL2VddseP8NhePk06EGu1tNCVRj8cQ9MwbXKDRZmL40b0sPgtixoqy3MIHRR8
+xshMhZTyONaZpdPxGMwXjK6/LcjmI0du4Lqx0QIDAQABAoIBAQCm832BPMKAIph9
+JljJ4l4WzapetEEZCERavTlK8zORS0+TJITawAYCd7V52D4MRnYl5LNfF+TFrz5P
+qcTeTktAXylfLI5u6KUUpGy7TkbVEWtUnP1EBHVHy+z/DL9hCPPikPXUnhuz9kfR
+YmILURe1fJM+LIFR+MFCnQJKB4fcXZUJ15wmqNpjEqfUgw6DKGyX5x/uMi8GF6pb
+QYZLyCiLDtNHwMvqH+ocXMUamXmRvole2u/9qDOQo/8SMD4xFOJ/RtWXBK2FXLee
+kmnuo59LiNcXYKpNjNkZJjs2JRiUdo1tPF9yEQmhXiFCm85a65TRnQBNUu68KeoP
+ZgDfgPs9AoGBAP38unzVhxUJSHumgBUFPhc4GOFsdKkrjzkOmEu3+pDbkLCuwoMT
+IvdrB/f650pUPskR+2VlsLk/ZsSG687kYgdWTv/v0llDC7/R9HSSmsQSd8ItbVU9
+f28QOg/Uc+Jzzm3EsS7yljtjP106R6ld+GgYLKBylGuNMlOe3GtX7AtjAoGBAOEy
+whQxTXRFW16VcqWdz350Qcuo3tHyfLDhSkoP//woDarWfZDDPwEEV1K7HziYYEp8
+uWECndRcyGeREfpTW70OvlC4wx3BSM86CQZ72Ag9uamQXdiHbrZgCKzaa5gMtHLD
+WxPU73QTENdazHkBHO2p7KP39ypm7gSnmW2YHUY7AoGAYge8ttf3hlAJ8OfHwdU/
+LNkTCVbCBFVytzQB5h/Bj02foAIjw1GMinB+J+FoihDQFu1g2bcRKb7l3G6y7yzJ
+BUnzvecDij5Nd6ECuEepgooaPREphN/yopxhvKBkhf/qqgVj2dn50DwzRblr1VwW
+t561AsyWqphZ11qWerv5uD8CgYBb5dK9WsE4yXTXzDTU0OlzuQ2AhpEnK8UmiUk/
+n/fedpndNVpYUNTNHXBlGmdLOSNSQkOECwVNO++sE886T/oH1JRlbIBzDAUiS5ST
+SMaH1miFgZxKWDodwmLH5voxOj4I9x+boDF3NLCSsULvvjyH3+fpoa8DZq2KyLob
+tw97MQKBgG1F22GAwLrGIT/7674Zc+kvmjP6hHm+nNRBKqcV0HtxQkjMvOpweZQ6
+G+3VBEEWsMbNqhX/BS5BwGkA//tFSsgUQKtZsO5kuXMcrKSve5drEnmJEQij0tgM
+d1rOh1yjnVCH35K4i4zKIW5zZxhk+eATSFqy98lvRQF3kVmJiNd2
+-----END RSA PRIVATE KEY-----