Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

pages.json

@@ -604,12 +604,6 @@
         "selectedIconPath": "static/image/apply-active.png",
         "text": "工单"
       },
-      {
-        "iconPath": "static/image/message.png",
-        "selectedIconPath": "static/image/message_active.png",
-        "pagePath": "pages/message/index",
-        "text": "消息"
-      },
       {
         "pagePath": "pages/person/index",
         "iconPath": "static/image/person.png",

root/detail/apply.vue

@@ -705,11 +705,12 @@ export default {
 		handleCopy() {
 			let that = this,
 				params = {};
+				// {{ orderDetail.userName }}{{ orderDetail.setTitle }}
 			params = {
-				"姓名：": this.orderDetail.userName + "/" + this.orderDetail.sex == 1 ? "男" : "女" + "/" + this.orderDetail.age + "岁/" + this.orderDetail.nation,
+				"姓名：": this.orderDetail.userName + this.orderDetail.setTitle,
 				"身份证号：": this.orderDetail.idCard ? this.orderDetail.idCard : "-",
 				"企业岗位：": this.orderDetail.storeJobName ? this.orderDetail.storeJobName : "-",
-				电话: this.orderDetail.tel ? this.orderDetail.tel : "-",
+				'电话：': this.orderDetail.tel ? this.orderDetail.tel : "-",
 			};
 			if (this.orderDetail.status == 10 || this.orderDetail.status == 20 || this.orderDetail.status == 25) {
 				params["面试时间"] = this.orderDetail.interview_time ? this.orderDetail.interview_time : "-";

root/detail/job.vue

@@ -449,7 +449,7 @@
 								<div class="g_fs_12 g_c_6" style="margin-top: 8px">{{ isSc ? "已收藏" : "收藏" }}</div>
 							</button>
 						</div>
-						<div class="g_flex_none g_flex_column_center">
+						<div class="g_flex_none g_flex_column_center" v-if="false">
 							<button class="g_pl_0 g_pr_0 g_bg_f g_mr_12 g_w_36" hover-class="thover" style="line-height: 1; border-radius: 0" 
 											@click="goIm"
 							>
@@ -1365,10 +1365,17 @@ export default {
 			return new Promise(function (imgres) {
 				// 岗位标题
 				that.G.fillTextLineBreak(ctx, that.jobDetail.jobName, baseLeft, line2, 800, 20, "#000", titleFontSize, "500", "left"); 
-				// 月工资
+				
-				that.G.fillTextLineBreak(ctx, that.jobDetail.monthPay, 750 - ctx.measureText(that.jobDetail.monthPay).width + 20, line3 + 6, 400, 20, "#ff4400", titleFontSize, "400"); 
 				// 时薪
-				that.G.fillTextLineBreak(ctx, that.G.getSalaryClassifyValue(that.jobDetail.salaryClassify, that.jobDetail.salaryClassifyValue), baseLeft, line3, 400, 40, "#ff4400", titleFontSize + 6, "600", "left"); 
+				if(that.G.getSalaryClassifyValue(that.jobDetail.salaryClassify, that.jobDetail.salaryClassifyValue) == "0-0元/月"){
+					// 月工资
+					that.G.fillTextLineBreak(ctx, that.jobDetail.priceStr, baseLeft, line3, 600, 40, "#ff4400", titleFontSize + 6, "600", "left");  
+				}else{
+					// 月工资
+				  that.G.fillTextLineBreak(ctx, that.jobDetail.monthPay, 750 - ctx.measureText(that.jobDetail.monthPay).width + 20, line3 + 6, 400, 20, "#ff4400", titleFontSize, "400"); 
+					that.G.fillTextLineBreak(ctx, that.G.getSalaryClassifyValue(that.jobDetail.salaryClassify, that.jobDetail.salaryClassifyValue), baseLeft, line3, 400, 40, "#ff4400", titleFontSize + 6, "600", "left"); 
+				}
+				
 				
 				if (that.jobDetail.jobRequestLabelNames.length > 0) {
 					that.jobDetail.jobRequestLabelNames.forEach((item1, index) => {

uni_modules/vk-uview-ui/components/u-radio/u-radio.vue

@@ -8,7 +8,7 @@
 				:color="iconColor"
 			/>
 		</view>
-		<view class="u-radio__label" @tap="onClickLabel" :style="{ fontSize: $u.addUnit(labelSize) }">
+		<view class="u-radio__label" style="margin-right: 10px;" @tap="onClickLabel" :style="{ fontSize: $u.addUnit(labelSize) }">
 			<slot />
 		</view>
 	</view>