diff --git a/.gitignore b/.gitignore index 6594faf..baf490c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ selenium-debug.log *.suo *.ntvs* *.njsproj + *.sln *.local diff --git a/manifest.json b/manifest.json index 54c7a59..663e9d0 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "多样青春活动版", - "appid" : "__UNI__BD0139D", + "appid" : "__UNI__F09A3D9", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", diff --git a/packageB/wallet/bank.vue b/packageB/wallet/bank.vue new file mode 100644 index 0000000..1d5cc61 --- /dev/null +++ b/packageB/wallet/bank.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/packageB/wallet/index.vue b/packageB/wallet/index.vue new file mode 100644 index 0000000..f041946 --- /dev/null +++ b/packageB/wallet/index.vue @@ -0,0 +1,261 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index aa228d4..ee1641b 100644 --- a/pages.json +++ b/pages.json @@ -2,26 +2,25 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, - "pages": [ - { + "pages": [{ "path": "pages/tail", "style": { "navigationBarTitleText": "", - "navigationStyle": "custom" //单个页面设置 + "navigationStyle": "custom" //单个页面设置 } }, { "path": "pages/index/index", "style": { "navigationBarTitleText": "多样青春·活动", - "navigationStyle": "custom" //单个页面设置 + "navigationStyle": "custom" //单个页面设置 } }, { "path": "pages/fenl/index", "style": { "navigationBarTitleText": "分类", - "navigationStyle": "custom" //单个页面设置 + "navigationStyle": "custom" //单个页面设置 } }, { @@ -30,12 +29,12 @@ "navigationBarTitleText": "申请入驻" } }, - + { "path": "pages/activity/index", "style": { "navigationBarTitleText": "活动中心", - "navigationStyle": "custom" //单个页面设置 + "navigationStyle": "custom" //单个页面设置 } }, { @@ -48,252 +47,266 @@ { "path": "pages/my/index", "style": { - "navigationBarTitleText": "我的" ,// 更改为更清晰的标题 - "navigationStyle": "custom" //单个页面设置 + "navigationBarTitleText": "我的", // 更改为更清晰的标题 + "navigationStyle": "custom" //单个页面设置 } }, { "path": "pages/my/classCheck", "style": { - "navigationBarTitleText": "活动核销" ,// 更改为更清晰的标题 - "navigationStyle": "custom" //单个页面设置 + "navigationBarTitleText": "活动核销", // 更改为更清晰的标题 + "navigationStyle": "custom" //单个页面设置 } }, { "path": "pages/center/index", // 确保此处与 tabBar 匹配 "style": { "navigationBarTitleText": "", - "navigationStyle": "custom" //单个页面设置 + "navigationStyle": "custom" //单个页面设置 } } - + ], "subPackages": [{ "root": "packageA", - "pages": [ - { - "path": "afterSales/index", - "style": { - "navigationBarTitleText": "售后订单" - } - }, + "pages": [{ + "path": "afterSales/index", + "style": { + "navigationBarTitleText": "售后订单" + } + }, - { - "path": "afterSales/list", - "style": { - "navigationBarTitleText": "售后订单" - } - }, - { - "path": "afterSales/info", - "style": { - "navigationBarTitleText": "售后订单" - } - }, { - "path": "Negotiate/agreement", - "style": { - "navigationBarTitleText": "用户协议" - } - }, - { - "path": "Negotiate/privacy", - "style": { - "navigationBarTitleText": "隐私政策" - } - }, - { - "path": "my/person-detail", - "style": { - "navigationBarTitleText": "个人中心" - } - }, - - { - "path": "my/makeList", - "style": { - "navigationBarTitleText": "我的预约" - } - }, - { - "path": "my/station", - "style": { - "navigationBarTitleText": "站内信" - } - }, - { - "path": "my/orderList", - "style": { - "navigationBarTitleText": "我发布的活动" - } - }, - { - "path": "my/exercise", - "style": { - "navigationBarTitleText": "我参与的活动" - } - }, - { - "path": "my/pendinPay", - "style": { - "navigationBarTitleText": "待支付订单" - } - }, - { - "path": "my/pendinPayDetail", - "style": { - "navigationBarTitleText": "待核销订单" - } - }, - { - "path": "my/pendinPayStatus", - "style": { - "navigationBarTitleText": "已完成订单", - "navigationStyle": "custom" - } - }, + "path": "afterSales/list", + "style": { + "navigationBarTitleText": "售后订单" + } + }, + { + "path": "afterSales/info", + "style": { + "navigationBarTitleText": "售后订单" + } + }, + { + "path": "Negotiate/agreement", + "style": { + "navigationBarTitleText": "用户协议" + } + }, + { + "path": "Negotiate/privacy", + "style": { + "navigationBarTitleText": "隐私政策" + } + }, + { + "path": "my/person-detail", + "style": { + "navigationBarTitleText": "个人中心" + } + }, - { - "path": "my/cancel", - "style": { - "navigationBarTitleText": "课程核销" + { + "path": "my/makeList", + "style": { + "navigationBarTitleText": "我的预约" + } + }, + { + "path": "my/station", + "style": { + "navigationBarTitleText": "站内信" + } + }, + { + "path": "my/orderList", + "style": { + "navigationBarTitleText": "我发布的活动" + } + }, + { + "path": "my/exercise", + "style": { + "navigationBarTitleText": "我参与的活动" + } + }, + { + "path": "my/pendinPay", + "style": { + "navigationBarTitleText": "待支付订单" + } + }, + { + "path": "my/pendinPayDetail", + "style": { + "navigationBarTitleText": "待核销订单" + } + }, + { + "path": "my/pendinPayStatus", + "style": { + "navigationBarTitleText": "已完成订单", + "navigationStyle": "custom" + } + }, + + { + "path": "my/cancel", + "style": { + "navigationBarTitleText": "课程核销" + } + }, + { + "path": "my/cancelActivity", + "style": { + "navigationBarTitleText": "活动核销" + } + }, + { + "path": "my/success", + "style": { + "navigationBarTitleText": "报名成功" + } + }, + { + "path": "my/classCheck", + "style": { + "navigationBarTitleText": "报名审核" + } + }, + { + "path": "my/stationDetail", + "style": { + "navigationBarTitleText": "消息详情" + } + }, + { + + "path": "my/Feedback", + "style": { + "navigationBarTitleText": "课程反馈" + } + }, + { + + "path": "my/timetable", + "style": { + "navigationBarTitleText": "课程表" + } + }, + { + + "path": "my/Judge", + "style": { + "navigationBarTitleText": "课程评价" + } + }, + { + "path": "my/settleIn", + "style": { + "navigationBarTitleText": "邀请入驻" + } + }, + { + "path": "my/management", + "style": { + "navigationBarTitleText": "课程管理" + } + }, + { + "path": "my/ac-management", + "style": { + "navigationBarTitleText": "活动管理" + } + }, + { + "path": "my/help", + "style": { + "navigationBarTitleText": "帮助" + } + }, + { + "path": "my/helpDetail", + "style": { + "navigationBarTitleText": "帮助中心" + } + }, + + { + "path": "my/addManagement", + "style": { + "navigationBarTitleText": "新增课程" + } + }, + { + "path": "my/mentList", + "style": { + "navigationBarTitleText": "订单管理" + } + }, + + { + "path": "my/refund", + "style": { + "navigationBarTitleText": "发起退款" + } + }, + { + "path": "center/detail", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" //单个页面设置 + } + }, + { + "path": "center/detailSys", + "style": { + "navigationBarTitleText": "", // 发布活动详情 + "navigationStyle": "custom" + } + }, + { + "path": "center/signDetail", + "style": { + "navigationBarTitleText": "报名信息" + } + }, + { + "path": "center/MechanismDetail", + "style": { + "navigationBarTitleText": "机构详情" + } + }, + + { + "path": "center/orderDetail", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "center/applyDetail", + "style": { + "navigationBarTitleText": "支付参加" + } } - }, - { - "path": "my/cancelActivity", - "style": { - "navigationBarTitleText": "活动核销" - } - }, - { - "path": "my/success", - "style": { - "navigationBarTitleText": "报名成功" - } - }, - { - "path": "my/classCheck", - "style": { - "navigationBarTitleText": "报名审核" - } - }, - { - "path": "my/stationDetail", - "style": { - "navigationBarTitleText": "消息详情" - } - }, - { - - "path": "my/Feedback", - "style": { - "navigationBarTitleText": "课程反馈" - } - }, - { - - "path": "my/timetable", - "style": { - "navigationBarTitleText": "课程表" - } - }, - { - - "path": "my/Judge", - "style": { - "navigationBarTitleText": "课程评价" - } - }, - { - "path": "my/settleIn", - "style": { - "navigationBarTitleText": "邀请入驻" - } - }, - { - "path": "my/management", - "style": { - "navigationBarTitleText": "课程管理" - } - }, - { - "path": "my/ac-management", - "style": { - "navigationBarTitleText": "活动管理" - } - }, - { - "path": "my/help", - "style": { - "navigationBarTitleText": "帮助" - } - }, - { - "path": "my/helpDetail", - "style": { - "navigationBarTitleText": "帮助中心" - } - }, - - { - "path": "my/addManagement", - "style": { - "navigationBarTitleText": "新增课程" - } - }, - { - "path": "my/mentList", - "style": { - "navigationBarTitleText": "订单管理" - } - }, - - { - "path": "my/refund", - "style": { - "navigationBarTitleText": "发起退款" - } - }, - { - "path": "center/detail", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" //单个页面设置 - } - }, - { - "path": "center/detailSys", - "style": { - "navigationBarTitleText": "", // 发布活动详情 - "navigationStyle": "custom" - } - }, - { - "path": "center/signDetail", - "style": { - "navigationBarTitleText": "报名信息" - } - }, - { - "path": "center/MechanismDetail", - "style": { - "navigationBarTitleText": "机构详情" - } - }, - - { - "path": "center/orderDetail", - "style": { - "navigationBarTitleText": "订单详情" - } - }, - { - "path": "center/applyDetail", - "style": { - "navigationBarTitleText": "支付参加" - } - } ] + + }, + { + "root": "packageB", + "pages": [{ + "path": "wallet/index", + "style": { + "navigationBarTitleText": "我的钱包" + } + },{ + "path": "wallet/bank", + "style": { + "navigationBarTitleText": "提现" + } + }] }], "preloadRule": { // 分包预载配置 "pages/index/index": { // 在进入小程序pages/index页面时,由框架自动预下载分包A、分包B @@ -311,8 +324,7 @@ "custom": true, "color": "#888888", "selectedColor": "#181818", - "list": [ - { + "list": [{ "pagePath": "pages/index/index", "text": "首页" }, diff --git a/pages/center/index.vue b/pages/center/index.vue index d78728c..8e04bea 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -6,7 +6,7 @@ - + @@ -40,7 +40,8 @@ - + 集合地点 @@ -57,9 +58,10 @@ - + - + 活动时间 @@ -105,8 +107,7 @@ 活动人数 - + @@ -134,7 +135,7 @@ - + @@ -189,11 +190,14 @@ - - + + + - 确认 + @@ -218,6 +222,9 @@ + + 确定选择 + @@ -245,1220 +252,1239 @@ \ No newline at end of file diff --git a/pages/fenl/index.vue b/pages/fenl/index.vue index a75f577..9edf641 100644 --- a/pages/fenl/index.vue +++ b/pages/fenl/index.vue @@ -112,14 +112,11 @@