单位和结果反了

src/css/popup.less

@@ -83,8 +83,13 @@
       margin: 10px 0;
       position: relative;
       padding-left: 98px;
-      padding-right: 20px;
+      padding-right: 60px;
       float: none;
+      .uint {
+        position: absolute;
+        right: -10px;
+        top: 0;
+      }
       .caculateLis {
         li {
           float: left;

src/js/disclaimer.js

@@ -8,6 +8,5 @@ const {post, config} = require('./promise.js');
             $("h1").html(data[2].title);
             $(".content").html(data[2].description);
         })
-
     }
 })()

src/js/indexDom.js

@@ -15,7 +15,7 @@ function bqtsFun(data){//病情提示
         for(var n = 0;n < tmpBqDetail.content.details.length;n++){
           var deepDetail = tmpBqDetail.content.details[n]
           if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
-            deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input type="text" placeholder="请输入" value="'+deepDetail.value+'"></li>'
+            deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input type="text" placeholder="请输入" value="'+deepDetail.value+'"><i class="uint">'+deepDetail.uint+'</i></li>'
           }
           if(deepDetail.controlType == 0){
             let tooDeepDetailStr = ''
@@ -35,7 +35,7 @@ function bqtsFun(data){//病情提示
           }
         }
         for(var v = 0;v < tmpBqDetail.content.result.length;v++){
-          deepDetailResultStr+='<p class="result"><span>'+tmpBqDetail.content.result[v].name+'：</span><span class="calculateResult"></span></p>'
+          deepDetailResultStr+='<p class="result"><span class="calculateName">'+tmpBqDetail.content.result[v].name+'：</span><span class="calculateResult"></span></p>'
         }
         tmpBqDetailStr+='<div class="mayResult">计算公式结果：<span class="mayResultSelect">'+
         '<span class="makesureResult">请选择</span>'+
@@ -47,9 +47,9 @@ function bqtsFun(data){//病情提示
         deepDetailStr+
         '</ul>'+
         '<button class="calculate" data-num="'+k+'">计算</button>'+
-        '<p class="calculateError">请填写计算公式内容</p>'+
+        '<p class="calculateError">请填写计算公式内容</p><div class="resultLis">'+
         deepDetailResultStr+
-        '</div>'+
+        '</div></div>'+
         '<div class="btnWrap clearfix">'+
         '<button class="sureScore" data-type="2">确定</button>'+
         '</div>'+

src/js/popup.js

@@ -70,9 +70,20 @@ $(".conditionHintTips").on('click','.calculate',function(){
     var data = res.data
     if(data.code == 0){
       var result = data.data;
+      var tmpName = that.parent().find(".calculateName");
+      var deepDetailResultStr = '';
       for(var v = 0;v < result.result.length;v++){
-        that.parent().find(".calculateResult").eq(v).html(result.result[v].text)
+        var name = result.result[v].name
+        var text = result.result[v].text
+        deepDetailResultStr+='<p class="result"><span class="calculateName">'+name+'：</span><span class="calculateResult">'+text+'</span></p>'
+        // for(var s = 0;s < tmpName.length;s++){
+        //   console.log(tmpName.eq(s).html().split("：")[0])
+        //   if(tmpName.eq(s).html().split("：")[0] == name){
+        //     tmpName.eq(s).next().html(result.result[v].text)
+        //   }
+        // }
       }
+      $('.resultLis').html(deepDetailResultStr)
       that.parent().find(".calculateError").css("display","none")
     }else{
       console.log(res)

webpack.config.js

@@ -4,7 +4,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.236:5050";
+const proxyHost = "http://192.168.2.241:5050";
 
 module.exports = {
   entry: {