518

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/CardCase.vue

@@ -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>
@@ -107,6 +107,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;

src/pages/confirmorder.vue

@@ -154,7 +154,6 @@ export default {
             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,

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;
@@ -124,6 +123,7 @@ export default {
             this.$http
                 .get('/cardCase/showInfoMA?caseId=' + this.$mp.options.id)
                 .then(res => {
+                    console.log(res);
                     this.hideLoading();
                     this.detailsList = res.groupBoxMap;
                     this.cardCaseInfo = res.cardCaseInfo || {};
@@ -211,7 +211,7 @@ export default {
         img {
             width: 10px;
             height: 10px;
-            margin-top: 12px;
+            margin-top: 10px;
         }
         p {
             font-family: 'OSP';
@@ -374,11 +374,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;