diff --git a/apis/interfaces/vip.js b/apis/interfaces/vip.js index f2524f8..0784a70 100644 --- a/apis/interfaces/vip.js +++ b/apis/interfaces/vip.js @@ -39,13 +39,6 @@ const vipCont = (id, data) =>{ }) } -// 会员开通协议 -const userAgree = () =>{ - return request({ - url : 'articles/agreement/openvip' - }) -} - // 上传打款凭证 const vipVoucher = (data) =>{ return request({ @@ -55,11 +48,18 @@ const vipVoucher = (data) =>{ }) } +// 用户协议 +const userAgree = (apiUrl) => { + return request({ + url: apiUrl + }) +} + export { identities, vipOrder, vipWechatPay, vipCont, - userAgree, - vipVoucher + vipVoucher, + userAgree } diff --git a/manifest.json b/manifest.json index 30b1c92..fc88c68 100644 --- a/manifest.json +++ b/manifest.json @@ -5,6 +5,12 @@ "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, + "h5": { + "title": "链商星球", + "router": { + "mode": "history" + } + }, /* 5+App特有相关 */ "app-plus" : { "usingComponents" : true, diff --git a/pages.json b/pages.json index a70a75b..38ad395 100644 --- a/pages.json +++ b/pages.json @@ -8,189 +8,210 @@ } }, { "path": "pages/found/index", - "name": "Found", + "name": "Found", + "aliasPath": "/found", "auth": true, "style": { "navigationBarTitleText": "发现更多" } }, { "path": "pages/user/index", - "name": "User", + "name": "User", + "aliasPath": "/user", "auth": true, "style": { "navigationBarTitleText": "节点中心" } }, { "path": "pages/user/code", - "name": "userCode", + "name": "userCode", + "aliasPath": "/user/code", "auth": true, "style": { "navigationBarTitleText": "邀请好友" } }, { "path": "pages/user/help", - "name": "userHelp", + "name": "userHelp", + "aliasPath": "/user/help", "auth": true, "style": { "navigationBarTitleText": "帮助中心" } }, { "path": "pages/user/partner", - "name": "userPartner", + "name": "userPartner", + "aliasPath": "/user/partner", "auth": true, "style": { "navigationBarTitleText": "我的伙伴" } }, { "path": "pages/user/clause", - "name": "userClause", + "name": "userClause", + "aliasPath": "/user/clause", "auth": true, "style": { "navigationBarTitleText": "服务条款" } }, { "path": "pages/user/followOfficial", - "name": "Official", + "name": "Official", + "aliasPath": "/user/followOfficial", "auth": true, "style": { "navigationBarTitleText": "关注公众号" } }, { "path": "pages/vip/vip", - "name": "vipIndex", + "name": "vipIndex", + "aliasPath": "/vip", "style": { "navigationBarTitleText": "开通节点" } }, { "path": "pages/vip/agree", - "name": "vipAgree", + "name": "vipAgree", + "aliasPath": "/vip/agree", "style": { - "navigationBarTitleText": "服务条款" + "navigationBarTitleText": "用户协议" } }, { - "path": "pages/vip/examine", - "name": "Examine", + "path": "pages/vip/examine", + "name": "Examine", + "aliasPath": "/vip/examine", "style": { "navigationBarTitleText": "提交成功" } }, { "path": "pages/setting/setting", - "name": "setting", + "name": "setting", + "aliasPath": "/setting", "auth": true, "style": { "navigationBarTitleText": "设置中心" } }, { "path": "pages/goods/management", - "name": "goodsManagement", + "name": "goodsManagement", + "aliasPath": "/goods/management", "style": { "navigationBarTitleText": "商品权证管理" } }, { "path": "pages/goods/addClassify", - "name": "goodsaddClassify", + "name": "goodsaddClassify", + "aliasPath": "/goods/add-classify", "style": { "navigationBarTitleText": "发布商品类目" } }, { "path": "pages/goods/add", - "name": "goodsAdd", + "name": "goodsAdd", + "aliasPath": "/goods/add", "style": { "navigationBarTitleText": "商品权证创建" } }, { "path": "pages/goods/goodsAuth", - "name": "goodsAddAuth", + "name": "goodsAddAuth", + "aliasPath": "/goods/goods-auth", "style": { "navigationBarTitleText": "商品权证认证" } }, { "path": "pages/coupons/management", - "name": "couponsManagement", + "name": "couponsManagement", + "aliasPath": "/coupons/management", "style": { "navigationBarTitleText": "创建优惠券" } }, { "path": "pages/coupons/add", - "name": "couponsAdd", + "name": "couponsAdd", + "aliasPath": "/coupons/add", "style": { "navigationBarTitleText": "创建优惠券" } }, { "path": "pages/coupons/magDetails", - "name": "couponsDetails", + "name": "couponsDetails", + "aliasPath": "/coupons/mag-details", "style": { "navigationBarTitleText": "优惠券详情" } }, { "path": "pages/coupons/selectGoods", - "name": "couponsSelectGoods", + "name": "couponsSelectGoods", + "aliasPath": "/coupons/select-goods", "style": { "navigationBarTitleText": "关联产品" } }, { "path": "pages/login/login", - "name": "Login", + "name": "Login", + "aliasPath": "/login", "style": { "navigationBarTitleText": "登录" } }, { "path": "pages/login/guide", - "name": "loginGuide", + "name": "loginGuide", + "aliasPath": "/login/guide", "style": { "navigationBarTitleText": "引导页" } }, { "path": "pages/login/agreement", - "name": "agreement", + "name": "agreement", + "aliasPath": "/login/agreement", "style": { "navigationBarTitleText": "用户隐藏协议" } }, { "path": "pages/certification/personal", - "name": "Personal", + "name": "Personal", + "aliasPath": "/personal", "auth": true, "style": { "navigationBarTitleText": "个人认证" } - }, { - "path": "pages/setting/setting", - "name": "setting", - "auth": true, - "style": { - "navigationBarTitleText": "设置中心" - } }, { "path": "pages/setting/aboutUs", - "name": "aboutUs", + "name": "aboutUs", + "aliasPath": "/setting/about-us", "auth": true, "style": { "navigationBarTitleText": "关于我们" } }, { "path": "pages/company/approve", - "name": "companyApprove", + "name": "companyApprove", + "aliasPath": "/company/approve", "auth": true, "style": { "navigationBarTitleText": "企业认证" } }, { "path": "pages/news/index", - "name": "news", + "name": "news", + "aliasPath": "/news/index", "auth": true, "style": { "navigationBarTitleText": "消息中心" } }, { "path": "pages/news/detail", - "name": "newsDetail", + "name": "newsDetail", + "aliasPath": "/news/detail", "auth": true, "style": { "navigationBarTitleText": "消息列表" } }, { "path": "pages/wallet/property", - "name": "walletProperty", + "name": "walletProperty", + "aliasPath": "/wallet/property", "style": { "navigationBarTitleText": "能量钱包", "enablePullDownRefresh": false, @@ -198,7 +219,8 @@ } }, { "path": "pages/wallet/extract", - "name": "Extract", + "name": "Extract", + "aliasPath": "/wallet/extract", "style": { "navigationBarTitleText": "提现能量", "enablePullDownRefresh": false, @@ -207,69 +229,78 @@ } },{ "path": "pages/verification/index", - "name": "verificationIndex", + "name": "verificationIndex", + "aliasPath": "/verification/index", "auth": true, "style": { "navigationBarTitleText": "扫码核销" } },{ "path": "pages/verification/history", - "name": "verificationHistory", + "name": "verificationHistory", + "aliasPath": "/verification/history", "auth": true, "style": { "navigationBarTitleText": "核销记录" } },{ "path": "pages/shop/lists", - "name": "shopLists", + "name": "shopLists", + "aliasPath": "/shop/lists", "auth": true, "style": { "navigationBarTitleText": "部门/门店" } },{ "path": "pages/shop/create", - "name": "shopCreate", + "name": "shopCreate", + "aliasPath": "/shop/create", "auth": true, "style": { "navigationBarTitleText": "创建部门/门店" } },{ "path": "pages/employees/list", - "name": "employeesList", + "name": "employeesList", + "aliasPath": "/employees/list", "auth": true, "style": { "navigationBarTitleText": "员工管理" } },{ "path": "pages/employees/add", - "name": "employeesAdd", + "name": "employeesAdd", + "aliasPath": "/employees/add", "auth": true, "style": { "navigationBarTitleText": "添加员工" } },{ "path": "pages/instrument/Spread", - "name": "instrumentSpread", + "name": "instrumentSpread", + "aliasPath": "/instrument/spread", "auth": true, "style": { "navigationBarTitleText": "营销推广码" } },{ "path": "pages/instrument/basics", - "name": "instrumentBasics", + "name": "instrumentBasics", + "aliasPath": "/instrument/basics", "auth": true, "style": { "navigationBarTitleText": "基础信息" } }, { "path": "pages/wallet/fragment", + "name": "Fragment", + "aliasPath": "/wallet/fragment", "style": { "navigationBarTitleText": "能量碎片记录", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" - }, - "name": "Fragment" + } }, { "path": "pages/wallet/addBank", @@ -279,7 +310,8 @@ "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" }, - "name": "addBank" + "name": "addBank", + "aliasPath": "/wallet/add-bank" },{ "path": "pages/wallet/bankList", "style": { @@ -288,7 +320,8 @@ "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" }, - "name": "bankList" + "name": "bankList", + "aliasPath": "/wallet/bank/list" },{ "path": "pages/wallet/withdrawList", "style": { @@ -297,7 +330,8 @@ "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" }, - "name": "withdrawList" + "name": "withdrawList", + "aliasPath": "/wallet/withdraw/list" }], "globalStyle": { "navigationStyle": "custom", diff --git a/pages/login/login.vue b/pages/login/login.vue index 22376df..2780c9e 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -26,8 +26,11 @@ - 未注册的手机号验证后将自动创建账号,登录即表示同意接收用户隐私协议用户服务协议 - + + 未注册的手机号验证后将自动创建账号,登录即表示同意接收 + 用户隐私协议 + 和 + 用户服务协议 @@ -253,8 +256,7 @@ padding-top: $padding * 2; font-size: $title-size-sm; color: $text-gray; - - navigator { + view { color: $text-price; display: inline-block; padding: 0 10rpx; diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index 8ec4f9a..e15d27e 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -278,9 +278,7 @@ }, loginOut() { this.$store.commit('setToken', '') - uni.reLaunch({ - url: '/pages/login/login' - }) + this.$Router.push({name: 'Login'}) }, // 上传头像 updImgs(type) { diff --git a/pages/user/code.vue b/pages/user/code.vue index 90c388b..1ae2b87 100644 --- a/pages/user/code.vue +++ b/pages/user/code.vue @@ -1,5 +1,5 @@