Merge branch 'dev' of http://git.2weisou.com/liumin/NewZkgj into dev

pages/center/Piabodata/TrendAnalysis.vue

@@ -55,7 +55,14 @@
 						</view>
 						<view class="comparesize" v-if="compareFlag&&timepickpickisshow">
 							<text style="margin-right: 10rpx;">对比：{{index==1?item.num1+'%':item.num1}} </text>
-							<text :style="{color:item.num2*1>0?'red':'green'}">{{item.num2+'%'}}{{item.num2*1>0?'↑':'↓'}}</text>
+							<template v-if="item.num2*1 != 0">
+								<text
+									:style="{color:item.num2*1>0?'red':'green'}">{{item.num2+'%'}}{{item.num2*1 > 0 ? '↑':'↓'}}</text>
+							</template>
+							<template>
+								<text
+									:style="{color:item.num2*1>0?'red':'green'}">{{item.num2+'%'}}</text>
+							</template>
 						</view>
 					</view>
 				</view>
@@ -185,7 +192,8 @@
 								style="display: inline-block;">
 								<view v-if="index==1&&index1>0" class="td" :style="{color:item1*1>0?'red':'green'}"
 									style="border-right:1px solid #E0E0E0;">
-									{{item1==0?'--':item1+'%'}}{{item1*1>0?'↑':item1*1<0?'↓':''}}</view>
+									{{item1==0?'--':item1+'%'}}{{item1*1>0?'↑':item1*1<0?'↓':''}}
+								</view>
 								<view v-else-if="index>1&&index1>0" class="td" style="border-right:1px solid #E0E0E0;">
 									{{item1+'%'}}
 								</view>
@@ -323,8 +331,8 @@
 		},
 		onPullDownRefresh() {
 			this.init()
-			setTimeout(function () {
-			    uni.stopPullDownRefresh();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		watch: {
@@ -743,7 +751,7 @@
 				this.pamect.accountId = this.lopanobj.id;
 				this.ConsultantDimension()
 				this.Showhiddenunits = false;
-				for(let i = 0; i < this.selectlist.length; i++) {
+				for (let i = 0; i < this.selectlist.length; i++) {
 					if (e[0].value == this.selectlist[i].value) {
 						this.selindexList[0] = i
 					}
@@ -981,8 +989,8 @@
 				this.timepickpickisshow = false;
 				this.init()
 				this.TeamCompared()
-				
-				for(let i = 0; i < this.selectlist4.length; i++) {
+
+				for (let i = 0; i < this.selectlist4.length; i++) {
 					if (e[0].value == this.selectlist4[i].value) {
 						this.selindexList4[0] = i
 					}

pages/center/Piabodata/index.vue

@@ -251,7 +251,7 @@
 				totalTimeShow: false,
 				activeTab: 0,
 				numlist: [{
-						name: '接待客户',
+						name: '有效接待',
 						num: ''
 					},
 					{

pages/center/consumer/edit.vue

@@ -39,9 +39,16 @@
 							*
 						</view>
 					</view>
-					<view class="conmsg-msg-lab-inp">
-						<input  :disabled="dataCode!=6" type="number" placeholder="请输入联系电话" placeholder-style="color:#B2B2B2;" maxlength="11"  v-model="form.phone"/>
-					</view>
+					<template v-if="form.isShow == 1">
+						<view class="conmsg-msg-lab-inp">
+							<input disabled type="number" placeholder="请输入联系电话" placeholder-style="color:#B2B2B2;" maxlength="11"  v-model="form.showPhone"/>
+						</view>
+					</template>
+					<template v-else>
+						<view class="conmsg-msg-lab-inp">
+							<input :disabled="dataCode!=6" type="number" placeholder="请输入联系电话" placeholder-style="color:#B2B2B2;" maxlength="11"  v-model="form.phone"/>
+						</view>
+					</template>
 				</view>
 				<view class="conmsg-msg-lab">
 					<view class="conmsg-msg-lab-1">
@@ -177,13 +184,13 @@
 				allList:[],
 				dataCode:'',
 				projectId: '', // 项目ID
+				userInfo: {}, // 当前用户信息
 			}
 		},
 		onLoad(e) {
-			const {
-				dataCode
-			} = uni.getStorageSync("weapp_session_userInfo_data");
-			this.dataCode=dataCode
+			this.userInfo = uni.getStorageSync("weapp_session_userInfo_data");
+			console.log()
+			this.dataCode=this.userInfo.dataCode
 			console.log(e)
 			// 先调用借口查询数据
 			this.customerId=e.id
@@ -206,6 +213,9 @@
 						if(data.data.code==10000){
 							this.list = data.data.data
 						}
+					},
+					fail: (res) => {
+						console.log(res)
 					}
 				})
 			},
@@ -253,6 +263,7 @@
 				this.$u.get("customer/findById?",{id:this.customerId})
 				.then(res=>{
 					this.form=res
+					this.form.showPhone = this.form.phone&&this.form.isShow==1?this.form.phone.length==11?this.form.phone.substr(0, 3) + '****' + this.form.phone.substr(7):this.form.phone:this.form.phone&&this.form.isShow!=1?this.form.phone: '--'
 					// 给客户等级赋值
 					let idx= this.levellist.findIndex(item=>item.value==res.level)
 					if(idx!=-1){

pages/center/consumer/index.vue

@@ -344,19 +344,19 @@
 				}, ],
 				levelList: [{
 					label: 'A',
-					value: 0,
+					value: 1,
 					isShow: false,
 				}, {
 					label: 'B',
-					value: 1,
+					value: 2,
 					isShow: false,
 				}, {
 					label: 'C',
-					value: 2,
+					value: 3,
 					isShow: false,
 				}, {
 					label: 'D',
-					value: 3,
+					value: 4,
 					isShow: false,
 				}, ],
 				isRefresh: false,