增加商品 修改授权

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "xkjHelperongcheng",
+    "name": "xkj-helper",
     "version": "0.1.0",
     "private": true,
     "scripts": {

src/common/js/plugin.js

@@ -257,18 +257,39 @@ export default {
                         uni.hideLoading();
                         if (res.success) {
                             store.commit('user/login', res.data)
-                            resolve()
-                        } else {
-                            store.commit('user/update', {
-                                openId: res.data.user.wechatOpenId,
-                                noPower:true
-                            })
                             router.replace({
-                                path: '/pages/index/bind',
+                                path: '/pages/index/index',
                                 isReLaunch: true,
-                                query: {
-                                    openId: res.data.user.wechatOpenId,
-                                },
+                            })
+                            resolve()
+                        } else {
+                            this.showModal({
+                                title: '提示',
+                                content: '当前小程序需要绑定手机号使用'
+                            }).then((res2) => {
+
+                                if (res2.confirm) {
+                                    store.commit('user/login', {
+                                        openId: res.data.user.wechatOpenId,
+                                        noPower: true
+                                    })
+                                    router.replace({
+                                        path: '/pages/index/bind',
+                                        isReLaunch: true,
+                                        query: {
+                                            openId: res.data.user.wechatOpenId,
+                                        },
+                                    })
+                                } else {
+                                    store.commit('user/update', {
+                                        openId: res.data.user.wechatOpenId,
+                                        noPower: true
+                                    })
+                                    router.replace({
+                                        path: '/pages/index/index',
+                                        isReLaunch: true,
+                                    })
+                                }
                             })
                         }
                     })

src/pages/index/index.vue

@@ -3,7 +3,7 @@
         <ul class="tab">
             <li
                 class="tab__item"
-                :class="{'tab__item--active': tab === index}"
+                :class="{ 'tab__item--active': tab === index }"
                 v-for="(item, index) in list"
                 :key="index"
                 @click="setTab(index)"
@@ -12,10 +12,14 @@
                 <div class="tab__num" v-if="item.num > 0">{{ item.num }}</div>
             </li>
         </ul>
-        <div class="page__content">
+        <div class="page__content" v-if="!noPower">
             <swiper class="page__swiper" :current="tab" @change="swiperChange">
                 <swiper-item v-for="(item, index) in list" :key="index">
-                    <scroll-view class="page__scroll" :scroll-y="true" @scrolltolower="getMoreList">
+                    <scroll-view
+                        class="page__scroll"
+                        :scroll-y="true"
+                        @scrolltolower="getMoreList"
+                    >
                         <ul class="order">
                             <li
                                 class="order__item"
@@ -24,9 +28,19 @@
                             >
                                 <div class="order__main">
                                     <div class="order__top">
-                                        <div
-                                            class="des"
-                                        ><span>要求送达时间：</span>{{order.orderInfo.deliveryStartTime | dateFormat('MM-dd hh:mm')}} —— {{order.orderInfo.deliveryEndTime | dateFormat('MM-dd hh:mm')}}</div>
+                                        <div class="des">
+                                            <span>要求送达时间：</span
+                                            >{{
+                                                order.orderInfo
+                                                    .deliveryStartTime
+                                                    | dateFormat("MM-dd hh:mm")
+                                            }}
+                                            ——
+                                            {{
+                                                order.orderInfo.deliveryEndTime
+                                                    | dateFormat("MM-dd hh:mm")
+                                            }}
+                                        </div>
                                         <div class="index">
                                             <!-- <span class="symbol">#</span>155 -->
                                         </div>
@@ -34,67 +48,165 @@
                                     <div class="tags">
                                         <span
                                             class="tag geekblue"
-                                            v-if="order.orderInfo.deliveryMethod===0"
-                                        >快递</span>
+                                            v-if="
+                                                order.orderInfo
+                                                    .deliveryMethod === 0
+                                            "
+                                            >快递</span
+                                        >
                                         <span
                                             class="tag green"
-                                            v-if="order.orderInfo.deliveryMethod===1"
-                                        >门店自提</span>
+                                            v-if="
+                                                order.orderInfo
+                                                    .deliveryMethod === 1
+                                            "
+                                            >门店自提</span
+                                        >
                                         <span
                                             class="tag magenta"
-                                            v-if="order.orderInfo.deliveryMethod===2"
-                                        >送货上门</span>
+                                            v-if="
+                                                order.orderInfo
+                                                    .deliveryMethod === 2
+                                            "
+                                            >送货上门</span
+                                        >
                                     </div>
                                     <div class="order__con">
-                                        <div
-                                            class="order__title"
-                                        >{{order.fromAddress.address}} ({{order.storeInfo.name}})</div>
-                                        <p
-                                            class="order__des"
-                                        >{{order.fromAddress.province+ order.fromAddress.city+order.fromAddress.county}}</p>
+                                        <div class="order__title">
+                                            {{
+                                                order.fromAddress.address || ""
+                                            }}
+                                            ({{ order.storeInfo.name || "" }})
+                                        </div>
+                                        <p class="order__des">
+                                            {{
+                                                order.fromAddress.province +
+                                                    order.fromAddress.city +
+                                                    order.fromAddress.county ||
+                                                ""
+                                            }}
+                                        </p>
                                         <div
                                             class="order__title on order__title2"
-                                        >{{order.toAddress.address}}</div>
-                                        <p
-                                            class="order__des on"
-                                        >{{order.toAddress.province+ order.toAddress.city+order.toAddress.county}}</p>
+                                        >
+                                            {{ order.toAddress.address }}
+                                        </div>
+                                        <p class="order__des on">
+                                            {{
+                                                order.toAddress.province +
+                                                order.toAddress.city +
+                                                order.toAddress.county
+                                            }}
+                                        </p>
                                     </div>
                                 </div>
                                 <!-- <div class="yuji" v-if="tab!==4">预计{{order | yujiTime}}送达</div> -->
                                 <div
                                     class="remarks"
                                     v-if="order.orderInfo.description"
-                                >备注：{{order.orderInfo.description}}</div>
-                                <div class="order__btns" v-if="tab!==4">
-                                    <div class="btn tel" @click="makePhone(order)">
-                                        <my-image src="/static/icon/tal.png"></my-image>
+                                >
+                                    备注：{{ order.orderInfo.description }}
+                                </div>
+
+                                <div class="view-detail">
+                                    <div class="view-btn" @click="orderClick(order)">查看订单商品</div>
+                                    <ul class="goods" v-if="order.viewDetail">
+                                        <li
+                                            v-for="good of order.orderItems"
+                                            :key="good.id"
+                                            class="goods__item"
+                                        >
+                                            <div class="goods__content">
+                                                <div class="goods__left">
+                                                    <my-image
+                                                        class="goods__img"
+                                                        :src="good.productImage"
+                                                    ></my-image>
+                                                    <div class="goods__info">
+                                                        <div
+                                                            class="goods__title"
+                                                        >
+                                                            {{
+                                                                good.productName ||
+                                                                ""
+                                                            }}
+                                                        </div>
+                                                        <div
+                                                            class="goods__spec"
+                                                        >
+                                                            {{
+                                                                good.skuName ||
+                                                                ""
+                                                            }}
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="goods__right">
+                                                    <div class="goods__price">
+                                                        ¥{{
+                                                            good.price
+                                                                | minuteToRmb
+                                                        }}
+                                                    </div>
+                                                    <div class="goods__num">
+                                                        {{
+                                                            "X" +
+                                                            (good.count || "0")
+                                                        }}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </li>
+                                    </ul>
+                                </div>
+
+                                <div class="order__btns" v-if="tab !== 4">
+                                    <div
+                                        class="btn tel"
+                                        @click="makePhone(order)"
+                                    >
+                                        <my-image
+                                            src="/static/icon/tal.png"
+                                        ></my-image>
                                         <span>联系</span>
                                     </div>
                                     <div
                                         class="btn active"
-                                        v-if="tab===0"
-                                        @click="receivingOrder(order,oindex)"
-                                    >接单</div>
+                                        v-if="tab === 0"
+                                        @click="receivingOrder(order, oindex)"
+                                    >
+                                        接单
+                                    </div>
                                     <div
                                         class="btn active"
-                                        v-if="tab===1"
-                                        @click="packagedOrder(order,oindex)"
-                                    >打包完</div>
+                                        v-if="tab === 1"
+                                        @click="packagedOrder(order, oindex)"
+                                    >
+                                        打包完
+                                    </div>
                                     <div
                                         class="btn active"
-                                        v-if="tab===2"
-                                        @click="deliveryOrder(order,oindex)"
-                                    >配送中</div>
+                                        v-if="tab === 2"
+                                        @click="deliveryOrder(order, oindex)"
+                                    >
+                                        配送中
+                                    </div>
                                     <div
                                         class="btn active"
-                                        v-if="tab===3"
-                                        @click="completeOrder(order,oindex)"
-                                    >完成订单</div>
+                                        v-if="tab === 3"
+                                        @click="completeOrder(order, oindex)"
+                                    >
+                                        完成订单
+                                    </div>
                                 </div>
                             </li>
                         </ul>
                         <div class="null" v-if="loading && !item.list.length">
-                            <img class="null__img" src="/static/common/order_null.jpg" alt />
+                            <img
+                                class="null__img"
+                                src="/static/common/order_null.jpg"
+                                alt
+                            />
                             <div class="null__title">还没有相关数据哦</div>
                             <!-- <div class="null__sub-title">xxx</div> -->
                         </div>
@@ -102,6 +214,10 @@
                 </swiper-item>
             </swiper>
         </div>
+        <div v-if="noPower" class="tips">
+            当前小程序需要绑定手机号使用,
+            <span class="bind" @click="goBind">去绑定</span>
+        </div>
     </div>
 </template>
 
@@ -187,17 +303,17 @@ export default {
     async onShow() {
         const self = this;
         // 未授权
-        if (this.$store.state.user.noPower === true) {
-            console.log("未授权重定向", this.$store.state.user);
-            this.idrouter.replace({
-                path: "/pages/index/bind",
-                isReLaunch: true,
-                query: {
-                    openId: this.$store.state.user.openId,
-                },
-            });
-            return;
-        }
+        // if (this.$store.state.user.noPower === true) {
+        //     console.log("未授权重定向", this.$store.state.user);
+        //     this.idrouter.replace({
+        //         path: "/pages/index/bind",
+        //         isReLaunch: true,
+        //         query: {
+        //             openId: this.$store.state.user.openId,
+        //         },
+        //     });
+        //     return;
+        // }
         await self.fn.init();
         this.getList();
     },
@@ -245,7 +361,6 @@ export default {
                     // self.list[1].num = data.countInfo.unpaidOrderCount
                     // self.list[2].num = data.countInfo.waitShippedOrderCount
                     // self.list[3].num = data.countInfo.waitReceivedOrderCount
-                    console.log(data);
                     self.list[self.tab].list = data;
                     self.loading = true;
                     uni.hideLoading();
@@ -276,38 +391,6 @@ export default {
                     );
                 });
         },
-        // // 取消订单
-        // 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) {
@@ -407,14 +490,31 @@ export default {
                     }
                 });
         },
+
+        goBind() {
+            this.router.push({
+                path: "/pages/index/bind",
+                isReLaunch: true,
+                query: {
+                    openId: this.$store.state.user.openId,
+                },
+            });
+        },
+
+        orderClick(order){
+            order.viewDetail = !order.viewDetail;
+            this.list = [...this.list];
+        }
     },
 
     // 数据计算
     computed: {
         orderList() {
-            console.log(3, this.list[this.tab].list);
             return this.list[this.tab].list;
         },
+        noPower() {
+            return this.$store.state.user.noPower;
+        },
     },
 
     // 数据监听
@@ -525,7 +625,7 @@ page {
         align-items: center;
         .des {
             font-size: px(40);
-            span{
+            span {
                 color: #666;
             }
         }
@@ -711,4 +811,121 @@ page {
         color: #999;
     }
 }
+.tips {
+    padding: px(60) px(30);
+    text-align: center;
+    font-size: px(44);
+    .bind {
+        color: #3582fb;
+    }
+}
+.view-detail {
+    padding: px(20) px(40) px(50);
+    .view-btn {
+        display: block;
+        text-align: right;
+        font-size: px(38);
+        color: #3582fb;
+    }
+}
+
+.goods {
+    margin-top: px(40);
+    padding: 0 px(45);
+    background-color: #f5f5f5;
+
+    &__item {
+        min-height: px(225);
+        padding-top: px(30);
+        & ~ .goods__item {
+            border-top: solid px(3) #ececec;
+        }
+
+        &:first-child {
+            border-top: none;
+        }
+    }
+
+    &__content {
+        display: flex;
+        justify-content: space-between;
+    }
+
+    &__left {
+        display: flex;
+        flex: 1;
+    }
+
+    &__img /deep/ img {
+        width: px(170);
+        height: px(170);
+        border-radius: px(10);
+    }
+
+    &__info {
+        flex: 1;
+        margin-left: px(30);
+    }
+
+    &__title {
+        @include omits(2);
+        font-size: px(36);
+        color: #333;
+    }
+
+    &__spec {
+        @include omits(1);
+        margin-top: px(30);
+        font-size: px(36);
+        color: #999;
+    }
+
+    &__right {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        width: px(210);
+    }
+
+    &__price {
+        font-size: px(36);
+        color: #333;
+    }
+
+    &__num {
+        margin-top: px(20);
+        font-size: px(36);
+        color: #999;
+    }
+
+    &__bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: px(30) 0;
+    }
+
+    &__text {
+        font-size: px(36);
+        color: #999;
+    }
+
+    &__status {
+        display: flex;
+        align-items: center;
+    }
+
+    &__btn {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: px(70);
+        padding: 0 px(40);
+        margin-left: px(30);
+        font-size: px(36);
+        color: #666;
+        border-radius: px(35);
+        border: solid px(3) #999;
+    }
+}
 </style>