From 0fc18e37160807e393e8a2bcf7b94d038e469fcf Mon Sep 17 00:00:00 2001
From: shengliang <sligxl@163.com>
Date: Sun, 19 Apr 2020 10:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=83=8C=E6=99=AF=E5=9B=BE=E6=97=A0=E6=B3=95=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E7=9A=84=E9=97=AE=E9=A2=98=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E7=89=A9=E6=B5=81api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/Goods/GoodsPage.vue | 42 ++++++++++-----------
 src/renderer/components/LoginPage.vue       |  3 +-
 src/renderer/config/api.js                  | 15 ++++----
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/renderer/components/Goods/GoodsPage.vue b/src/renderer/components/Goods/GoodsPage.vue
index 1c798b7a..9700b43e 100755
--- a/src/renderer/components/Goods/GoodsPage.vue
+++ b/src/renderer/components/Goods/GoodsPage.vue
@@ -12,15 +12,14 @@
         </div>
         <div class="content-main">
             <div class="block">
-                        <span class="wrapper">
-                            <el-button :plain="true" type="primary" :class="activeClass == 1 ? 'active' : '' "
-                                       @click="sortOrder(1)" size="small">按销量排序</el-button>
-                            <el-button :plain="true" type="primary" :class="activeClass == 2 ? 'active' : '' "
-                                       @click="sortOrder(2)" size="small">按售价排序</el-button>
-                            <el-button :plain="true" type="primary" :class="activeClass == 3 ? 'active' : '' "
-                                       @click="sortOrder(3)" size="small">按库存排序</el-button>
-                            <!--<el-button :plain="true" type="info" @click="sortOrder" data-index="3">信息按钮</el-button>-->
-                        </span>
+				<span class="wrapper">
+					<el-button :plain="true" type="primary" :class="activeClass == 1 ? 'active' : '' "
+							   @click="sortOrder(1)" size="small">按销量排序</el-button>
+					<el-button :plain="true" type="primary" :class="activeClass == 2 ? 'active' : '' "
+							   @click="sortOrder(2)" size="small">按售价排序</el-button>
+					<el-button :plain="true" type="primary" :class="activeClass == 3 ? 'active' : '' "
+							   @click="sortOrder(3)" size="small">按库存排序</el-button>
+				</span>
             </div>
             <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane label="全部商品" name="first">
@@ -122,13 +121,9 @@
                             <el-input-number class="sort-width" size="mini" :min="1" :max="100" controls-position="right" v-model="scope.row.sort_order" placeholder="排序" @blur="submitSort(scope.$index, scope.row)" @change="submitSort(scope.$index, scope.row)"></el-input-number>
                         </template>
                     </el-table-column>
-                    <!--<el-table-column prop="category_p_name" label="父类" width="100" sortable></el-table-column>-->
-                    <!--<el-table-column prop="category_name" label="子类" width="100" sortable></el-table-column>-->
                     <el-table-column prop="sell_volume" label="销量" width="80" sortable></el-table-column>
-                    <!--<el-table-column prop="retail_price" label="售价" width="80" sortable></el-table-column>-->
                     <el-table-column prop="goods_number" label="库存" width="80" sortable>
                     </el-table-column>
-                    <!-- <el-table-column prop="has_done" label="完成" width="80" sortable></el-table-column> -->
                     <el-table-column label="首页显示" width="80">
                         <template scope="scope">
                             <el-switch
@@ -159,7 +154,7 @@
                 </el-table>
             </div>
             <div class="page-box">
-                <el-pagination @current-change="handlePageChange" :current-page="page" :page-size="50"
+                <el-pagination @current-change="handlePageChange" :current-page="page" :page-size="size"
                                layout="total, prev, pager, next, jumper" :total="total">
                 </el-pagination>
             </div>
@@ -173,6 +168,7 @@
         data() {
             return {
                 page: 1,
+				size:10,
                 total: 0,
                 filterForm: {
                     name: ''
@@ -298,8 +294,7 @@
             },
             handleClick(tab, event) {
                 let pindex = tab._data.index;
-                localStorage.setItem('pIndex', pindex);
-                localStorage.setItem('goodsPage', 0)
+				this.page = 1;
                 this.activeClass = 0;
                 if (pindex == 0) {
                     this.getList();
@@ -320,11 +315,7 @@
             },
             handlePageChange(val) {
                 this.page = val;
-                //保存到localStorage
-                localStorage.setItem('goodsPage', this.page)
-                localStorage.setItem('goodsFilterForm', JSON.stringify(this.filterForm));
                 let nIndex = this.pIndex;
-
                 if (nIndex == 0) {
                     this.getList();
                 }
@@ -402,6 +393,7 @@
                 this.axios.get('goods', {
                     params: {
                         page: this.page,
+						size: this.size,
                         name: this.filterForm.name
                     }
                 }).then((response) => {
@@ -413,7 +405,8 @@
             getOnSaleList() {
                 this.axios.get('goods/onsale', {
                     params: {
-                        page: this.page
+                        page: this.page,
+						size: this.size
                     }
                 }).then((response) => {
                     this.tableData = response.data.data.data
@@ -424,7 +417,8 @@
             getOutList() {
                 this.axios.get('goods/out', {
                     params: {
-                        page: this.page
+                        page: this.page,
+						size: this.size
                     }
                 }).then((response) => {
                     this.tableData = response.data.data.data;
@@ -435,7 +429,8 @@
             getDropList() {
                 this.axios.get('goods/drop', {
                     params: {
-                        page: this.page
+                        page: this.page,
+						size: this.size
                     }
                 }).then((response) => {
                     this.tableData = response.data.data.data;
@@ -450,6 +445,7 @@
                 this.axios.get('goods/sort', {
                     params: {
                         page: this.page,
+						size: this.size,
                         index: num
                     }
                 }).then((response) => {
diff --git a/src/renderer/components/LoginPage.vue b/src/renderer/components/LoginPage.vue
index 75287c79..8693c05b 100755
--- a/src/renderer/components/LoginPage.vue
+++ b/src/renderer/components/LoginPage.vue
@@ -108,7 +108,8 @@
 <style>
     .login {
         align-items: center;
-        background: url("/static/images/back1.jpg");
+        background: url("http://hiolabs.com/demo/static/images/back1.jpg"); 
+		/* 以上为登录背景,可以自己更换成自己喜欢的 */
         background-size: 100%;
         background-repeat:no-repeat;
         display: flex;
diff --git a/src/renderer/config/api.js b/src/renderer/config/api.js
index 6e15f1aa..d5312b63 100755
--- a/src/renderer/config/api.js
+++ b/src/renderer/config/api.js
@@ -3,15 +3,16 @@ const rootUrl = 'http://www.hiolabs.com:8360/admin/';
 
 const api = {
     rootUrl : rootUrl,
-    express: {
-        // 快递物流信息查询使用的是快递鸟接口，申请地址：http://www.kdniao.com/
-        appid: '123', // 对应快递鸟用户后台 用户ID
-        appkey: '123123', // 对应快递鸟用户后台 API key
-        request_url: 'http://api.kdniao.cc/Ebusiness/EbusinessOrderHandle.aspx'
-    },
+    // express: {
+    //     // 快递物流信息查询使用的是快递鸟接口，申请地址：http://www.kdniao.com/
+    //     appid: '123', // 对应快递鸟用户后台 用户ID
+    //     appkey: '123123', // 对应快递鸟用户后台 API key
+    //     request_url: 'http://api.kdniao.cc/Ebusiness/EbusinessOrderHandle.aspx'
+    // },
+	// 4.19更新，物流查询不需要以上配置，只需要在server的config配置阿里云物流接口就可以
+    qiniu: 'http://up.qiniu.com',
     // 请根据自己创建的七牛的区域进行设置：
     // https://developer.qiniu.com/kodo/manual/1671/region-endpoint
-    qiniu: 'http://up.qiniu.com'
 };