diff --git a/pages.json b/pages.json index 5fa7776..fd3b88b 100644 --- a/pages.json +++ b/pages.json @@ -10,35 +10,30 @@ "path": "pages/index/index", "style": { "navigationStyle": "custom" - // "navigationBarTitleText": "CGC-ICH" } }, { "path": "pages/index/readingBody", "style": { "navigationStyle": "custom" - // "navigationBarTitleText": "阅读体" } }, { "path": "pages/index/sensoryStore", "style": { "navigationStyle": "custom" - // "navigationBarTitleText": "有感商店" } }, { "path": "pages/index/intelligentAgent", "style": { "navigationStyle": "custom" - // "navigationBarTitleText": "智能体" } }, { "path": "pages/index/iSoul", "style": { "navigationStyle": "custom" - // "navigationBarTitleText": "iSoul" } }, { @@ -48,13 +43,13 @@ "navigationStyle": "custom" } }, - { - "path": "pages/index/timeShopBank", - "style": { - "navigationBarTitleText": "时间银行", - "navigationStyle": "custom" - } - } + { + "path": "pages/index/timeShopBank", + "style": { + "navigationBarTitleText": "时间银行", + "navigationStyle": "custom" + } + } ], "subPackages": [ { @@ -184,24 +179,42 @@ "navigationBarTitleText": "搜索" } }, - { - "path": "equityGoods/index", - "style": { - "navigationBarTitleText": "权益商品" - } - }, - { - "path": "equityGoods/list", - "style": { - "navigationBarTitleText": "权益商品" - } - }, - { - "path": "equityGoods/detail", - "style": { - "navigationBarTitleText": "权益商品" - } - } + { + "path": "equityGoods/index", + "style": { + "navigationBarTitleText": "权益商品" + } + }, + { + "path": "equityGoods/list", + "style": { + "navigationBarTitleText": "权益商品" + } + }, + { + "path": "equityGoods/detail", + "style": { + "navigationBarTitleText": "权益商品" + } + }, + { + "path": "orderQy/list", + "style": { + "navigationBarTitleText": "权益商品订单" + } + }, + { + "path": "orderQy/detail", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "orderQy/confrim", + "style": { + "navigationBarTitleText": "确认订单" + } + } ] }, { @@ -326,7 +339,6 @@ "navigationStyle": "custom" } } - ] }, { @@ -476,56 +488,55 @@ "navigationBarTextStyle": "white" } }, - { - "path": "chapter4/chapter4", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - } - }, - - { - "path": "chapter4/secBuy", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - } - }, - { - "path": "chapter4/first", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - } - }, - { - "path": "chapter4/second", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - } - }, - { - "path": "chapter4/third", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - } - }, - { - "path": "chapter4/fourth", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - } - } - + { + "path": "chapter4/chapter4", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + + { + "path": "chapter4/secBuy", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "chapter4/first", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "chapter4/second", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "chapter4/third", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "chapter4/fourth", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + } ] } ], diff --git a/pages/index/iSoul.vue b/pages/index/iSoul.vue index 64c103f..fc84f67 100644 --- a/pages/index/iSoul.vue +++ b/pages/index/iSoul.vue @@ -380,22 +380,22 @@ export default { switch (action) { case "待核销": uni.navigateTo({ - url: "/subPackages/order/trades?status=PAYMENT_SUCCESSFULLY", + url: "/subPackages/orderQy/list?status=PAYMENT_SUCCESSFULLY", }); break; case "待发货": uni.navigateTo({ - url: "/subPackages/order/trades?status=POST", + url: "/subPackages/orderQy/list?status=POST", }); break; case "退货/退款": uni.navigateTo({ - url: "/subPackages/order/trades?status=WAIT_REFUND", + url: "/subPackages/orderQy/list?status=WAIT_REFUND", }); break; case "历史记录": uni.navigateTo({ - url: "/subPackages/order/trades", + url: "/subPackages/orderQy/list", }); break; } diff --git a/subPackages/orderQy/confrim.vue b/subPackages/orderQy/confrim.vue new file mode 100644 index 0000000..e69de29 diff --git a/subPackages/orderQy/detail.vue b/subPackages/orderQy/detail.vue new file mode 100644 index 0000000..1453ec4 --- /dev/null +++ b/subPackages/orderQy/detail.vue @@ -0,0 +1,818 @@ + + + + + diff --git a/subPackages/orderQy/list.vue b/subPackages/orderQy/list.vue new file mode 100644 index 0000000..88c5eae --- /dev/null +++ b/subPackages/orderQy/list.vue @@ -0,0 +1,739 @@ + + + + + diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md index 6449885..0261131 100644 --- a/uni_modules/uni-icons/changelog.md +++ b/uni_modules/uni-icons/changelog.md @@ -1,3 +1,23 @@ +## 2.0.10(2024-06-07) +- 优化 uni-app x 中,size 属性的类型 +## 2.0.9(2024-01-12) +fix: 修复图标大小默认值错误的问题 +## 2.0.8(2023-12-14) +- 修复 项目未使用 ts 情况下,打包报错的bug +## 2.0.7(2023-12-14) +- 修复 size 属性为 string 时,不加单位导致尺寸异常的bug +## 2.0.6(2023-12-11) +- 优化 兼容老版本icon类型,如 top ,bottom 等 +## 2.0.5(2023-12-11) +- 优化 兼容老版本icon类型,如 top ,bottom 等 +## 2.0.4(2023-12-06) +- 优化 uni-app x 下示例项目图标排序 +## 2.0.3(2023-12-06) +- 修复 nvue下引入组件报错的bug +## 2.0.2(2023-12-05) +-优化 size 属性支持单位 +## 2.0.1(2023-12-05) +- 新增 uni-app x 支持定义图标 ## 1.3.5(2022-01-24) - 优化 size 属性可以传入不带单位的字符串数值 ## 1.3.4(2022-01-24) diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue new file mode 100644 index 0000000..8740559 --- /dev/null +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue @@ -0,0 +1,91 @@ + + + + + diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue index 86e7444..7da5356 100644 --- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue @@ -1,24 +1,28 @@ diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json index d15fdf0..0542c52 100644 --- a/uni_modules/uni-transition/package.json +++ b/uni_modules/uni-transition/package.json @@ -1,7 +1,7 @@ { "id": "uni-transition", "displayName": "uni-transition 过渡动画", - "version": "1.3.1", + "version": "1.3.6", "description": "元素的简单过渡动画", "keywords": [ "uni-ui", @@ -12,16 +12,14 @@ ], "repository": "https://github.com/dcloudio/uni-ui", "engines": { - "HBuilderX": "" + "HBuilderX": "", + "uni-app": "^4.12", + "uni-app-x": "" }, "directories": { "example": "../../temps/example_temps" }, "dcloudext": { - "category": [ - "前端组件", - "通用组件" - ], "sale": { "regular": { "price": "0.00" @@ -38,48 +36,75 @@ "data": "无", "permissions": "无" }, - "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue", + "darkmode": "x", + "i18n": "x", + "widescreen": "x" }, "uni_modules": { - "dependencies": ["uni-scss"], + "dependencies": [ + "uni-scss" + ], "encrypt": [], "platforms": { "cloud": { - "tcb": "y", - "aliyun": "y" + "tcb": "x", + "aliyun": "x", + "alipay": "x" }, "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" + "uni-app": { + "vue": { + "vue2": "√", + "vue3": "√" + }, + "web": { + "safari": "√", + "chrome": "√" + }, + "app": { + "vue": "√", + "nvue": "√", + "android": "√", + "ios": "√", + "harmony": "√" + }, + "mp": { + "weixin": { + }, + "alipay": { + }, + "toutiao": { + }, + "baidu": { + }, + "kuaishou": { + }, + "jd": { + }, + "harmony": "-", + "qq": "√", + "lark": "-" + }, + "quickapp": { + "huawei": "√", + "union": "√" + } }, - "Vue": { - "vue2": "y", - "vue3": "y" + "uni-app-x": { + "web": { + "safari": "-", + "chrome": "-" + }, + "app": { + "android": "-", + "ios": "-", + "harmony": "-" + }, + "mp": { + "weixin": "-" + } } } }