diff --git a/components/CountDown.vue b/components/CountDown.vue index a314cd1..50fdd7a 100644 --- a/components/CountDown.vue +++ b/components/CountDown.vue @@ -78,7 +78,7 @@ export default { }, methods: { show_time() { - console.log(this.datatime) + console.log(this.datatime,'==========================') console.log('sdfasdgasdgad', this.time) if (this.time.toString().length == 13) { // 毫秒级 diff --git a/pages.json b/pages.json index d1aff5e..c0ceb4f 100644 --- a/pages.json +++ b/pages.json @@ -517,7 +517,27 @@ "navigationStyle": "custom" } } - ], + ,{ + "path" : "pages/user/Problem/index", + "style" : + { + "navigationBarTitleText": "常见问题", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, + { + "path" : "pages/user/AboutUs/index", + "style" : + { + "navigationBarTitleText": "关于我们", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + } + ], "easycom": { "autoscan": true, "custom": { diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 37ccd87..4426147 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -381,6 +381,7 @@ export default { let url = handleQrCode() if (!url) { url = handleUrlParam(getCurrentPageUrlWithArgs()) + console.log(url,'================-'); } const token = cookie.get('login_status') diff --git a/pages/user/AboutUs/index.vue b/pages/user/AboutUs/index.vue new file mode 100644 index 0000000..6485cce --- /dev/null +++ b/pages/user/AboutUs/index.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/pages/user/Problem/index.vue b/pages/user/Problem/index.vue new file mode 100644 index 0000000..12555f8 --- /dev/null +++ b/pages/user/Problem/index.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue index 5f804e2..185f3b1 100644 --- a/pages/user/User/index.vue +++ b/pages/user/User/index.vue @@ -264,7 +264,7 @@ export default { name: "关于我们", enName: "ABOUT US", pic: "../../../static/images/about-us.png", - uniapp_url: "/pages/user/address/AddressManagement/index" + uniapp_url: "/pages/user/AboutUs/index" } ], MyMenus2: [ @@ -272,7 +272,7 @@ export default { name: "常见问题", enName: "Q&A", pic: "../../../static/images/Q&A.png", - uniapp_url: "/pages/user/address/AddressManagement/index" + uniapp_url: "/pages/user/Problem/index" }, { name: "联系客服", diff --git a/static/images/guanyu.jpg b/static/images/guanyu.jpg new file mode 100644 index 0000000..87d7cfc Binary files /dev/null and b/static/images/guanyu.jpg differ diff --git a/static/images/picker-down.png b/static/images/picker-down.png new file mode 100644 index 0000000..04a80e8 Binary files /dev/null and b/static/images/picker-down.png differ diff --git a/static/images/picker-up.png b/static/images/picker-up.png new file mode 100644 index 0000000..866fff6 Binary files /dev/null and b/static/images/picker-up.png differ