Merge branch 'his/jiaxingeryuan' into test

config/index.js

@@ -4,8 +4,8 @@
 
 const path = require('path')
 //const proxy_path = 'http://192.168.2.121:5050';
-// const proxy_path = 'http://192.168.2.236:5050';
-const proxy_path = 'http://192.168.2.241:5050';
+const proxy_path = 'http://192.168.2.236:5050';
+// const proxy_path = 'http://127.0.0.1:5050';
 // const proxy_path = 'http://223.93.170.82:23650';
 // const proxy_path = 'http://223.93.170.82:24182';
 
@@ -24,8 +24,8 @@ module.exports = {
 
     // Various Dev Server settings
     port: 8083, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    // host: '192.168.0.101',
-    host: '192.168.4.213',
+    host: '192.168.3.106',
+    // host: '127.0.0.1',
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: true,

src/common/Submit.vue

@@ -12,7 +12,7 @@
         >
         <p class="success">{{msg}}</p>
         <p class="tip">{{tip}}</p>
-        <span @click="goStart">完 成</span>
+        <span @click="goStart">重新填写</span>
       </div>
       <div
         v-if="showType=='fail'"
@@ -38,7 +38,7 @@ export default {
   data() {
     return {
       msg: '提交成功',
-      tip: '您的病历信息已提交至医生问诊系统，点击完成按钮结束本次预问诊服务。'
+      tip: '病历已提交给医生，可点击左上角“X”退出问诊'
     }
   },
   methods: {
@@ -109,22 +109,23 @@ export default {
     margin-bottom: 0.5rem;
   }
   span {
-    width: 4.9rem;
+    width: 2.9rem;
     height: 0.88rem;
     line-height: 0.88rem;
     font-size: 0.32rem;
-    color: #ffffff;
+    color: #colors[btn];
     font-weight: bold;
     display: inline-block;
-    background: -webkit-gradient(
-      linear,
-      right top,
-      left top,
-      from(#4f8bff),
-      to(#4f4fff)
-    );
-    background: #colors[btn];
-    border-radius: 0.2rem;
+    border: 1px solid #colors[btn];
+    // background: -webkit-gradient(
+    //   linear,
+    //   right top,
+    //   left top,
+    //   from(#4f8bff),
+    //   to(#4f4fff)
+    // );
+    // background: #colors[btn];
+    border-radius: 0.44rem;
   }
 }
 .submitFail {

src/utils/tools.js

@@ -1,8 +1,7 @@
 
 const qs = require('qs');
 const $ = require('jquery');
-// const imageUrlPrefix = 'http://192.168.2.241:82' //后台图片地址
-const imageUrlPrefix = 'http://192.168.2.121:82' //后台图片地址
+const imageUrlPrefix = 'http://192.168.2.122:82';//'http://223.93.170.82:10082' //后台图片地址
 // const imageUrlPrefix = 'http://192.168.2.236:82' //后台图片地址
 
 const configer = {