。

project.config.json

@@ -1,205 +1,220 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": false,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": []
     },
-    "enableEngineNative": false,
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.16.1",
-  "appid": "wxf3120271892d4f18",
-  "projectname": "%E5%8D%A1%E7%89%8C%E5%B0%8F%E7%A8%8B%E5%BA%8F",
-  "cloudfunctionTemplateRoot": "",
-  "watchOptions": {
-    "ignore": []
-  },
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "miniprogramRoot": "dist-wechat/",
-  "condition": {
-    "search": {
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": false,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "bundle": false,
+        "useIsolateContext": true,
+        "useCompilerModule": true,
+        "userConfirmedUseCompilerModuleSwitch": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true
     },
-    "conversation": {
-      "list": []
+    "compileType": "miniprogram",
+    "libVersion": "2.16.1",
+    "appid": "wxf3120271892d4f18",
+    "projectname": "%E5%8D%A1%E7%89%8C%E5%B0%8F%E7%A8%8B%E5%BA%8F",
+    "cloudfunctionTemplateRoot": "",
+    "watchOptions": {
+        "ignore": []
     },
-    "plugin": {
-      "list": []
+    "debugOptions": {
+        "hidedInDevtools": []
     },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "id": -1,
-          "name": "消息",
-          "pathName": "/pages/news",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "聊天页面",
-          "pathName": "/pages/chat",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "我的",
-          "pathName": "/pages/mine",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "我的收藏",
-          "pathName": "/pages/mineFollow",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "个人设置",
-          "pathName": "/pages/setting",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "我的钱包",
-          "pathName": "/pages/wallet",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "授权登陆",
-          "pathName": "/pages/authorized",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "常见问题",
-          "pathName": "/pages/questions",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "选择地址",
-          "pathName": "/pages/chooseAddress",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "订单详情",
-          "pathName": "/pages/orderdetails",
-          "query": "id=779"
-        },
-        {
-          "id": -1,
-          "name": "新增地址",
-          "pathName": "/pages/receiving",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "首页",
-          "pathName": "/pages/Home",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "拼箱详情",
-          "pathName": "/pages/details",
-          "query": "id=209"
-        },
-        {
-          "id": -1,
-          "name": "收货地址",
-          "pathName": "/pages/address",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "确认订单",
-          "pathName": "/pages/confirmorder",
-          "query": "caseId=2248&boxIds=2251%2C2257%2C2275%2C2281",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "我买到的",
-          "pathName": "/pages/allorder",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "店铺申请",
-          "pathName": "/pages/store/apply",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "认证审核进度",
-          "pathName": "/pages/store/review",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "店铺首页",
-          "pathName": "/pages/store/homePage",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "申请退款",
-          "pathName": "/pages/Apply",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "退款详情",
-          "pathName": "/pages/Applydetails",
-          "scene": null
+    "scripts": {},
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "miniprogramRoot": "dist-wechat/",
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "scripts": {},
+        "simulatorType": "wechat",
+        "simulatorPluginLibVersion": {},
+        "miniprogramRoot": "dist-wechat/",
+        "condition": {
+            "search": {
+                "list": []
+            },
+            "conversation": {
+                "list": []
+            },
+            "plugin": {
+                "list": []
+            },
+            "game": {
+                "list": []
+            },
+            "gamePlugin": {
+                "list": []
+            },
+            "miniprogram": {
+                "list": [
+                    {
+                        "id": -1,
+                        "name": "消息",
+                        "pathName": "/pages/news",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "聊天页面",
+                        "pathName": "/pages/chat",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "我的",
+                        "pathName": "/pages/mine",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "我的收藏",
+                        "pathName": "/pages/mineFollow",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "个人设置",
+                        "pathName": "/pages/setting",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "我的钱包",
+                        "pathName": "/pages/wallet",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "授权登陆",
+                        "pathName": "/pages/authorized",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "常见问题",
+                        "pathName": "/pages/questions",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "选择地址",
+                        "pathName": "/pages/chooseAddress",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "订单详情",
+                        "pathName": "/pages/orderdetails",
+                        "query": "id=779"
+                    },
+                    {
+                        "id": -1,
+                        "name": "新增地址",
+                        "pathName": "/pages/receiving",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "首页",
+                        "pathName": "/pages/Home",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "拼箱详情",
+                        "pathName": "/pages/details",
+                        "query": "id=2353"
+                    },
+                    {
+                        "id": -1,
+                        "name": "收货地址",
+                        "pathName": "/pages/address",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "确认订单",
+                        "pathName": "/pages/confirmorder",
+                        "query": "caseId=2248&boxIds=2251%2C2257%2C2275%2C2281",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "我买到的",
+                        "pathName": "/pages/allorder",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "店铺申请",
+                        "pathName": "/pages/store/apply",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "认证审核进度",
+                        "pathName": "/pages/store/review",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "店铺首页",
+                        "pathName": "/pages/store/homePage",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "申请退款",
+                        "pathName": "/pages/Apply",
+                        "scene": null
+                    },
+                    {
+                        "id": -1,
+                        "name": "退款详情",
+                        "pathName": "/pages/Applydetails",
+                        "scene": null
+                    }
+                ]
+            }
         }
-      ]
     }
-  }
-}
+}

project.private.config.json

@@ -0,0 +1,162 @@
+{
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "id": -1,
+          "name": "消息",
+          "pathName": "/pages/news",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "聊天页面",
+          "pathName": "/pages/chat",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我的",
+          "pathName": "/pages/mine",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我的收藏",
+          "pathName": "/pages/mineFollow",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "个人设置",
+          "pathName": "/pages/setting",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我的钱包",
+          "pathName": "/pages/wallet",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "授权登陆",
+          "pathName": "/pages/authorized",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "常见问题",
+          "pathName": "/pages/questions",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "选择地址",
+          "pathName": "/pages/chooseAddress",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "订单详情",
+          "pathName": "/pages/orderdetails",
+          "query": "id=779"
+        },
+        {
+          "id": -1,
+          "name": "新增地址",
+          "pathName": "/pages/receiving",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "首页",
+          "pathName": "/pages/Home",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "拼箱详情",
+          "pathName": "/pages/details",
+          "query": "id=2570",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "收货地址",
+          "pathName": "/pages/address",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "确认订单",
+          "pathName": "/pages/confirmorder",
+          "query": "caseId=2248&boxIds=2251%2C2257%2C2275%2C2281",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "我买到的",
+          "pathName": "/pages/allorder",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "店铺申请",
+          "pathName": "/pages/store/apply",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "认证审核进度",
+          "pathName": "/pages/store/review",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "店铺首页",
+          "pathName": "/pages/store/homePage",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "申请退款",
+          "pathName": "/pages/Apply",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "退款详情",
+          "pathName": "/pages/Applydetails",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
+}

src/components/AllorderInfo.vue

@@ -121,20 +121,29 @@ export default {
         logistics() {
             this.showLoading();
             // 查看物流
-            this.$http.get('/orderInfo/checkLogistic', { orderInfoId: this.id }).then(res => {
-                wx.hideLoading();
-                this.logisTics = res.logistic.result;
-                let steps = [];
-                res.logistic.result.list.forEach(item => {
-                    let newStep = {
-                        desc: item.status,
-                        text: item.time
-                    };
-                    steps.push(newStep);
+            this.$http
+                .get('/orderInfo/checkLogistic', { orderInfoId: this.id })
+                .then(res => {
+                    this.hideLoading();
+                    this.logisTics = res.logistic.result;
+                    let steps = [];
+                    res.logistic.result.list.forEach(item => {
+                        let newStep = {
+                            desc: item.status,
+                            text: item.time
+                        };
+                        steps.push(newStep);
+                    });
+                    this.stepsList = steps;
+                    this.show = true;
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    wx.showToast({
+                        title: '暂无物流信息',
+                        icon: 'none'
+                    });
                 });
-                this.stepsList = steps;
-            });
-            this.show = true;
         },
         refreash() {
             this.$emit('refreash');
@@ -172,7 +181,6 @@ export default {
                 success: res => {
                     if (res.confirm) {
                         this.$http.post('/orderInfo/finish', { orderInfoId: this.id }).then(res => {
-                            wx.hideLoading();
                             wx.showToast({
                                 icon: 'none',
                                 title: '收货成功'
@@ -195,7 +203,6 @@ export default {
                 })
                 .then(res => {
                     res.package = res.packageValue;
-                    // console.log(res);
                     wx.requestPayment({
                         ...res,
                         success: () => {
@@ -230,7 +237,6 @@ export default {
                 success: res => {
                     if (res.confirm) {
                         this.$http.post('/orderInfo/cancel', { orderInfoId: this.id }).then(res => {
-                            wx.hideLoading();
                             wx.showToast({
                                 icon: 'none',
                                 title: '订单已取消'
@@ -250,7 +256,6 @@ export default {
                 success: res => {
                     if (res.confirm) {
                         this.$http.post('orderInfo/delete', { orderInfoId: this.id }).then(res => {
-                            wx.hideLoading();
                             wx.showToast({
                                 icon: 'none',
                                 title: '订单已删除'
@@ -268,26 +273,9 @@ export default {
                 title: '敬请开放',
                 icon: 'none'
             });
-            // wx.showModal({
-            //     title: '提示',
-            //     content: '敬请开放',
-            //     success: res => {
-            //         if (res.confirm) {
-            // this.$http.post('orderInfo/refund', { orderInfoId: this.id, remark: '' }).then(res => {
-            //     wx.hideLoading();
-            //     wx.showToast({
-            //         icon: 'none',
-            //         title: '退款成功'
-            //     });
-            //     this.refreash();
-            // });
-            //         }
-            //     }
-            // });
         },
         remind() {
             this.$http.post('orderInfo/remindMy', { orderInfoId: this.id, remark: '' }).then(res => {
-                wx.hideLoading();
                 wx.showToast({
                     icon: 'none',
                     title: '提醒商家成功'

src/components/CardCase.vue

@@ -5,7 +5,7 @@
                 <div class="text1" v-if="chooseIds.length > 0">
                     已选<span>{{ chooseIds.length }}</span
                     >包，共<span>{{ money }}</span
-                    >元，邮费0元
+                    >元，邮费10元
                 </div>
                 <div v-else>请选择卡包</div>
             </div>
@@ -33,10 +33,10 @@
                                 :key="item.id"
                                 class="card-item"
                                 :class="{
-                                    used: item.caseStatus !== ('WAIT' || 'PROGRESS') || item.userId,
+                                    used: !canChoose(item),
                                     active: nowChoose.includes(item.id)
                                 }"
-                                @click="choose(item.id, item.caseStatus !== ('WAIT' || 'PROGRESS') || item.userId)"
+                                @click="choose(item.id, !canChoose(item))"
                             >
                                 {{ itemIndex + 1 }}
                             </div>
@@ -45,7 +45,7 @@
                 </div>
 
                 <div class="bottom">
-                    <span class="text">已选{{ nowChoose.length }}包，共{{ money }}元，邮费0元</span>
+                    <span class="text">已选{{ nowChoose.length }}包，共{{ money }}元，邮费10元</span>
                     <van-button size="medium" @click="submit" class="submit" :radius="0" type="primary"
                         >确认购买</van-button
                     >
@@ -93,9 +93,20 @@ export default {
             let list = [...this.allCards].filter(item => {
                 return [...choose].includes(item.id);
             });
-
             return list.reduce((prev, cur) => {
-                return prev + cur.money;
+                var r1, r2, m;
+                try {
+                    r1 = prev.toString().split('.')[1].length;
+                } catch (e) {
+                    r1 = 0;
+                }
+                try {
+                    r2 = cur.money.toString().split('.')[1].length;
+                } catch (e) {
+                    r2 = 0;
+                }
+                m = Math.pow(10, Math.max(r1, r2));
+                return (prev * m + cur.money * m) / m;
             }, 0);
         }
     },
@@ -107,6 +118,10 @@ export default {
         };
     },
     methods: {
+        canChoose(info) {
+            let status = ['WAIT', 'PROGRESS'];
+            return status.includes(info.caseStatus) && !info.userId;
+        },
         init(type) {
             this.nowChoose = [...this.chooseIds];
             this.show = true;
@@ -142,9 +157,10 @@ export default {
                     if (!checkResult) {
                         wx.showToast({
                             icon: 'none',
-                            title: '该卡箱需要两个卡包组选择数量一样'
+                            title: '该卡箱需要两个卡包组选择数量一样',
+                            duration: 4000
                         });
-                        return Promise.reject();
+                        return Promise.reject('提示');
                     } else {
                         return Promise.resolve();
                     }
@@ -157,7 +173,6 @@ export default {
                     }
                 })
                 .catch(e => {
-                    wx.hideLoading();
                     if (e.error) {
                         wx.showToast({
                             icon: 'none',

src/components/SeriesSelect.vue

@@ -44,6 +44,7 @@ export default {
                         }
                     )
                     .then(res => {
+                        console.log(res);
                         this.columns = res.content;
                     });
             } else {

src/pages/Applydetails.vue

@@ -14,6 +14,39 @@
                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;渠道返回，请注意查收</span
             >
         </div>
+        <div class="bor"></div>
+        <div class="con">
+            <div class="price">
+                <p>退款总金额</p>
+                <span>¥970</span>
+            </div>
+            <div class="box-tit">
+                <div>
+                    <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
+                    <p>光之城卡牌</p>
+                </div>
+                <div class="box-tit-seller">联系卖家</div>
+            </div>
+            <div>
+                <div class="box-con">
+                    <div class="box-con-Cards">
+                        <img src="../native/imgs/marker.png" alt="" />
+                        <div class="box-con-right">
+                            <p class="box-con-tit">1105皇权破晓</p>
+                            <div class="box-con-today">
+                                <p>卡盒选号:卡包02—A</p>
+                            </div>
+                            <div class="box-con-money">
+                                <div class="box-con-num">
+                                    <p>¥320</p>
+                                </div>
+                                <p>×1</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 <script>
@@ -23,9 +56,8 @@ export default {
 </script>
 <style lang="less" scoped>
 .apply {
-    margin: 0 20px;
     .top {
-        margin: 30px 40px 16px 40px;
+        margin: 30px 60px 16px;
         img {
             width: 60px;
             height: 60px;
@@ -46,5 +78,108 @@ export default {
             line-height: 24px;
         }
     }
+    .bor {
+        height: 5px;
+        background: #f5f7fa;
+        width: 100%;
+    }
+    .con {
+        padding: 0 20px;
+        .price {
+            .flex();
+            line-height: 70px;
+            color: #f42202;
+            justify-content: space-between;
+            p {
+                font-size: 14px;
+                font-weight: bold;
+            }
+            span {
+                font-size: 16px;
+                font-weight: bold;
+            }
+        }
+        .box-tit {
+            margin: 21px 0 16px 0;
+            .flex();
+            justify-content: space-between;
+            div {
+                .flex();
+                img {
+                    width: 17px;
+                    height: 17px;
+                }
+                p {
+                    font-size: 14px;
+                    font-weight: bold;
+                    color: #000000;
+                    margin-left: 2px;
+                }
+            }
+            .box-tit-seller {
+                font-size: 14px;
+                font-weight: 400;
+                color: #000;
+                line-height: 22px;
+            }
+        }
+        .box-con {
+            height: 160px;
+            background: #ffffff;
+            border-radius: 12px;
+            .box-con-Cards {
+                display: flex;
+                img {
+                    width: 62px;
+                    height: 90px;
+                    border-radius: 6px;
+                }
+                .box-con-right {
+                    width: 237px;
+                    margin-left: 8px;
+                    .box-con-tit {
+                        font-size: 16px;
+                        font-weight: bold;
+                        color: #000000;
+                        margin: 5px 0 10px 0;
+                    }
+                }
+                .box-con-today {
+                    .flex();
+                    height: 30px;
+                    background: #f5f7fa;
+                    border-radius: 6px;
+                    width: 142px;
+                    p {
+                        font-size: 14px;
+                        font-weight: 400;
+                        color: #303133;
+                    }
+                }
+                .box-con-money {
+                    .flex();
+                    justify-content: space-between;
+                    margin-top: 28px;
+                    .box-con-num {
+                        .flex();
+                        img {
+                            width: 16px;
+                            height: 16px;
+                        }
+                        p {
+                            font-size: 14px;
+                            font-weight: normal;
+                            color: #c8c9cc;
+                        }
+                    }
+                    p {
+                        font-size: 14px;
+                        font-weight: 400;
+                        color: #c8c9cc;
+                    }
+                }
+            }
+        }
+    }
 }
 </style>

src/pages/Home.vue

@@ -12,11 +12,7 @@
         <van-sticky>
             <div class="container-bg">
                 <div class="mytest">
-                    <img
-                        class="mytest"
-                        src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/home_top_bg3x.jpg"
-                        alt=""
-                    />
+                    <img class="mytest" :src="bgImg" alt="" />
                 </div>
                 <span>{{ seriesName }}</span>
                 <div class="box-top">
@@ -99,9 +95,18 @@ export default {
             collectionId: 0,
             seriesId: 0,
             seriesName: '',
-            isSeries: true
+            isSeries: true,
+            columns: []
         };
     },
+    computed: {
+        bgImg() {
+            let info = [...this.columns].find(item => {
+                return item.id === this.seriesId;
+            });
+            return info ? info.image : '';
+        }
+    },
     methods: {
         getSeries() {
             return this.$http
@@ -162,6 +167,29 @@ export default {
                         this.toast(e.rror);
                     }
                 });
+            this.$http
+                .post(
+                    '/series/all',
+                    {
+                        page: 0,
+                        size: 100
+                    },
+                    {
+                        header: {
+                            'Content-Type': 'application/json'
+                        }
+                    }
+                )
+                .then(res => {
+                    this.hideLoading();
+                    this.columns = res.content;
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    if (e.error) {
+                        this.toast(e.rror);
+                    }
+                });
         },
         searchData(e) {
             this.collectionId = 0;
@@ -232,6 +260,7 @@ export default {
     }
     .container-bg {
         padding-top: 54px;
+        background-color: rgba(0, 0, 0, 0.5);
 
         &::after {
             content: '';

src/pages/confirmorder.vue

@@ -62,7 +62,7 @@
         <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>邮费</p>
-                <p class="box-buttom-p">¥0</p>
+                <p class="box-buttom-p">¥10</p>
             </div>
         </div>
         <div class="box-buttom">
@@ -137,12 +137,12 @@ export default {
                     userAddressId: this.userAddressId
                 })
                 .then(res => {
-                    wx.hideLoading();
+                    this.hideLoading();
                     this.id = res.id;
                     this.navigateTo('/pages/orderdetails?id=' + this.id);
                 })
                 .catch(e => {
-                    wx.hideLoading();
+                    this.hideLoading();
                     wx.showToast({
                         icon: 'none',
                         title: e.error
@@ -150,24 +150,22 @@ export default {
                 });
         },
         getFn() {
-            console.log(this.$mp.query.boxIds);
             this.showLoading();
             let caseId = this.$mp.query.caseId;
             let boxIds = this.$mp.query.boxIds.replace(/%2C/g, ',');
-            console.log(boxIds);
             this.$http
                 .get('/orderInfo/showPreview', {
                     caseId,
                     boxIds
                 })
                 .then(res => {
-                    wx.hideLoading();
+                    this.hideLoading();
                     this.total = res.total;
                     this.Boxes = res.selectedBoxes;
                     this.cardCaseInfo = res.selectedCase.collection;
                 })
                 .catch(e => {
-                    wx.hideLoading();
+                    this.hideLoading();
                     wx.showToast({
                         icon: 'none',
                         title: e.error
@@ -189,6 +187,13 @@ export default {
                         this.userAddressId = res.content[0].id;
                         this.addressList = res.content[0];
                     }
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    wx.showToast({
+                        icon: 'none',
+                        title: e.error
+                    });
                 });
         }
     },

src/pages/details.vue

@@ -111,7 +111,6 @@ export default {
         time() {
             if (this.cardCaseInfo.endTime) {
                 let date = dayjs(this.cardCaseInfo.endTime, 'YYYY-MM-DD HH:mm:ss');
-                console.log(date);
                 return date.diff(dayjs());
             } else {
                 return 0;
@@ -130,7 +129,7 @@ export default {
                     this.banners = res.cardCaseInfo.image.split(',');
                 })
                 .catch(e => {
-                    wx.hideLoading();
+                    this.hideLoading();
                     wx.showToast({
                         icon: 'none',
                         title: e.error
@@ -211,7 +210,7 @@ export default {
         img {
             width: 10px;
             height: 10px;
-            margin-top: 12px;
+            margin-top: 10px;
         }
         p {
             font-family: 'OSP';
@@ -374,11 +373,12 @@ export default {
         }
         p {
             height: 28px;
+            width: 20px;
             font-size: 16px;
             font-weight: 500;
             color: #000000;
             line-height: 28px;
-            margin-bottom: 16px;
+            padding: 0 0 16px 2px;
         }
         .box-footer-con {
             display: flex;

src/pages/orderdetails.vue

@@ -80,7 +80,7 @@
         <div class="box-buttom">
             <div class="box-buttom-con">
                 <p>邮费</p>
-                <p class="box-buttom-p">¥0</p>
+                <p class="box-buttom-p">¥10</p>
             </div>
         </div>
         <div class="box-buttom">
@@ -242,7 +242,7 @@ export default {
             this.$http
                 .get('/orderInfo/get/' + this.$mp.query.id)
                 .then(res => {
-                    wx.hideLoading();
+                    this.hideLoading();
                     this.caseId = res.caseId;
                     this.status = res;
                     this.addressList = res.address;
@@ -275,7 +275,7 @@ export default {
                     }
                 })
                 .catch(e => {
-                    wx.hideLoading();
+                    this.hideLoading();
                     wx.showToast({
                         icon: 'none',
                         title: '请返回首页操作'
@@ -285,7 +285,7 @@ export default {
             // if (this.status.orderStatus == 'COMPETED' || this.status.orderStatus == 'SEND') {
             // console.log(this.status.orderStatus);
             this.$http.get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id }).then(res => {
-                wx.hideLoading();
+                this.hideLoading();
                 this.logisTics = res.logistic.result;
                 let steps = [];
                 res.logistic.result.list.forEach(item => {
@@ -298,6 +298,7 @@ export default {
                 this.stepsList = steps;
                 this.stepsShow = res.logistic.result.list[0];
             });
+
             // }
             // }, 1000);
         },
@@ -307,20 +308,29 @@ export default {
         logistics() {
             this.showLoading();
             // 查看物流
-            this.$http.get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id }).then(res => {
-                wx.hideLoading();
-                this.logisTics = res.logistic.result;
-                let steps = [];
-                res.logistic.result.list.forEach(item => {
-                    let newStep = {
-                        desc: item.status,
-                        text: item.time
-                    };
-                    steps.push(newStep);
+            this.$http
+                .get('/orderInfo/checkLogistic', { orderInfoId: this.$mp.query.id })
+                .then(res => {
+                    this.hideLoading();
+                    this.logisTics = res.logistic.result;
+                    let steps = [];
+                    res.logistic.result.list.forEach(item => {
+                        let newStep = {
+                            desc: item.status,
+                            text: item.time
+                        };
+                        steps.push(newStep);
+                    });
+                    this.stepsList = steps;
+                    this.show = true;
+                })
+                .catch(e => {
+                    this.hideLoading();
+                    wx.showToast({
+                        title: '暂无物流信息',
+                        icon: 'none'
+                    });
                 });
-                this.stepsList = steps;
-            });
-            this.show = true;
         },
         comfrim() {
             wx.showModal({
@@ -328,16 +338,18 @@ export default {
                 content: '确定收货？',
                 success: res => {
                     if (res.confirm) {
-                        this.$http.post('/orderInfo/finish', { orderInfoId: this.$mp.query.id }).then(res => {
-                            wx.hideLoading();
-                            wx.showToast({
-                                icon: 'none',
-                                title: '收货成功'
-                            });
-                            setTimeout(() => {
-                                this.getFn();
-                            }, 1000);
-                        });
+                        this.$http
+                            .post('/orderInfo/finish', { orderInfoId: this.$mp.query.id })
+                            .then(res => {
+                                wx.showToast({
+                                    icon: 'none',
+                                    title: '收货成功'
+                                });
+                                setTimeout(() => {
+                                    this.getFn();
+                                }, 1000);
+                            })
+                            .catch(() => {});
                     }
                 }
             });
@@ -403,16 +415,18 @@ export default {
                 content: '确定取消订单？',
                 success: res => {
                     if (res.confirm) {
-                        this.$http.post('/orderInfo/cancel', { orderInfoId: this.$mp.query.id }).then(res => {
-                            wx.hideLoading();
-                            wx.showToast({
-                                icon: 'none',
-                                title: '订单已取消'
-                            });
-                            setTimeout(() => {
-                                this.getFn();
-                            }, 1000);
-                        });
+                        this.$http
+                            .post('/orderInfo/cancel', { orderInfoId: this.$mp.query.id })
+                            .then(res => {
+                                wx.showToast({
+                                    icon: 'none',
+                                    title: '订单已取消'
+                                });
+                                setTimeout(() => {
+                                    this.getFn();
+                                }, 1000);
+                            })
+                            .catch(() => {});
                     }
                 }
             });
@@ -423,16 +437,18 @@ export default {
                 content: '确定删除订单？',
                 success: res => {
                     if (res.confirm) {
-                        this.$http.post('orderInfo/delete', { orderInfoId: this.$mp.query.id }).then(res => {
-                            wx.hideLoading();
-                            wx.showToast({
-                                icon: 'none',
-                                title: '订单已删除'
-                            });
-                            setTimeout(() => {
-                                this.navigateTo('/pages/allorder');
-                            }, 1000);
-                        });
+                        this.$http
+                            .post('orderInfo/delete', { orderInfoId: this.$mp.query.id })
+                            .then(res => {
+                                wx.showToast({
+                                    icon: 'none',
+                                    title: '订单已删除'
+                                });
+                                setTimeout(() => {
+                                    this.navigateTo('/pages/allorder');
+                                }, 1000);
+                            })
+                            .catch(() => {});
                     }
                 }
             });
@@ -563,13 +579,11 @@ export default {
         background: #f5f7fa;
     }
     .box-tit {
-        display: flex;
-        align-items: center;
+        .flex();
         justify-content: space-between;
         margin: 20px 20px 0 20px;
         div {
-            display: flex;
-            align-items: center;
+            .flex();
             img {
                 width: 17px;
                 height: 17px;
@@ -616,12 +630,11 @@ export default {
                 }
             }
             .box-con-today {
-                display: flex;
+                .flex();
                 height: 30px;
                 background: #f5f7fa;
                 border-radius: 6px;
                 width: 142px;
-                align-items: center;
                 p {
                     height: 24px;
                     font-size: 14px;
@@ -631,13 +644,11 @@ export default {
                 }
             }
             .box-con-money {
-                display: flex;
-                align-items: center;
+                .flex();
                 justify-content: space-between;
                 margin-top: 28px;
                 .box-con-num {
-                    display: flex;
-                    align-items: center;
+                    .flex();
                     img {
                         width: 16px;
                         height: 16px;
@@ -663,8 +674,7 @@ export default {
     .box-buttom {
         margin: 35px 20px;
         .box-buttom-con {
-            display: flex;
-            align-items: center;
+            .flex();
             justify-content: space-between;
             p {
                 height: 20px;
@@ -698,8 +708,7 @@ export default {
     .box-footer {
         margin: 15px 20px;
         .box-footer-con {
-            display: flex;
-            align-items: center;
+            .flex();
             justify-content: space-between;
             .box-footer-cr {
                 display: flex;