From 00013cb46c9ae4d0f075a1880ce171e504be633d Mon Sep 17 00:00:00 2001 From: Waiting Date: Sun, 10 Mar 2024 15:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/goods/index.ts | 16 +- src/api/goods/types.ts | 12 + src/api/user/index.ts | 15 +- src/pages.json | 6 + src/pages/mall/index.vue | 67 +-- src/pages/mall/subs/components/sku-dialog.vue | 215 ++++++++ src/pages/mall/subs/goods/goods-detail.vue | 39 +- src/pages/mine/subs/address/address-list.vue | 10 + src/static/images/ic_close.png | Bin 0 -> 1561 bytes src/static/images/ic_plus.png | Bin 0 -> 450 bytes src/static/images/ic_reduce.png | Bin 0 -> 139 bytes src/store/modules/user/index.ts | 11 +- src/uni_modules/uni-popup/changelog.md | 60 +++ .../components/uni-popup-dialog/keypress.js | 45 ++ .../uni-popup-dialog/uni-popup-dialog.vue | 271 ++++++++++ .../uni-popup-message/uni-popup-message.vue | 143 ++++++ .../uni-popup-share/uni-popup-share.vue | 187 +++++++ .../components/uni-popup/i18n/en.json | 7 + .../components/uni-popup/i18n/index.js | 8 + .../components/uni-popup/i18n/zh-Hans.json | 7 + .../components/uni-popup/i18n/zh-Hant.json | 7 + .../components/uni-popup/keypress.js | 45 ++ .../uni-popup/components/uni-popup/popup.js | 26 + .../components/uni-popup/uni-popup.vue | 474 ++++++++++++++++++ src/uni_modules/uni-popup/package.json | 90 ++++ src/uni_modules/uni-popup/readme.md | 17 + src/uni_modules/uni-transition/changelog.md | 20 + .../uni-transition/createAnimation.js | 128 +++++ .../uni-transition/uni-transition.vue | 277 ++++++++++ src/uni_modules/uni-transition/package.json | 87 ++++ src/uni_modules/uni-transition/readme.md | 11 + src/utils/request/index.ts | 4 +- src/utils/request/type.ts | 2 +- 34 files changed, 2244 insertions(+), 65 deletions(-) create mode 100644 src/api/goods/types.ts create mode 100644 src/pages/mall/subs/components/sku-dialog.vue create mode 100644 src/static/images/ic_close.png create mode 100644 src/static/images/ic_plus.png create mode 100644 src/static/images/ic_reduce.png create mode 100644 src/uni_modules/uni-popup/changelog.md create mode 100644 src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js create mode 100644 src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue create mode 100644 src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue create mode 100644 src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue create mode 100644 src/uni_modules/uni-popup/components/uni-popup/i18n/en.json create mode 100644 src/uni_modules/uni-popup/components/uni-popup/i18n/index.js create mode 100644 src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json create mode 100644 src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json create mode 100644 src/uni_modules/uni-popup/components/uni-popup/keypress.js create mode 100644 src/uni_modules/uni-popup/components/uni-popup/popup.js create mode 100644 src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue create mode 100644 src/uni_modules/uni-popup/package.json create mode 100644 src/uni_modules/uni-popup/readme.md create mode 100644 src/uni_modules/uni-transition/changelog.md create mode 100644 src/uni_modules/uni-transition/components/uni-transition/createAnimation.js create mode 100644 src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue create mode 100644 src/uni_modules/uni-transition/package.json create mode 100644 src/uni_modules/uni-transition/readme.md diff --git a/.env.development b/.env.development index 0434f5f..fd86701 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE='uniapp-vue3-project' VITE_APP_ENV='development' # 接口地址 -VITE_APP_BASE_API='https://apidev.lakeapp.cn/ext/' +VITE_APP_BASE_API='https://apidev.lakeapp.cn/' # 删除console VITE_DROP_CONSOLE=false diff --git a/src/api/goods/index.ts b/src/api/goods/index.ts index da0beab..f42009b 100644 --- a/src/api/goods/index.ts +++ b/src/api/goods/index.ts @@ -1,14 +1,14 @@ -import { get } from '@/utils'; +import { get, post } from '@/utils'; enum URL { - CategoryList = '/goods/category_list', - GoodsList = '/goods/category_list', - GoodsDetail = '/goods/info', - Order = '/user/logout', + categoryList = '/ext//goods/category_list', + goodsList = '/ext/goods/query', + goodsDetail = '/ext/goods/info', + order = '/user/logout', } -export const getCategoryList = () => get({ url: URL.CategoryList }); +export const getCategoryList = (companyId: string) => get({ url: URL.categoryList + `?companyId=${companyId}` }); -export const getGoodsList = () => get({ url: URL.GoodsList }); +export const getGoodsList = (params: any) => post({ url: URL.goodsList, data: params }); -export const getGoodsDetail = () => get({ url: URL.GoodsDetail }); +export const getGoodsDetail = () => get({ url: URL.goodsDetail }); diff --git a/src/api/goods/types.ts b/src/api/goods/types.ts new file mode 100644 index 0000000..8d15b38 --- /dev/null +++ b/src/api/goods/types.ts @@ -0,0 +1,12 @@ +export interface CategoryBean { + typeId: string; + typeName: string; +} + +export interface GoodsBean { + code: string; + goodsId: string; + goodsName: string; + images: string; + price: number; +} diff --git a/src/api/user/index.ts b/src/api/user/index.ts index f00e447..68edf47 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -7,13 +7,24 @@ import type { UserState } from '@/store/modules/user/types'; enum URL { // login = '/member/login', - login = 'wechat/LoginByMa', - loginByCode = 'wechat/LoginByMaCode', + login = '/wc/wechat/LoginByMa', + loginByCode = '/wc/wechat/LoginByMaCode', logout = '/user/logout', profile = '/user/profile', + addressList = '/addr/list', + addressDetail = '/addr/find', + addressCreate = '/addr/create', + addressUpdate = '/addr/update', + addressDelete = '/addr/delete', } export const getUserProfile = () => get({ url: URL.profile }); export const login = (data: LoginParams) => post({ url: URL.login, data }); export const loginByCode = (code: string, companyId: string) => post({ url: URL.loginByCode + `?code=${code}` }); export const logout = () => post({ url: URL.logout }); + +export const getAddressList = () => get({ url: URL.addressList }); +export const getAddressDetail = (id: string) => get({ url: URL.addressDetail + `?id=${id}` }); +export const addressCreate = (data: any) => post({ url: URL.addressCreate, data }); +export const addressUpdate = (data: any) => post({ url: URL.addressUpdate, data }); +export const addressDelete = (id: string) => post({ url: URL.addressDelete + `?id=${id}` }); diff --git a/src/pages.json b/src/pages.json index bc8eb0c..6b58779 100644 --- a/src/pages.json +++ b/src/pages.json @@ -67,6 +67,12 @@ "style": { "navigationBarTitleText": "商品详情" } + }, + { + "path": "order/order-confirm", + "style": { + "navigationBarTitleText": "确认订单" + } } ] }, diff --git a/src/pages/mall/index.vue b/src/pages/mall/index.vue index 43ac08e..3af04dd 100644 --- a/src/pages/mall/index.vue +++ b/src/pages/mall/index.vue @@ -12,25 +12,25 @@ - {{ item }} + {{ item.typeName }} - + @click.stop='goPath(`/pages/mall/subs/goods/goods-detail?goodsId=${item.goodsId}`)'> + {{ item.goodsName }} - ¥{{ item.goodsPrice }} - + ¥{{ item.price }} + - + 10 @@ -39,53 +39,36 @@ diff --git a/src/pages/mall/subs/components/sku-dialog.vue b/src/pages/mall/subs/components/sku-dialog.vue new file mode 100644 index 0000000..0671dea --- /dev/null +++ b/src/pages/mall/subs/components/sku-dialog.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/src/pages/mall/subs/goods/goods-detail.vue b/src/pages/mall/subs/goods/goods-detail.vue index 85ba936..7c22bcd 100644 --- a/src/pages/mall/subs/goods/goods-detail.vue +++ b/src/pages/mall/subs/goods/goods-detail.vue @@ -22,14 +22,14 @@ - + 选择 规格 颜色/尺码 共1种颜色可选 - - + + 参数 品牌 风格 季节 款号 @@ -72,24 +72,45 @@ - 加入购物车 - 立即下单 + 加入购物车 + 立即下单 + diff --git a/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue new file mode 100644 index 0000000..91370a8 --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue new file mode 100644 index 0000000..5be7624 --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue @@ -0,0 +1,187 @@ + + + + diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json new file mode 100644 index 0000000..7f1bd06 --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json @@ -0,0 +1,7 @@ +{ + "uni-popup.cancel": "cancel", + "uni-popup.ok": "ok", + "uni-popup.placeholder": "pleace enter", + "uni-popup.title": "Hint", + "uni-popup.shareTitle": "Share to" +} diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js new file mode 100644 index 0000000..de7509c --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js @@ -0,0 +1,8 @@ +import en from './en.json' +import zhHans from './zh-Hans.json' +import zhHant from './zh-Hant.json' +export default { + en, + 'zh-Hans': zhHans, + 'zh-Hant': zhHant +} diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json new file mode 100644 index 0000000..5e3003c --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json @@ -0,0 +1,7 @@ +{ + "uni-popup.cancel": "取消", + "uni-popup.ok": "确定", + "uni-popup.placeholder": "请输入", + "uni-popup.title": "提示", + "uni-popup.shareTitle": "分享到" +} diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json new file mode 100644 index 0000000..13e39eb --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json @@ -0,0 +1,7 @@ +{ + "uni-popup.cancel": "取消", + "uni-popup.ok": "確定", + "uni-popup.placeholder": "請輸入", + "uni-popup.title": "提示", + "uni-popup.shareTitle": "分享到" +} diff --git a/src/uni_modules/uni-popup/components/uni-popup/keypress.js b/src/uni_modules/uni-popup/components/uni-popup/keypress.js new file mode 100644 index 0000000..62dda46 --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup/keypress.js @@ -0,0 +1,45 @@ +// #ifdef H5 +export default { + name: 'Keypress', + props: { + disable: { + type: Boolean, + default: false + } + }, + mounted () { + const keyNames = { + esc: ['Esc', 'Escape'], + tab: 'Tab', + enter: 'Enter', + space: [' ', 'Spacebar'], + up: ['Up', 'ArrowUp'], + left: ['Left', 'ArrowLeft'], + right: ['Right', 'ArrowRight'], + down: ['Down', 'ArrowDown'], + delete: ['Backspace', 'Delete', 'Del'] + } + const listener = ($event) => { + if (this.disable) { + return + } + const keyName = Object.keys(keyNames).find(key => { + const keyName = $event.key + const value = keyNames[key] + return value === keyName || (Array.isArray(value) && value.includes(keyName)) + }) + if (keyName) { + // 避免和其他按键事件冲突 + setTimeout(() => { + this.$emit(keyName, {}) + }, 0) + } + } + document.addEventListener('keyup', listener) + // this.$once('hook:beforeDestroy', () => { + // document.removeEventListener('keyup', listener) + // }) + }, + render: () => {} +} +// #endif diff --git a/src/uni_modules/uni-popup/components/uni-popup/popup.js b/src/uni_modules/uni-popup/components/uni-popup/popup.js new file mode 100644 index 0000000..c4e5781 --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup/popup.js @@ -0,0 +1,26 @@ + +export default { + data() { + return { + + } + }, + created(){ + this.popup = this.getParent() + }, + methods:{ + /** + * 获取父元素实例 + */ + getParent(name = 'uniPopup') { + let parent = this.$parent; + let parentName = parent.$options.name; + while (parentName !== name) { + parent = parent.$parent; + if (!parent) return false + parentName = parent.$options.name; + } + return parent; + }, + } +} diff --git a/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue new file mode 100644 index 0000000..d05e756 --- /dev/null +++ b/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue @@ -0,0 +1,474 @@ + + + + diff --git a/src/uni_modules/uni-popup/package.json b/src/uni_modules/uni-popup/package.json new file mode 100644 index 0000000..069e9ce --- /dev/null +++ b/src/uni_modules/uni-popup/package.json @@ -0,0 +1,90 @@ +{ + "id": "uni-popup", + "displayName": "uni-popup 弹出层", + "version": "1.7.9", + "description": " Popup 组件，提供常用的弹层", + "keywords": [ + "uni-ui", + "弹出层", + "弹窗", + "popup", + "弹框" + ], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [ + "uni-scss", + "uni-transition" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/src/uni_modules/uni-popup/readme.md b/src/uni_modules/uni-popup/readme.md new file mode 100644 index 0000000..fdad4b3 --- /dev/null +++ b/src/uni_modules/uni-popup/readme.md @@ -0,0 +1,17 @@ + + +## Popup 弹出层 +> **组件名：uni-popup** +> 代码块： `uPopup` +> 关联组件：`uni-transition` + + +弹出层组件，在应用中弹出一个消息提示窗口、提示框等 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 + + + + + diff --git a/src/uni_modules/uni-transition/changelog.md b/src/uni_modules/uni-transition/changelog.md new file mode 100644 index 0000000..b1a824b --- /dev/null +++ b/src/uni_modules/uni-transition/changelog.md @@ -0,0 +1,20 @@ +## 1.3.1（2021-11-23） +- 修复 init 方法初始化问题 +## 1.3.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition) +## 1.2.1（2021-09-27） +- 修复 init 方法不生效的 Bug +## 1.2.0（2021-07-30） +- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.1.1（2021-05-12） +- 新增 示例地址 +- 修复 示例项目缺少组件的 Bug +## 1.1.0（2021-04-22） +- 新增 通过方法自定义动画 +- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式 +- 优化 动画触发逻辑，使动画更流畅 +- 优化 支持单独的动画类型 +- 优化 文档示例 +## 1.0.2（2021-02-05） +- 调整为 uni_modules 目录规范 diff --git a/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js new file mode 100644 index 0000000..5f54365 --- /dev/null +++ b/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js @@ -0,0 +1,128 @@ +// const defaultOption = { +// duration: 300, +// timingFunction: 'linear', +// delay: 0, +// transformOrigin: '50% 50% 0' +// } +// #ifdef APP-NVUE +const nvueAnimation = uni.requireNativePlugin('animation') +// #endif +class MPAnimation { + constructor(options, _this) { + this.options = options + this.animation = uni.createAnimation(options) + this.currentStepAnimates = {} + this.next = 0 + this.$ = _this + + } + + _nvuePushAnimates(type, args) { + let aniObj = this.currentStepAnimates[this.next] + let styles = {} + if (!aniObj) { + styles = { + styles: {}, + config: {} + } + } else { + styles = aniObj + } + if (animateTypes1.includes(type)) { + if (!styles.styles.transform) { + styles.styles.transform = '' + } + let unit = '' + if(type === 'rotate'){ + unit = 'deg' + } + styles.styles.transform += `${type}(${args+unit}) ` + } else { + styles.styles[type] = `${args}` + } + this.currentStepAnimates[this.next] = styles + } + _animateRun(styles = {}, config = {}) { + let ref = this.$.$refs['ani'].ref + if (!ref) return + return new Promise((resolve, reject) => { + nvueAnimation.transition(ref, { + styles, + ...config + }, res => { + resolve() + }) + }) + } + + _nvueNextAnimate(animates, step = 0, fn) { + let obj = animates[step] + if (obj) { + let { + styles, + config + } = obj + this._animateRun(styles, config).then(() => { + step += 1 + this._nvueNextAnimate(animates, step, fn) + }) + } else { + this.currentStepAnimates = {} + typeof fn === 'function' && fn() + this.isEnd = true + } + } + + step(config = {}) { + // #ifndef APP-NVUE + this.animation.step(config) + // #endif + // #ifdef APP-NVUE + this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config) + this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin + this.next++ + // #endif + return this + } + + run(fn) { + // #ifndef APP-NVUE + this.$.animationData = this.animation.export() + this.$.timer = setTimeout(() => { + typeof fn === 'function' && fn() + }, this.$.durationTime) + // #endif + // #ifdef APP-NVUE + this.isEnd = false + let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref + if(!ref) return + this._nvueNextAnimate(this.currentStepAnimates, 0, fn) + this.next = 0 + // #endif + } +} + + +const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d', + 'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY', + 'translateZ' +] +const animateTypes2 = ['opacity', 'backgroundColor'] +const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom'] +animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => { + MPAnimation.prototype[type] = function(...args) { + // #ifndef APP-NVUE + this.animation[type](...args) + // #endif + // #ifdef APP-NVUE + this._nvuePushAnimates(type, args) + // #endif + return this + } +}) + +export function createAnimation(option, _this) { + if(!_this) return + clearTimeout(_this.timer) + return new MPAnimation(option, _this) +} diff --git a/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue new file mode 100644 index 0000000..0d739bd --- /dev/null +++ b/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue @@ -0,0 +1,277 @@ + + + + + diff --git a/src/uni_modules/uni-transition/package.json b/src/uni_modules/uni-transition/package.json new file mode 100644 index 0000000..d15fdf0 --- /dev/null +++ b/src/uni_modules/uni-transition/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-transition", + "displayName": "uni-transition 过渡动画", + "version": "1.3.1", + "description": "元素的简单过渡动画", + "keywords": [ + "uni-ui", + "uniui", + "动画", + "过渡", + "过渡动画" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/src/uni_modules/uni-transition/readme.md b/src/uni_modules/uni-transition/readme.md new file mode 100644 index 0000000..2f8a77e --- /dev/null +++ b/src/uni_modules/uni-transition/readme.md @@ -0,0 +1,11 @@ + + +## Transition 过渡动画 +> **组件名：uni-transition** +> 代码块： `uTransition` + + +元素过渡动画 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts index 24c7bb7..fe4d7aa 100644 --- a/src/utils/request/index.ts +++ b/src/utils/request/index.ts @@ -20,8 +20,8 @@ export function request(config: HttpRequestConfig): Promise { if(res instanceof ArrayBuffer) { resolve(res); } else { - const { result } = res; - resolve(result as T); + const { data } = res; + resolve(data as T); } }); }); diff --git a/src/utils/request/type.ts b/src/utils/request/type.ts index a9f24b8..34c233d 100644 --- a/src/utils/request/type.ts +++ b/src/utils/request/type.ts @@ -1,7 +1,7 @@ // 返回res.data的interface export interface IResponse { code: number | string; - result: T; + data: T; message: string; status: string | number; }