fixbug

src/utils/validate.js

@@ -15,7 +15,7 @@ export function isExternal(path) {
  * @returns {Boolean}
  */
 export function validUsername(str) {
-  const valid_map = ['admin', 'editor']
+  const valid_map = ['admin', 'editor', 'caimeilijun', 'caimei_lijun', 'caimei123']
   return valid_map.indexOf(str.trim()) >= 0
 }
 

src/views/club/list.vue

@@ -60,9 +60,8 @@
       <el-table-column label="手机号" width="110" align="center" prop="bindMobile" />
       <el-table-column class-name="status-col" label="上线状态" width="150" align="center" prop="status">
         <template slot-scope="{row}">
-          <el-tag>
-            {{ row.clubStatus === '91' ? '已下线' : '已上线' }}
-          </el-tag>
+          <el-tag v-if="row.clubStatus*1===91" type="danger" size="small">已下线</el-tag>
+          <el-tag v-else type="success" size="small">已上线</el-tag>
           <el-button v-if="row.clubStatus === '91'" type="primary" size="mini" @click="handOnline(row)">上线</el-button>
           <el-button v-else type="primary" size="mini" @click="handOffline(row)">下线</el-button>
         </template>

src/views/order/detail.vue

@@ -15,7 +15,7 @@
             <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
           </template>
           <template v-else>
-            <el-tag :type="row.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
+            <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
           </template>
         </el-col>
         <el-col v-if="order.bpOrderUserinfo" :span="6"><b>买家:</b> {{ order.bpOrderUserinfo.name }}</el-col>

src/views/order/list.vue

@@ -1,53 +1,64 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <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-form-item label="创建时间:">
-        <el-date-picker
-          v-model="searchTimeVal"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="yyyy-MM-dd"
-        />
-      </el-form-item>
-      <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-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="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+      <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-date-picker
+            v-model="listQuery.startTime"
+            style="width:150px"
+            type="date"
+            placeholder="下单时间"
+            format="yyyy/MM/dd"
+            value-format="yyyy-MM-dd"
+          />
+          至
+          <el-date-picker
+            v-model="listQuery.endTime"
+            style="width:150px"
+            type="date"
+            placeholder="下单时间"
+            format="yyyy/MM/dd"
+            value-format="yyyy-MM-dd"
+          />
+        </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="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+      </el-form>
     </div>
 
     <el-table
@@ -57,7 +68,6 @@
       border
       fit
       highlight-current-row
-      style="width:100%;margin-top:20px;"
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">
@@ -159,7 +169,6 @@ export default {
       list: null,
       listLoading: true,
       total: 0,
-      searchTimeVal: '',
       dialogRemarkList: [],
       dialogRemarksVisible: false,
       dialogRemarksOrderId: 0,
@@ -176,7 +185,9 @@ export default {
         sendOutStatus: '',
         payStatus: '',
         refundType: '',
-        returnedPurchaseStatus: ''
+        returnedPurchaseStatus: '',
+        startTime: '',
+        endTime: ''
       },
       statusObj: {
         '0': '待确认',
@@ -225,6 +236,8 @@ export default {
 </script>
 
 <style scoped>
-
+  .date-box{
+    margin-right:0;
+  }
 </style>
 

src/views/order/refund-record.vue

@@ -112,9 +112,9 @@
       </el-table-column>
       <el-table-column label="退款状态" align="center" prop="payType">
         <template slot-scope="{row}">
-          <el-tag v-if="row.sendOutStatus*1===1" type="warning" size="small">待审核</el-tag>
-          <el-tag v-if="row.sendOutStatus*1===2" type="success" size="small">审核通过</el-tag>
-          <el-tag v-if="row.sendOutStatus*1===3" type="danger" size="small">审核不通过</el-tag>
+          <el-tag v-if="row.status*1===1" type="warning" size="small">待审核</el-tag>
+          <el-tag v-if="row.status*1===2" type="success" size="small">审核通过</el-tag>
+          <el-tag v-if="row.status*1===3" type="danger" size="small">审核不通过</el-tag>
         </template>
       </el-table-column>
     </el-table>

src/views/order/refund.vue

@@ -11,12 +11,12 @@
           <el-option label="审核通过" value="2" />
           <el-option label="审核不通过" value="3" />
         </el-select>
-        <el-form-item label="  申请时间:">
+        <el-form-item class="date-box">
           <el-date-picker
             v-model="listQuery.beginReturnTime"
             style="width:150px"
             type="date"
-            placeholder="选择日期"
+            placeholder="申请时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
           />
@@ -25,7 +25,7 @@
             v-model="listQuery.endReturnTime"
             style="width:150px"
             type="date"
-            placeholder="选择日期"
+            placeholder="申请时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
           />
@@ -41,7 +41,6 @@
       border
       fit
       highlight-current-row
-      style="width:100%;margin-top:20px;"
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">
@@ -147,5 +146,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .date-box{
+    margin-right:0;
+  }
 </style>