Merge branch 'develop/3.0.6' into test

src/common/main.scss

@@ -18,19 +18,19 @@
 .el-button--delete.is-active,
 .el-button--delete:active,
 .el-button--delete:focus,
-.el-button--delete:hover{
+.el-button--delete:hover {
   background: none;
   color: #f56c6c;
 }
 
-.el-button--delete.is-disabled, 
-.el-button--delete.is-disabled:hover, 
-.el-button--delete.is-disabled:focus{
+.el-button--delete.is-disabled,
+.el-button--delete.is-disabled:hover,
+.el-button--delete.is-disabled:focus {
   background: transparent;
 }
 
-/* 分页透明样式 */ 
-.el-pagination{
+/* 分页透明样式 */
+.el-pagination {
   text-align: center;
   margin: 16px 0;
 }
@@ -54,14 +54,14 @@
   color: rgba(0, 0, 0, 0.65);
 }
 
-.el-pagination.is-background .el-pager li:not(.disabled).active{
+.el-pagination.is-background .el-pager li:not(.disabled).active {
   background: none;
   border: 1px solid #1890ff;
   color: #1890ff;
 }
 
 /* 表单按钮 */
-.form-btn{
+.form-btn {
   margin-left: 100px;
 }
 
@@ -73,6 +73,12 @@
 /* 级联选择器 */
 .el-select,
 .el-range-editor--medium.el-input__inner,
-.el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner {
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner {
   width: 100%;
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
 }

src/views/order/list/index.vue

@@ -9,7 +9,7 @@
         <el-input v-model="form.userName" placeholder="请输入用户账户" clearable />
       </el-form-item>
       <el-form-item label="用户手机号:">
-        <el-input-number v-model="form.phone" step-strictly :controls="false" placeholder="请输入用户手机号" />
+        <el-input type="number" v-model.number="form.phone" placeholder="请输入用户手机号" clearable />
       </el-form-item>
       <!-- 流量订单 -->
       <span v-if="form.searchType === '2'">
@@ -54,7 +54,7 @@
       </el-form-item>
       <el-form-item label="下单时间:">
         <el-date-picker v-model="form.listDate" type="datetimerange" start-placeholder="开始日期" end-placeholder="结束日期"
-        format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptions" />
+          format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptions" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="getSearch">搜索</el-button>
@@ -125,8 +125,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="dialogForm.pageNum" :limit.sync="dialogForm.pageSize"
-        @pagination="getDialogList" />
+      <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="dialogForm.pageNum"
+        :limit.sync="dialogForm.pageSize" @pagination="getDialogList" />
     </el-dialog>
   </div>
 </template>
@@ -365,6 +365,4 @@ export default {
     }
   }
 }
-</script>
-
-<style lang="scss" scoped></style>
+</script>

src/views/user/list/index.vue

@@ -6,7 +6,7 @@
         <el-input v-model="form.userName" placeholder="请输入用户账号" clearable />
       </el-form-item>
       <el-form-item label="用户手机号:">
-        <el-input-number v-model="form.phone" step-strictly :controls="false" placeholder="请输入用户手机号" />
+        <el-input type="number" v-model="form.phone" placeholder="请输入用户手机号" clearable />
       </el-form-item>
       <el-form-item label="注册来源:">
         <el-select v-model="form.registerChannel" placeholder="请选择注册来源" clearable>