Merge branch 'dev' of http://git.izouma.com/xiongzhu/9th into dev

src/main/vue/src/views/CouponList.vue

@@ -49,12 +49,14 @@
             <el-table-column prop="remark" label="备注" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="limited" label="指定藏品">
                 <template slot-scope="{ row }">
-                    <el-tag :type="row.limited ? '' : 'info'">{{ row.limited }}</el-tag>
+                    <el-tag v-if="row.limited" type="success">是</el-tag>
+                    <el-tag v-else type="info">否</el-tag>
                 </template>
             </el-table-column>
             <el-table-column prop="needGas" label="需要支付GAS">
                 <template slot-scope="{ row }">
-                    <el-tag :type="row.needGas ? '' : 'info'">{{ row.needGas }}</el-tag>
+                    <el-tag v-if="row.needGas" type="success">是</el-tag>
+                    <el-tag v-else type="info">否</el-tag>
                 </template>
             </el-table-column>
             <el-table-column prop="expiration" label="到期时间"> </el-table-column>

src/main/vue/src/views/OrderList.vue

@@ -72,7 +72,7 @@
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
             <el-table-column prop="transactionId" label="交易ID" show-overflow-tooltip> </el-table-column>
-            <el-table-column prop="createdAt" label="创建时间" width="140"> </el-table-column>
+            <el-table-column prop="createdAt" label="下单时间" width="140"> </el-table-column>
             <el-table-column prop="payTime" label="支付时间" width="140"> </el-table-column>
             <el-table-column prop="txHash" label="链上hash" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="gasUsed" label="消耗gas"></el-table-column>

src/main/vue/src/views/RecommendList.vue

@@ -12,7 +12,7 @@
             </el-button>
         </page-title>
         <div class="filters-container">
-            <el-select v-model="type" clearable @change="getData">
+            <el-select v-model="type" clearable @change="getData" placeholder="请选择类型">
                 <el-option v-for="item in typeOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
             </el-select>
             <el-input

src/main/vue/src/views/UserList.vue

@@ -9,7 +9,7 @@
             </el-button>
         </page-title>
         <div class="filters-container">
-            <created-at-picker v-model="createdAt" @input="getData" name="创建" style="margin-right:10px"></created-at-picker>
+            <created-at-picker v-model="createdAt" @input="getData" name="注册" style="margin-right:10px"></created-at-picker>
             <el-input placeholder="搜索..." v-model="search" clearable class="filter-item search">
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
@@ -43,7 +43,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="手机" prop="phone"></el-table-column>
-            <el-table-column label="创建时间" prop="createdAt" width="150"></el-table-column>
+            <el-table-column label="注册时间" prop="createdAt" width="150"></el-table-column>
             <el-table-column label="操作" align="center" fixed="right">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>