gjy пре 2 година
родитељ
комит
94b607db63

+ 2 - 1
public/index.html

@@ -4,7 +4,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <meta http-equiv="Content-Security-Policy">
+    <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
   </head>

+ 20 - 2
src/views/cargoOwnerManagement/empowerExamine.vue

@@ -96,6 +96,13 @@
                     </div>
                     <div class="right">{{ item.amountMoney }}元</div>
                   </div>
+                  <div class="row1">
+                    <div class="left">
+                      <img v-if='item.rechargeUrl' style='width:20px;height:20px;' @click="enlarge(item.rechargeUrl)" :src="item.rechargeUrl" alt="">
+                      <div v-else>暂无图片</div>
+                    </div>
+                    <div class="right">{{ item.createDate }}</div>
+                  </div>
                   <!-- <div class="row2">
                     <div class="left">
                       支付预付款
@@ -126,8 +133,7 @@
               :disabled="scope.row.authenticationStatus != '审核中'">驳回</el-link>
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="recharge(scope.row)" type="primary" :underline="false"
-              :disabled="scope.row.passOnce!=0">充值
-            </el-link>
+              :disabled="scope.row.passOnce == '0'">充值</el-link>
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="newInfo(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.authenticationStatus == '审核中'">消息</el-link>
@@ -971,4 +977,16 @@ export default {
 .find::v-deep input.el-input__inner {
   border-radius: 0;
 }
+.bill-item{
+  border-bottom:1px solid #ccc;
+}
+.bill-item:last-child{
+  border-bottom:1px solid transparent;
+}
+.row1{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding:5px;
+}
 </style>

+ 21 - 10
src/views/enterpriseManagement/enterpriseAudit.vue

@@ -57,7 +57,14 @@
                     <div class="left">
                       {{ item.types }}
                     </div>
-                    <div class="right">{{ item.amountMoney }}</div>
+                    <div class="right">{{ item.amountMoney }}元</div>
+                  </div>
+                  <div class="row1">
+                    <div class="left">
+                      <img v-if='item.rechargeUrl' style='width:20px;height:20px;' @click="enlarge(item.rechargeUrl)" :src="item.rechargeUrl" alt="">
+                      <div v-else>暂无图片</div>
+                    </div>
+                    <div class="right">{{ item.createDate }}</div>
                   </div>
                   <!-- <div class="row2">
                     <div class="left">
@@ -91,7 +98,7 @@
             <el-link target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false">查看</el-link>
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="recharge(scope.row)" type="primary" :underline="false"
-              :disabled="scope.row.passOnce != 0">充值</el-link>
+              :disabled="scope.row.passOnce == '0'">充值</el-link>
             <!-- <span class="btn_css" @click="seeInfo(scope.row)"></span> -->
           </template>
         </el-table-column>
@@ -719,14 +726,18 @@ export default {
 }
 
 .bill-content {
-  .bill-item {
-
-    .row1,
-    .row2 {
-      display: flex;
-      justify-content: space-between;
-    }
-  }
+  .bill-item{
+  border-bottom:1px solid #ccc;
+}
+.bill-item:last-child{
+  border-bottom:1px solid transparent;
+}
+.row1{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding:5px;
+}
 }
 
 .pay {

+ 5 - 6
src/views/login/index.vue

@@ -26,11 +26,11 @@
       </el-form-item>
       <el-form-item prop="code">
         <el-row :span="24" style="display: flex; align-items: center">
-          <el-col :span="12">
+          <el-col :span="20">
             <el-input v-model="loginForm.code" auto-complete="off" placeholder="请输入验证码" size=""
               @keyup.enter.native="submitForm('loginForm')"></el-input>
           </el-col>
-          <el-col :span="12" style="display: flex; justify-content: flex-end">
+          <el-col :span="4" style="display: flex; justify-content: flex-end">
             <div class="login-code" @click="refreshCode">
               <!--验证码组件-->
               <s-identify :identifyCode="identifyCode"></s-identify>
@@ -40,10 +40,10 @@
       </el-form-item>
       <el-form-item prop="checkCode">
         <el-row :span="24" style="display: flex; align-items: center">
-          <el-col :span="12">
+          <el-col :span="20">
             <el-input v-model="loginForm.checkCode" auto-complete="off" placeholder="请输入手机验证码"></el-input>
           </el-col>
-          <el-col :span="12" style="display: flex; justify-content: flex-end">
+          <el-col :span="4" style="display: flex; justify-content: flex-end">
             <div class="login-code" @click="checkClick">
               <el-button type="primary" style="width: 112px">{{
                 codeText
@@ -342,9 +342,8 @@
               loginPassword: this.loginForm.password,
               compId: "2710b21efc1e4393930c5dc800010dc4",
             })
-
               if (res.code == 200) {
-                const res = await this.$store.dispatch('user/login', this.loginForm)
+                const res1 = await this.$store.dispatch('user/login', this.loginForm)
                 localStorage.setItem("ws_login_type", 2);
                 Cookies.set("ws_login_companyShortName", this.loginForm.companyName, {
                   expires: 365,