增加接口

.env

@@ -7,13 +7,13 @@ NODE_ENV = 'production'
 VUE_APP_ENV = develop
 
 # 接口请求基地址
-VUE_APP_API_BASE_URL = https://whcapi.chuangzhikeji.com
+VUE_APP_API_BASE_URL = http://localhost:59982
 
 # 接口请求基地址
 VUE_APP_WEBSOCKET_BASE_URL = wss://whcsocket.chuangzhikeji.com
 
 # 图片基地址
-VUE_APP_IMAGE_BASE_URL = https://whcapi.chuangzhikeji.com
+VUE_APP_IMAGE_BASE_URL = http://localhost:59982
 VUE_APP_IMAGE_RESOURCE_URL = https://whcoss.chuangzhikeji.com
 
 # 微信小程序appId

.env.develop

@@ -7,13 +7,13 @@ NODE_ENV = 'production'
 VUE_APP_ENV = production
 
 # 接口请求基地址
-VUE_APP_API_BASE_URL = https://whc.api.dev.chuangzhikeji.com
+VUE_APP_API_BASE_URL = http://localhost:59982
 
 # 接口请求基地址
 VUE_APP_WEBSOCKET_BASE_URL = wss://whc.socket.dev.chuangzhikeji.com
 
 # 图片基地址
-VUE_APP_IMAGE_BASE_URL = https://whc.api.dev.chuangzhikeji.com
+VUE_APP_IMAGE_BASE_URL = http://localhost:59982
 VUE_APP_IMAGE_RESOURCE_URL = https://whcoss.chuangzhikeji.com
 
 # 微信小程序appId

src/App.vue

@@ -44,7 +44,8 @@
             }
 
             // 登录处理
-            // await self.fn.login(option)
+        console.log(22)
+            await self.fn.login(option)
 
             // 修改配置
             // self.fn.setConfig()

src/common/api/ajax.js

@@ -64,15 +64,16 @@ const http = {
         }
 
         // 发送请求
+        console.log(store.state.user,1111111)
         let response = await uni.request({
             url: url,
             data: data,
             header: {
                 'Accept': 'application/json',
                 'Content-Type': ContentType,
-                'appId': store.state.user.appId,
-                'companyId': store.state.user.companyId,
-                'userId': store.state.user.userId,
+                'appId': store.state.user.user.appId,
+                'companyId': store.state.user.user.companyId,
+                'userId': store.state.user.user.id,
                 'Authorization': 'Bearer ' + store.state.user.token,
             },
             method: type,

src/common/api/index.js

@@ -15,7 +15,7 @@ export default {
     get(url, data = {}, config = {}) {
         return new Promise((resolve, reject) => {
             ajax.get(url, {
-                preview: Number(store.state.common.preview),
+                // preview: Number(store.state.common.preview),
                 ...data,
             }, {
                 ...config,
@@ -45,7 +45,7 @@ export default {
 
         return new Promise((resolve, reject) => {
             ajax.post(url, {
-                preview: Number(store.state.common.preview),
+                // preview: Number(store.state.common.preview),
                 ...data,
             }, {
                 isJson: true,

src/common/js/plugin.js

@@ -227,7 +227,9 @@ export default {
             let timer = setInterval(() => {
                 if (store.state.user.init) {
                     clearInterval(timer)
-                    resolve()
+                    resolve(true)
+                } else {
+                    resolve(false)
                 }
             }, 10)
         })
@@ -237,21 +239,39 @@ export default {
     login(option) {
         const self = this
         return new Promise(resolve => {
+            uni.showLoading({
+                title: "登录中",
+            });
             uni.login({
                 provider: 'weixin',
                 success: async result => {
                     api.post('/Login/Login', {
                         code: result.code,
-                        appId: config.appId,
-                        boxId: option.query.bid,
-                        fromUserId: option.query.uid,
-                        fromScene: option.scene,
-                        fromUrl: option.path + '?' + qs.stringify(option.query),
-                        fromExtra: JSON.stringify(option),
+                        // appId: config.appId,
+                        // boxId: option.query.bid,
+                        // fromUserId: option.query.uid,
+                        // fromScene: option.scene,
+                        // fromUrl: option.path + '?' + qs.stringify(option.query),
+                        // fromExtra: JSON.stringify(option),
+                    }, {
+                        pass: true
                     }).then(res => {
-                        store.commit('user/login', res.data)
-                        self.updateUserInfo()
-                        resolve()
+                        uni.hideLoading();
+                        if (res.success) {
+                            store.commit('user/login', res.data)
+                            resolve()
+                        } else {
+                            store.commit('user/update', {
+                                openId: res.data.user.wechatOpenId
+                            })
+                            router.replace({
+                                path: '/pages/index/bind',
+                                isReLaunch: true,
+                                query: {
+                                    openId: res.data.user.wechatOpenId,
+                                },
+                            })
+                        }
                     })
                     resolve()
                 },

src/common/store/user.js

@@ -5,19 +5,11 @@ const module = {
 
     // 仓库
     state: {
-        appId: '',// appId(系统内部使用)
-        companyId: '',// 公司id
-        userId: '',// 用户id
-        boxId: '',// 盒子id
-        token: '',// 聊天使用的
-        sessionKeyId: '',// 微信登录的sessionKeyId
-        userInfo: '', // 用户信息
-        integral: 0,// 用户剩余积分
-        vip: false,// 是否是vip
-        vipStatus: false,// 是否激活vip
-        login: false,// 是否登录
-        writeOffUser: false,// 是否有核销权限
-        init: false,// 是否初始化
+        user:null,
+        token:'',
+        tokenExpires:'',
+        init:false,
+        openId:'',
     },
 
     // 同步方法
@@ -46,24 +38,20 @@ const module = {
 
         // 登录处理
         login(state, data) {
-            state.companyId = data.visitor.companyId || ''
-            state.userId = data.visitor.id || ''
-            state.boxId = data.visitor.boxId ? data.visitor.boxId : state.boxId
-            state.appId = data.visitor.appId || ''
+            state.user = data.user || null
             state.token = data.token || ''
-            state.vip = data.visitor.isVip || false
-            state.vipStatus = data.visitor.vipStatus === 1 || false
-            state.login = data.visitor.nickName ? true : false
-            state.writeOffUser = data.visitor.writeOffUser
-            state.init = true
+            state.tokenExpires = data.tokenExpires || ''
+            state.openId = '';
+            state.init = true;
         },
 
         // 退出登录处理
         logout(state) {
-            state.companyId = ''
-            state.userId = ''
-            state.userInfo = ''
-            state.vipStatus = false
+            state.user = data.user || null
+            state.token =  ''
+            state.tokenExpires =  ''
+            state.openId = '';
+            state.init = false;
         },
     },
 

src/pages.json

@@ -13,6 +13,13 @@
                 "navigationBarTitleText": "配送助手",
                 "enablePullDownRefresh": true
             }
+        },
+        {
+            "path": "pages/index/bind",
+            "style": {
+                "navigationBarTitleText": "绑定手机号",
+                "enablePullDownRefresh": true
+            }
         }
     ]
 }

src/pages/index/bind.vue

@@ -0,0 +1,194 @@
+<template>
+    <div class="page">
+        <div class="main">
+            <div class="tit">绑定手机号</div>
+            <div class="inp-box">
+                <input
+                    type="number"
+                    name="mobile"
+                    v-model="mobile"
+                    placeholder="填写绑定手机号"
+                    @input="mobileChange"
+                    maxlength="11"
+                />
+            </div>
+            <div class="inp-box">
+                <input type="number" name="code" maxlength="6" v-model="code" placeholder="输入验证码" />
+                <span :class="{dis:(!mobileOk || isVfDis)}" @click="getVfCode">{{countDownStr}}</span>
+            </div>
+            <button class="btn" @click="submit">确定</button>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+            mobile: "",
+            code: "",
+            mobileOk: false,
+            isVfDis: false,
+            countDownStr: "发送验证码",
+        };
+    },
+
+    onLoad() {
+        this.openId = this.$mp.query.openId;
+        console.log("open", this.openId);
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+        /**
+         * 电话号码变化
+         */
+        mobileChange() {
+            console.log();
+            if (this.mobile.length === 11) {
+                this.mobileOk = true;
+            } else {
+                this.mobileOk = false;
+            }
+        },
+
+        // 获取验证码
+        getVfCode() {
+            const mobile = this.mobile;
+            const url = "/Login/SendSms";
+
+            this.countDown();
+            this.api
+                .get(url, {
+                    mobile: this.mobile,
+                })
+                .then((res) => {
+                    if (res.success) {
+                        this.codeData = res.data;
+                    } else {
+                        this.fn.showToast(`获取验证码错误：${res.message}`);
+                        return;
+                    }
+                });
+        },
+
+        /**
+         * 倒计时
+         */
+        countDown() {
+            this.isVfDis = true;
+            let time = 60;
+            let timer = setInterval(() => {
+                time--;
+                this.countDownStr = time + "秒重新获取";
+                if (time <= 0) {
+                    clearInterval(timer);
+                    this.countDownStr = "发送验证码";
+                    this.isVfDis = false;
+                }
+            }, 1000);
+        },
+
+        submit() {
+            if (!this.mobile || this.mobile.length !== 11) {
+                this.fn.showToast(`手机号错误`);
+                return;
+            }
+            if (!this.code) {
+                this.fn.showToast(`请输入验证码`);
+                return;
+            }
+
+            uni.showLoading({
+                title: "提交中",
+            });
+            this.api
+                .post("/Login/BindWechat", {
+                    mobile: this.mobile,
+                    code: this.code,
+                    openId: this.openId,
+                })
+                .then((res) => {
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.$store.commit("user/login", res.data);
+                        this.router.replace({
+                            isReLaunch: true,
+                            path: "/pages/index/index",
+                        });
+                    } else {
+                        this.fn.showModal({
+                            title: "提交失败",
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+    },
+
+    // 数据计算
+    computed: {},
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.page {
+    height: 100%;
+    background-color: #fff;
+}
+.main {
+    padding-top: px(120);
+    padding-left: px(40);
+    padding-right: px(40);
+}
+.tit {
+    font-size: px(48);
+    padding-bottom: px(60);
+}
+.inp-box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #c3c1c2;
+    padding: px(30) 0;
+    margin-bottom: px(30);
+}
+.inp-box span {
+    font-size: px(32);
+    color: #e92e25;
+    border-radius: px(15);
+    border: 1px solid #e92e25;
+    width: px(230);
+    height: px(80);
+    text-align: center;
+    line-height: px(80);
+    flex-shrink: 0;
+    margin-left: px(30);
+}
+.inp-box input {
+    width: 100%;
+}
+.inp-box .dis {
+    color: #999;
+    border-color: #999;
+    pointer-events: none;
+}
+.btn {
+    margin-top: px(120);
+    color: #fff;
+    background-color: #e92e25;
+    font-size: px(44);
+}
+</style>

src/pages/index/index.vue

@@ -17,7 +17,7 @@
                 <swiper-item v-for="(item, index) in list" :key="index">
                     <scroll-view class="page__scroll" :scroll-y="true" @scrolltolower="getMoreList">
                         <ul class="order">
-                            <li class="order__item">
+                            <li class="order__item" v-for="item of list[self.tab].list" :key="item.id">
                                 <div class="order__main">
                                     <div class="order__top">
                                         <div class="des">立即 (建议19：00前送达)</div>
@@ -31,21 +31,33 @@
                                         <div class="order__title order__title2">周庄子家园（6号楼2单元1701）</div>
                                     </div>
                                 </div>
-                                <div class="yuji">
-                                    预计9.30出餐
-                                </div>
-                                <div class="remarks">
-                                    备注：多放辣
-                                </div>
+                                <div class="yuji">预计9.30出餐</div>
+                                <div class="remarks">备注：多放辣</div>
                                 <div class="order__btns" v-if="tab!==4">
-                                    <div class="btn tel">
+                                    <div class="btn tel" @click="makePhone(item)">
                                         <my-image src="/static/icon/tal.png"></my-image>
-                                        <span >联系</span>
+                                        <span>联系</span>
                                     </div>
-                                    <div class="btn active" v-if="tab===0">接单</div>
-                                    <div class="btn active" v-if="tab===1">打包完</div>
-                                    <div class="btn active" v-if="tab===2">配送中</div>
-                                    <div class="btn active" v-if="tab===3">送达</div>
+                                    <div
+                                        class="btn active"
+                                        v-if="tab===0"
+                                        @click="receivingOrder(item)"
+                                    >接单</div>
+                                    <div
+                                        class="btn active"
+                                        v-if="tab===1"
+                                        @click="packagedOrder(item)"
+                                    >打包完</div>
+                                    <div
+                                        class="btn active"
+                                        v-if="tab===2"
+                                        @click="deliveryOrder(item)"
+                                    >配送中</div>
+                                    <div
+                                        class="btn active"
+                                        v-if="tab===3"
+                                        @click="completeOrder(item)"
+                                    >送达</div>
                                 </div>
                             </li>
                         </ul>
@@ -74,35 +86,35 @@ export default {
             list: [
                 {
                     title: "待接单",
-                    status: "0",
+                    status: "20",
                     num: 0,
                     page: 1,
                     list: [],
                 },
                 {
                     title: "打包中",
-                    status: "2",
+                    status: "21",
                     num: 0,
                     page: 1,
                     list: [],
                 },
                 {
                     title: "待配送",
-                    status: "3",
+                    status: "23",
                     num: 0,
                     page: 1,
                     list: [],
                 },
                 {
                     title: "配送中",
-                    status: "4",
+                    status: "24",
                     num: 0,
                     page: 1,
                     list: [],
                 },
                 {
                     title: "已送达",
-                    status: "9",
+                    status: "25",
                     num: 0,
                     page: 1,
                     list: [],
@@ -114,20 +126,13 @@ export default {
 
     onLoad() {
         const self = this;
-
-        // if (!self.loading) {
-        //     uni.showLoading({
-        //         title: '加载中...',
-        //     })
-        // }
-
-        self.tab = self.$mp.query.index ? Number(self.$mp.query.index) : 0;
     },
 
-    onShow() {
+    async onShow() {
         const self = this;
-
-        // self.getList()
+        await self.fn.init();
+        console.log(11)
+        this.getList();
     },
 
     // 函数
@@ -146,6 +151,11 @@ export default {
             // self.getList()
         },
 
+        onPullDownRefresh() {
+            const self = this;
+            self.getList();
+        },
+
         // 获取订单列表
         getList() {
             const self = this;
@@ -159,16 +169,16 @@ export default {
                     pageSize: 20,
                 })
                 .then((res) => {
-                    let data = JSON.parse(res.data);
+                    let data = res.data;
 
-                    if (data.orderList.length) {
+                    if (data.length) {
                         self.list[self.tab].page++;
                     }
 
                     // self.list[1].num = data.countInfo.unpaidOrderCount
                     // self.list[2].num = data.countInfo.waitShippedOrderCount
                     // self.list[3].num = data.countInfo.waitReceivedOrderCount
-                    self.list[self.tab].list = data.orderList;
+                    self.list[self.tab].list = data;
                     self.loading = true;
                     uni.hideLoading();
                 });
@@ -176,7 +186,6 @@ export default {
 
         // 获取更多内容
         getMoreList() {
-            return console.log("获取更多");
             const self = this;
 
             self.api
@@ -186,144 +195,136 @@ export default {
                     pageSize: 20,
                 })
                 .then((res) => {
-                    let data = JSON.parse(res.data);
-
-                    if (data.orderList.length) {
+                    let data = res.data;
+                    if (data.length) {
                         self.list[self.tab].page++;
                     }
 
-                    self.list[1].num = data.countInfo.unpaidOrderCount;
-                    self.list[2].num = data.countInfo.waitShippedOrderCount;
-                    self.list[3].num = data.countInfo.waitReceivedOrderCount;
+                    // self.list[1].num = data.countInfo.unpaidOrderCount;
+                    // self.list[2].num = data.countInfo.waitShippedOrderCount;
+                    // self.list[3].num = data.countInfo.waitReceivedOrderCount;
                     self.list[self.tab].list = self.list[self.tab].list.concat(
-                        data.orderList
+                        data
                     );
                 });
         },
-
-        // 跳转到详情
-        jumpDetail(val) {
-            const self = this;
-
-            self.router.push({
-                path: "/pages/order/detail",
-                query: {
-                    orderId: val.shopOrderId,
-                },
+        // // 取消订单
+        // cancel(val, key) {
+        //     const self = this;
+
+        //     self.fn
+        //         .showModal({
+        //             title: "取消订单",
+        //             content: "这么好的宝贝，确定不要了？",
+        //         })
+        //         .then((res) => {
+        //             if (res.confirm) {
+        //                 self.api
+        //                     .post(
+        //                         "/Order/Cancel",
+        //                         {
+        //                             orderId: val.shopOrderId,
+        //                             reason: "",
+        //                         },
+        //                         {
+        //                             repeat: true,
+        //                         }
+        //                     )
+        //                     .then(() => {
+        //                         if (self.tab !== 0 && self.tab !== 4) {
+        //                             self.list[self.tab].num--;
+        //                         }
+        //                         self.list[self.tab].list.splice(key, 1);
+        //                         self.fn.showToast("订单取消成功");
+        //                     });
+        //             }
+        //         });
+        // },
+
+        // 打电话
+        makePhone(val) {
+            uni.makePhoneCall({
+                phoneNumber: "17343041879",
             });
         },
 
-        // 跳转到物流信息
-        jumpExpress(val) {
-            const self = this;
-
-            self.router.push({
-                path: "/pages/order/express",
-                query: {
-                    orderId: val.shopOrderId,
-                },
-            });
-        },
-
-        // 取消订单
-        cancel(val, key) {
-            const self = this;
-
-            self.fn
-                .showModal({
-                    title: "取消订单",
-                    content: "这么好的宝贝，确定不要了？",
-                })
+        // 接单
+        receivingOrder(val) {
+            self.api
+                .post(
+                    "/Order/ReceivingOrder",
+                    {
+                        id: val.id,
+                    },
+                    {
+                        repeat: true,
+                    }
+                )
                 .then((res) => {
-                    if (res.confirm) {
-                        self.api
-                            .post(
-                                "/Order/Cancel",
-                                {
-                                    orderId: val.shopOrderId,
-                                    reason: "",
-                                },
-                                {
-                                    repeat: true,
-                                }
-                            )
-                            .then(() => {
-                                if (self.tab !== 0 && self.tab !== 4) {
-                                    self.list[self.tab].num--;
-                                }
-                                self.list[self.tab].list.splice(key, 1);
-                                self.fn.showToast("订单取消成功");
-                            });
+                    if (res.success) {
+                        self.fn.showToast("接单成功");
+                    } else {
+                        self.fn.showToast("接单失败：" + res.message);
                     }
                 });
         },
-
-        // 支付
-        pay(val) {
-            const self = this;
-
-            self.fn.pay(val.shopOrderId, val.buyerPayAmount);
+        // 打包完
+        packagedOrder(val) {
+            self.api
+                .post(
+                    "/Order/PackagedOrder",
+                    {
+                        id: val.id,
+                    },
+                    {
+                        repeat: true,
+                    }
+                )
+                .then((res) => {
+                    if (res.success) {
+                        self.fn.showToast("打包完成功");
+                    } else {
+                        self.fn.showToast("打包完失败：" + res.message);
+                    }
+                });
         },
-
-        // 确认收货处理
-        receive(val, key) {
-            const self = this;
-
-            self.fn
-                .showModal({
-                    title: "确认收货",
-                    content: "请你收到货物后再点击“确认”，否则可能钱货两空！",
-                })
+        // 配送中
+        deliveryOrder(val) {
+            self.api
+                .post(
+                    "/Order/DeliveryOrder",
+                    {
+                        id: val.id,
+                    },
+                    {
+                        repeat: true,
+                    }
+                )
                 .then((res) => {
-                    if (res.confirm) {
-                        self.api
-                            .post(
-                                "/Order/SignOff",
-                                {
-                                    orderId: val.shopOrderId,
-                                },
-                                {
-                                    repeat: true,
-                                }
-                            )
-                            .then(() => {
-                                if (self.tab !== 0 && self.tab !== 4) {
-                                    self.list[self.tab].num--;
-                                }
-                                self.list[self.tab].list.splice(key, 1);
-                            });
+                    if (res.success) {
+                        self.fn.showToast("配送中成功");
+                    } else {
+                        self.fn.showToast("配送中失败：" + res.message);
                     }
                 });
         },
-
-        // 删除订单
-        remove(val, key) {
-            const self = this;
-
-            self.fn
-                .showModal({
-                    title: "删除订单",
-                    content: "确定删除订单？",
-                })
+        // 送达
+        completeOrder(val) {
+            self.api
+                .post(
+                    "/Order/CompleteOrder",
+                    {
+                        id: val.id,
+                    },
+                    {
+                        repeat: true,
+                    }
+                )
                 .then((res) => {
-                    if (res.confirm) {
-                        self.api
-                            .delete(
-                                "/Order/Delete",
-                                {
-                                    orderId: val.shopOrderId,
-                                },
-                                {
-                                    repeat: true,
-                                }
-                            )
-                            .then(() => {
-                                if (self.tab !== 0 && self.tab !== 4) {
-                                    self.list[self.tab].num--;
-                                }
-                                self.list[self.tab].list.splice(key, 1);
-                                self.fn.showToast("删除成功");
-                            });
+                    if (res.success) {
+                        self.fn.showToast("送达成功");
+                    } else {
+                        self.fn.showToast("送达失败：" + res.message);
                     }
                 });
         },
@@ -428,9 +429,10 @@ page {
         margin-top: px(30);
         background-color: #fff;
         border-radius: px(10);
-        box-shadow: 0px 2px 6px -3px rgba(0,0,0,0.5);
+        box-shadow: 0px 2px 6px -3px rgba(0, 0, 0, 0.5);
+        padding-bottom: 1px;
     }
-    &__main{
+    &__main {
         padding: px(40);
     }
     &__top {
@@ -447,13 +449,12 @@ page {
             font-size: px(36);
         }
     }
-    
 
     &__con {
         margin-top: px(60);
         padding-left: px(60);
         position: relative;
-        &::after{
+        &::after {
             content: "";
             position: absolute;
             left: px(20);
@@ -464,52 +465,53 @@ page {
         }
     }
 
-    &__title{
+    &__title {
         font-size: px(60);
         position: relative;
-        &::after{
+        &::after {
             content: "";
             position: absolute;
             left: px(-50);
             top: 50%;
-            transform: translate(0,-50%);
+            transform: translate(0, -50%);
             z-index: 1;
             width: px(20);
             height: px(20);
             border-radius: 50%;
             background-color: #a8a8a8;
         }
-        &.on{
+        &.on {
             color: #333;
-            &::after{
+            &::after {
                 background-color: #f68a3f;
             }
         }
     }
-    &__title2{
+    &__title2 {
         margin-top: px(60);
-            color: #999;
+        color: #999;
     }
-    &__des{
+    &__des {
         font-size: px(36);
         margin-top: px(20);
     }
-    &__btns{
+    &__btns {
         display: flex;
         border-top: 1px solid #dedede;
         justify-content: space-between;
-        .btn{
+        margin-bottom: -1px;
+        .btn {
             height: px(130);
             line-height: px(130);
             text-align: center;
         }
-        .active{
+        .active {
             background-color: #f68a3f;
             color: #fff;
             font-size: px(50);
             width: 100%;
         }
-        .tel{
+        .tel {
             width: px(200);
             flex-shrink: 0;
             display: flex;
@@ -518,20 +520,19 @@ page {
             align-items: center;
             font-size: px(36);
             line-height: 1;
-            /deep/ img{
+            /deep/ img {
                 width: px(60);
                 height: px(60);
                 margin-bottom: px(10);
             }
         }
-        
     }
-    .yuji{
-        padding:px(20) px(40) px(20) px(60);
+    .yuji {
+        padding: px(20) px(40) px(20) px(60);
         font-size: px(36);
         color: #999;
     }
-    .remarks{
+    .remarks {
         background-color: #fefaf1;
         color: #6b5651;
         font-size: px(36);