优化弹窗

src/views/club/list.vue

@@ -96,8 +96,8 @@
 
     <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="fetchData" />
 
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form ref="dataForm" :rules="rules" :model="addPeople" label-position="left" label-width="70px" style="width: 400px; margin-left:24%;">
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="440px">
+      <el-form ref="dataForm" :rules="rules" :model="addPeople" label-position="left" label-width="70px" style="width: 400px;">
         <el-form-item label="姓名" prop="linkName">
           <el-input v-model="addPeople.linkName" placeholder="请输入姓名" maxlength="11" />
         </el-form-item>
@@ -276,3 +276,8 @@ export default {
 }
 
 </script>
+<style scoped>
+  .el-dialog{
+    width: 600px;
+  }
+</style>

src/views/club/operateList.vue

@@ -106,7 +106,7 @@
 
     <pagination v-show="total>20" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="initOperatorListData" />
 
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="40%">
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="440px">
       <el-form ref="dataForm" :rules="rules" :model="editTemp" label-position="left" label-width="80px" style="width: 400px;">
         <el-form-item label="姓名" prop="linkName">
           <el-input v-model="editTemp.linkName" placeholder="请输入姓名" maxlength="11" />

src/views/goods/list.vue

@@ -10,7 +10,7 @@
 
     <div class="filter-container" style="padding: 20px 0;">
       <el-form class="demo-form-inline goods-list">
-        <el-form-item label="商品ID:" style="width:225px;float: left;margin-bottom: 8px;">
+        <el-form-item label="商品ID:" style="width:225px;float: left;">
           <el-input v-model="listQuery.id" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="商品名称:" style="width:240px;float: left;">
@@ -84,11 +84,11 @@
         </template>
       </el-table-column>
       <el-table-column label="商品名称" align="center" prop="productName" min-width="200" />
-      <el-table-column label="供应商" align="center" prop="shopName" min-width="120" />
+      <el-table-column label="供应商" align="center" prop="shopName" min-width="110" />
       <el-table-column label="市场价" align="center" prop="normalPrice" />
       <el-table-column label="成本价" align="center" prop="costPrice" />
       <el-table-column label="售价" align="center" prop="retailPrice" />
-      <el-table-column label="起订量" align="center" prop="minBuyNumber" />
+      <el-table-column label="起订量" align="center" prop="minBuyNumber" width="70" />
       <el-table-column v-if="modules && modules.firstModulesName" :label="modules.firstModulesName" align="center" prop="preferredProduct" width="50">
         <template slot-scope="{row}">
           <!--<el-tag :type="row.preferredProduct | statusFilter">{{ row.preferredProduct*1 === 1 ? '启用' : '停用' }}</el-tag>-->
@@ -112,7 +112,7 @@
           <el-tag :type="row.validFlag | statusFilter">{{ row.validFlag*1 === 1 ? '已上架' : '已下架' }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="商品分类" align="center" prop="productClassifyName" />
+      <el-table-column label="商品分类" align="center" prop="productClassifyName" width="100" />
       <el-table-column align="center" label="添加时间" prop="addTime">
         <template v-if="row.addTime" slot-scope="{row}">
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
@@ -254,7 +254,7 @@ export default {
     },
     handleSwitch(row) {
       if (row.validFlag === '1') {
-        this.$confirm('确定下架该商品吗？下架后该商品将不会再出现在星范商城，若该商品设置为了星范优惠，热销商品或星范精品，则该商品也会从这三种商品中删除。', '系统提示', {
+        this.$confirm('确定下架该商品吗？下架后该商品将不会出现在小程序商城。', '系统提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

src/views/order/list.vue

@@ -2,16 +2,24 @@
   <div class="app-container">
     <div class="filter-container">
       <el-form ref="searchForm" :inline="true" class="demo-form-inline">
-        <el-input v-model="listQuery.orderID" placeholder="订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-input v-model="listQuery.orderNo" placeholder="订单号" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-input v-model="listQuery.buyer" placeholder="买家" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-input v-model="listQuery.receiver" placeholder="收货人" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-form-item class="date-box">
+        <el-form-item label="订单ID:" style="width:180px;float: left;">
+          <el-input v-model="listQuery.orderID" placeholder="请输入订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item label="订单号:" style="width:180px;float: left;">
+          <el-input v-model="listQuery.orderNo" placeholder="请输入订单号" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item label="买家:" style="width:200px;float: left;">
+          <el-input v-model="listQuery.buyer" placeholder="请输入买家名称" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item label="收货人:" style="width:180px;float: left;">
+          <el-input v-model="listQuery.receiver" placeholder="请输入收货人" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item class="date-box" label="下单时间:" style="width:405px;float: left;">
           <el-date-picker
             v-model="listQuery.startTime"
             style="width:150px"
             type="date"
-            placeholder="下单时间"
+            placeholder="请选择日期"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
@@ -21,45 +29,61 @@
             v-model="listQuery.endTime"
             style="width:150px"
             type="date"
-            placeholder="下单时间"
+            placeholder="请选择日期"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
           />
         </el-form-item>
-        <el-select v-model="listQuery.status" placeholder="订单状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-          <el-option label="待确认" value="0" />
-          <el-option label="交易中" value="99" />
-          <el-option label="交易完成" value="4" />
-          <el-option label="订单完成" value="5" />
-          <el-option label="已关闭" value="6" />
-          <el-option label="交易全退" value="7" />
-        </el-select>
-        <el-select v-model="listQuery.receiptStatus" 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-select v-model="listQuery.sendOutStatus" 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-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-select v-model="listQuery.refundType" placeholder="退款状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
-          <el-option label="无退款" value="0" />
-          <el-option label="部分退款" value="1" />
-          <el-option label="已退款" value="2" />
-        </el-select>
-        <el-select v-model="listQuery.returnedPurchaseStatus" placeholder="待审核退款" clearable style="width: 120px" class="filter-item" value="" @change="handleFilter">
-          <el-option label="有" value="1" />
-          <el-option label="无" value="0" />
-        </el-select>
-        <el-button class="filter-item" type="success" icon="el-icon-search" @click="handleFilter">查询</el-button>
+        <el-form-item class="date-box" label="订单状态:" style="width:200px;float: left;">
+          <el-select v-model="listQuery.status" placeholder="订单状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
+            <el-option label="待确认" value="0" />
+            <el-option label="交易中" value="99" />
+            <el-option label="交易完成" value="4" />
+            <el-option label="订单完成" value="5" />
+            <el-option label="已关闭" value="6" />
+            <el-option label="交易全退" value="7" />
+          </el-select>
+        </el-form-item>
+        <el-form-item class="date-box" label="收款状态:" style="width:200px;float: left;">
+          <el-select v-model="listQuery.receiptStatus" 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.sendOutStatus" 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.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" />
+            <el-option label="部分退款" value="1" />
+            <el-option label="已退款" value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item class="date-box" label="待审核退款:" style="width:220px;float: left;">
+          <el-select v-model="listQuery.returnedPurchaseStatus" placeholder="待审核退款" clearable style="width: 120px" class="filter-item" value="" @change="handleFilter">
+            <el-option label="有" value="1" />
+            <el-option label="无" value="0" />
+          </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-form-item>
       </el-form>
     </div>
 
@@ -249,6 +273,9 @@ export default {
 </script>
 
 <style scoped>
+  .el-form-item{
+    margin-bottom: 0;
+  }
   .date-box{
     margin-right:0;
   }

src/views/order/refund.vue

@@ -2,21 +2,31 @@
   <div class="app-container">
     <div class="filter-container">
       <el-form ref="searchForm" :inline="true" class="demo-form-inline">
-        <el-input v-model="listQuery.returnedNo" placeholder="退款编号" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-input v-model="listQuery.orderID" placeholder="订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-input v-model="listQuery.orderNo" placeholder="订单编号" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-input v-model="listQuery.userName" placeholder="买家" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
-        <el-select v-model="listQuery.status" placeholder="退款审核状态" clearable style="width: 130px" 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 class="date-box">
+        <el-form-item label="退款编号:" style="width:215px;float: left;">
+          <el-input v-model="listQuery.returnedNo" placeholder="请输入退款编号" style="width: 140px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item label="订单ID:" style="width:180px;float: left;">
+          <el-input v-model="listQuery.orderID" placeholder="请输入订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item label="订单编号:" style="width:215px;float: left;">
+          <el-input v-model="listQuery.orderNo" placeholder="请输入订单编号" style="width: 140px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item label="买家:" style="width:190px;float: left;">
+          <el-input v-model="listQuery.userName" placeholder="请输入买家名称" style="width: 140px;" class="filter-item" @keyup.enter.native="handleFilter" />
+        </el-form-item>
+        <el-form-item label="退款审核状态:" style="width:240px;float: left;">
+          <el-select v-model="listQuery.status" placeholder="退款审核状态" clearable style="width: 130px" 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:405px;float: left;">
           <el-date-picker
             v-model="listQuery.beginReturnTime"
             style="width:150px"
             type="date"
-            placeholder="申请时间"
+            placeholder="请选择时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
@@ -26,13 +36,15 @@
             v-model="listQuery.endReturnTime"
             style="width:150px"
             type="date"
-            placeholder="申请时间"
+            placeholder="请选择时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
             @change="handleFilter"
           />
         </el-form-item>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+        <el-form-item style="width:100px;float: left;">
+          <el-button class="filter-item" type="success" icon="el-icon-search" @click="handleFilter">查询</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
@@ -90,7 +102,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="{row}">
-          <router-link :to="'/order/refund/detail/' + row.id + '?orderID=' + row.orderID "><el-button type="primary" size="small">查看详情</el-button></router-link>
+          <router-link :to="'/order/refund/detail/' + row.id + '?orderID=' + row.orderID "><el-button type="primary" size="mini" style="width: 80px;margin:5px;">查看详情</el-button></router-link>
         </template>
       </el-table-column>
     </el-table>
@@ -156,6 +168,9 @@ export default {
 </script>
 
 <style scoped>
+  .el-form-item{
+    margin-bottom: 0;
+  }
   .date-box{
     margin-right:0;
   }