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

pages/center/Piabodata/index.vue

@@ -139,7 +139,7 @@
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="single">
 			<view class="title">
-				<view class="title1">销讲维度执行率</view>
+				<view class="title1">场景触达分析</view>
 				<!-- <view class="title3">
 					<view class="title3-box">
 						<view style="height: 42rpx;" :class="{ activecltab: activeTotal2 == 0 }">执行率</view>

pages/index/learning.vue

@@ -3,7 +3,7 @@
 		<view class="tab-box">
 			<view class="tab-item-wrap">
 				<view v-for="(item, index) in tablist" :key="index" 
-					  :class="activeClass == index ? 'bottom' : ''" @tap="clocktab(index, item.id)">
+					  :class="activeClass == index ? 'bottom' : ''" @click="clocktab(index, item.id)">
 					{{ item.name }}
 					<view class="bottomLine" v-if="activeClass == index"></view>
 				</view>

pages/mine/equipment/index.vue

@@ -20,7 +20,7 @@
 		<view class="infoet">
 			<view class="infoviewbox" v-for="(item,index) in newListdata" :key="index">
 				<view class="infobox1">
-					<view class="box1-zuo">领用人：{{item.accName}}</view>
+					<view class="box1-zuo u-line-1">领用人：{{item.accName}}</view>
 					<view class="box1-you">
 						<view class="you1" v-if="item.electricity>20">
 							<view class="youimg" :style="{ height: item.electricity + '%' }"></view>

pages/mine/reception/addreception.vue

@@ -122,7 +122,7 @@
 				daitiReceptionobj: {},
 				saveisshow: true,
 				isBand: false, // 阻止二次提交
-				tap: true,
+				tap: true,
 				fdFlag:null
 			};
 		},
@@ -200,17 +200,17 @@
 					agentId: that.parames.agentId
 				}).then(res => {
 					if (res.unchecked == 0) {
-						that.baochunfun()
+						that.baochunfun()
 						this.tap = false;
 					} else {
 						if (res.zs == 0) {
 							that.parames.agentId = res.assign.accountId;
-							that.baochunfun()
+							that.baochunfun()
 							this.tap = false;
 						} else {
 							console.log("zo")
 							if (res.assign == null && res.replacement == null) {
-								that.baochunfun()
+								that.baochunfun()
 								this.tap = false;
 							} else {
 								if (res.assign == null) {
@@ -470,7 +470,7 @@
 	.clive2 {
 		width: 690rpx;
 		height: 88rpx;
-		background: #9999;
+		background: #999;
 		text-align: center;
 		line-height: 88rpx;
 		color: #666;
@@ -479,4 +479,4 @@
 		margin-top: 300rpx;
 		font-size: 32rpx;
 	}
-</style>
+</style>