前端代码合并提交

src/views/personal/personal.vue

@@ -29,7 +29,7 @@
                     <td><span>{{formUserList.phone}}</span></td>
                   </tr>
 
-                  <tr>
+                  <tr v-if="formUserList.roleId == 2">
                     <td><span>余额</span></td>
                      <td><span>{{formUserList.fee | rounding}}</span></td>
                   </tr>

src/views/platform/apply/selfCarTrade.vue

@@ -165,7 +165,7 @@ export default {
       }
       const loading = this.$loading({
         lock: true,
-        text: `系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...`,
+        text: `系统正在努力接收中，可能较慢，此页面无法关闭时后请稍后刷新查看..`,
         spinner: `el-icon-loading`,
         background: `rgba(0, 0, 0, 0.7)`
       })
@@ -200,25 +200,29 @@ export default {
       var loading = null
       const formData = new FormData()
       if (this.multipleSelection.length == 0) {
-        loading = this.$loading({
+          loading = this.$loading({
           lock: true,
-          text: `全量更新中,速度较慢，请您耐心等待...`,
+          text: `全量更新中,可能无法关闭该页面，请稍后刷新查看...`,
           spinner: `el-icon-loading`,
           background: `rgba(0, 0, 0, 0.7)`
         })
-        formData.append(`companyName`, this.formCondition.companyName)
-      };
-
+      }else{
+         loading = this.$loading({
+          lock: true,
+          text: `更新中,速度较慢，请您耐心等待...`,
+          spinner: `el-icon-loading`,
+          background: `rgba(0, 0, 0, 0.7)`
+        })
+      }
+      formData.append(`companyName`, this.formCondition.companyName)
       formData.append(`selfCarTradesStr`, JSON.stringify(this.multipleSelection))
       const response = await this.$http.post(`selfCar/updateTrades`, formData)
-      if (this.multipleSelection.length == 0) {
-        loading.close()
-      };
-      this.loadData()
-      this.$message({
-        type: `success`,
-        message: `更新成功`
-      })
+      loading.close()
+      if (response.data.code == 0) {
+         this.loadData()
+      }else{
+        this.$message(response.data.msg)
+      }
     },
     async initCompanyList() {
       const response = await this.$http.post(`lowerService/customeRecQueryList`, {'customerName': sessionStorage.getItem(`userName`)})