修盖bug

manifest.json

@@ -99,11 +99,7 @@
             "minified" : true
         },
         "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "获取地址信息"
-            }
-        },
+        "permission" : {},
         "requiredBackgroundModes" : [ "audio" ],
         "plugins" : {
             "WechatSI" : {

pages/center/Piabodata/requireminingAnalysis.vue

@@ -14,10 +14,6 @@
 				{{ guwen}}
 				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
-			<!-- <view class="tabbox" @click="huashushow=true">
-				{{ huashu}}
-				<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
-			</view> -->
 		</view>
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="boxzonglan" style="min-height: 400rpx;">
@@ -101,16 +97,19 @@
 			</view>
 		</view>
 		<u-popup v-model="timeshow" mode="bottom">
-			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }"
-				@click="tabtimetap(4, '近7天')">
+			<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(5, '接待时间')">
+				全部</view>
+			<view class="timeview" :style="{ color: activeTotal == 2 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(2, '近7天')">
 				近7天</view>
-				<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }"
-				@click="tabtimetap(5, '近15天')">
+				<view class="timeview" :style="{ color: activeTotal == 3 ? '#2B6EFF' : '#333333' }"
+				@click="tabtimetap(3, '近15天')">
 				近15天</view>
 			<view class="timeview" :style="{ color: activeTotal == 6 ? '#2B6EFF' : '#333333' }"
 				@click="tabtimetap(6, '近30天')">
 				近30天</view>
-			<view class="timeview" :style="{ color: activeTotal == 3 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(3,'自定义')">
+			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(4,'自定义')">
 				自定义</view>
 		</u-popup>	
 		<u-calendar v-model="calendarShow" mode="range" @change="calendarTimeChange"></u-calendar>
@@ -118,8 +117,6 @@
 			:default-value='selindex'></u-select>
 		<u-select v-model="deptshow" :list="teamList" @confirm="deptCallback"
 			:default-value='selindex'></u-select>
-			<!-- <u-select v-model="huashushow" :list="hushuList" @confirm="huashuCallback"
-			:default-value='selindex'></u-select> -->
 		<!-- 加载组件  -->
 		<loading v-model="LOADING"></loading>
 	</view>
@@ -136,7 +133,6 @@
 		data() {
 			return {
 				selindex: '',
-				// huashushow: false,
 				guwenshow: false,
 				timeshow: false,
 				selectshow: false,
@@ -157,7 +153,7 @@
 				opts: { 
 					rotate: false,
 					rotateLock: false,
-					color: ["#1890FF","#91CB74","#FAC858","#EE6666"],
+					color: ['#F8A12B','#07B79D','#E7483C','#2671E1'],
 					padding: [5,5,5,5],
 					dataLabel: true,
 					legend: {
@@ -188,7 +184,7 @@
 						}
 					}
 				},
-				activeTotal: 4,
+				activeTotal: 5,
 				houseId: '',
 				// hushuList: [],// 业务话术
 				staffList: [],// 员工列表
@@ -327,10 +323,10 @@
             ]}
 					})
 			},
-			Toview(){
 				//跳转到接待记录
+			Toview(){
 				uni.navigateTo({
-					url: '/pages/center/records/index?refresh=refresh'
+					url: '/pages/center/records/index?refresh=refresh&activeTotal='+this.activeTotal+'&staTime='+ this.startDate + '&endTime'+this.endDate+'&validInvalid=0'
 				});
 			},
 			// 需求挖掘分析-简报

pages/center/consumer/consumerDetail.vue

@@ -113,13 +113,13 @@
 
 					<view class="content-sec">
 						<view class="left">
-							<view class="cus" style="line-height: 46rpx;">客户：{{item.name || ''}} |</view>
-							<view style="line-height: 46rpx;" class="arriveNum">{{item.visitRecord || '--'}}次到访</view>
+							<view class="cus" style="line-height: 46rpx;">客户：{{item.name || '--'}} |</view>
+							<view style="line-height: 46rpx;" class="arriveNum">{{item.visitRecord || '0'}}次到访</view>
 						</view>
 						<view class="right">{{item.fraction || '0'}}%</view>
 					</view>
 
-					<view class="content-last">{{item.createTime}} | {{item.mm || '--'}}min</view>
+					<view class="content-last">{{item.createTime}} | {{item.mm || 0}}min</view>
 				</view>
 			</view>
 

pages/center/consumer/index.vue

@@ -776,6 +776,8 @@ export default {
     this.isnorefresh = options.refresh;
   },
   onShow() {
+    // dataCode: 身份标识 2：项目总、3：客服、4：策划、5：经理、6：置业顾问
+    this.userInfo = uni.getStorageSync('weapp_session_userInfo_data');
     if (this.isnorefresh == "refresh") {
       this.buildingID = uni.getStorageSync("buildingID").id;
       this.nextPage = 1;
@@ -992,7 +994,6 @@ export default {
           orderBy: this.screen.orderBy==''?'': this.screen.orderBy,// 排序
         },
       };
-      this.userInfo = uni.getStorageSync("weapp_session_userInfo_data");
       this.$u.post("/customer/customerManagement", parames)
         .then((data) => {
           this.LOADING = false;
@@ -1070,6 +1071,9 @@ export default {
             label: '全部',
             value: '',
           })
+          if(this.userInfo.dataCode==6){
+            this.freeList = []
+          }
         });
     },
   // 获取客户阶段数据

pages/mine/details2.vue

@@ -149,13 +149,15 @@
 		<view class="zhezhao" v-if="wajueshow" @tap="CancelAdd"></view>
 		<u-modal width="600rpx" v-model="wajueshow" title="新增挖掘话术" :show-cancel-button="true" @cancel="CancelAdd" @confirm="wajueConfirm()">
 			<view class="tian-view" style="margin-left: 20rpx;">
-				<view class="tian-view-t3">
-					话术分类：<input class="huashu-input" disabled @click="treeshow=true" v-model="wordBiao.wordBiaoqian" type="text" placeholder="请选择" />
+				<view class="tian-view-t2">
+					话术分类：<view class="word" @click="treeshow=true">{{wordBiao.wordBiaoqian}}</view>
 				</view>
 			</view>
 			<view class="tian-view" style="margin-left: 20rpx;">
 				<view class="tian-view-t2">
-					话术内容：<u-input style="flex:1" :auto-height="true" :height="50" type="textarea" v-model="thewrongword" :border="false" :custom-style="{'width': '320rpx','font-size':'34rpx','border-bottom': '1px solid #ccc'}" placeholder="请输入" />
+					话术内容：<view class="word1">
+					<u-input :auto-height="false"  height="30" type="textarea" v-model="thewrongword" :border="false" :custom-style="customStyle" placeholder="请输入" />
+				</view>
 				</view>
 			</view>
 		</u-modal>
@@ -164,12 +166,18 @@
 		<u-modal v-model="isshow2" title="添加常错词" :show-cancel-button="true" @cancel="Cancelout" @confirm="$noMultipleClicks(Confirmtheexit)">
 			<view class="tian-view">
 				<view class="tian-view-t2" style="margin-left: 20rpx;">
-					常错词：<u-input style="flex:1"  :auto-height="true" :height="50" type="textarea" v-model="thewrongword" :border="false" :custom-style="{'width': '320rpx','font-size':'34rpx','border-bottom': '1px solid #ccc'}" placeholder="请输入" />
+					常错词：<view class="word1">
+					<u-input :auto-height="false"  height="30" type="textarea" v-model="thewrongword" :border="false" :custom-style="customStyle" placeholder="请输入" />
+				</view>
+					<!-- <u-input :auto-height="false" height="40" type="textarea" v-model="reswrongword" :border="false" :custom-style="customStyle" placeholder="请输入" /> -->
+					<!-- <view class="word">{{thewrongword}}</view> -->
 				</view>
 			</view>
 			<view class="tian-view">
-				<view class="tian-view-t3" style="margin-left: 20rpx;">
-					正确词：<u-input style="flex:1"  :auto-height="true" :height="50" type="textarea" v-model="reswrongword" :border="false" :custom-style="{'width': '320rpx','font-size':'34rpx','border-bottom': '1px solid #ccc'}" placeholder="请输入" /></view>
+				<view class="tian-view-t2" style="margin-left: 20rpx;">
+					正确词：<view class="word1">
+					<u-input :auto-height="false" height="30" type="textarea" v-model="reswrongword" :border="false" :custom-style="customStyle" placeholder="请输入" /></view>
+					</view>
 			</view>
 		</u-modal>
 
@@ -518,6 +526,11 @@
 
 		data() {
 			return {
+				customStyle: {
+					'width': '320rpx',
+					'font-size':'34rpx',
+					'border-bottom': '1px solid #ccc'
+				},
 				wordBiao: {
 					level: 1,
 					wordBiaoqian: '',
@@ -759,10 +772,10 @@
 						icon: 'none',
 						duration: 2000
 					});
-					this.wajueItem.isshow = true
 					this.wajueshow = true
 					return;
 				}
+				this.wajueshow = true
 				uni.request({
 					url: config.service.addWordMining,	
 					method: "post",
@@ -780,17 +793,14 @@
 					success: (res) => {
 						// console.log(res)
 						if(res.data.code==10000){
-							this.wajueItem.isshow = false
-							this.wajueshow = false
 							uni.showToast({
 								title: '添加成功',
 								duration: 2000
 							});
+							this.wajueshow = false
 						}else{
-							this.wajueshow = true
-							this.wajueItem.isshow = false
 							uni.showToast({
-								title: '添加失败',
+								title: res.data.message,
 								icon: 'none',
 								duration: 2000
 							});
@@ -1623,6 +1633,7 @@
 			openwajue(item) {
 				this.wajueItem = item
 				this.wajueshow = true;
+				item.isshow = false
 			},
 			//加精华
 			Addtheessence() {
@@ -2729,16 +2740,17 @@
 			font-size: 34rpx;
 			display: flex;
 			color: #333;
-		}
-		.tian-view-t3 {
-			width: 100%;
-			display: flex;
-			font-size: 34rpx;
-			.huashu-input{
-				flex:1;
-				font-size: 34rpx;
+			.word{
+				flex: 1;
 				border-bottom: 1px solid #ccc;
 			}
+			.word1{
+				height: 80rpx;
+				flex: 1;
+				/deep/ textarea{
+					max-height: 80rpx !important;
+				}
+			}
 		}
 	}