diff --git a/.cursor/rules/md.mdc b/.cursor/rules/md.mdc index 4eab25e..2372112 100644 --- a/.cursor/rules/md.mdc +++ b/.cursor/rules/md.mdc @@ -3,4 +3,7 @@ description: globs: alwaysApply: false --- -请你写代码之前先查看一下README.md文件，按照这个文件中说的写 \ No newline at end of file +请你写代码之前先查看一下README.md文件，按照这个文件中说的写 + + +## 对接接口的时候，请你先仔细看一下根目录apijson.json文件，这个是接口文档的数据 \ No newline at end of file diff --git a/App.vue b/App.vue index cc1058b..ff5e1c7 100644 --- a/App.vue +++ b/App.vue @@ -3,7 +3,10 @@ onLaunch: function() { }, onShow: function() { - // this.$store.commit('initConfig') + this.$store.commit('initConfig') + if(uni.getStorageSync('token')){ + this.$store.commit('getQrCode') + } }, onHide: function() { } diff --git a/api/api.js b/api/api.js index 1293351..061bea8 100644 --- a/api/api.js +++ b/api/api.js @@ -14,7 +14,7 @@ const config = { // limit : 1000 // }, - getConfig : {url : '/config_common/getConfig', method : 'GET', limit : 500}, + getConfig : {url : '/conf/getConfig', method : 'GET', limit : 500}, } diff --git a/api/model/index.js b/api/model/index.js index 9ec5e2e..3863380 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -1,6 +1,4 @@ - - -// 登录相关接口 +// 接口 const api = { // 获取banner @@ -23,6 +21,98 @@ const api = { url: '/index/getProductList', method: 'GET', }, + // 创建订单 + createOrder: { + url: '/index/createOrder', + method: 'POST', + limit : 1000, + }, + // 支付订单 + payOrder: { + url: '/index/payOrder', + method: 'POST', + }, + // 快捷下单 + addOrder: { + url: '/index/addOrder', + method: 'POST', + limit : 1000, + }, + // 获取快捷下单信息 + getOrderInfo: { + url: '/index/getOrderInfo', + method: 'GET', + }, + // 获取订单列表 + getOrderPageBean: { + url: '/order/getOrderPageBean', + method: 'GET', + }, + // 获取订单详情 + getOrderInfoById: { + url: '/order/getOrderInfo', + method: 'GET', + }, + // 确认收货 + confirmOrder: { + url: '/order/confirmOrder', + method: 'POST', + limit : 1000, + }, + // 再次支付 + payOrderAgain: { + url: '/order/payOrder', + method: 'POST', + limit : 1000, + }, + // 更新用户信息 + updateUserInfo: { + url: '/info/updateUserInfo', + method: 'POST', + }, + // 获取地址列表 + getAddressList: { + url: '/info/getAddressList', + method: 'GET', + }, + // 获取地址详情 + getAddressInfo: { + url: '/info/getAddressInfo', + method: 'GET', + }, + // 保存或更新地址 + saveOrUpdateAddress: { + url: '/info/saveOrUpdateAddress', + method: 'POST', + limit : 1000, + }, + // 删除地址 + deleteAddress: { + url: '/info/deleteAddress', + method: 'POST', + }, + // 获取流水日志 + getLogList: { + url: '/info/getLogList', + method: 'GET', + }, + // 获取团队列表 + getTeamList: { + url: '/info/getTeamList', + method: 'GET', + }, + // 提现 + openMoney: { + url: '/info/openMoney', + method: 'POST', + limit : 1000, + }, + // 添加帮助 + addHelp: { + url: '/info/addHelp', + method: 'POST', + limit : 1000, + }, } export default api \ No newline at end of file diff --git a/api/model/login.js b/api/model/login.js index 3ff9999..9ce1d53 100644 --- a/api/model/login.js +++ b/api/model/login.js @@ -11,13 +11,13 @@ const api = { }, // 获取绑定手机号码 bindPhone: { - url: '/login_common/bindPhone', + url: '/all_login/bindPhone', method: 'GET', auth: true, }, // 修改个人信息接口 updateInfo: { - url: '/info_common/updateInfo', + url: '/info/updateUserInfo', method: 'POST', auth: true, limit : 500, @@ -25,7 +25,7 @@ const api = { }, // 获取个人信息 getInfo: { - url: '/info_common/getInfo', + url: '/info/getUserInfo', method: 'GET', auth: true, }, diff --git a/apijson.json b/apijson.json new file mode 100644 index 0000000..5b59bde --- /dev/null +++ b/apijson.json @@ -0,0 +1,1931 @@ +{ + "swagger": "2.0", + "info": { + "description": "后台API接口", + "version": "1.0", + "title": "后台服务API接口文档", + "contact": { + "name": "*********有限公司", + "url": "*********有限公司", + "email": "*********@qq.com" + } + }, + "host": "h5.xzaiyp.top", + "tags": [ + { + "name": "个人中心", + "x-order": "2147483647" + }, + { + "name": "公共配置接口", + "x-order": "2147483647" + }, + { + "name": "授权登录", + "x-order": "2147483647" + }, + { + "name": "订单接口", + "x-order": "2147483647" + }, + { + "name": "首页接口", + "x-order": "2147483647" + } + ], + "paths": { + "/building-admin/all_login/appletLogin": { + "get": { + "tags": [ + "授权登录" + ], + "summary": "微信小程序授权登录", + "description": "微信小程序授权登录", + "operationId": "appletLoginUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "code", + "in": "query", + "description": "参数信息", + "required": false, + "type": "string" + }, + { + "name": "encryptedData", + "in": "query", + "description": "解密", + "required": false, + "type": "string" + }, + { + "name": "headimgurl", + "in": "query", + "description": "用户头像", + "required": false, + "type": "string" + }, + { + "name": "id", + "in": "query", + "description": "标识", + "required": false, + "type": "string" + }, + { + "name": "iv", + "in": "query", + "description": "解密标签", + "required": false, + "type": "string" + }, + { + "name": "nickName", + "in": "query", + "description": "用户姓名", + "required": false, + "type": "string" + }, + { + "name": "openid", + "in": "query", + "description": "用户唯一标识", + "required": false, + "type": "string" + }, + { + "name": "session_key", + "in": "query", + "description": "会话密钥", + "required": false, + "type": "string" + }, + { + "name": "shareId", + "in": "query", + "description": "邀请者销售标识", + "required": false, + "type": "string" + }, + { + "name": "state", + "in": "query", + "description": "类型", + "required": false, + "type": "string" + }, + { + "name": "vid", + "in": "query", + "description": "参数信息", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/all_login/bindPhone": { + "get": { + "tags": [ + "授权登录" + ], + "summary": "绑定手机号码", + "description": "绑定手机号码", + "operationId": "bindPhoneUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "code", + "in": "query", + "description": "code", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/conf/getConfig": { + "get": { + "tags": [ + "公共配置接口" + ], + "summary": "获取平台基础配置", + "description": "获取平台基础配置", + "operationId": "getConfigUsingGET", + "produces": [ + "*/*" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/addOrder": { + "post": { + "tags": [ + "首页接口" + ], + "summary": "快捷下单-拍照下单/语音下单", + "description": "快捷下单-拍照下单/语音下单", + "operationId": "addOrderUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "createBy", + "in": "query", + "description": "创建人", + "required": false, + "type": "string" + }, + { + "name": "createTime", + "in": "query", + "description": "创建日期", + "required": false, + "type": "string", + "format": "date-time" + }, + { + "name": "id", + "in": "query", + "description": "主键", + "required": false, + "type": "string" + }, + { + "name": "imageUrl", + "in": "query", + "description": "内容图片", + "required": false, + "type": "string" + }, + { + "name": "isPay", + "in": "query", + "description": "是否支付", + "required": false, + "type": "string" + }, + { + "name": "shopId", + "in": "query", + "description": "推荐商品", + "required": false, + "type": "string" + }, + { + "name": "status", + "in": "query", + "description": "审核状态", + "required": false, + "type": "string" + }, + { + "name": "type", + "in": "query", + "description": "类型", + "required": false, + "type": "string" + }, + { + "name": "updateBy", + "in": "query", + "description": "更新人", + "required": false, + "type": "string" + }, + { + "name": "updateTime", + "in": "query", + "description": "更新日期", + "required": false, + "type": "string", + "format": "date-time" + }, + { + "name": "userId", + "in": "query", + "description": "提交用户", + "required": false, + "type": "string" + }, + { + "name": "voiceUrl", + "in": "query", + "description": "语音图片", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/createOrder": { + "post": { + "tags": [ + "首页接口" + ], + "summary": "创建订单", + "description": "创建订单", + "operationId": "createOrderUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "addressId", + "in": "query", + "description": "addressId", + "required": false, + "type": "string" + }, + { + "name": "payType", + "in": "query", + "description": "payType", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "productId", + "in": "query", + "description": "productId", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/getBanner": { + "get": { + "tags": [ + "首页接口" + ], + "summary": "获取banner", + "description": "获取banner", + "operationId": "getBannerUsingGET", + "produces": [ + "*/*" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/getIcon": { + "get": { + "tags": [ + "首页接口" + ], + "summary": "获取金刚区icon", + "description": "获取金刚区icon", + "operationId": "getIconUsingGET", + "produces": [ + "*/*" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/getOrderInfo": { + "get": { + "tags": [ + "首页接口" + ], + "summary": "根据用户登录信息获取当前是否有快捷下单订单", + "description": "根据用户登录信息获取当前是否有快捷下单订单", + "operationId": "getOrderInfoUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/getProductDetail": { + "get": { + "tags": [ + "首页接口" + ], + "summary": "获取商品信息详情", + "description": "获取商品信息详情", + "operationId": "getProductDetailUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "productId", + "in": "query", + "description": "productId", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/getProductList": { + "get": { + "tags": [ + "首页接口" + ], + "summary": "获取建材商品信息列表", + "description": "获取建材商品信息列表", + "operationId": "getProductListUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "pageNo", + "in": "query", + "description": "当前页", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "pageSize", + "in": "query", + "description": "显示条数", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "shopClassId", + "in": "query", + "description": "shopClassId", + "required": false, + "type": "string" + }, + { + "name": "shopIconId", + "in": "query", + "description": "shopIconId", + "required": false, + "type": "string" + }, + { + "name": "title", + "in": "query", + "description": "搜索标题", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/index/payOrder": { + "post": { + "tags": [ + "首页接口" + ], + "summary": "立即支付", + "description": "立即支付", + "operationId": "payOrderUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "orderId", + "in": "query", + "description": "orderId", + "required": false, + "type": "string" + }, + { + "name": "type", + "in": "query", + "description": "type", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/addHelp": { + "post": { + "tags": [ + "个人中心" + ], + "summary": "添加帮助", + "description": "添加帮助", + "operationId": "addHelpUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "createBy", + "in": "query", + "description": "创建人", + "required": false, + "type": "string" + }, + { + "name": "createTime", + "in": "query", + "description": "创建日期", + "required": false, + "type": "string", + "format": "date-time" + }, + { + "name": "id", + "in": "query", + "description": "主键", + "required": false, + "type": "string" + }, + { + "name": "image", + "in": "query", + "description": "问题截图", + "required": false, + "type": "string" + }, + { + "name": "name", + "in": "query", + "description": "姓名", + "required": false, + "type": "string" + }, + { + "name": "phone", + "in": "query", + "description": "联系方式", + "required": false, + "type": "string" + }, + { + "name": "title", + "in": "query", + "description": "描述内容", + "required": false, + "type": "string" + }, + { + "name": "updateBy", + "in": "query", + "description": "更新人", + "required": false, + "type": "string" + }, + { + "name": "updateTime", + "in": "query", + "description": "更新日期", + "required": false, + "type": "string", + "format": "date-time" + }, + { + "name": "userId", + "in": "query", + "description": "提交用户", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/createQrCode": { + "get": { + "tags": [ + "个人中心" + ], + "summary": "创建二维码", + "description": "创建二维码", + "operationId": "createQrCodeUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/deleteAddress": { + "post": { + "tags": [ + "个人中心" + ], + "summary": "删除地址", + "description": "删除地址", + "operationId": "deleteAddressUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "id", + "in": "query", + "description": "id", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/getAddressInfo": { + "get": { + "tags": [ + "个人中心" + ], + "summary": "获取地址详情", + "description": "获取地址详情", + "operationId": "getAddressInfoUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "id", + "in": "query", + "description": "id", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/getAddressList": { + "get": { + "tags": [ + "个人中心" + ], + "summary": "获取地址列表", + "description": "获取地址列表", + "operationId": "getAddressListUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "pageNo", + "in": "query", + "description": "当前页", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "pageSize", + "in": "query", + "description": "显示条数", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "title", + "in": "query", + "description": "搜索标题", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/getLogList": { + "get": { + "tags": [ + "个人中心" + ], + "summary": "获取流水日志列表", + "description": "获取流水日志列表", + "operationId": "getLogListUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "pageNo", + "in": "query", + "description": "当前页", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "pageSize", + "in": "query", + "description": "显示条数", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "timeDate", + "in": "query", + "description": "timeDate", + "required": false, + "type": "string" + }, + { + "name": "title", + "in": "query", + "description": "搜索标题", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/getTeamList": { + "get": { + "tags": [ + "个人中心" + ], + "summary": "获取团队列表", + "description": "获取团队列表", + "operationId": "getTeamListUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "pageNo", + "in": "query", + "description": "当前页", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "pageSize", + "in": "query", + "description": "显示条数", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "state", + "in": "query", + "description": "state", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "title", + "in": "query", + "description": "搜索标题", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/getUserInfo": { + "get": { + "tags": [ + "个人中心" + ], + "summary": "获取用户信息", + "description": "获取用户信息", + "operationId": "getUserInfoUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/openMoney": { + "post": { + "tags": [ + "个人中心" + ], + "summary": "提现", + "description": "提现", + "operationId": "openMoneyUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "money", + "in": "query", + "description": "money", + "required": false, + "type": "number" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/saveOrUpdateAddress": { + "post": { + "tags": [ + "个人中心" + ], + "summary": "保存或修改地址", + "description": "保存或修改地址", + "operationId": "saveOrUpdateAddressUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "address", + "in": "query", + "description": "地址", + "required": false, + "type": "string" + }, + { + "name": "addressDetails", + "in": "query", + "description": "详细", + "required": false, + "type": "string" + }, + { + "name": "createBy", + "in": "query", + "description": "创建人", + "required": false, + "type": "string" + }, + { + "name": "createTime", + "in": "query", + "description": "创建日期", + "required": false, + "type": "string", + "format": "date-time" + }, + { + "name": "defaultFlag", + "in": "query", + "description": "默认", + "required": false, + "type": "string" + }, + { + "name": "id", + "in": "query", + "description": "主键", + "required": false, + "type": "string" + }, + { + "name": "latitude", + "in": "query", + "description": "经度", + "required": false, + "type": "string" + }, + { + "name": "longitude", + "in": "query", + "description": "纬度", + "required": false, + "type": "string" + }, + { + "name": "name", + "in": "query", + "description": "姓名", + "required": false, + "type": "string" + }, + { + "name": "phone", + "in": "query", + "description": "电话", + "required": false, + "type": "string" + }, + { + "name": "updateBy", + "in": "query", + "description": "更新人", + "required": false, + "type": "string" + }, + { + "name": "updateTime", + "in": "query", + "description": "更新日期", + "required": false, + "type": "string", + "format": "date-time" + }, + { + "name": "userId", + "in": "query", + "description": "用户", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/info/updateUserInfo": { + "post": { + "tags": [ + "个人中心" + ], + "summary": "修改用户信息", + "description": "修改用户信息", + "operationId": "updateUserInfoUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "headImage", + "in": "query", + "description": "headImage", + "required": false, + "type": "string" + }, + { + "name": "nickName", + "in": "query", + "description": "nickName", + "required": false, + "type": "string" + }, + { + "name": "phone", + "in": "query", + "description": "phone", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/order/confirmOrder": { + "post": { + "tags": [ + "订单接口" + ], + "summary": "确认收货", + "description": "确认收货", + "operationId": "confirmOrderUsingPOST", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "orderId", + "in": "query", + "description": "orderId", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/order/getOrderInfo": { + "get": { + "tags": [ + "订单接口" + ], + "summary": "获取订单详情", + "description": "获取订单详情", + "operationId": "getOrderInfoUsingGET_1", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "orderId", + "in": "query", + "description": "orderId", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/order/getOrderPageBean": { + "get": { + "tags": [ + "订单接口" + ], + "summary": "获取订单列表带分页", + "description": "获取订单列表带分页", + "operationId": "getOrderPageBeanUsingGET", + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "pageNo", + "in": "query", + "description": "当前页", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "pageSize", + "in": "query", + "description": "显示条数", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "status", + "in": "query", + "description": "status", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "title", + "in": "query", + "description": "搜索标题", + "required": false, + "type": "string" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + }, + "/building-admin/order/payOrder": { + "post": { + "tags": [ + "订单接口" + ], + "summary": "再次支付", + "description": "再次支付", + "operationId": "payOrderUsingPOST_1", + "consumes": [ + "application/json" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "orderId", + "in": "query", + "description": "orderId", + "required": false, + "type": "string" + }, + { + "name": "type", + "in": "query", + "description": "type", + "required": false, + "type": "integer", + "format": "int32" + }, + { + "name": "X-Access-Token", + "in": "header", + "description": "X-Access-Token", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/接口返回对象«object»", + "originalRef": "接口返回对象«object»" + } + }, + "201": { + "description": "Created" + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "security": [ + { + "X-Access-Token": [ + "global" + ] + } + ], + "x-order": "2147483647" + } + } + }, + "securityDefinitions": { + "X-Access-Token": { + "type": "apiKey", + "name": "X-Access-Token", + "in": "header" + } + }, + "definitions": { + "接口返回对象«object»": { + "type": "object", + "properties": { + "code": { + "type": "integer", + "format": "int32", + "description": "返回代码" + }, + "message": { + "type": "string", + "description": "返回处理消息" + }, + "result": { + "type": "object", + "description": "返回数据对象" + }, + "success": { + "type": "boolean", + "description": "成功标志" + }, + "timestamp": { + "type": "integer", + "format": "int64", + "description": "时间戳" + } + }, + "title": "接口返回对象«object»", + "description": "接口返回对象" + } + } +} \ No newline at end of file diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index 6135e05..f743fa4 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -17,14 +17,10 @@ @@ -196,7 +218,6 @@ } .head { - z-index: -1; display: flex; background-color: #DC2828; padding: 0rpx 20rpx; @@ -231,6 +252,11 @@ .name { font-size: 36rpx; color: #fff; + margin-right: 20rpx; + width: 240rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .tips { @@ -238,59 +264,31 @@ color: #fff; margin-top: 10rpx; } + + .login-btn { + margin-top: 20rpx; + background-color: #fff; + color: #DC2828; + padding: 10rpx 30rpx; + border-radius: 30rpx; + font-size: 28rpx; + display: inline-block; + width: 160rpx; + text-align: center; + } } .headBtn { - position: absolute; - left: 310rpx; - top: 175rpx; color: #FFF; font-size: 26rpx; - } - - .amend { - position: absolute; - left: 275rpx; - top: 180rpx; - } - } - - .userShop { - .userList { - .title { - font-size: 32rpx; - font-weight: 900; - padding: 20rpx; - } - - .list { - display: flex; - flex-wrap: wrap; - - .item { - width: 270rpx; - margin: 20rpx; - display: flex; - flex-direction: column; - padding: 40rpx 30rpx; - background-color: #fff; - border-radius: 30rpx; - line-height: 60rpx; - - .name {} - - .num { - color: $uni-color; - font-weight: 600; - font-size: 28rpx; - } - } - } + display: flex; + align-items: center; } } .user { - z-index: 99; + position: relative; + z-index: 9; margin: 0 30rpx; margin-top: -60rpx; .line { @@ -319,7 +317,6 @@ } .image-home{ z-index: 1; - height: 300rpx; width: 100%; } } @@ -346,6 +343,34 @@ width: 120rpx; font-size: 24rpx; } + + .share { + background: none; + padding: 0; + margin: 0; + line-height: normal; + border: none; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + + &::after { + border: none; + } + + .image { + width: 50rpx; + height: 50rpx; + margin: 20rpx 0; + } + + .grid-text { + text-align: center; + width: 120rpx; + font-size: 24rpx; + } + } } } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 4e137cd..8bb86e3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -26,65 +26,43 @@ - + - - - XX建材 - - - - - XX建材 - - - - - XX建材 - - - - - XX建材 + + + {{item.title}} + 热卖建材 - - - 你有一条新的快捷下单信息 - - - - 1 - - - - - + - + - 泰山工装石膏板 + {{item.name}} - + - ￥38.00元/米 + ￥{{item.price}}元/{{item.unit}} @@ -96,6 +74,18 @@ + + + + 你有一条新的快捷下单信息 + + + + 1 + + + + @@ -115,15 +105,27 @@ export default { return { keyword: '', bannerList : [], - mixinsListApi: 'getClassShopPageList', + menuList: [], + mixinsListApi: 'getProductList', } }, computed: { }, - onLoad() { + onShow() { this.getBanner() + this.getMenu() + if(uni.getStorageSync('token')){ + this.getOrderInfo() + } }, methods: { + // 快捷下单信息 + getOrderInfo(){ + this.$api('getOrderInfo') + .then(res => { + + }) + }, // 获取轮播图 getBanner() { this.$api('getBanner', res => { @@ -132,20 +134,32 @@ export default { } }) }, + // 获取菜单 + getMenu() { + this.$api('getIcon', res => { + if (res.code == 200) { + this.menuList = res.result + } + }) + }, toUrl() { uni.navigateTo({ url: '/pages_order/order/fastCreateOrder' }) - // this.$utils.navigateTo('/pages_order/mine/address') }, toGoodInfo(item, index) { - // uni.navigateTo({ - // url: `/pages_order/order/product/productDetail?id=`+item.id - // }) uni.navigateTo({ - url: '/pages_order/product/productDetail' + url: `/pages_order/product/productDetail?id=${item.id}` }) }, + menuClick(item){ + if(!item.url){ + return + } + uni.navigateTo({ + url: item.url, + }) + }, } } @@ -246,7 +260,6 @@ export default { .image-home { z-index: 1; - height: 350rpx; margin: 0 20rpx; margin-top: -90rpx; border-radius: 20rpx; @@ -269,8 +282,8 @@ export default { margin-left: 20rpx; margin-right: 20rpx; margin-bottom: 10rpx; - width: 100rpx; - height: 100rpx; + width: 90rpx; + height: 90rpx; display: inline-block; transition: transform 0.3s; @@ -279,7 +292,8 @@ export default { } } - :deep(.grid-text) { + .grid-text { + margin-top: 4rpx; font-size: 26rpx; font-weight: 500; color: #333; @@ -326,7 +340,7 @@ export default { .quick-order-container { position: fixed; right: 30rpx; - top: 40vh; + bottom: 30vh; z-index: 99; transition: transform 0.3s; @@ -411,7 +425,7 @@ export default { .top-shop { height: 100rpx; width: 100%; - font-size: 30rpx; + font-size: 32rpx; margin-top: 20rpx; text-align: center; font-weight: 600; @@ -427,29 +441,31 @@ export default { .bottom-price { display: inline-block; - color: #DC2828; - height: 80rpx; - width: 250rpx; - line-height: 100rpx; - } - } - - .buy-shop { - height: 100%; - width: 250rpx; - display: flex; - justify-content: center; - align-items: center; - - :deep(.uv-button) { - transition: transform 0.2s; - &:active { - transform: scale(0.95); + font-size: 28rpx; + color: #666; + text { + color: #DC2828; + font-weight: 700; } } } } + + .buy-shop { + height: 100%; + width: 250rpx; + display: flex; + justify-content: center; + align-items: center; + + :deep(.uv-button) { + transition: transform 0.2s; + &:active { + transform: scale(0.95); + } + } + } @keyframes pulse { 0% { diff --git a/pages/index/order.vue b/pages/index/order.vue index 43f28a6..0c9caa7 100644 --- a/pages/index/order.vue +++ b/pages/index/order.vue @@ -8,6 +8,7 @@ lineColor="#FD5100" lineHeight="8rpx" lineWidth="50rpx" + :scrollable="false" @click="clickTabs"> diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index a9c905e..1fe65de 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -1,10 +1,10 @@