Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-前台/src/views/screening/h5Result.vue

@@ -5,23 +5,28 @@
       <div class="card-title">筛查结论</div>
       <div class="card-tips-item">
         <span class="lable">您的体重指数（BMI）为：</span>
-        <span class="div-value" v-if="weightShow">{{ form["SCWJ-BMI"] }}</span>
+        <span>{{ form["SCWJ-BMI"] }}</span>
-        <div class="div-value1" v-else>您的筛查结论是正常的</div>
+      </div>
+      <div :style="{ color: weightShow ? 'red' : 'green' }">
+        {{ weightShow ? "" : "您的筛查结论是正常的" }}
       </div>
       <div class="card-tips-item">
         <span class="lable">您的睡眠效率为：</span>
-        <span class="div-value" v-if="sleepShow">{{ form["SCWJ-SMXL"] }}%</span>
+        <span>{{ form["SCWJ-SMXL"] }}%</span>
-        <div class="div-value1" v-else>您的筛查结论是正常的</div>
+      </div>
+      <div :style="{ color: sleepShow ? 'red' : 'green' }">
+        {{
+          sleepShow ? "您的睡眠筛查结论是欠佳的" : "您的睡眠筛查结论是正常的"
+        }}
       </div>
     </div>
-    <div class="card card1" v-if="weightShow || sleepShow">
+    <div class="card card1" v-if="weightShow">
-      <span v-if="weightShow">
+      您已成功报名此次减重活动！您属于<span
-        属于<span :class="`BIMTips${BMIVerdict[form['SCWJ-JL']]}`">{{
+        :class="`BIMTips${BMIVerdict[form['SCWJ-JL']]}`"
-          form["SCWJ-JL"] || "-"
+        >{{ form["SCWJ-JL"] || "-" }}</span
-        }}</span
+      >型肥胖，下一步请扫码关注南宁市第七人民医院微信公众号，预约体重管理中心医师进一步评估。流程为：
-        >型肥胖，</span
+      <br />
-      ><span v-if="sleepShow"><span class="BIMTips5">睡眠效率欠佳</span>，</span
+      公众号→体重管理→减重预约挂号→体重管理中心→选择医师。咨询电话0771-2312932。
-      >您此次筛查报名已成功，建议扫码关注医院公众号，预约体重管理中心医师进一步评估。流程为：公众号→就诊服务→预约挂号→体重管理中心→选择医师。或可以电话0771-2312932进行咨询。
       <div>
         <img src="./gzh.jpg" style="max-width: 100%" />
       </div>
@@ -119,8 +124,7 @@ export default {
   color: green;
 }
 .lable {
-  text-align: right;
+  text-align: left;
-  width: 194px;
   flex-shrink: 0;
 }
 .hospital1 {

acupuncture-前台/src/views/screening/h5eva.vue

@@ -45,6 +45,14 @@
               @blur="getqueryDetailNoToken"
             ></el-input>
           </el-form-item>
+          <el-form-item label="联系方式" prop="SCWJ-PHONE">
+            <el-input
+              @blur="getqueryDetailNoToken"
+              v-model="form['SCWJ-PHONE']"
+              type="number"
+              placeholder="请输入联系方式"
+            ></el-input>
+          </el-form-item>
           <el-form-item label="性别" prop="SCWJ-SEX">
             <el-radio-group v-model="form['SCWJ-SEX']">
               <el-radio label="男">男</el-radio>
@@ -69,14 +77,7 @@
               placeholder="请输入年龄"
             ></el-input>
           </el-form-item>
-          <el-form-item label="联系方式" prop="SCWJ-PHONE">
+
-            <el-input
-              @blur="getqueryDetailNoToken"
-              v-model="form['SCWJ-PHONE']"
-              type="number"
-              placeholder="请输入联系方式"
-            ></el-input>
-          </el-form-item>
           <el-form-item label="身高cm" prop="SCWJ-HEIGHT">
             <el-input
               @blur="calculateBMI"