bug

src/views/OrderTrack/goods.vue

@@ -11,6 +11,8 @@
         <el-form-item label="订单状态" prop="status">
         <el-form-item label="订单状态" prop="status">
           <el-select v-model="formInline.status" placeholder="请选择">
           <el-select v-model="formInline.status" placeholder="请选择">
             <el-option label="全部" value=""></el-option>
             <el-option label="全部" value=""></el-option>
+            <el-option label="待提审" value="-2"></el-option>
+            <el-option label="待审核" value="-1"></el-option>
             <el-option label="进行中" value="2"></el-option>
             <el-option label="进行中" value="2"></el-option>
             <el-option label="已完成" value="4"></el-option>
             <el-option label="已完成" value="4"></el-option>
             <el-option label="已作废" value="-3"></el-option>
             <el-option label="已作废" value="-3"></el-option>
@@ -58,7 +60,16 @@
               <a :href="'/#/orderTrackGoodsDetail?purchase_id='+scope.row.purchase_id" class="f-blue">{{ scope.row.company_name }}</a>
               <a :href="'/#/orderTrackGoodsDetail?purchase_id='+scope.row.purchase_id" class="f-blue">{{ scope.row.company_name }}</a>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column prop="status_val" label="订单状态" min-width="80"></el-table-column>
+          <el-table-column prop="status_val" label="订单状态" min-width="80">
+            <template slot-scope="scope">
+              <el-tag type="primary" v-if="scope.row.status_val == '待提审'" disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="warning" v-else-if="scope.row.status_val == '待审核'" disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="info" v-else-if="scope.row.status_val == '进行中'" disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="success" v-else-if="scope.row.status_val == '已完成'" disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.status_val == '已作废'" disable-transitions>{{ scope.row.status_val }}</el-tag>
+              <el-tag type="primary" v-else>{{ scope.row.status_val }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="pay_name" label="对方付款方式" min-width="100"></el-table-column>
           <el-table-column prop="pay_name" label="对方付款方式" min-width="100"></el-table-column>
           <el-table-column prop="pay_status_val" label="收款状态" min-width="80">
           <el-table-column prop="pay_status_val" label="收款状态" min-width="80">
             <template slot-scope="scope">
             <template slot-scope="scope">

src/views/User/login.vue

@@ -168,7 +168,10 @@ export default {
               if (res.code === 0) {
               if (res.code === 0) {
                 window.location.href = res.data.wx_login_url;
                 window.location.href = res.data.wx_login_url;
               } else {
               } else {
-                this.$message(res.msg);
+                this.$message({
+                  message: res.msg,
+                  type: 'warning'
+                });
               }
               }
             })
             })
           } else {
           } else {
@@ -180,15 +183,20 @@ export default {
           }
           }
         } else if (res.code === 102) {
         } else if (res.code === 102) {
           this.errror_text = res.msg;
           this.errror_text = res.msg;
-          //this.errorClass3 = true;
           this.cp = true;
           this.cp = true;
           this.updateCp();
           this.updateCp();
-          this.$message(res.msg);
+          this.$message({
+            message: res.msg,
+            type: 'warning'
+          });
         } else {
         } else {
           this.errror_text = res.msg;
           this.errror_text = res.msg;
           this.cp = true;
           this.cp = true;
-          this.$message(res.msg);
           this.updateCp();
           this.updateCp();
+          this.$message({
+            message: res.msg,
+            type: 'warning'
+          });
         }
         }
       }).catch(err => {
       }).catch(err => {
         loadingInstance.close();
         loadingInstance.close();
@@ -201,7 +209,8 @@ export default {
 </script>
 </script>
 <style scoped>
 <style scoped>
 @import "../../assets/css/login/index.min.css";
 @import "../../assets/css/login/index.min.css";
-#app ::v-deep  {
+
+#app ::v-deep {
   padding: 0 !important;
   padding: 0 !important;
 }
 }
 </style>
 </style>
\ No newline at end of file