Merge remote-tracking branch 'origin/master'

src/views/banner_management/banner_management.vue

@@ -152,7 +152,7 @@
                       type="warning"
                       @click="deListBanner(scope.row)"
                       :disabled="scope.row.id === 1"
-                    >下架
+                    >禁用
                     </el-button>
                   </div>
                 </div>
@@ -333,13 +333,13 @@ export default {
         ...this.queryParams
       }, `banner_${new Date().getTime()}.xlsx`)
     },
-    /** 下架轮播图 */
+    /** 禁用轮播图 */
     deListBanner(row) {
       const update = {
         id: row.id,
         status: '2'
       }
-      this.$modal.confirm('是否确认下架该轮播图信息？').then(function() {
+      this.$modal.confirm('是否确认禁用该轮播图信息？').then(function() {
         updateBanner(update).then(res => {
           if (res.code === 200) {
             this.getBannerList()
@@ -348,7 +348,7 @@ export default {
         return null
       }).then(() => {
         this.getBannerList()
-        this.$modal.msgSuccess('下架成功')
+        this.$modal.msgSuccess('禁用成功')
       }).catch(() => {})
     }
   }
@@ -379,13 +379,13 @@ export default {
   color: #666666 !important;
   width: 200px !important;
 }
-/*表格上下架状态颜色样式*/
+/*表格上禁用状态颜色样式*/
 /*上架*/
 ::v-deep .status-grounding {
   color: #67C23A;
 }
 
-/*下架*/
+/*禁用*/
 ::v-deep .status-offshelf {
   color: #f5aa6c;
 }

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -130,13 +130,13 @@ export default {
         petStatus: ''
       },
       rules: {
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur'
-          }
-        ]
+        // phone: [
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: '请输入正确的手机号码',
+        //     trigger: 'blur'
+        //   }
+        // ]
       },
       // 选中数据
       chooseData: {},