Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

src/views/abPoint/award_punish.vue

@@ -121,11 +121,6 @@
 				  <el-col :span="4" style="margin-bottom:5px;">来源类型</el-col>
 				  <el-col :span="20">{{ detail_info.source_type_mark }}</el-col>
 				</el-row>
-				
-				<el-row :gutter="10" v-show="detail_info.source_type_mark">
-					<el-col :span="4">来源类型</el-col>
-					<el-col :span="20">{{ detail_info.source_type_mark }}</el-col>
-				</el-row>
 
 				<el-row :gutter="10" v-show="!detail_info.rule_id">
 					<el-col :span="4">记录人</el-col>

src/views/common/rewardTaskDetailsPopup.vue

@@ -58,14 +58,14 @@
 							></el-image>
 						</div>
 					</li>
-          <li class="flex-box">
-            <div class="label">任务类型</div>
-            <div class="content_text">{{workDetailData.source_type_mark}}</div>
-          </li>
-          <li class="flex-box" v-if="workDetailData.point_config">
-            <div class="label">任务积分</div>
-            <div class="content_text">{{workDetailData.point_config.base_point}}{{$getTypsName(workDetailData.pt_id)}}</div>
-          </li>
+					<li class="flex-box">
+						<div class="label">任务类型</div>
+						<div class="content_text">{{workDetailData.type_mark}}</div>
+					</li>
+					<li class="flex-box" v-if="workDetailData.point_config">
+						<div class="label">任务积分</div>
+						<div class="content_text">{{workDetailData.point_config.base_point}}{{$getTypsName(workDetailData.pt_id)}}</div>
+					</li>
 					<li class="flex-box">
 						<div class="label">审批人</div>
 						<div class="content_text">{{ workDetailData.reviewer_name }}</div>