Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

manager/src/views/member/list/index.vue

@@ -1,38 +1,33 @@
 <template>
   <div class="search">
-    <Row>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-            <Form-item label="会员名称" prop="username">
-              <Input type="text" v-model="searchForm.username" placeholder="请输入会员名称" clearable style="width: 200px" />
-            </Form-item>
+    <Card>
+      <Row @keydown.enter.native="handleSearch">
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员名称" prop="username">
+            <Input type="text" v-model="searchForm.username" placeholder="请输入会员名称" clearable style="width: 200px" />
+          </Form-item>
 
-            <Form-item label="会员昵称" prop="nickName">
-              <Input type="text" v-model="searchForm.nickName" placeholder="请输入会员昵称" clearable style="width: 200px" />
-            </Form-item>
+          <Form-item label="会员昵称" prop="nickName">
+            <Input type="text" v-model="searchForm.nickName" placeholder="请输入会员昵称" clearable style="width: 200px" />
+          </Form-item>
 
-            <Form-item label="联系方式" prop="mobile">
-              <Input type="text" v-model="searchForm.mobile" placeholder="请输入会员联系方式" clearable style="width: 200px" />
-            </Form-item>
-            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
-          </Form>
-        </Row>
-        <Row class="operation padding-row">
-          <Button @click="addMember" type="primary">添加会员</Button>
-        </Row>
+          <Form-item label="联系方式" prop="mobile">
+            <Input type="text" v-model="searchForm.mobile" placeholder="请输入会员联系方式" clearable style="width: 200px" />
+          </Form-item>
+          <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button>
+        </Form>
+      </Row>
+      <Row class="operation padding-row">
+        <Button @click="addMember" type="primary">添加会员</Button>
+      </Row>
 
-        <Row>
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
-          </Table>
-
-        </Row>
-        <Row type="flex" justify="end" class="page">
-          <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
-            size="small" show-total show-elevator show-sizer></Page>
-        </Row>
-      </Card>
-    </Row>
+        <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        </Table>
+      <Row type="flex" justify="end" class="page">
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
+      </Row>
+    </Card>
 
     <!-- 添加用户模态框 -->
     <Modal v-model="addFlag" title="添加用户">

manager/src/views/member/list/memberDetail.vue

@@ -78,7 +78,6 @@
             </div>
           </div>
           <div class="point-data" style="margin-top: -5px">
-            <Row>
               <Table
                 :loading="loading"
                 border
@@ -89,7 +88,6 @@
                 @on-sort-change="pointChangeSort"
               >
               </Table>
-            </Row>
 
             <Row type="flex" justify="end" class="page" style="margin-top: 10px">
               <Page
@@ -168,18 +166,16 @@
             </Form>
           </Row>
           <div style="min-height: 180px">
-            <Row class="padding-row">
-              <Table
-                :loading="loading"
-                border
-                :columns="orderColumns"
-                :data="orderData"
-                ref="table"
-                sortable="custom"
-                @on-sort-change="orderChangeSort"
-              >
-              </Table>
-            </Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="orderColumns"
+              :data="orderData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="orderChangeSort"
+            >
+            </Table>
 
             <Row type="flex" justify="end" class="page" style="margin-top: 10px">
               <Page
@@ -201,18 +197,16 @@
           <Row class="operation padding-row">
             <Button @click="addMemberAddress" type="primary">新增</Button>
           </Row>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="addressColumns"
-              :data="addressData"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="addressChangeSort"
-            >
-            </Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="addressColumns"
+            :data="addressData"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="addressChangeSort"
+          >
+          </Table>
 
           <Row type="flex" justify="end" class="page" style="margin-top: 10px">
             <Page
@@ -249,18 +243,16 @@
               </div>
             </div>
           </div>
-          <Row>
-            <Table
-              :loading="loading"
-              border
-              :columns="walletColumns"
-              :data="walletData"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="walletChangeSort"
-            >
-            </Table>
-          </Row>
+          <Table
+            :loading="loading"
+            border
+            :columns="walletColumns"
+            :data="walletData"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="walletChangeSort"
+          >
+          </Table>
 
           <Row type="flex" justify="end" class="page" style="margin-top: 10px">
             <Page
@@ -292,23 +284,21 @@
               <Button @click="getReceiptRecordData" type="primary" icon="ios-search" class="search-btn">搜索</Button>
             </Form>
           </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="receiptRecordColumns"
-              :data="receiptRecordData"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="walletChangeSort"
-            >
-              <template slot="orderSnSlot" slot-scope="scope">
+          <Table
+            :loading="loading"
+            border
+            :columns="receiptRecordColumns"
+            :data="receiptRecordData"
+            ref="table"
+            sortable="custom"
+            @on-sort-change="walletChangeSort"
+          >
+            <template slot="orderSnSlot" slot-scope="scope">
 
-                <a @click="orderDetail(scope.row.orderSn)">{{scope.row.orderSn}}</a>
+              <a @click="orderDetail(scope.row.orderSn)">{{scope.row.orderSn}}</a>
 
-              </template>
-            </Table>
-          </Row>
+            </template>
+          </Table>
 
           <Row type="flex" justify="end" class="page" style="margin-top: 10px">
             <Page

manager/src/views/member/list/memberRecycle.vue

@@ -32,20 +32,17 @@
             <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
           </Form>
         </Row>
-        <Row class="padding-row">
-          <Table
-            :loading="loading"
-            border
-            :columns="columns"
-            :data="data"
-            ref="table"
-            sortable="custom"
-            @on-sort-change="changeSort"
-            @on-selection-change="changeSelect"
-          >
-          </Table>
-
-        </Row>
+        <Table
+          :loading="loading"
+          border
+          :columns="columns"
+          :data="data"
+          ref="table"
+          sortable="custom"
+          @on-sort-change="changeSort"
+          @on-selection-change="changeSelect"
+        >
+        </Table>
         <Row type="flex" justify="end" class="page">
           <Page
             :current="searchForm.pageNumber"