diff --git a/apis/index.js b/apis/index.js index 143c5f7..5238aa1 100644 --- a/apis/index.js +++ b/apis/index.js @@ -30,6 +30,9 @@ const request = (parameter) => { 'Accept': 'application/json', 'Authorization': store.getters.getToken || '' } + + console.log('发送数据调试用', parameter) + // 请求实例 return new Promise((resolve, reject) => { uni.request({ @@ -83,9 +86,6 @@ const errToast = (code) => { icon : 'none' }) break; - case 401: - console.log('重新登录') - break; } } diff --git a/apis/interfaces/auth.js b/apis/interfaces/auth.js index 26aef3a..191a6ff 100644 --- a/apis/interfaces/auth.js +++ b/apis/interfaces/auth.js @@ -9,7 +9,7 @@ import request from '../index' // 一键登录 -const auth = (data) => { +const keyAuth = (data) => { return request({ url: 'user/socialite/login/unicloud/app', method: 'POST', @@ -17,6 +17,26 @@ const auth = (data) => { }) } -export { - auth +// 验证码登录 +const smsAuth = (data) =>{ + return request({ + url: "user/auth/sms", + method: 'POST', + data: data + }) +} + +// 获取验证码 +const getSms = (data) =>{ + return request({ + url: "user/auth/verify", + method: 'POST', + data: data + }) +} + +export { + keyAuth, + smsAuth, + getSms } diff --git a/manifest.json b/manifest.json index a205fd2..26d93fb 100644 --- a/manifest.json +++ b/manifest.json @@ -16,11 +16,11 @@ "autoclose" : true, "delay" : 0 }, - "safearea": { - "bottom": { - "offset" : "none" - } - }, + "safearea" : { + "bottom" : { + "offset" : "none" + } + }, /* 模块配置 */ "modules" : { "OAuth" : {} diff --git a/pages.json b/pages.json index 9fb21ec..60bc20a 100644 --- a/pages.json +++ b/pages.json @@ -1,122 +1,114 @@ { - "pages": [{ - "path": "pages/guide/index", - "name": "Guide", - "style": { - "navigationStyle":"custom" - } - }, { - "path": "pages/index/index", - "name": "Index" - }, { - "path": "pages/user/index", - "name": "User", - "style": { - "navigationBarTitleText": "我的", - "transparentTitle": "auto" - } - }, { - "path": "pages/login/login", - "name": "Login" - }, { - "path": "pages/login/sms", - "name": "Sms" - }, { - "path": "pages/company/auth", - "style": { - "navigationBarTitleText": "企业认证", - "enablePullDownRefresh": false - } - }, { - "path": "pages/vip/index", - "style": { - "navigationBarTitleText": "会员", - "enablePullDownRefresh": false - } - }, { - "path": "pages/vip/pay", - "style": { - "navigationBarTitleText": "会员支付", - "enablePullDownRefresh": false - } - }, { - "path": "pages/order/index", - "style": { - "navigationBarTitleText": "订单列表", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/order/details", - "style": { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false - } - }, { - "path": "pages/order/submit", - "style": { - "navigationBarTitleText": "提交订单", - "enablePullDownRefresh": false - } - }, { - "path": "pages/property/cash", - "style": { - "navigationBarTitleText": "现金账户", - "enablePullDownRefresh": false - } - }, { - "path": "pages/property/eb", - "style": { - "navigationBarTitleText": "EB账户", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/property/integral", - "style": { - "navigationBarTitleText": "贡献值", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/property/token", - "style": { - "navigationBarTitleText": "数权账户", - "enablePullDownRefresh": false - } - }, + "pages": [ { "path": "pages/equity/index", "name": "Equity", "style":{ - "navigationBarTitleText":"企业广场", "navigationStyle":"custom" } - } - ], + },{ + "path": "pages/market/index", + "name": "Market", + "style": { + "navigationBarTitleText":"转让市场", + "titleNView": { + "backgroundColor": "#FFFFFF", + "buttons": [ + { + "text": "成交历史", + "fontSize": "14", + "width": "80", + "color": "#555555" + } + ] + } + } + },{ + "path": "pages/store/index", + "name": "Store" + },{ + "path": "pages/property/index", + "name": "Property" + },{ + "path" : "pages/goods/details", + "style": { + "navigationBarTitleText":"", + "titleNView": { + "backgroundColor": "#FFFFFF", + "type": "transparent", + "buttons": [ + { + "text": "分享", + "fontSize": "12", + "color": "#555555" + } + ] + } + } + },{ + "path": "pages/login/login", + "name": "Login", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#FFFFFF", + "disableScroll": true + } + },{ + "path" : "pages/company/registered", + "name" : "Registered", + "style":{ + "navigationBarTitleText": "" + } + },{ + "path" : "pages/company/prompt", + "name" : "Prompt", + "style":{ + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#FFFFFF", + "disableScroll": true, + "titleNView": { + "backgroundColor": "#FFFFFF", + "buttons": [ + { + "text": "先逛一逛", + "fontSize": "14", + "width": "80", + "color": "#555555" + } + ] + } + } + },{ + "path": "pages/vip/index", + "name": "Vip", + "style": { + "navigationBarTitleText": "我的会员" + } + } + ], "tabBar": { "color": "#bababa", "selectedColor": "#c82626", "backgroundColor": "#FFFFFF", "borderStyle": "white", "list": [{ - "pagePath": "pages/index/index", - "text": "易货", + "pagePath": "pages/equity/index", + "text": "通证权易", "iconPath": "static/tabBar/tabBar_icon_00.png", "selectedIconPath": "static/tabBar/tabBar_show_00.png" }, { - "pagePath": "pages/property/token", - "text": "数权", + "pagePath": "pages/market/index", + "text": "转让市场", "iconPath": "static/tabBar/tabBar_icon_01.png", "selectedIconPath": "static/tabBar/tabBar_show_01.png" }, { - "pagePath": "pages/property/integral", - "text": "贡献值", + "pagePath": "pages/store/index", + "text": "企业工具", "iconPath": "static/tabBar/tabBar_icon_02.png", "selectedIconPath": "static/tabBar/tabBar_show_02.png" }, { - "pagePath": "pages/user/index", - "text": "我的", + "pagePath": "pages/property/index", + "text": "我的资产", "iconPath": "static/tabBar/tabBar_icon_03.png", "selectedIconPath": "static/tabBar/tabBar_show_03.png" }] diff --git a/pages/company/prompt.vue b/pages/company/prompt.vue new file mode 100644 index 0000000..4189d0d --- /dev/null +++ b/pages/company/prompt.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/pages/company/registered.vue b/pages/company/registered.vue new file mode 100644 index 0000000..b85b52e --- /dev/null +++ b/pages/company/registered.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/pages/equity/index.vue b/pages/equity/index.vue index ee29dc2..89afd8e 100644 --- a/pages/equity/index.vue +++ b/pages/equity/index.vue @@ -2,68 +2,110 @@ - - - 搜索 - - - - - - - MLB - 进店 - - - - 名创优品 - 进店 - - - - - - - - - - MLB(美职联) - - - - 累计交易100次 + + + + 搜索企业/行业 + + + 推荐商家 + + + + + MLB + 进店 - 进店 + + + 名创优品 + 进店 + + + + + + 热易商家 + 查看更多 + + + + + + + MLB(美职联) + + + + 累计交易100次 + + 进店 + + + + + + 全部 + 轻工食品 + 服饰纺织 + 家居用品 + 住宿餐饮 + 建筑建材 + + + + + + + + 搜索企业/行业 + + + + + + + + 餐饮美食 - - - - - 全部 - 轻工食品 - 服饰纺织 - 家居用品 - 住宿餐饮 - 建筑建材 - + + + + + 公告信息 + + + + + + @@ -71,12 +113,14 @@ export default{ data() { return { + tabIndex: 0, nvConfig: { tabArr: [ - {title:'企业广场', active:true}, - {title:'易货商城'} + {title:'广场', active:true}, + {title:'易货'} ], - color: "#555" + color: "#555", + hideback: true } }; }, @@ -87,6 +131,7 @@ if(i == tabIndex) this.nvConfig.tabArr[i].active = true else this.nvConfig.tabArr[i].active = false } + this.tabIndex = tabIndex } } } @@ -96,7 +141,7 @@ // 行业分类 .industry-tabs{ white-space:nowrap; - padding: $padding 0; + padding: 0 0 $padding 0; .industry-item{ margin-left: $margin; display: inline-block; @@ -209,6 +254,33 @@ } } } + // 搜索 + .search{ + padding: $padding; + .nav{ + background: white; + border-radius: $radius/2; + height: 70rpx; + line-height: 70rpx; + text-align: center; + box-shadow: 0 0 6rpx 6rpx rgba($color: #000000, $alpha: .02); + font-size: $title-size-lg; + color: $text-gray-m; + } + } + // 模块标题 + .block-title{ + padding: 0 $padding; + font-weight: bold; + color: $text-color; + display: flex; + justify-content: space-between; + .more{ + font-size: $title-size-m; + font-weight: normal; + color: $text-gray; + } + } + + + + + + + + + + + + + + + + + 谷风一木3层软抽面巾纸 6包/提 + 进口原木浆 和风高颜值 + + 100.00 + 累计易货10次 + + + + + 宜家哈尔滨旗舰店 + + + + + 进店 + + + + + + 17个功能分区,理性展现 + + + + 特价商品不可与优惠券叠加使用 + + + + 易货严选自营・30天无忧退换・不可用券・国内部分地区不可配送 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/guide/index.vue b/pages/guide/index.vue index 960e68c..e13ede4 100644 --- a/pages/guide/index.vue +++ b/pages/guide/index.vue @@ -1,7 +1,7 @@