diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue index c7f5efcc3..9acf6e86e 100755 --- a/yudao-ui-admin/src/views/system/tenant/index.vue +++ b/yudao-ui-admin/src/views/system/tenant/index.vue @@ -346,7 +346,7 @@ export default { }, handleQRCode(row) { const baseUrl = 'http://yuxy.perrymake.com' - const url =`${baseUrl}/pages/index/index?redirectUrl=${baseUrl}&tenantId=${row.id}` + const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${row.id}` QRCode.toCanvas(document.getElementById(`id-${row.id}`), url, { scale: 2 }, function (error) { diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json index d4057b600..73cc78bfb 100644 --- a/yudao-ui-app/pages.json +++ b/yudao-ui-app/pages.json @@ -567,30 +567,31 @@ "selectedColor": "#fc4141", "borderStyle": "white", "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/index/index", - "iconPath": "static/images/tabbar/nav_icon_shop.png", - "selectedIconPath": "static/images/1-002.png", - "text": "商城" - }, - { - "pagePath": "pages/goods_cate/goods_cate", - "iconPath": "static/images/tabbar/nav_icon_sort.png", - "selectedIconPath": "static/images/2-002.png", - "text": "分类" - }, + "list": [ + // { + // "pagePath": "pages/index/index", + // "iconPath": "static/images/tabbar/nav_icon_shop.png", + // "selectedIconPath": "static/images/1-002.png", + // "text": "商城" + // }, + // { + // "pagePath": "pages/goods_cate/goods_cate", + // "iconPath": "static/images/tabbar/nav_icon_sort.png", + // "selectedIconPath": "static/images/2-002.png", + // "text": "分类" + // }, { "pagePath": "pages/member_application/index", "iconPath": "static/images/2-001.png", "selectedIconPath": "static/images/tabbar/nav_icon_member_active.png", "text": "会员申请" }, - { - "pagePath": "pages/order_addcart/order_addcart", - "iconPath": "static/images/tabbar/nav_icon_cart.png", - "selectedIconPath": "static/images/3-002.png", - "text": "购物车" - }, + // { + // "pagePath": "pages/order_addcart/order_addcart", + // "iconPath": "static/images/tabbar/nav_icon_cart.png", + // "selectedIconPath": "static/images/3-002.png", + // "text": "购物车" + // }, { "pagePath": "pages/user/index", "iconPath": "static/images/tabbar/nav_icon_my.png", diff --git a/yudao-ui-app/pages/users/login/index.vue b/yudao-ui-app/pages/users/login/index.vue index 157144001..cf589e614 100644 --- a/yudao-ui-app/pages/users/login/index.vue +++ b/yudao-ui-app/pages/users/login/index.vue @@ -269,10 +269,11 @@ getUserInfo().then(res => { this.$store.commit("UPDATE_USERINFO", res.data); // let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index"; - let backUrl = "/pages/index/index"; - if (backUrl.indexOf('/pages/users/login/index') !== -1) { - backUrl = '/pages/index/index'; - } + let backUrl = "/pages/member_application/index"; + // let backUrl = "/pages/index/index"; + // if (backUrl.indexOf('/pages/users/login/index') !== -1) { + // backUrl = '/pages/index/index'; + // } uni.reLaunch({ url: backUrl });