增加门店过滤

releaselog.md

@@ -1,4 +1,8 @@
 
+# 0.1.7 (20.11.4 18:00)
+### 增加门店过滤 
+
+
 # 0.1.6 (20.10.20 18:00)
 ### 增加用户名称，修改bug
 

src/App.vue

@@ -45,6 +45,7 @@
 
             // 登录处理
             await self.fn.login(option)
+            // self.fn.getStoreList();
 
             // 修改配置
             // self.fn.setConfig()

src/common/api/ajax.js

@@ -74,6 +74,7 @@ const http = {
                 'companyId': store.state.user.user ? store.state.user.user.companyId : '',
                 'userId': store.state.user.user ? store.state.user.user.id : '',
                 'Authorization': 'Bearer ' + store.state.user.token,
+                'StoreId': store.state.common.curShop.id || ''
             },
             method: type,
         })

src/common/js/plugin.js

@@ -299,6 +299,8 @@ export default {
         })
     },
 
+
+
     // 获取token
     getToken() {
         return new Promise(resolve => {

src/common/store/common.js

@@ -6,6 +6,8 @@ const module = {
     // 仓库
     state: {
         iphoneX:false,
+        curShop:{},
+        tabIndex:0,
     },
 
     // 同步方法

src/pages.json

@@ -10,8 +10,7 @@
         {
             "path": "pages/index/index",
             "style": {
-                "navigationBarTitleText": "配送助手",
-                "enablePullDownRefresh": true
+                "navigationBarTitleText": "配送助手"
             }
         },
         {
@@ -20,6 +19,13 @@
                 "navigationBarTitleText": "绑定手机号",
                 "enablePullDownRefresh": true
             }
+        },
+        {
+            "path": "pages/index/select",
+            "style": {
+                "navigationBarTitleText": "门店选择",
+                "enablePullDownRefresh": true
+            }
         }
     ]
 }

src/pages/index/index.vue

@@ -1,5 +1,17 @@
 <template>
-    <div class="page">
+    <div class="page">        
+        <div class="page__top">
+            <div class="name">
+                当前门店：
+            </div>
+            <div class="shop" v-if="!hideShop" @click="goShopSelect">
+                <div class="shop__name">
+                    <!-- 最多6字 -->
+                    {{ curShopName }}
+                    <i class="iconfont iconyoujiantou shop__arrow"></i>
+                </div>
+            </div>
+        </div>
         <ul class="tab">
             <li
                 class="tab__item"
@@ -343,10 +355,6 @@ export default {
         },
     },
 
-    onLoad() {
-        const self = this;
-    },
-
     async onShow() {
         const self = this;
         // 未授权
@@ -362,18 +370,24 @@ export default {
         //     return;
         // }
         await self.fn.init();
-
-        self.fn.shareMenu({});
+        self.tab = this.$store.state.common.tabIndex;
         this.getList();
     },
 
+    // onPullDownRefresh() {
+    //     const self = this;
+    //     self.getList();
+    // },
+
     // 函数
     methods: {
         // 切换导航
         setTab(index) {
             const self = this;
-            console.log(index)
             self.tab = index;
+             this.$store.commit("common/update", {
+                tabIndex: index,
+            });
         },
 
         // swiper切换处理
@@ -383,17 +397,15 @@ export default {
             self.getList();
         },
 
-        onPullDownRefresh() {
-            const self = this;
-            self.getList();
-        },
-
         // 获取订单列表
         getList() {
             const self = this;
 
             self.list[self.tab].page = 1;
 
+            uni.showLoading({
+                title: "加载中...",
+            });
             self.api
                 .get("/Order/GetList", {
                     status: self.list[self.tab].status,
@@ -401,6 +413,7 @@ export default {
                     pageSize: 20,
                 })
                 .then((res) => {
+                    uni.hideLoading();
                     let data = res.data.data;
 
                     if (data.length) {
@@ -588,6 +601,10 @@ export default {
                 },
             });
         },
+
+        goShopSelect(){
+            this.router.push("/pages/index/select");
+        },
     },
 
     // 数据计算
@@ -598,6 +615,10 @@ export default {
         noPower() {
             return this.$store.state.user.noPower;
         },
+
+        curShopName(){
+            return this.$store.state.common.curShop.name || '不限门店';
+        }
     },
 
     // 数据监听
@@ -612,6 +633,53 @@ page {
 </style>
 
 <style lang="scss" scoped>
+.page {
+    &__top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: px(145);
+        padding: 0 px(50);
+        background-color: #fff;
+        border-bottom: 1px solid #f1f1f1;
+    }
+    .name{
+        font-size: px(36);
+        color: #999;
+        flex-shrink: 0;
+        margin-right: px(20);;
+    }
+}
+
+.shop {
+    display: flex;
+    color: #666;
+    font-size: px(36);
+    flex-shrink: 0;
+    margin-right: px(30);
+    width: 100%;
+    &__logo {
+        margin-right: px(20);
+        width: px(80);
+        height: px(80);
+        border-radius: 50%;
+        box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
+        overflow: hidden;
+        /deep/ img {
+            width: px(80);
+            height: px(80);
+        }
+    }
+    &__name {
+        display: flex;
+        white-space: nowrap;
+        align-items: center;
+    }
+    &__arrow {
+        margin-left: px(10);
+        transform: rotate(90deg);
+    }
+}
 .page {
     display: flex;
     flex-direction: column;

src/pages/index/select.vue

@@ -0,0 +1,185 @@
+<template>
+    <div class="page">
+        <div class="shop-select">
+            <ul class="list">
+                <li
+                    class="item"
+                    @click="shopClick({})"
+                    :class="{ on: !curShop.id }"
+                >
+                    <div class="info">
+                        <div class="title">
+                            不限门店
+                            <my-image
+                                class="selected"
+                                src="/static/icon/select2.png"
+                            ></my-image>
+                        </div>
+                    </div>
+                </li>
+                <li
+                    class="item"
+                    :class="{ on: curShop.id === item.id }"
+                    v-for="item of shopList"
+                    :key="item.id"
+                    @click="shopClick(item)"
+                >
+                    <!-- <my-image
+                                class="logo"
+                                src="https://whcoss.chuangzhikeji.com/images/621b9cc5-11b3-4d0e-ad82-981351e25336/1595236331022_600x600.jpg"
+                    ></my-image>-->
+                    <div class="info">
+                        <div class="title">
+                            {{ item.name }}
+                            <!-- <span class="raising">支持自提</span> -->
+                            <!-- <span class="selected">✔</span> -->
+                            <my-image
+                                class="selected"
+                                src="/static/icon/select2.png"
+                            ></my-image>
+                        </div>
+                        <p class="add-info">
+                            <span>{{
+                                item.province +
+                                item.city +
+                                item.county +
+                                item.address
+                            }}</span>
+                            <!-- <span class="distance">1.36km</span> -->
+                        </p>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+
+import appConfig from "./../../common/js/config";
+export default {
+    name: "",
+    components: { MyImage },
+
+    // 数据
+    data() {
+        return {
+            shopList: [],
+            curShop: {},
+            curShop: {},
+        };
+    },
+
+    async onShow() {
+        this.curShop = this.$store.state.common.curShop;
+        this.getList();
+    },
+    onPullDownRefresh() {
+        this.getList();
+    },
+    // 函数
+    methods: {
+        getList() {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.api.get("/Store/GetShopList").then((res) => {
+                this.shopList = res.data;
+                uni.hideLoading();
+                uni.stopPullDownRefresh();
+            });
+        },
+
+        shopClick(v) {
+            this.curShop = v;
+            this.$store.commit("common/update", {
+                curShop: v,
+            });
+            this.router.back();
+        },
+    },
+
+    // 数据计算
+    computed: {
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.shop-select {
+    background-color: #fff;
+    .item {
+        display: flex;
+        justify-content: space-between;
+        padding: px(30);
+        border-bottom: 1px solid #f1f1f1;
+        &.on {
+            .title .selected {
+                display: block;
+            }
+        }
+        .logo {
+            width: px(110);
+            height: px(110);
+            overflow: hidden;
+            border-radius: 50%;
+            border: 1px solid #f1f1f1;
+            margin-right: px(40);
+            flex-shrink: 0;
+            /deep/ img {
+                width: px(110);
+                height: px(110);
+            }
+        }
+        .info {
+            width: 100%;
+        }
+        .title {
+            font-size: px(50);
+            position: relative;
+            padding-right: px(100);
+            line-height: px(60);
+            position: relative;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            .raising {
+                font-size: px(30);
+                margin-left: px(30);
+                color: #a6b4e3;
+            }
+            .selected {
+                width: px(60);
+                height: px(60);
+                position: absolute;
+                right: 0;
+                top: 50%;
+                z-index: 1;
+                transform: translate(0, -50%);
+                display: none;
+                /deep/ img {
+                    width: px(60);
+                    height: px(60);
+                }
+            }
+        }
+        .add-info {
+            margin-top: px(20);
+            font-size: px(32);
+            display: flex;
+            justify-content: space-between;
+            font-size: px(34);
+            line-height: px(40);
+            .distance {
+                flex-shrink: 0;
+                font-size: px(30);
+                margin-left: px(40);
+            }
+        }
+    }
+}
+</style>