1、修复登录密码错误不报错的问题

2、修复商品页删除后，显示所有商品的问题 3、新增线下支付订单的显示
AnderZip · Mar 4, 2020 · c8b43d0 · c8b43d0
1 parent 9a43917
commit c8b43d0
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 34 deletions.
diff --git a/src/renderer/components/Goods/GoodsPage.vue b/src/renderer/components/Goods/GoodsPage.vue
@@ -298,6 +298,8 @@
             },
             handleClick(tab, event) {
                 let pindex = tab._data.index;
+                localStorage.setItem('pIndex', pindex);
+                localStorage.setItem('goodsPage', 0)
                 this.activeClass = 0;
                 if (pindex == 0) {
                     this.getList();
@@ -350,19 +352,29 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-
-                    this.axios.post('goods/destory', {id: row.id}).then((response) => {
-                        if (response.data.errno === 0) {
-                            this.$message({
-                                type: 'success',
-                                message: '删除成功!'
-                            });
-
-                            this.getList();
+                let that = this;
+                that.axios.post('goods/destory', {id: row.id}).then((response) => {
+                    if (response.data.errno === 0) {
+                        that.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                        let pIndex = localStorage.getItem('pIndex');
+                        console.log(pIndex);
+                        if (pIndex == 0) {
+                            that.getList();
                         }
-                    })
-
-
+                        else if (pIndex == 1) {
+                            that.getOnSaleList();
+                        }
+                        else if (pIndex == 2) {
+                            that.getOutList();
+                        }
+                        else if (pIndex == 3) {
+                            that.getDropList();
+                        }
+                    }
+                })
                 }).catch(() => {
 //                    this.$message({
 //                        type: 'info',
@@ -381,7 +393,6 @@
                         name: ''
                     }
                 }).then((response) => {
-                    console.log(response.data)
                     this.tableData = response.data.data.data
                     this.page = response.data.data.currentPage
                     this.total = response.data.data.count
@@ -394,7 +405,6 @@
                         name: this.filterForm.name
                     }
                 }).then((response) => {
-                    console.log(response.data)
                     this.tableData = response.data.data.data
                     this.page = response.data.data.currentPage
                     this.total = response.data.data.count
@@ -435,7 +445,6 @@
             },
             sortOrder(num) {
                 this.num = num;
-                console.log(num);
                 this.pIndex = 4;
                 this.activeClass = num;
                 this.axios.get('goods/sort', {

diff --git a/src/renderer/components/LoginPage.vue b/src/renderer/components/LoginPage.vue
@@ -61,6 +61,7 @@
                         password: this.form.password
                     }).then((res) => {
                         let call = res.data;
+                        console.log(call);
                         this.loading = false;
                         if (res.data.errno === 0) {
                             console.log(res.data.data);
@@ -84,7 +85,7 @@
                                 this.$router.push({name: 'wap'});
                             }
 
-                        } else if(call.errno == 400){
+                        } else{
                             this.$message({
                                 type: 'error',
                                 message: call.errmsg

diff --git a/src/renderer/components/Order/OrderPage.vue b/src/renderer/components/Order/OrderPage.vue
@@ -35,16 +35,20 @@
                 <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
                     <div v-for="item in tableData" class="list-wrap clearfix">
                         <div class="header clearfix">
-                            <div class="status-text">{{item.order_status_text}}{{item.is_fake ? '--假的订单' : ''}}</div>
-                            <div class="add-time">下单时间：{{item.add_time}}</div>
-                            <div class="pay-time" v-if="item.pay_time != 0">付款时间：{{item.pay_time}}</div>
-                            <div class="order-id">订单号：{{item.order_sn}}</div>
-
-                            <div class="price-wrap">当前合计{{item.actual_price}}元（含运费{{item.freight_price}}元）</div>
-                            <div v-if="item.change_price!= item.actual_price" class="price-change">
-                                改价前{{item.change_price}}元
+                            <div class="left">
+                                <div class="off-text" v-if="item.offline_pay">线下支付订单</div>
+                                <div class="status-text">{{item.order_status_text}}</div>
+                                <div class="add-time">下单时间：{{item.add_time}}</div>
+                                <div class="pay-time" v-if="item.pay_time != 0">付款时间：{{item.pay_time}}</div>
+                                <div class="order-id">订单号：{{item.order_sn}}</div>
+                            </div>
+                            <div class="right">
+                                <div class="goods-num">共{{item.goodsCount}}件商品</div>
+                                <div v-if="item.change_price!= item.actual_price" class="price-change">
+                                    改价前{{item.change_price}}元
+                                </div>
+                                <div class="price-wrap">当前合计{{item.actual_price}}元（含运费{{item.freight_price}}元）</div>
                             </div>
-                            <div class="goods-num">共{{item.goodsCount}}件商品</div>
                         </div>
                         <div class="content-wrap clearfix">
                             <div class="left">
@@ -1286,10 +1290,15 @@
 
     .filter-box {
         display: flex;
-        justify-content: space-between;
+        justify-content: flex-start;
         align-items: center;
     }
 
+    .filter-box .box{
+        margin-right: 20px;
+        margin-bottom: 10px;
+    }
+
     .demo-form-inline {
         display: flex;
         justify-content: space-between;
@@ -1318,30 +1327,49 @@
         -webkit-box-sizing: border-box;
         -moz-box-sizing: border-box;
         box-sizing: border-box;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .header .left{
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+    }
+
+    .header .right{
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+    }
+
+
+    .off-text{
+        color: #fff;
+        border-radius: 4px;
+        background: #594d72;
+        height: 15px;
+        line-height: 15px;
+        padding: 4px 10px;
+        font-size: 12px;
+        margin-right: 10px;
     }
 
     .status-text {
-        float: left;
         color: #f0797f;
         margin-right: 10px;
     }
 
     .add-time {
-        float: left;
         margin-right: 20px;
     }
 
     .pay-time {
-        float: left;
         margin-right: 20px;
     }
 
-    .order-id {
-        float: left;
-    }
-
     .goods-num {
-        float: right;
         margin-right: 20px;
     }
 

diff --git a/src/renderer/components/WelcomePage.vue b/src/renderer/components/WelcomePage.vue
@@ -13,6 +13,10 @@
                     <countdown class="count" endTime="" :callback="callback" endText="已经结束了"></countdown>
                 </div>
             </div>
+            <div class="github">
+                <a target="_blank" href="https://github.com/iamdarcy">github地址</a>
+                <div class="l">请您在github给个star。 技术交流QQ群：824781955</div>
+            </div>
             <div class="header clearfix">
                 <el-card class="box-card card-red">
                     <router-link class="link-color" :to="{ path: '/dashboard/order' }">
@@ -251,11 +255,29 @@
         justify-content: space-between;
         align-items: center;
     }
+    .github{
+        width: 100%;
+        height: 60px;
+        padding: 30px;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+        background: #f8f8f8;
+        margin-bottom: 20px;
+        font-size: 16px;
+        border-radius: 6px;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+    }
     .notice .r{
         display: flex;
         justify-content: space-between;
         align-items: center;
     }
+    .github a{
+        margin-right: 20px;
+    }
     .count{
         background: #fff;
         padding: 10px;