diff --git a/pages.json b/pages.json
index 64a0f67..f39db70 100644
--- a/pages.json
+++ b/pages.json
@@ -113,6 +113,15 @@
"meta": {
"auth": false
}
+ },
+ {
+ "path": "wallet/withdraw",
+ "style": {
+ "navigationBarTitleText": "提现"
+ },
+ "meta": {
+ "auth": false
+ }
}
]
}
diff --git a/pages/index/icons.vue b/pages/index/icons.vue
index b65a527..3e6fbee 100644
--- a/pages/index/icons.vue
+++ b/pages/index/icons.vue
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/peach/store/app.js b/peach/store/app.js
index f5398c5..6b88b04 100644
--- a/peach/store/app.js
+++ b/peach/store/app.js
@@ -1,181 +1,182 @@
-import { ref } from 'vue'
-import { defineStore } from 'pinia'
-import $platform from '@/peach/platform'
-import $router from '@/peach/router'
-import useSysStore from './sys'
+import { ref } from "vue";
+import { defineStore } from "pinia";
+import $platform from "@/peach/platform";
+import $router from "@/peach/router";
+import useSysStore from "./sys";
const useAppStore = defineStore(
- 'app',
- () => {
- /**
- * @description 应用信息
- * @param string name 应用名称
- * @param string logo 应用logo
- * @param string version 应用版本
- * @param string copyright 版权信息
- * @param string copyrightTime 版权时间
- * @param string cdnurl 静态资源域名
- * @param string filesystem 文件系统
- */
- const info = ref({
- name: '',
- logo: '',
- version: '',
- copyright: '',
- copytime: '',
- cdnurl: '',
- filesystem: '',
- })
+ "app",
+ () => {
+ /**
+ * @description 应用信息
+ * @param string name 应用名称
+ * @param string logo 应用logo
+ * @param string version 应用版本
+ * @param string copyright 版权信息
+ * @param string copyrightTime 版权时间
+ * @param string cdnurl 静态资源域名
+ * @param string filesystem 文件系统
+ */
+ const info = ref({
+ name: "",
+ logo: "",
+ version: "",
+ copyright: "",
+ copytime: "",
+ cdnurl: "",
+ filesystem: "",
+ });
- /**
- * @description 平台信息
- * @param Array share.methods 分享方式
- * @param Object share.forwardInfo 转发信息
- * @param Object share.posterInfo 海报信息
- * @param string share.linkAddress 分享链接地址
- * @param number bindMobile 绑定手机号提醒 0: 提醒 1: 不提醒
- */
- const platform = ref({
- share: {
- methods: [],
- forwardInfo: {},
- posterInfo: {},
- linkAddress: '',
+ /**
+ * @description 平台信息
+ * @param Array share.methods 分享方式
+ * @param Object share.forwardInfo 转发信息
+ * @param Object share.posterInfo 海报信息
+ * @param string share.linkAddress 分享链接地址
+ * @param number bindMobile 绑定手机号提醒 0: 提醒 1: 不提醒
+ */
+ const platform = ref({
+ share: {
+ methods: [],
+ forwardInfo: {},
+ posterInfo: {},
+ linkAddress: "",
+ },
+ bindMobile: 0,
+ });
+
+ const chat = ref({});
+
+ /**
+ * @description 模板信息
+ * @param Object basic 基础模板
+ * @param Object tabbar 底部导航模板
+ */
+ const template = ref({
+ basic: {
+ tabbar: {
+ items: [
+ {
+ activeIconUrl: "/static/a-index.png",
+ iconUrl: "/static/index.png",
+ text: "首页",
+ url: "/pages/index/index",
},
- bindMobile: 0,
- })
-
- const chat = ref({})
-
- /**
- * @description 模板信息
- * @param Object basic 基础模板
- * @param Object tabbar 底部导航模板
- */
- const template = ref({
- basic: {
- tabbar: {
- items: [
- {
- activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-002.png',
- iconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-001.png',
- text: '首页',
- url: '/pages/index/index',
- },
- {
- activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/2-002.png',
- iconUrl: 'http://mall.yudao.iocoder.cn/static/images/2-001.png',
- text: '产品',
- url: '/pages/index/product',
- },
- {
- activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/3-002.png',
- iconUrl: 'http://mall.yudao.iocoder.cn/static/images/3-001.png',
- text: '订单',
- url: '/pages/order/list',
- },
- {
- activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-002.png',
- iconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-001.png',
- text: '我的',
- url: '/pages/index/my',
- },
- {
- activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-002.png',
- iconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-001.png',
- text: 'icons',
- url: '/pages/index/icons',
- },
- ],
- style: {
- activeColor: '#fc4141',
- bgColor: '#fff',
- bgType: 'color',
- color: '#282828',
- },
- theme: 'red',
- },
+ {
+ activeIconUrl: "/static/a-product.png",
+ iconUrl: "/static/product.png",
+ text: "产品",
+ url: "/pages/index/product",
},
- })
-
- // 全局分享信息
- const shareInfo = ref({})
-
- // 小程序发货信息管理 0: 没有 1：有
- const hasWechatTradeManaged = ref(0)
-
- /**
- * @author Ankkaya
- * @description 小程序初始化
- * @param {Type} -
- * @returns {Type}
- */
- async function init() {
- // 检查网络
- const networkStatus = await $platform.checkNetwork()
- if (!networkStatus) {
- $router.error('NetworkError')
- }
-
- if (true) {
- this.info = {
- name: '🍑商城',
- logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
- version: '1.0.0',
- copyright: '全部开源，个人与企业可 100% 免费使用',
- copytime: 'Copyright© 2018-2024',
-
- cdnurl: 'https://file.sheepjs.com', // 云存储域名
- filesystem: 'qcloud', // 云存储平台
- }
- this.platform = {
- share: {
- methods: ['poster', 'link'],
- linkAddress: 'https://shopro.sheepjs.com/#/',
- posterInfo: {
- user_bg: '/static/img/shop/config/user-poster-bg.png',
- goods_bg: '/static/img/shop/config/goods-poster-bg.png',
- groupon_bg: '/static/img/shop/config/groupon-poster-bg.png',
- },
- },
- bind_mobile: 0,
- }
- this.chat = {
- chat_domain: 'https://api.shopro.sheepjs.com/chat',
- room_id: 'admin',
- }
- this.has_wechat_trade_managed = 0
-
- // 加载主题
- const sysStore = useSysStore()
- sysStore.setTheme()
-
- return Promise.resolve(true)
- } else {
- $router.error('InitError', res.msg || '加载失败')
- }
- }
-
- return {
- info,
- platform,
- chat,
- template,
- shareInfo,
- hasWechatTradeManaged,
- init,
- }
- },
- {
- persist: {
- enabled: true,
- strategies: [
- {
- key: 'app-store',
- },
- ],
+ {
+ activeIconUrl: "/static/a-order.png",
+ iconUrl: "/static/order.png",
+ text: "订单",
+ url: "/pages/order/list",
+ },
+ {
+ activeIconUrl: "/static/a-my.png",
+ iconUrl: "/static/my.png",
+ text: "我的",
+ url: "/pages/index/my",
+ },
+ {
+ activeIconUrl:
+ "http://mall.yudao.iocoder.cn/static/images/4-002.png",
+ iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png",
+ text: "icons",
+ url: "/pages/index/icons",
+ },
+ ],
+ style: {
+ activeColor: "#fc4141",
+ bgColor: "#fff",
+ bgType: "color",
+ color: "#282828",
+ },
+ theme: "red",
},
- }
-)
+ },
+ });
-export default useAppStore
+ // 全局分享信息
+ const shareInfo = ref({});
+
+ // 小程序发货信息管理 0: 没有 1：有
+ const hasWechatTradeManaged = ref(0);
+
+ /**
+ * @author Ankkaya
+ * @description 小程序初始化
+ * @param {Type} -
+ * @returns {Type}
+ */
+ async function init() {
+ // 检查网络
+ const networkStatus = await $platform.checkNetwork();
+ if (!networkStatus) {
+ $router.error("NetworkError");
+ }
+
+ if (true) {
+ this.info = {
+ name: "🍑商城",
+ logo: "https://static.iocoder.cn/ruoyi-vue-pro-logo.png",
+ version: "1.0.0",
+ copyright: "全部开源，个人与企业可 100% 免费使用",
+ copytime: "Copyright© 2018-2024",
+
+ cdnurl: "https://file.sheepjs.com", // 云存储域名
+ filesystem: "qcloud", // 云存储平台
+ };
+ this.platform = {
+ share: {
+ methods: ["poster", "link"],
+ linkAddress: "https://shopro.sheepjs.com/#/",
+ posterInfo: {
+ user_bg: "/static/img/shop/config/user-poster-bg.png",
+ goods_bg: "/static/img/shop/config/goods-poster-bg.png",
+ groupon_bg: "/static/img/shop/config/groupon-poster-bg.png",
+ },
+ },
+ bind_mobile: 0,
+ };
+ this.chat = {
+ chat_domain: "https://api.shopro.sheepjs.com/chat",
+ room_id: "admin",
+ };
+ this.has_wechat_trade_managed = 0;
+
+ // 加载主题
+ const sysStore = useSysStore();
+ sysStore.setTheme();
+
+ return Promise.resolve(true);
+ } else {
+ $router.error("InitError", res.msg || "加载失败");
+ }
+ }
+
+ return {
+ info,
+ platform,
+ chat,
+ template,
+ shareInfo,
+ hasWechatTradeManaged,
+ init,
+ };
+ },
+ {
+ persist: {
+ enabled: true,
+ strategies: [
+ {
+ key: "app-store",
+ },
+ ],
+ },
+ }
+);
+
+export default useAppStore;
diff --git a/peach/ui/pb-inner-navbar/pb-inner-navbar.vue b/peach/ui/pb-inner-navbar/pb-inner-navbar.vue
index 81fa822..33737b8 100644
--- a/peach/ui/pb-inner-navbar/pb-inner-navbar.vue
+++ b/peach/ui/pb-inner-navbar/pb-inner-navbar.vue
@@ -82,6 +82,11 @@ const props = defineProps({
default: '',
},
+ iconColor: {
+ type: String,
+ default: '#000'
+ },
+
title: {
//返回文本
type: String,
@@ -191,14 +196,17 @@ const init = () => {
.sicon-back {
font-size: 32rpx;
+ color: v-bind(iconColor)
}
.sicon-home {
font-size: 32rpx;
+ color: v-bind(iconColor)
}
.sicon-more {
font-size: 32rpx;
+ color: v-bind(iconColor)
}
.icon-button {
diff --git a/peach/ui/pb-layout/pb-layout.vue b/peach/ui/pb-layout/pb-layout.vue
index 5de598f..12929cd 100644
--- a/peach/ui/pb-layout/pb-layout.vue
+++ b/peach/ui/pb-layout/pb-layout.vue
@@ -6,7 +6,8 @@
:opacityBgUi="opacityBgUi" @search="(e) => emits('search', e)" :defaultSearch="defaultSearch" />
-
+
@@ -106,6 +107,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
+ iconColor: {
+ type: String,
+ default: '#000'
+ }
})
const emits = defineEmits(['search'])
diff --git a/peach/ui/pb-tabbar/pb-tabbar.vue b/peach/ui/pb-tabbar/pb-tabbar.vue
index 8a4c654..3b241b4 100644
--- a/peach/ui/pb-tabbar/pb-tabbar.vue
+++ b/peach/ui/pb-tabbar/pb-tabbar.vue
@@ -1,33 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/a-index.png b/static/a-index.png
new file mode 100644
index 0000000..6b338f7
Binary files /dev/null and b/static/a-index.png differ
diff --git a/static/a-my.png b/static/a-my.png
new file mode 100644
index 0000000..93243b6
Binary files /dev/null and b/static/a-my.png differ
diff --git a/static/a-order.png b/static/a-order.png
new file mode 100644
index 0000000..8ba5fd5
Binary files /dev/null and b/static/a-order.png differ
diff --git a/static/a-product.png b/static/a-product.png
new file mode 100644
index 0000000..844fd11
Binary files /dev/null and b/static/a-product.png differ
diff --git a/static/index.png b/static/index.png
new file mode 100644
index 0000000..f74a29b
Binary files /dev/null and b/static/index.png differ
diff --git a/static/my.png b/static/my.png
new file mode 100644
index 0000000..38d6ee8
Binary files /dev/null and b/static/my.png differ
diff --git a/static/order.png b/static/order.png
new file mode 100644
index 0000000..c1faa69
Binary files /dev/null and b/static/order.png differ
diff --git a/static/point.png b/static/point.png
new file mode 100644
index 0000000..665996e
Binary files /dev/null and b/static/point.png differ
diff --git a/static/product.png b/static/product.png
new file mode 100644
index 0000000..abad852
Binary files /dev/null and b/static/product.png differ