Revert "Revert "Revert "CLOUD-14729 前端 - 希望会话结束的时候 ，可以让用户先打问题是否解决的标签，在打满意度评分"""

This reverts commit e2aa401.

Author: chengxiuning

src/i18n/en-US.js

@@ -64,7 +64,6 @@ module.exports = {
 	},
 	evaluation: {
 		rate_my_service: "Rate my service",
-		rate_my_evalute: "请问客服是否解决了您的问题?",
 		review: "Review",
 		select_level_please: "Select a star",
 		select_tag_please: "Select a label",

src/i18n/zh-CN.js

@@ -64,7 +64,6 @@ module.exports = {
 	},
 	evaluation: {
 		rate_my_service: "请对我的服务做出评价",
-		rate_my_evalute: "请问客服是否解决了您的问题?",
 		review: "请输入评价内容",
 		select_level_please: "请先选择星级",
 		select_tag_please: "请先选择标签",

src/js/app/pages/main/apis.js

@@ -936,21 +936,6 @@ function getSatisfactionTipWord(){
 	});
 }
 
-function getEvaluteSolveWord(){
-	return new Promise(function(resolve, reject){
-		api("getEvaluteSolveWord", {
-			tenantId: config.tenantId
-		}, function(msg){
-			var tipWord = utils.getDataByPath(msg, "data.entities.0.optionValue") || __("evaluation.rate_my_evalute");
-			resolve(tipWord);
-		}, function(){
-			// 异常时，问题解决评价引导语为默认提示语，无reject
-			var tipWord = __("evaluation.rate_my_evalute");
-			resolve(tipWord);
-		});
-	});
-}
-
 function updateCustomerInfo(data){
 	return new Promise(function(resolve, reject){
 		Promise.all([
@@ -1262,7 +1247,6 @@ module.exports = {
 	getOptForShowTrackMsg: getOptForShowTrackMsg,
 	getOptForManualMenuGuide: getOptForManualMenuGuide,
 	getlaiyeHtml: getlaiyeHtml,
-	getEvaluteSolveWord: getEvaluteSolveWord,
 
 	update: function(cfg){
 		config = cfg;

src/js/app/pages/main/satisfaction.js

@@ -21,9 +21,6 @@ var invite;
 var score;
 var evaluationDegreeId;
 var isSingleTag;
-var resolvedDom;
-var resolveTip;
-var resolvedId = 1;
 var _initOnce = _.once(_init);
 
 module.exports = {
@@ -33,13 +30,10 @@ module.exports = {
 
 function _init(){
 	loading.show("satisfaction");
-	apiHelper.getEvaluteSolveWord().then(function(tip){
-		resolveTip = tip;
-	});
 	apiHelper.getSatisfactionTipWord().then(function(tipWord){
 		dom = utils.createElementFromHTML([
 			"<div class=\"wrapper\">",
-			"<div class=\"resolveCon\"><span class=\"title\">" + resolveTip + "</span>",
+			"<div class=\"resolveCon\"><span class=\"title\">问题解决评价引导语？</span>",
 			"<div><span class=\"resolve-btn selected resolved\" data-num = \"1\"><i class=\"icon-resolved\"></i>已解决</span>",
 			"<span class=\"resolve-btn unresolved\" data-num = \"2\"><i class=\"icon-unresolved\"></i>未解决</span></div></div>",
 			"<span class=\"title\">" + tipWord + "</span>",
@@ -52,12 +46,11 @@ function _init(){
 		commentDom = dom.querySelector("textarea");
 		tagContainer = dom.querySelector(".tag-container");
 		resolvedBtn = dom.querySelectorAll(".resolve-btn");
-		resolvedDom = dom.querySelector(".resolved");
 
 		utils.live(".resolve-btn", "click", function(){
 			utils.removeClass(resolvedBtn, "selected");
 			utils.addClass(this, "selected");
-			resolvedId = this.dataset.num;
+			console.log(this.dataset.num);
 		});
 
 		utils.live("li", "click", function(){
@@ -105,14 +98,9 @@ function _clear(){
 	utils.removeClass(starList, "sel");
 	// clear label
 	tagContainer.innerHTML = "";
-	// clear resolvedBtn
-	utils.removeClass(resolvedBtn, "selected");
-	utils.addClass(resolvedDom, "selected");
-	resolvedId = 1;
-
 }
 
-function _sendSatisfaction(score, content, session, invite, appraiseTags, resolutionParam, evaluationDegreeId){
+function _sendSatisfaction(score, content, session, invite, appraiseTags, evaluationDegreeId){
 	channel.sendText("", {
 		ext: {
 			weichat: {
@@ -124,7 +112,6 @@ function _sendSatisfaction(score, content, session, invite, appraiseTags, resolu
 					detail: content,
 					summary: score,
 					appraiseTags: appraiseTags,
-					resolutionParam: resolutionParam,
 					evaluationDegreeId: evaluationDegreeId,
 				}
 			}
@@ -180,12 +167,6 @@ function _confirm(){
 			name: elem.innerText
 		};
 	});
-	var resolutionParam = [{
-		id: resolvedId,
-		name: resolvedId == 1 ? "已解决" : "未解决",
-		score: resolvedId,
-		resolutionParamTags: []
-	}];
 
 	// 必须选择星级
 	if(!score){
@@ -200,7 +181,7 @@ function _confirm(){
 		return false;
 	}
 
-	_sendSatisfaction(score, content, session, invite, appraiseTags, resolutionParam, evaluationDegreeId);
+	_sendSatisfaction(score, content, session, invite, appraiseTags, evaluationDegreeId);
 	uikit.showSuccess(__("evaluation.submit_success"));
 	_clear();
 }

src/js/transfer/api.js

@@ -766,14 +766,6 @@ up2Im.listen(function(msg){
 			excludeData: true,
 		});
 		break;
-	case "getEvaluteSolveWord":
-		emitAjax({
-			url: "__WEBIM_SLASH_KEY_PATH__/v1/webimplugin/tenants/" + tenantId + "/options/evaluteSolveWord",
-			type: "GET",
-			msg: msg,
-			excludeData: true,
-		});
-		break;
 	case "getPassword2":
 		emitAjax({
 			url: "__WEBIM_SLASH_KEY_PATH__/v1/webimplugin/visitors/password2"