diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/api/cart.js b/api/cart.js index 6bb1692..66c76b2 100644 --- a/api/cart.js +++ b/api/cart.js @@ -48,3 +48,12 @@ export function getSettleList(data) { data, }); } + +// 结算下单 +export function settle(data) { + return request({ + url: "/cart/settle", + method: "post", + data, + }); +} \ No newline at end of file diff --git a/api/common.js b/api/common.js index 47cd0de..5e2b14b 100644 --- a/api/common.js +++ b/api/common.js @@ -1,9 +1,11 @@ import request from '@/utils/request.js'; // 引入封装的方法 +import { APPID } from '@/utils/config.js'; // 获取短信验证码 export function getUserList(data) { // return request.post('/common/getSmsCode',qs.stringify(params)); + data.appId = APPID; return request({ url: "/common/getSmsCode", method: "post", @@ -13,11 +15,18 @@ export function getUserList(data) { // 查询级联地区 export function getCascadeRegion(data) { - // return request.post('/common/getSmsCode',qs.stringify(params)); return request({ url: "/common/getCascadeRegion", method: "get", data, }); } - \ No newline at end of file + + // 查询级联类目 + export function getCascadeCategory(data) { + return request({ + url: "/common/getCascadeCategory", + method: "get", + data, + }); + } \ No newline at end of file diff --git a/api/login.js b/api/login.js deleted file mode 100644 index c378eaf..0000000 --- a/api/login.js +++ /dev/null @@ -1,16 +0,0 @@ -import request from '@/utils/request.js'; -import qs from "qs"; - - -/** - * 登录(SMS) - * @param {Object} params - */ -export function loginbysms(params) { - return request({ - url: "/auth/loginbysms", - method: "post", - data:params, - }); -} - \ No newline at end of file diff --git a/api/product.js b/api/product.js index 4e5f0fb..2b1c7b5 100644 --- a/api/product.js +++ b/api/product.js @@ -1,5 +1,4 @@ import request from '@/utils/request.js'; -import qs from "qs"; import {getStorageFun,TOKEN_NAME} from '@/utils/auth.js'; /** diff --git a/common.scss b/common.scss index 904a24b..81c2d34 100644 --- a/common.scss +++ b/common.scss @@ -228,6 +228,7 @@ display: grid; justify-content: center; margin-top: 220rpx; + width: 100%; .not_order_warp_img{ text-align: center; } @@ -337,6 +338,7 @@ .product_item_right{ margin-left: 20rpx; display: grid; + width: calc(100% - 194rpx); .title_warp{ font-weight: bold; font-size: 28rpx; @@ -361,7 +363,8 @@ font-size: 22rpx; } .price_zq_warp{ - width: 50%; + width: 300rpx; + text-align: center; border-radius: 8rpx; font-weight: bold; font-size: 20rpx; diff --git a/common/classify.data.js b/common/classify.data.js index cb4f75a..88716dc 100644 --- a/common/classify.data.js +++ b/common/classify.data.js @@ -1,181 +1,181 @@ export default[ { - "name": "女装", - "foods": [ - { - "name": "A字裙", - "key": "A字裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg", - "cat": 10 - }, - { - "name": "T恤", - "key": "T恤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/2.jpg", - "cat": 10 - }, - { - "name": "半身裙", - "key": "半身裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/3.jpg", - "cat": 10 - }, - { - "name": "衬衫", - "key": "衬衫", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/4.jpg", - "cat": 10 - }, - { - "name": "短裙", - "key": "短裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg", - "cat": 10 - }, - { - "name": "阔腿裤", - "key": "阔腿裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/6.jpg", - "cat": 10 - }, - { - "name": "连衣裙", - "key": "连衣裙", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/7.jpg", - "cat": 10 - }, - { - "name": "妈妈装", - "key": "妈妈装", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg", - "cat": 10 - }, - { - "name": "牛仔裤", - "key": "牛仔裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg", - "cat": 10 - }, - { - "name": "情侣装", - "key": "情侣装", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg", - "cat": 10 - }, - { - "name": "休闲裤", - "key": "休闲裤", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/11.jpg", - "cat": 10 - }, - { - "name": "雪纺衫", - "key": "雪纺衫", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/12.jpg", - "cat": 10 - }, - { - "name": "防晒衣", - "key": "防晒衣", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/13.jpg", - "cat": 10 - }, - { - "name": "礼服/婚纱", - "key": "礼服婚纱", - "icon": "https://cdn.uviewui.com/uview/common/classify/1/14.jpg", - "cat": 10 - } - ] + "name": "女装", + "foods": [ + { + "name": "A字裙", + "key": "A字裙", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg", + "cat": 10 + }, + { + "name": "T恤", + "key": "T恤", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/2.jpg", + "cat": 10 + }, + { + "name": "半身裙", + "key": "半身裙", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/3.jpg", + "cat": 10 + }, + { + "name": "衬衫", + "key": "衬衫", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/4.jpg", + "cat": 10 + }, + { + "name": "短裙", + "key": "短裙", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg", + "cat": 10 + }, + { + "name": "阔腿裤", + "key": "阔腿裤", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/6.jpg", + "cat": 10 + }, + { + "name": "连衣裙", + "key": "连衣裙", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/7.jpg", + "cat": 10 + }, + { + "name": "妈妈装", + "key": "妈妈装", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg", + "cat": 10 + }, + { + "name": "牛仔裤", + "key": "牛仔裤", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg", + "cat": 10 + }, + { + "name": "情侣装", + "key": "情侣装", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg", + "cat": 10 + }, + { + "name": "休闲裤", + "key": "休闲裤", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/11.jpg", + "cat": 10 + }, + { + "name": "雪纺衫", + "key": "雪纺衫", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/12.jpg", + "cat": 10 + }, + { + "name": "防晒衣", + "key": "防晒衣", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/13.jpg", + "cat": 10 + }, + { + "name": "礼服/婚纱", + "key": "礼服婚纱", + "icon": "https://cdn.uviewui.com/uview/common/classify/1/14.jpg", + "cat": 10 + } + ] }, { - "name": "美食", - "foods": [ - { - "name": "火锅", - "key": "火锅", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/1.jpg", - "cat": 6 - }, - { - "name": "糕点饼干", - "key": "糕点饼干", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/2.jpg", - "cat": 6 - }, - { - "name": "坚果果干", - "key": "坚果果干", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/3.jpg", - "cat": 6 - }, - { - "name": "酒类", - "key": "酒类", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/4.jpg", - "cat": 6 - }, - { - "name": "辣条", - "key": "辣条", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/5.jpg", - "cat": 6 - }, - { - "name": "大礼包", - "key": "大礼包", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/6.jpg", - "cat": 6 - }, - { - "name": "精品茗茶", - "key": "茶", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/7.jpg", - "cat": 6 - }, - { - "name": "休闲食品", - "key": "休闲食品", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/8.jpg", - "cat": 6 - }, - { - "name": "糖果巧克力", - "key": "糖果巧克力", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/9.jpg", - "cat": 6 - }, - { - "name": "方便速食", - "key": "方便速食", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/10.jpg", - "cat": 6 - }, - { - "name": "营养代餐", - "key": "营养代餐", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/11.jpg", - "cat": 6 - }, - { - "name": "粮油副食", - "key": "粮油", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/12.jpg", - "cat": 6 - }, - { - "name": "生鲜水果", - "key": "水果", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/13.jpg", - "cat": 6 - }, - { - "name": "饮品", - "key": "饮品", - "icon": "https://cdn.uviewui.com/uview/common/classify/2/14.jpg", - "cat": 6 - } - ] + "name": "美食", + "foods": [ + { + "name": "火锅", + "key": "火锅", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/1.jpg", + "cat": 6 + }, + { + "name": "糕点饼干", + "key": "糕点饼干", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/2.jpg", + "cat": 6 + }, + { + "name": "坚果果干", + "key": "坚果果干", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/3.jpg", + "cat": 6 + }, + { + "name": "酒类", + "key": "酒类", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/4.jpg", + "cat": 6 + }, + { + "name": "辣条", + "key": "辣条", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/5.jpg", + "cat": 6 + }, + { + "name": "大礼包", + "key": "大礼包", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/6.jpg", + "cat": 6 + }, + { + "name": "精品茗茶", + "key": "茶", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/7.jpg", + "cat": 6 + }, + { + "name": "休闲食品", + "key": "休闲食品", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/8.jpg", + "cat": 6 + }, + { + "name": "糖果巧克力", + "key": "糖果巧克力", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/9.jpg", + "cat": 6 + }, + { + "name": "方便速食", + "key": "方便速食", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/10.jpg", + "cat": 6 + }, + { + "name": "营养代餐", + "key": "营养代餐", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/11.jpg", + "cat": 6 + }, + { + "name": "粮油副食", + "key": "粮油", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/12.jpg", + "cat": 6 + }, + { + "name": "生鲜水果", + "key": "水果", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/13.jpg", + "cat": 6 + }, + { + "name": "饮品", + "key": "饮品", + "icon": "https://cdn.uviewui.com/uview/common/classify/2/14.jpg", + "cat": 6 + } + ] }, { "name": "美妆", diff --git a/package-lock.json b/package-lock.json index ef95296..57588ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,106 +1,445 @@ { "name": "Hello i18n", "version": "1.0.2", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "Hello i18n", + "version": "1.0.2", + "dependencies": { + "axios": "0.27.2", + "axios-adapter-uniapp": "^0.1.4", + "axios-miniprogram-adapter": "^0.3.4", + "dayjs": "^1.11.13", + "qs": "^6.14.0" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "0.27.2", + "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "dependencies": { + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" + } + }, + "node_modules/axios-adapter-uniapp": { + "version": "0.1.4", + "resolved": "https://registry.npmmirror.com/axios-adapter-uniapp/-/axios-adapter-uniapp-0.1.4.tgz", + "integrity": "sha512-4je5JcWGrrTjPEJXVXJZnOkv+BsnYn/fKbQmjxzdCGFyoQw1gq3tfQ4/WhLzy+Gi9cQJl3K8EH26G7U0BK3wcw==", + "dependencies": { + "axios": "^0.27.2" + } + }, + "node_modules/axios-miniprogram-adapter": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/axios-miniprogram-adapter/-/axios-miniprogram-adapter-0.3.5.tgz", + "integrity": "sha512-ZAudH+aTi0QPIy8IQm26F0nxKoTFa/mNhDfxGkG5ndsQe4RVnyyb6f50tIT13nHtNepAjZo9i+UGmTbke5+lbQ==", + "dependencies": { + "axios": "^0.19.2" + } + }, + "node_modules/axios-miniprogram-adapter/node_modules/axios": { + "version": "0.19.2", + "resolved": "https://registry.npmmirror.com/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410", + "dependencies": { + "follow-redirects": "1.5.10" + } + }, + "node_modules/axios-miniprogram-adapter/node_modules/follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "dependencies": { + "debug": "=3.1.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/dayjs": { + "version": "1.11.13", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" + }, + "node_modules/debug": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.2", + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + } + }, "dependencies": { - "@ctrl/tinycolor": { - "version": "3.6.1", - "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz", - "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==" - }, - "@element-plus/icons-vue": { - "version": "2.3.1", - "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz", - "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==" - }, - "@floating-ui/core": { - "version": "1.6.9", - "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.9.tgz", - "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==", - "requires": { - "@floating-ui/utils": "^0.2.9" - } - }, - "@floating-ui/dom": { - "version": "1.6.13", - "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.6.13.tgz", - "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==", - "requires": { - "@floating-ui/core": "^1.6.0", - "@floating-ui/utils": "^0.2.9" - } - }, - "@floating-ui/utils": { - "version": "0.2.9", - "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.9.tgz", - "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==" - }, - "@popperjs/core": { - "version": "2.11.7", - "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", - "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" - }, - "@types/lodash": { - "version": "4.17.16", - "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.16.tgz", - "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==" - }, - "@types/lodash-es": { - "version": "4.17.12", - "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz", - "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", - "requires": { - "@types/lodash": "*" - } - }, - "@types/web-bluetooth": { - "version": "0.0.16", - "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz", - "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==" - }, - "@vueuse/core": { - "version": "9.13.0", - "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz", - "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==", - "requires": { - "@types/web-bluetooth": "^0.0.16", - "@vueuse/metadata": "9.13.0", - "@vueuse/shared": "9.13.0", - "vue-demi": "*" - } - }, - "@vueuse/metadata": { - "version": "9.13.0", - "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz", - "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==" - }, - "@vueuse/shared": { - "version": "9.13.0", - "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz", - "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==", - "requires": { - "vue-demi": "*" - } - }, - "async-validator": { - "version": "4.2.5", - "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz", - "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==" - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "axios": { - "version": "1.8.3", - "resolved": "https://registry.npmmirror.com/axios/-/axios-1.8.3.tgz", - "integrity": "sha512-iP4DebzoNlP/YN2dpwCgb8zoCmhtkajzS48JvwmkSkXvPI3DHc7m+XYL5tGnSlJtR6nImXZmdCuN5aP8dh1d8A==", + "version": "0.27.2", + "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "requires": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" } }, "axios-adapter-uniapp": { @@ -109,17 +448,6 @@ "integrity": "sha512-4je5JcWGrrTjPEJXVXJZnOkv+BsnYn/fKbQmjxzdCGFyoQw1gq3tfQ4/WhLzy+Gi9cQJl3K8EH26G7U0BK3wcw==", "requires": { "axios": "^0.27.2" - }, - "dependencies": { - "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", - "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" - } - } } }, "axios-miniprogram-adapter": { @@ -231,11 +559,6 @@ "hasown": "^2.0.2" } }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, "follow-redirects": { "version": "1.15.9", "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz", @@ -309,31 +632,11 @@ "function-bind": "^1.1.2" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "lodash-es": { - "version": "4.17.21", - "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" - }, - "lodash-unified": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" - }, "math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" }, - "memoize-one": { - "version": "6.0.0", - "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz", - "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" - }, "mime-db": { "version": "1.52.0", "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", @@ -352,21 +655,11 @@ "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "normalize-wheel-es": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz", - "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==" - }, "object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==" }, - "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, "qs": { "version": "6.14.0", "resolved": "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz", @@ -418,11 +711,6 @@ "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } - }, - "vue-demi": { - "version": "0.14.10", - "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz", - "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==" } } } diff --git a/pages.json b/pages.json index 6e55b8e..f4a886b 100644 --- a/pages.json +++ b/pages.json @@ -244,6 +244,13 @@ "enablePullDownRefresh": false, "navigationStyle": "default" // 默认样式，会显示返回图标 } + }, + { + "path" : "pages/LuckyWheel/LuckyWheel", + "style" : + { + "navigationBarTitleText" : "" + } } ], "tabBar": { diff --git a/pages/home/home.vue b/pages/home/home.vue index 040001f..d7af536 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -29,7 +29,7 @@ - + @@ -55,16 +55,17 @@ + - {{item.name}} - 优选价 99元 + {{item.title}} + 优选价 {{item.price}}元 - + @@ -77,17 +78,18 @@ - + + - {{item.name}} - 优选价 99元 + {{item.title}} + 优选价 {{item.price}}元 - + @@ -134,6 +136,8 @@ @@ -378,12 +391,13 @@ padding: 20rpx; border-radius: 24rpx; display: flex; - justify-content: space-between; + // justify-content: space-between; align-items: center; .product_item{ width: 32%; border-radius: 16rpx; position: relative; + margin-right: 20rpx; } .product_f_item{ position: absolute; diff --git a/pages/login/login.vue b/pages/login/login.vue index 97d8027..1ca8b55 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -55,7 +55,8 @@ 验证码登录 @@ -90,7 +91,7 @@ import InputCodeComm from '@/components/code-comm/code-comm.vue'; import { SMS_TYPE } from '@/utils/enumUtils.js'; import { getUserList } from '@/api/common.js'; - import { loginbysms } from '@/api/login.js'; + import { loginbysms,loginbypw } from '@/api/auth.js'; import { setStorageFun,TOKEN_NAME,USER_KEY,USER_DATA,USER_LOGIN_TIME } from '@/utils/auth.js'; export default { @@ -115,6 +116,7 @@ isShow:false,// 是否显示 isPolicy:false,// 是否同意 countdown:false,// 清空倒计时 + butLoading:false, } }, methods: { @@ -142,9 +144,12 @@ }); return; } + this.butLoading=true; let response={}; if(this.loginWay === 'password'){ - + params.mobile = form.name; + params.password = form.password; + response = await loginbypw(params); }else{ params.mobile = form.name; params.smsCode = form.code; @@ -158,24 +163,28 @@ avatar:data.avatarUrl, name: data.name, userId: data.userId, + grade:data.grade, + inviteCode:data.inviteCode, }; setStorageFun(USER_DATA,userInfo); // 当前登录得时间戳 let currentTimeStamp = new Date().getTime(); setStorageFun(USER_LOGIN_TIME,currentTimeStamp); + this.butLoading=false; this.$refs.uToastRef.show({ type: 'success', message: response.msg, }); + setTimeout(()=>{ then.jumpHome(); },2000); }, checkNameParam(val){ - console.log("val",val); + // console.log("val",val); }, checkParam(val){ - console.log("val",val); + // console.log("val",val); }, /** * 获取手机验证码 @@ -196,6 +205,7 @@ type:SMS_TYPE.LOGIN, } const response = await getUserList(params); + console.log("responseresponseresponse",response); if(response && response.bizcode === 100){ this.$refs.uToastRef.show({ type: 'success', @@ -243,6 +253,8 @@ font-size: 32rpx; color: #999999; padding: 28rpx 0; + display: flex; + justify-content: center; } .login_comm_but_yes{ background: $app-bt-bj; diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 0d161ca..f8f721e 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -9,8 +9,8 @@ - ID:{{userData.userId}} - + ID:{{userData.inviteCode}} + @@ -114,8 +114,8 @@ url:'/static/mine/order_notReceive.png', path:"/pages/mine_order/mine_order" },{ - id:ORDER_TYPE.AFTER_SALE, - title:"退款售后", + id:ORDER_TYPE.SUCCEED, + title:"待评价", url:'/static/mine/order_afterSale.png', path:"/pages/mine_order/mine_order" }, @@ -214,8 +214,6 @@ let path = '/pages/mine_order/mine_order' if(item && Object.keys(item).length!==0){ path = '/pages/mine_order/mine_order?type='+item.id - }else{ - path = '/pages/mine_order/mine_order?type=0'; } uni.navigateTo({ url:path, diff --git a/pages/mine_address/mine_address.vue b/pages/mine_address/mine_address.vue index a3e6bd7..9874206 100644 --- a/pages/mine_address/mine_address.vue +++ b/pages/mine_address/mine_address.vue @@ -28,7 +28,7 @@ - 暂时地址，快去添加吧~ + 暂无地址，快去添加吧~ 新增地址 diff --git a/pages/mine_order/mine_order.vue b/pages/mine_order/mine_order.vue index d1cd4fe..b55d9d0 100644 --- a/pages/mine_order/mine_order.vue +++ b/pages/mine_order/mine_order.vue @@ -6,7 +6,7 @@ - - {{item.name}} + + {{item.shopName}} {{getValue(ORDER_STATUS,item.status)}} @@ -33,41 +33,41 @@ 等待付款 - {{item.paymentTime}}分钟 + {{item.expireTime}}分钟 - - + + {{pItem.title}} - {{pItem.tag.join(" ")}} - + {{pItem.goodsSpece}} + - ￥{{pItem.total}} - x{{pItem.quantity}} + ￥{{pItem.goodsAmount}} + x{{pItem.buyNum}} - 共1件,合计￥3599 + 共{{item.buyNum}}件,合计￥{{item.sumAmount}} 取消订单 去付款 - 申请退款 + 确认收货 - 提醒发货 - 申请售后 - 查看售后 - 删除记录 - 再次购买 + + + + + @@ -118,6 +118,7 @@ diff --git a/pages/productInfo/productInfo.vue b/pages/productInfo/productInfo.vue index c16a084..8f807b8 100644 --- a/pages/productInfo/productInfo.vue +++ b/pages/productInfo/productInfo.vue @@ -96,13 +96,17 @@ - + 首页 - + 咨询 + + + 购物车 + 加入购物车 @@ -111,7 +115,7 @@ { - console.log("item",item); optionArr.push({ type:item.type, items:item.items, @@ -373,9 +369,7 @@ } this.orderInfo.quantity = currentQuantity; }, - /** - * 立即购买，确定订单页面 - */ + // 立即购买，确定订单页面 byFun(){ // 先加入购物车，再去购买 this.addCart(); @@ -383,9 +377,7 @@ url: '/pages/order_submit/order_submit', }) }, - /** - * 加入购入车 - */ + // 加入购入车 async addCart(){ const selectTempl = this.selectSpecificationTempl; if(!selectTempl || Object.keys(selectTempl).length ===0){ @@ -546,7 +538,7 @@ .product_but_left{ display: flex; justify-content: space-between; - width: 30%; + width: 36%; .left_item{ width: 50%; text-align: center; diff --git a/pages/register/register.vue b/pages/register/register.vue index 80ae476..82e4b8a 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -14,12 +14,12 @@ - + -