diff --git a/pages.json b/pages.json index ebd032c..4b416d4 100644 --- a/pages.json +++ b/pages.json @@ -1,357 +1,362 @@ { - "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/Login/launcherPage", - "style": { - "navigationBarTitleText": "启动页", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "商家端首页", - "navigationStyle": "custom" - } - }, - { - "path": "pages/manage/informationManage", - "style": { - "navigationBarTitleText": "设备管理", - "navigationStyle": "custom" - } - }, - { - "path": "pages/manage/informationAdd", - "style": { - "navigationBarTitleText": "设备管理新增编辑页", - "navigationStyle": "custom" - } - }, - { - "path": "pages/manage/deviceManage", - "style": { - "navigationBarTitleText": "资料管理", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/authority", - "style": { - "navigationBarTitleText": "官方端", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/announcement", - "style": { - "navigationBarTitleText": "行业公告", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/details", - "style": { - "navigationBarTitleText": "详情页", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/statistics", - "style": { - "navigationBarTitleText": "数据展示", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/Detection", - "style": { - "navigationBarTitleText": "汽车检测", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/newadd", - "style": { - "navigationBarTitleText": "新增文章", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/editlist", - "style": { - "navigationBarTitleText": "编辑文章列表", - "navigationStyle": "custom" - } - }, - { - "path": "pages/manage/manage", - "style": { - "navigationBarTitleText": "h-管理", - "navigationStyle": "custom" - } - }, - { - "path": "pages/manage/deviceAdd", - "style": { - "navigationBarTitleText": "新增文件", - "navigationStyle": "custom" - } - }, - { - "path": "pages/authority/editDete", - "style": { - "navigationBarTitleText": "编辑文章", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/synthesis", - "style": { - "navigationBarTitleText": "新首页", - "navigationStyle": "custom" - } - }, - { - "path": "pages/xiaoxi/xiaoxi", - "style": { - "navigationBarTitleText": "消息", - "navigationStyle": "custom" - } - }, - { - "path": "pages/xiaoxi/details", - "style": { - "navigationBarTitleText": "消息详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/coupon/coupon", - "style": { - "navigationBarTitleText": "优惠券", - "navigationStyle": "custom" - } - }, - { - "path": "pages/coupon/couponadd", - "style": { - "navigationBarTitleText": "新增优惠券", - "navigationStyle": "custom" - } - }, - { - "path": "pages/statistics/statistics", - "style": { - "navigationBarTitleText": "业务统计", - "navigationStyle": "custom" - } - }, - { - "path": "pages/statistics/statislist", - "style": { - "navigationBarTitleText": "业务统计二级页", - "navigationStyle": "custom" - } - }, - { - "path": "pages/staff/staff", - "style": { - "navigationBarTitleText": "员工端", - "navigationStyle": "custom" - } - }, - { - "path": "pages/staff/golist", - "style": { - "navigationBarTitleText": "员工端上门取车", - "navigationStyle": "custom" - } - }, - { - "path": "pages/staff/orderdetails", - "style": { - "navigationBarTitleText": "员工端-订单详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/staff/staff-my", - "style": { - "navigationBarTitleText": "员工端个人信息", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/Staffmanagement", - "style": { - "navigationBarTitleText": "员工列表", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/homecar", - "style": { - "navigationBarTitleText": "上门取车", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/order-home", - "style": { - "navigationBarTitleText": "指派上门人员", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/ordermanage", - "style": { - "navigationBarTitleText": "订单管理", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/orderdetails", - "style": { - "navigationBarTitleText": "订单详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/Neworder", - "style": { - "navigationBarTitleText": "新增线下订单", - "navigationStyle": "custom" - } - }, - { - "path": "pages/order/order", - "style": { - "navigationBarTitleText": "商品管理", - "navigationStyle": "custom" - } - }, - { - "path": "pages/order/reservationlist", - "style": { - "navigationBarTitleText": "预约列表", - "navigationStyle": "custom" - } - }, - { - "path": "pages/order/editorder", - "style": { - "navigationBarTitleText": "商品编辑", - "navigationStyle": "custom" - } - }, - { - "path": "pages/Tollannouncement/Tollannouncement", - "style": { - "navigationBarTitleText": "发布", - "navigationStyle": "custom" - } - }, - { - "path": "pages/release/release", - "style": { - "navigationBarTitleText": "新增商品", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/my", - "style": { - "navigationBarTitleText": "我的", - "navigationStyle": "custom" - } - }, - { - "path": "pages/safety/safety", - "style": { - "navigationBarTitleText": "我的-安全", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/my-wallet", - "style": { - "navigationBarTitleText": "钱包", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/rwm", - "style": { - "navigationBarTitleText": "二维码", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/rwmlist", - "style": { - "navigationBarTitleText": "核销记录", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/my-order", - "style": { - "navigationBarTitleText": "我的订单", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/ordermanage", - "style": { - "navigationBarTitleText": "订单管理", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/shoporder", - "style": { - "navigationBarTitleText": "我的店铺", - "navigationStyle": "custom" - } - }, - { - "path": "pages/Login/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" - } - }, - { - "path": "pages/Login/modify", - "style": { - "navigationBarTitleText": "修改密码", - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/order/editPrice", - "style" : - { - "navigationBarTitleText": "价格编辑", - "navigationStyle": "custom" - } - - }, - { - "path" : "pages/index/selectProject", - "style" : - { - "navigationBarTitleText" : "选择项目", - "navigationStyle": "custom" - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "uniIdRouter": {} + "pages": [ + //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/Login/launcherPage", + "style": { + "navigationBarTitleText": "启动页", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "商家端首页", + "navigationStyle": "custom" + } + }, + { + "path": "pages/manage/informationManage", + "style": { + "navigationBarTitleText": "设备管理", + "navigationStyle": "custom" + } + }, + { + "path": "pages/manage/informationAdd", + "style": { + "navigationBarTitleText": "设备管理新增编辑页", + "navigationStyle": "custom" + } + }, + { + "path": "pages/manage/deviceManage", + "style": { + "navigationBarTitleText": "资料管理", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/authority", + "style": { + "navigationBarTitleText": "官方端", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/announcement", + "style": { + "navigationBarTitleText": "行业公告", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/details", + "style": { + "navigationBarTitleText": "详情页", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/statistics", + "style": { + "navigationBarTitleText": "数据展示", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/Detection", + "style": { + "navigationBarTitleText": "汽车检测", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/newadd", + "style": { + "navigationBarTitleText": "新增文章", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/editlist", + "style": { + "navigationBarTitleText": "编辑文章列表", + "navigationStyle": "custom" + } + }, + { + "path": "pages/manage/manage", + "style": { + "navigationBarTitleText": "h-管理", + "navigationStyle": "custom" + } + }, + { + "path": "pages/manage/deviceAdd", + "style": { + "navigationBarTitleText": "新增文件", + "navigationStyle": "custom" + } + }, + { + "path": "pages/authority/editDete", + "style": { + "navigationBarTitleText": "编辑文章", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/synthesis", + "style": { + "navigationBarTitleText": "新首页", + "navigationStyle": "custom" + } + }, + { + "path": "pages/xiaoxi/xiaoxi", + "style": { + "navigationBarTitleText": "消息", + "navigationStyle": "custom" + } + }, + { + "path": "pages/xiaoxi/details", + "style": { + "navigationBarTitleText": "消息详情", + "navigationStyle": "custom" + } + }, + { + "path": "pages/coupon/coupon", + "style": { + "navigationBarTitleText": "优惠券", + "navigationStyle": "custom" + } + }, + { + "path": "pages/coupon/couponadd", + "style": { + "navigationBarTitleText": "新增优惠券", + "navigationStyle": "custom" + } + }, + { + "path": "pages/statistics/statistics", + "style": { + "navigationBarTitleText": "业务统计", + "navigationStyle": "custom" + } + }, + { + "path": "pages/statistics/statislist", + "style": { + "navigationBarTitleText": "业务统计二级页", + "navigationStyle": "custom" + } + }, + { + "path": "pages/staff/staff", + "style": { + "navigationBarTitleText": "员工端", + "navigationStyle": "custom" + } + }, + { + "path": "pages/staff/golist", + "style": { + "navigationBarTitleText": "员工端上门取车", + "navigationStyle": "custom" + } + }, + { + "path": "pages/staff/orderdetails", + "style": { + "navigationBarTitleText": "员工端-订单详情", + "navigationStyle": "custom" + } + }, + { + "path": "pages/staff/staff-my", + "style": { + "navigationBarTitleText": "员工端个人信息", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/Staffmanagement", + "style": { + "navigationBarTitleText": "员工列表", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/homecar", + "style": { + "navigationBarTitleText": "上门取车", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/order-home", + "style": { + "navigationBarTitleText": "指派上门人员", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/ordermanage", + "style": { + "navigationBarTitleText": "订单管理", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/orderdetails", + "style": { + "navigationBarTitleText": "订单详情", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/Neworder", + "style": { + "navigationBarTitleText": "新增线下订单", + "navigationStyle": "custom" + } + }, + { + "path": "pages/order/order", + "style": { + "navigationBarTitleText": "商品管理", + "navigationStyle": "custom" + } + }, + { + "path": "pages/order/reservationlist", + "style": { + "navigationBarTitleText": "预约列表", + "navigationStyle": "custom" + } + }, + { + "path": "pages/order/editorder", + "style": { + "navigationBarTitleText": "商品编辑", + "navigationStyle": "custom" + } + }, + { + "path": "pages/Tollannouncement/Tollannouncement", + "style": { + "navigationBarTitleText": "发布", + "navigationStyle": "custom" + } + }, + { + "path": "pages/release/release", + "style": { + "navigationBarTitleText": "新增商品", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my/my", + "style": { + "navigationBarTitleText": "我的", + "navigationStyle": "custom" + } + }, + { + "path": "pages/safety/safety", + "style": { + "navigationBarTitleText": "我的-安全", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my/my-wallet", + "style": { + "navigationBarTitleText": "钱包", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my/rwm", + "style": { + "navigationBarTitleText": "二维码", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my/rwmlist", + "style": { + "navigationBarTitleText": "核销记录", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my/my-order", + "style": { + "navigationBarTitleText": "我的订单", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my/ordermanage", + "style": { + "navigationBarTitleText": "订单管理", + "navigationStyle": "custom" + } + }, + { + "path": "pages/my/shoporder", + "style": { + "navigationBarTitleText": "我的店铺", + "navigationStyle": "custom" + } + }, + { + "path": "pages/Login/login", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom" + } + }, + { + "path": "pages/Login/modify", + "style": { + "navigationBarTitleText": "修改密码", + "navigationStyle": "custom" + } + }, + { + "path": "pages/order/editPrice", + "style": { + "navigationBarTitleText": "价格编辑", + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/selectProject", + "style": { + "navigationBarTitleText": "选择项目", + "navigationStyle": "custom" + } + }, + { + "path": "pages/staff/goRoyalty", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "uniIdRouter": {} } diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue index 6fea123..6522d94 100644 --- a/pages/index/orderdetails.vue +++ b/pages/index/orderdetails.vue @@ -58,7 +58,7 @@ 联系用户 - + 订单详情 @@ -248,6 +248,7 @@ export default { tbindex: 1, isOnline: 1, hge: false, + roleSelect:'', orImages:false, show: false, xling: false, @@ -298,6 +299,13 @@ export default { }, onShow() { this.getindex() + uni.getStorage({ + key: 'roleSelect', + success: (res) => { + console.log('读取缓存',res) + this.roleSelect = res.data + } + }) }, methods: { chooseBank(e) { diff --git a/pages/staff/goRoyalty.vue b/pages/staff/goRoyalty.vue new file mode 100644 index 0000000..3bb15d2 --- /dev/null +++ b/pages/staff/goRoyalty.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/pages/staff/staff-my.vue b/pages/staff/staff-my.vue index 65f1fa1..60c95f4 100644 --- a/pages/staff/staff-my.vue +++ b/pages/staff/staff-my.vue @@ -3,19 +3,19 @@ - - - - - - {{user.realName}} - {{user.phonenumber}} - - + + + + + + + + + - + - + @@ -29,6 +29,17 @@ + + + + + + 提成记录 + + + + + - + @@ -71,12 +82,12 @@ - - + + - + @@ -127,7 +138,7 @@ let ress = await request({ url:'/partnerOwn/partner/shopInfo', method: 'get', - }) + }) this.user = ress.data }, tui(){ @@ -141,6 +152,11 @@ url:"/pages/staff/golist" }) }, + goRoyalty(){ + uni.navigateTo({ + url:"/pages/staff/goRoyalty" + }) + }, getdianpu(){ uni.navigateTo({ url:"/pages/my/shoporder"