Merge remote-tracking branch 'origin/v3' into v3

src/views/Home.vue

@@ -1,7 +1,7 @@
 <template>
-     <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
+<!--     <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>-->
-    <div class="home app_content" v-if="!isLoading">
+<!--    <div class="home app_content" v-if="!isLoading">-->
-<!--    <div class="home app_content">-->
+    <div class="home app_content">
         <!-- 导航栏 -->
         <!--		<div class="header_body">-->
         <!--			<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@@ -139,6 +139,16 @@
 
     const getEnterpriseMerchant = (phoneNumber) => {
         getEnterpriseMerchantAuthorization({merchantTel: phoneNumber}, success => {
+            console.log("-----> : ", success);
+            if (!(success.data == null && success.data.length == 0)) {
+                useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
+            }
+        }, error => {
+        })
+    }
+
+    const getEnterpriseMerchant2 = (enterpriseNumber) => {
+        getEnterpriseMerchantAuthorization({enterpriseNumber: enterpriseNumber}, success => {
             if (!(success.data == null && success.data.length == 0)) {
                 useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
             }
@@ -147,14 +157,12 @@
     }
 
     onMounted(() => {
-        // console.log(useCommon.phonenumber)
         // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
         // new Vconsolefrom();
 
         // const access_key = '6374106c5eb449a4ad6c2430f30796e6';
         // const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
         // generateRandomNumber()
-        console.log(useCommon.firstLoad);
         isLoading.value = useCommon.firstLoad;
         siqCode(null, success => {
             let access_key = "";
@@ -175,19 +183,17 @@
             const signature = sha1(str).toString().toLowerCase();
 
             //深i企鉴权测试
-            // getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"}, success => {
+            // // getSiqLoginAuthTest({userId: "1430910304107227029", userName: "韦婵娟"}, success => {
             // getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
-            //     console.log(success.data);
+            //     console.log("-----> getSiqLoginAuthTest : ", success);
             //     useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
             //     useCommon.SET_USER_ID(success.data.userId);
-            //     console.log("-----> success.data: ", success.data);
             //     useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
             //     useCommon.SET_TOKEN(success.data.token);
-            //     console.log("-----> useCommon.userId: ", useCommon.userId);
-            //     console.log("-----> useCommon.firstLoad: ", useCommon.firstLoad);
             //      //设置已经初始化
             //     useCommon.SET_IS_FIRST_LOAD(false)
-            //     getEnterpriseMerchant(success.data.phonenumber.toString());
+            //     // getEnterpriseMerchant(success.data.phonenumber.toString());
+            //     getEnterpriseMerchant2(success.data.enterpriseNumber);
             //     isLoading.value = false;
             // }, error => {
             // })
@@ -206,7 +212,7 @@
                 // console.log(err)
                 console.log("鉴权", err);
                 // todo 临时工
-                getEnterpriseMerchant(useCommon.phonenumber.toString());
+                getEnterpriseMerchant2(useCommon.enterpriseNumber);
             });
 
             w6s.ready(() => {
@@ -231,7 +237,7 @@
                             }
                               //设置已经初始化
                             useCommon.SET_IS_FIRST_LOAD(false)
-                            getEnterpriseMerchant(success.data.phonenumber.toString());
+                            getEnterpriseMerchant2(useCommon.enterpriseNumber);
                             isLoading.value = false;
                         }, error => {
                             console.log("error : " + error)

src/views/administrative/appointment.vue

@@ -928,12 +928,17 @@
       width: 60%;
     }
 
-    /deep/ .van-field__control:read-only {
+    /deep/ .van-picker-column__item--selected {
-      cursor: default;
+      background: #e5eef9;
-      color: #666;
+      color: #000;
+      font-weight: 600;
     }
 
-    /deep/ .van-field__control {
+    /deep/ .van-field .van-field__control {
       color: #666;
     }
+
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
 </style>

src/views/administrative/appointmentDetail.vue

@@ -690,11 +690,20 @@
       margin-left: -0.1rem;
     }
 
-    /deep/ .van-field__control:read-only {
+    /deep/ .van-picker-column__item--selected {
-      cursor: default;
+      background: #e5eef9;
+      color: #000;
+      font-weight: 600;
+    }
+
+    /deep/ .van-field .van-field__control {
       color: #666;
     }
 
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
+
     .fold-div {
       position: relative;
       display: flex;

src/views/administrative/appointmentEdit.vue

@@ -801,13 +801,18 @@
         box-sizing: border-box;
     }
 
-    /deep/ .van-field__control:read-only {
+    /deep/ .van-picker-column__item--selected {
-      cursor: default;
+      background: #e5eef9;
-      color: #666;
+      color: #000;
+      font-weight: 600;
     }
 
-    /deep/ .van-field__control {
+    /deep/ .van-field .van-field__control {
       color: #666;
     }
 
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
+
 </style>

src/views/enforce/enforcementPlanAdd.vue

@@ -101,7 +101,7 @@
                     />
                     <div class="file-upload">
                         <div class="file-upload-center">
-                            文件上传 <span>(仅限PDF文档)</span>
+                            <label>文件上传</label> <span>(仅限PDF文档)</span>
                         </div>
                         <van-uploader v-model="data.fileListObj" max-count="1" class="file" :after-read="uploadFiles"
                                       multiple @oversize="onOversize" :before-delete="deleteFile" accept=".pdf">
@@ -424,9 +424,17 @@
         font-size: 0.37rem;
         span {
           font-size: 0.32rem;
-          color: rgb(221, 229, 227);
+          color: #b9b9b9;
         }
     }
+
+    .file-upload-center label::before {
+      margin-left: -0.2rem;
+      margin-right: 0.06rem;
+      color: #ee0a24;
+      content: "*";
+    }
+
     .file {
         position: relative;
         width: 100%;
@@ -536,9 +544,18 @@
       border-color: #1367fe;
     }
 
-    /deep/ .van-field__control:read-only {
+    /deep/ .van-picker-column__item--selected {
-      cursor: default;
+      background: #e5eef9;
+      color: #000;
+      font-weight: 600;
+    }
+
+    /deep/ .van-field .van-field__control {
       color: #666;
     }
 
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
+
 </style>

src/views/enforce/enterpriseBaseInfo.vue

@@ -812,8 +812,17 @@
       line-height: 1.25;
     }
 
-    /deep/ .van-field__control:read-only {
+    /deep/ .van-picker-column__item--selected {
-      cursor: default;
+      background: #e5eef9;
+      color: #000;
+      font-weight: 600;
+    }
+
+    /deep/ .van-field .van-field__control {
       color: #666;
     }
+
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
 </style>

src/views/enforce/sign.vue

@@ -1034,7 +1034,7 @@
 
         span {
             font-size: 0.32rem;
-            color: rgb(221, 229, 227);
+            color: #b9b9b9;
         }
     }
 
@@ -1145,4 +1145,8 @@
       color: #666;
     }
 
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
+
 </style>

src/views/enterprise/complaint.vue

@@ -537,7 +537,7 @@
         font-size: 0.37rem;
         span {
           font-size: 0.32rem;
-          color: rgb(221, 229, 227);
+          color: #b9b9b9;
         }
     }
     .file {
@@ -810,4 +810,18 @@
       line-height: 1.5;
     }
 
+    /deep/ .van-picker-column__item--selected {
+      background: #e5eef9;
+      color: #000;
+      font-weight: 600;
+    }
+
+    /deep/ .van-field .van-field__control {
+      color: #666;
+    }
+
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
+
 </style>

src/views/enterprise/complaintDetailView.vue

@@ -786,10 +786,20 @@
       box-shadow: 0 0 0.27rem #e5e5e5;
   }
 
-  /deep/ .van-field__control:read-only {
+  /deep/ .van-picker-column__item--selected {
-    cursor: default;
+    background: #e5eef9;
+    color: #000;
+    font-weight: 600;
+  }
+
+  /deep/ .van-field .van-field__control {
     color: #666;
   }
+
+  /deep/ .van-field__label--required:before {
+    margin-left: -0.2rem;
+  }
+
   .complaint-cont {
     margin: -1px 3% 2%;
     padding: 0 0.15rem 0.5rem;

src/views/enterprise/complaintNoScan.vue

@@ -451,7 +451,7 @@
         font-size: 0.37rem;
         span {
           font-size: 0.32rem;
-          color: rgb(221, 229, 227);
+          color: #b9b9b9;
         }
     }
     .file {
@@ -710,4 +710,18 @@
   }
   
 
+    /deep/ .van-picker-column__item--selected {
+      background: #e5eef9;
+      color: #000;
+      font-weight: 600;
+    }
+
+    /deep/ .van-field .van-field__control {
+      color: #666;
+    }
+
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
+
 </style>

src/views/enterprise/enterpriseEvaluate/evaluate.vue

@@ -227,7 +227,7 @@
 
         span {
             font-size: 0.32rem;
-            color: rgb(221, 229, 227);
+            color: #b9b9b9;
         }
     }
 

src/views/enterprise/enterpriseInspectionDetail.vue

@@ -303,10 +303,20 @@ onMounted(() =>{
     box-shadow: 0 0 0.27rem #e5e5e5;
 }
 
-/deep/ .van-field__control:read-only {
+/deep/ .van-picker-column__item--selected {
-  cursor: default;
+  background: #e5eef9;
+  color: #000;
+  font-weight: 600;
+}
+
+/deep/ .van-field .van-field__control {
   color: #666;
 }
+
+/deep/ .van-field__label--required:before {
+  margin-left: -0.2rem;
+}
+
 .fold-div {
   position: relative;
   display: flex;

src/views/enterprise/register.vue

@@ -397,9 +397,18 @@ export default {
   line-height: 1.25;
 }
 
-/deep/ .van-field__control:read-only {
+/deep/ .van-picker-column__item--selected {
-  cursor: default;
+  background: #e5eef9;
+  color: #000;
+  font-weight: 600;
+}
+
+/deep/ .van-field .van-field__control {
   color: #666;
 }
 
+/deep/ .van-field__label--required:before {
+  margin-left: -0.2rem;
+}
+
 </style>

src/views/enterprise/registrationDetail.vue

@@ -568,11 +568,20 @@ const reciveData2 = (item) =>{
     }
 }
 
-/deep/ .van-field__control:read-only {
+/deep/ .van-picker-column__item--selected {
-  cursor: default;
+  background: #e5eef9;
+  color: #000;
+  font-weight: 600;
+}
+
+/deep/ .van-field .van-field__control {
   color: #666;
 }
 
+/deep/ .van-field__label--required:before {
+  margin-left: -0.2rem;
+}
+
 /deep/ .mult-line .van-field__label {
   padding-right: 0.5rem;
   line-height: 1.25;

src/views/enterprise/registrationEdit.vue

@@ -898,7 +898,7 @@
         font-size: 0.37rem;
         span {
           font-size: 0.32rem;
-          color: rgb(221, 229, 227);
+          color: #b9b9b9;
         }
     }
     .file {
@@ -968,12 +968,18 @@
       line-height: 1.25;
     }
 
-    /deep/ .van-field__control:read-only {
+    /deep/ .van-picker-column__item--selected {
-      cursor: default;
+      background: #e5eef9;
-      color: #666;
+      color: #000;
+      font-weight: 600;
     }
 
-    /deep/ .van-field__control {
+    /deep/ .van-field .van-field__control {
       color: #666;
     }
+
+    /deep/ .van-field__label--required:before {
+      margin-left: -0.2rem;
+    }
+
 </style>