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

pages.json

@@ -676,25 +676,25 @@
       {
         "pagePath": "pages/home/index",
         "iconPath": "static/image/home.png",
-        "selectedIconPath": "static/image/home-active.png",
+        "selectedIconPath": "static/image/home.png",
         "text": "首页"
       },
       {
         "pagePath": "pages/home/order",
-        "iconPath": "static/image/apply.png",
+        "iconPath": "static/image/home.png",
-        "selectedIconPath": "static/image/apply-active.png",
+        "selectedIconPath": "static/image/home.png",
         "text": "发单号"
       },
       {
-        "iconPath": "static/image/message.png",
+        "iconPath": "static/image/home.png",
-        "selectedIconPath": "static/image/message_active.png",
+        "selectedIconPath": "static/image/home.png",
         "pagePath": "pages/message/index",
         "text": "消息"
       },
       {
         "pagePath": "pages/workBench/index",
-        "iconPath": "static/image/apply.png",
+        "iconPath": "static/image/home.png",
-        "selectedIconPath": "static/image/apply-active.png",
+        "selectedIconPath": "static/image/home.png",
         "text": "工单"
       },
       // { ai
@@ -705,8 +705,8 @@
       // },
       {
         "pagePath": "pages/person/index",
-        "iconPath": "static/image/person.png",
+        "iconPath": "static/image/home.png",
-        "selectedIconPath": "static/image/person-active.png",
+        "selectedIconPath": "static/image/home.png",
         "text": "我的"
       }
     ]

root/detail/job.vue

@@ -1381,7 +1381,7 @@ export default {
 			if (that.goImLoading) {
 				return false;
 			}
-
+ 
 			that.goImLoading = true;
 			that.F.wyyxGet(that.api.job_get_cus + "?jobId=" + that.jobDetail.id, {}, (cusData) => {
 				that.F.wyyxPost(
@@ -1403,26 +1403,52 @@ export default {
 							}
 						});
 						that.jobDetail.info = newList.join("丨");
-						let sendParams = {
+						that.F.wyyxPost(
-							conversationType: 1,
+							that.api.wyyx_sendCard, {
-							senderAccid: uni.getStorageSync("im-accid"),
+								conversationType: 1,
-							receiverAccid: cusData.accid,
+								// senderUserId: uni.getStorageSync("apply-uid"), // 发送者id 即当前登录用户id
-							type: 100000,
+								// receiverUserId: cusData, // 接收方用户id
-							jobDetail: {
+								senderAccid: uni.getStorageSync("im-accid"),
-								title: that.jobDetail.jobName,
+								receiverAccid: cusData.accid,
-								info: that.jobDetail.info,
+								type: 100000,
-								label: that.jobDetail.jobRequestLabelNames.length > 0 ? that.jobDetail.jobRequestLabelNames : [],
+								jobDetail: {
-								salaryClassifyValue: that.jobDetail.priceStr,
+									title: that.jobDetail.jobName,
-								serviceFee: that.showPrice ? that.jobDetail.serverPrice : "",
+									info: that.jobDetail.info,
-								monthPay: that.jobDetail.monthPay,
+									label: that.jobDetail.jobRequestLabelNames.length > 0 ? that
-								jobId: that.uid,
+										.jobDetail.jobRequestLabelNames : "",
+									salaryClassifyValue: that.jobDetail.priceStr,
+									serviceFee: that.jobDetail.fuWuFei,
+									monthPay: that.jobDetail.monthPay,
+									jobId: that.uid,
+								},
 							},
-						};
+							() => {
-						uni.setStorageSync("im_sendParams", JSON.stringify(sendParams));
+								uni.navigateTo({
-						uni.navigateTo({
+									url: "/root/NEUIKit/pages/Chat/index",
-							url: "/root/NEUIKit/pages/Chat/index",
+								});
-						});
+							},
-						that.goImLoading = false;
+							() => {}
+						);
+						// let sendParams = {
+						// 	conversationType: 1,
+						// 	senderAccid: uni.getStorageSync("im-accid"),
+						// 	receiverAccid: cusData.accid,
+						// 	type: 100000,
+						// 	jobDetail: {
+						// 		title: that.jobDetail.jobName,
+						// 		info: that.jobDetail.info,
+						// 		label: that.jobDetail.jobRequestLabelNames.length > 0 ? that.jobDetail.jobRequestLabelNames : [],
+						// 		salaryClassifyValue: that.jobDetail.priceStr,
+						// 		serviceFee: that.showPrice ? that.jobDetail.serverPrice : "",
+						// 		monthPay: that.jobDetail.monthPay,
+						// 		jobId: that.uid,
+						// 	},
+						// };
+						// uni.setStorageSync("im_sendParams", JSON.stringify(sendParams));
+						// uni.navigateTo({
+						// 	url: "/root/NEUIKit/pages/Chat/index",
+						// });
+						// that.goImLoading = false;
 					},
 					() => {}
 				);