测试BU修改

.env.dev

 NODE_ENV = dev
 
-VUE_APP_BASE_URL3 = https://beta-ysservice.yiboshi.com
+VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
 VUE_APP_BASE_URL1 = https://ys-service.yiboshi.com
 VUE_APP_BASE_URL111 = http://59.230.237.90:8115
-VUE_APP_BASE_URL = http://127.0.0.1:8083
+VUE_APP_BASE_URL22 = http://192.168.1.103:8083
 VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
 

.env.production

 NODE_ENV = prod
-VUE_APP_BASE_URL1 = https://beta-ysservice.yiboshi.com
-VUE_APP_BASE_URL1 = https://ys-service.yiboshi.com
-VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
-VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
+VUE_APP_BASE_URL = https://ys-service.yiboshi.com
+VUE_APP_BASE_PATH = https://lcgwypt-login.yiboshi.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
-
-VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/
-VUE_APP_LOCATION1 = https://yesuan.yiboshi.com/#/
+VUE_APP_LOCATION = https://yesuan.yiboshi.com/#/

src/views/Login.vue

@@ -56,6 +56,7 @@ export default {
         return {
             userList: [],
             formData: {
+                username:"4040050358",
                 password:"YNybs2021?"
             },
             formRules: {},

src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue

@@ -479,15 +479,19 @@ export default {
                 if (this.formData.bmi >= 28 && this.checkedList.length == 0) {
                     this.formData.recommendEat = "2颗/天(0.8mg/天)";
                 }
+                if (this.formData.bmi < 28 && this.checkedList.length == 0) {
+                    this.formData.recommendEat = "1颗/天(0.4mg/天)";
+                }
             }
         },
         onChange(checkedList) {
-            this.formData.recommendEat = "1颗/天(0.4mg/天)";
+            this.formData.recommendEat = "2颗/天(0.8mg/天)";
             if (this.formData.bmi >= 28 && checkedList.length == 0) {
                 this.formData.recommendEat = "2颗/天(0.8mg/天)";
-                return;
             }
-            this.formData.recommendEat = "2颗/天(0.8mg/天)";
+            if (this.formData.bmi < 28 && checkedList.length == 0) {
+                this.formData.recommendEat = "1颗/天(0.4mg/天)";
+            }
             checkedList.forEach(x => {
                 if (x == '3') {
                     this.formData.recommendEat = "10颗/天(4mg/天)";
@@ -544,7 +548,7 @@ export default {
                 if (this.formData.bmi >= 28) {
                     this.formData.recommendEat = "2颗/天(0.8mg/天)";
                 }
-                if (this.formData.womenCertificateType == 1) {
+                if (this.formData.womenCertificateType == '1') {
                     let length = this.formData.womenIdCard.length;
                     if (length == 15 | length == 18) {
                         let year = this.formData.womenIdCard.substring(6, 10);
@@ -562,9 +566,14 @@ export default {
         },
         getWomenIdCardInfo() {
             GetUserInfoByCardDevice().then(res => {
-                let {cardno, name, address} = res;
-                this.formData.womanName = name
-                this.formData.womenIdCard = cardno
+                let {cardno, name, born, address} = res;
+                this.formData.womanName = name;
+                this.formData.womenCertificateType = '1';
+                this.formData.womenIdCard = cardno;
+                let year = born.substring(0, 4);
+                let moth = born.substring(4, 6);
+                let day = born.substring(6, 8);
+                this.formData.birthDate = year + "-" + moth + "-" + day;
             })
         },
         getMenIdCardInfo() {

src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue

@@ -88,7 +88,7 @@
                                      @click="showVisible=true"/>
                             </a-descriptions-item>
                             <a-descriptions-item label="签名" v-if="routerParams.source == 2">
-                                <img style="width: auto;height: 80px" :src="detailInfo.applySignUrl">
+                                <img style="margin-left: 30px;width: auto;height: 80px;transform: rotate(-90deg)" :src="detailInfo.applySignUrl">
                             </a-descriptions-item>
                         </a-descriptions>
                    <!--     <div class="card_info">

src/views/indexComponent/folviteDistribution/folviteDistribution.vue

@@ -98,7 +98,7 @@
                     </div>
                     <div style="float: right;margin-right: 50px">
                         <div style="">签名： <img
-                                style="width:30px;height: 150px;transform: rotate(-90deg);margin-left: 60px"
+                                style="width:50px;height: 120px;transform: rotate(-90deg);margin-left: 60px"
                                 :src="applySignUrl"/></div>
                         <div>签署日期：<span style="margin-left: 8px">{{ currentRow.parentDate }}</span></div>
                     </div>

src/views/utils/common.js

@@ -192,7 +192,7 @@ export const GetUserInfoByCardDevice = () => {
     let url = protocol === "https:" ? "https://localhost:9199/api/ReadMsg" : "http://localhost:8989/api/ReadMsg";
     return new Promise((resolve) => {
         // res {code: "-1", retcode: "0x41", retmsg: "读居民身份证操作失败", errmsg: ""}
-        jsonp(url, {timeout: 3000}, (err, data) => {
+        jsonp(url, {timeout: 30000}, (err, data) => {
             if (!err) {
                 if (data.cardno) {
                     resolve(data);