Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/goods/category.vue
#	src/views/goods/list-commonly.vue
#	src/views/goods/list-preferential.vue
#	src/views/goods/list-preferred.vue

src/views/club/editForm.vue

@@ -2,10 +2,10 @@
   <div class="app-container clearfix" style=" width: 700px;margin: 0 auto;">
     <el-form ref="dataForm" :rules="rules" :model="form" label-position="left" label-width="130px">
       <el-form-item label="会所名称:" prop="name" style="width: 500px;text-align: right;">
-        <el-input v-model="form.name" placeholder="请与营业执照的注册名称保持一致" maxlength="50" />
+        <el-input v-model="form.name" type="text" placeholder="请与营业执照的注册名称保持一致" maxlength="20" />
       </el-form-item>
       <el-form-item label="联系人:" prop="linkMan" style="width: 500px; text-align: right;">
-        <el-input v-model="form.linkMan" placeholder="请填写联系人姓名" maxlength="10" />
+        <el-input v-model="form.linkMan" type="text" placeholder="请填写联系人姓名" maxlength="10" />
       </el-form-item>
       <el-form-item label="手机号:" prop="contractMobile" style="width: 500px; text-align: right;">
         <el-input v-model="form.contractMobile" placeholder="请填写你的常用号码" maxlength="11" />
@@ -62,9 +62,9 @@
         </el-radio-group>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;">
+    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;margin-right:70px">
       <router-link :to="'/club/list/'">
-        <el-button>返回</el-button>
+        <el-button style="margin-right:10px">返回</el-button>
       </router-link>
       <el-button type="primary" :loading="loadingbut" @click="onSubmite()">{{ loadingbuttext }}</el-button>
     </div>

src/views/club/form.vue

@@ -2,7 +2,7 @@
   <div class="app-container clearfix" style=" width: 700px;margin: 0 auto;">
     <el-form ref="dataForm" :rules="rules" :model="form" label-position="left" label-width="130px">
       <el-form-item label="会所名称:" prop="name" style="width: 500px;text-align: right;">
-        <el-input v-model="form.name" placeholder="请与营业执照的注册名称保持一致" maxlength="50" />
+        <el-input v-model="form.name" placeholder="请与营业执照的注册名称保持一致" maxlength="20" />
       </el-form-item>
       <el-form-item label="联系人:" prop="linkMan" style="width: 500px; text-align: right;">
         <el-input v-model="form.linkMan" placeholder="请填写联系人姓名" maxlength="10" />
@@ -63,9 +63,9 @@
         </el-radio-group>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;">
+    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;margin-right:70px">
       <router-link :to="'/club/list/'">
-        <el-button>返回</el-button>
+        <el-button style="margin-right:10px">返回</el-button>
       </router-link>
       <el-button type="primary" :loading="loadingbut" @click="onSubmite()">{{ loadingbuttext }}</el-button>
     </div>

src/views/finance/list.vue

@@ -29,7 +29,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="success" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">搜索</el-button>
         </el-form-item>
       </el-form>
     </div>

src/views/goods/list-commonly.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="commonlyProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.commonlyProductSort" size="mini" type="number" min="1" style="width:55px;" />
+          <el-input v-model="row.commonlyProductSort" style="width:55px;" size="small" type="number" min="1" maxlength="3" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/goods/list-preferential.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferentialProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferentialProductSort" size="mini" type="number" min="1" style="width:55px;" />
+          <el-input v-model="row.preferentialProductSort" size="mini" type="number" min="1" style="width:55px;" maxlength="3" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/goods/list-preferred.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferredProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferredProductSort" size="mini" type="number" min="1" style="width:55px;" />
+          <el-input v-model="row.preferredProductSort" size="mini" type="number" min="1" style="width:55px;" maxlength="3" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/goods/list-select.vue

@@ -166,6 +166,10 @@ export default {
     },
     confirmChoose() {
       console.log(this.multipleSelection)
+      if (this.multipleSelection.length === 0) {
+        this.$message({ message: '警告哦，请选择商品!', type: 'warning', center: true })
+        return
+      }
       const itemsList = []
       this.multipleSelection.map(item => {
         itemsList.push(item.id)

src/views/order/list.vue

@@ -61,13 +61,6 @@
           </el-select>
 
         </el-form-item>
-        <el-form-item class="date-box" label="付款状态:" style="width:200px;float: left;">
-          <el-select v-model="listQuery.payStatus" placeholder="付款状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-            <el-option label="待付款" value="1" />
-            <el-option label="部分付款" value="2" />
-            <el-option label="已付款" value="3" />
-          </el-select>
-        </el-form-item>
         <el-form-item class="date-box" label="退款状态:" style="width:200px;float: left;">
           <el-select v-model="listQuery.refundType" placeholder="退款状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
             <el-option label="无退款" value="0" />
@@ -82,7 +75,7 @@
           </el-select>
         </el-form-item>
         <el-form-item style="width:100px;float: left;">
-          <el-button class="filter-item" type="success" icon="el-icon-search" @click="handleFilter">查询</el-button>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -203,7 +196,6 @@ export default {
         status: '',
         receiptStatus: '',
         sendOutStatus: '',
-        payStatus: '',
         refundType: '',
         returnedPurchaseStatus: '',
         startTime: '',

src/views/order/refund.vue

@@ -43,7 +43,7 @@
           />
         </el-form-item>
         <el-form-item style="width:100px;float: left;">
-          <el-button class="filter-item" type="success" icon="el-icon-search" @click="handleFilter">查询</el-button>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
         </el-form-item>
       </el-form>
     </div>

src/views/other/about.vue

@@ -63,6 +63,9 @@ export default {
             setTimeout(() => {
               this.initData()
             }, 1000)
+          }).catch(() => {
+            this.loadingbut = false
+            this.loadingbuttext = '提交'
           })
         }
       })

src/views/other/after.vue

@@ -47,6 +47,9 @@ export default {
         setTimeout(() => {
           this.initData()
         }, 1000)
+      }).catch(() => {
+        this.loadingbut = false
+        this.loadingbuttext = '提交'
       })
     }
   }

src/views/other/notes.vue

@@ -47,6 +47,9 @@ export default {
         setTimeout(() => {
           this.initData()
         }, 1000)
+      }).catch(() => {
+        this.loadingbut = false
+        this.loadingbuttext = '提交'
       })
     }
   }