xuqiang %!s(int64=4) %!d(string=hai) anos
pai
achega
ebff9730b0
Modificáronse 2 ficheiros con 198 adicións e 196 borrados
  1. 189 189
      project.private.config.json
  2. 9 7
      src/pages/orderdetails.vue

+ 189 - 189
project.private.config.json

@@ -1,192 +1,192 @@
 {
-  "setting": {},
-  "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": "toUserId=1&toName=官方店铺",
-          "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=15441",
-          "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
-        },
-        {
-          "name": "店铺首页",
-          "pathName": "/pages/store/homePage",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "直播商品",
-          "pathName": "/pages/store/liveProduct",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "申请退款",
-          "pathName": "/pages/Apply",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "退款详情",
-          "pathName": "/pages/Applydetails",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "我卖出的",
-          "pathName": "pages/allsellout",
-          "query": "null",
-          "scene": null
-        },
-        {
-          "name": "新增商品",
-          "pathName": "pages/store/productEdit",
-          "query": "null",
-          "scene": null
-        },
-        {
-          "name": "提现",
-          "pathName": "pages/walletdetails",
-          "query": "null",
-          "scene": null
-        },
-        {
-          "name": "pages/addBlessing",
-          "pathName": "pages/addBlessing",
-          "query": "null",
-          "scene": null
+    "setting": {},
+    "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": "toUserId=1&toName=官方店铺",
+                    "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=83930"
+                },
+                {
+                    "id": -1,
+                    "name": "新增地址",
+                    "pathName": "/pages/receiving",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "首页",
+                    "pathName": "/pages/Home",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "拼箱详情",
+                    "pathName": "/pages/details",
+                    "query": "id=15441",
+                    "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
+                },
+                {
+                    "name": "店铺首页",
+                    "pathName": "/pages/store/homePage",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "直播商品",
+                    "pathName": "/pages/store/liveProduct",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "申请退款",
+                    "pathName": "/pages/Apply",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "退款详情",
+                    "pathName": "/pages/Applydetails",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "我卖出的",
+                    "pathName": "pages/allsellout",
+                    "query": "null",
+                    "scene": null
+                },
+                {
+                    "name": "新增商品",
+                    "pathName": "pages/store/productEdit",
+                    "query": "null",
+                    "scene": null
+                },
+                {
+                    "name": "提现",
+                    "pathName": "pages/walletdetails",
+                    "query": "null",
+                    "scene": null
+                },
+                {
+                    "name": "pages/addBlessing",
+                    "pathName": "pages/addBlessing",
+                    "query": "null",
+                    "scene": null
+                }
+            ]
         }
-      ]
     }
-  }
-}
+}

+ 9 - 7
src/pages/orderdetails.vue

@@ -10,9 +10,8 @@
         <div class="box-top">
             <p>{{ status.label }}</p>
             <h3 v-if="status.orderStatus == 'CREATED'">
-                <!-- 请尽快支付,<span v-if="minters < 10">0</span>{{ minters }}分<span v-if="seconds < 10">0</span
-                >{{ seconds }} 后未支付将自动取消订单 -->
-                请尽快支付,五分钟后未支付将自动取消订单
+                请尽快支付,<span v-if="minters < 10">0</span>{{ minters }}分<span v-if="seconds < 10">0</span
+                >{{ seconds }} 后未支付将自动取消订单
             </h3>
             <h3 v-else>{{ status.name }}</h3>
         </div>
@@ -288,20 +287,23 @@ export default {
             let matchedTime1 = undefined;
             if (oldTime) {
                 matchedTime = newTime - oldTime;
+                console.log(matchedTime);
                 matchedTime1 = this.allTime - parseInt(matchedTime / 1000);
+                console.log(matchedTime1);
                 if (matchedTime1 > 0) {
-                    // this.timeout(matchedTime1);
+                    this.timeout2(matchedTime1);
+                    console.log(matchedTime1);
                 } else {
                     console.log('暂停了');
                     // this.getFn();
                 }
             } else {
                 if (dingdanId) {
-                    this.timeout(this.allTime);
+                    this.timeout2(this.allTime);
                 }
             }
         },
-        timeout(time) {
+        timeout2(time) {
             console.log(time);
             let _this = this;
             _this.minters = parseInt(time / 60) > 0 ? parseInt(time / 60) : 0;
@@ -369,7 +371,7 @@ export default {
                     }
                     if (this.status.orderStatus === 'CREATED') {
                         this.status.label = '待支付';
-                        // this.initTime(this.orderInfoId, this.status.createdAt);
+                        this.initTime(this.orderInfoId, this.status.createdAt);
                     }
                     if (this.status.orderStatus === 'CANCELED') {
                         this.status.label = '已取消';