diff --git a/api/user.js b/api/user.js index 2f3ff4d..216725a 100644 --- a/api/user.js +++ b/api/user.js @@ -495,3 +495,11 @@ export function integral(q) { export function signIntegral(q) { return request.post('/sign/integral') } + + +/* + * 提现 + * */ +export function cash(data) { + return request.post('/user/cash', data) +} \ No newline at end of file diff --git a/pages/demandHall/business/newsSwiper.vue b/components/newsSwiper.vue similarity index 100% rename from pages/demandHall/business/newsSwiper.vue rename to components/newsSwiper.vue diff --git a/components/quick-skeleton/quick-skeleton.vue b/components/quick-skeleton/quick-skeleton.vue index a6e413f..a56de52 100644 --- a/components/quick-skeleton/quick-skeleton.vue +++ b/components/quick-skeleton/quick-skeleton.vue @@ -58,7 +58,11 @@ const that = this; //绘制背景 uni.createSelectorQuery().selectAll(`.${this.selector}`).boundingClientRect().exec(function(res){ - that.systemInfo.height = res[0][0].height + res[0][0].top; + // console.log(res) + if(res[0][0]) { + that.systemInfo.height = res[0][0].height + res[0][0].top; + } + }); //绘制矩形 diff --git a/config/index.js b/config/index.js index 1751c55..bf80009 100644 --- a/config/index.js +++ b/config/index.js @@ -1,10 +1,11 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api' - export const VUE_APP_API_URL = 'http://10.11.32.103:8092/api' -// export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' + // export const VUE_APP_API_URL = 'http://10.11.32.103:8092/api' +export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static' + \ No newline at end of file diff --git a/pages.json b/pages.json index 7e9740c..2676e2e 100644 --- a/pages.json +++ b/pages.json @@ -36,6 +36,12 @@ "path": "pages/login/index", "style": {} }, + { + "path": "pages/login/agreementPage", + "style": { + "navigationBarTitleText": "用户协议" + } + }, { "path": "pages/authorization/index", "style": {} @@ -487,7 +493,8 @@ { "path": "pages/information/index", "style": { - "navigationBarTitleText": "资讯广场" + "navigationBarTitleText": "资讯广场", + "enablePullDownRefresh": true } } ], @@ -524,8 +531,8 @@ { "pagePath": "pages/information/index", "text": "资讯", - "iconPath": "/static/tabbarComponent/icon/tab3.png", - "selectedIconPath": "/static/tabbarComponent/icon/tab3-a.png" + "iconPath": "/static/tabbarComponent/icon/tab5.png", + "selectedIconPath": "/static/tabbarComponent/icon/tab5-a.png" }, { "pagePath": "pages/user/index", diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue index dd02197..5a29b8b 100644 --- a/pages/Loading/index.vue +++ b/pages/Loading/index.vue @@ -4,7 +4,7 @@ 海量资源与福利尽在云生态~ - + diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue index 29d2898..1bc963c 100644 --- a/pages/demandHall/business/index.vue +++ b/pages/demandHall/business/index.vue @@ -97,7 +97,7 @@ - + @@ -123,7 +123,7 @@ diff --git a/pages/release/companyAuth/index.css b/pages/release/companyAuth/index.css index c6c9285..e52a541 100644 --- a/pages/release/companyAuth/index.css +++ b/pages/release/companyAuth/index.css @@ -105,4 +105,16 @@ width: 14rpx; height: 24rpx; margin-left: 10rpx; +} + +.argeement-box{ + font-size: 24rpx; + color: #666; + text-align: center; + display: flex; + align-items: center; + justify-content: center; +} +.argeement-box view{ + width: 60%; } \ No newline at end of file diff --git a/pages/release/companyAuth/index.vue b/pages/release/companyAuth/index.vue index 12c98cf..57df855 100644 --- a/pages/release/companyAuth/index.vue +++ b/pages/release/companyAuth/index.vue @@ -145,6 +145,16 @@ --> 保存并提交 + + + + + + + 我已阅读并同意 + 《用户协议及隐私政策》 + + @@ -333,10 +343,25 @@ // urls: [url], // }) }, - + argeementClick(e){ + console.log(e) + let state = e.detail.value + if(state.length > 0) { + this.isCheck = true + } else{ + this.isCheck = false + } + }, submit() { let form = this.form; console.log(form); + if(!this.isCheck){ + uni.showToast({ + title: '请阅读并勾选用户隐私协议', + icon: 'none' + }); + return; + } if (form.isLegalPerson == 0 && form.authorizationPath == '') { uni.showToast({ @@ -455,7 +480,10 @@ \ No newline at end of file diff --git a/pages/user/incomeDetail/index.vue b/pages/user/incomeDetail/index.vue index c4f985a..da635cc 100644 --- a/pages/user/incomeDetail/index.vue +++ b/pages/user/incomeDetail/index.vue @@ -14,7 +14,7 @@ 累计收益 {{pageData.brokeragePrice}}元 - + 提现 @@ -63,43 +63,13 @@ export default { onLoad: function (options) { this.getDetail(); }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () {}, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () {}, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () {}, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () {}, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () {}, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () {} - /** - * 用户点击右上角分享 - */ - // onShareAppMessage: function () { - // } - , + methods: { + toWithDraw(){ + uni.navigateTo({ + url: '/pages/user/withdraw/index' + }) + }, getDetail() { app.http('get', 'user/profitDetail').then(res => { if (res.data.success) { diff --git a/pages/user/mine/index.vue b/pages/user/mine/index.vue index 385b8b9..189fdf9 100644 --- a/pages/user/mine/index.vue +++ b/pages/user/mine/index.vue @@ -260,10 +260,13 @@ }, tixian() { - uni.showToast({ - title: '提现功能暂未开放!', - icon: 'none' + uni.navigateTo({ + url: '/pages/user/withdraw/index' }); + // uni.showToast({ + // title: '提现功能暂未开放!', + // icon: 'none' + // }); } } diff --git a/pages/user/withdraw/index.vue b/pages/user/withdraw/index.vue index 9ea725b..0b92efd 100644 --- a/pages/user/withdraw/index.vue +++ b/pages/user/withdraw/index.vue @@ -2,28 +2,64 @@ 可用金额 - 888.88 + {{userInfo.spread.brokeragePrice || 0}} 提现金额(元) - - 全部提现 + + 全部提现 - 确认提现 + 确认提现 diff --git a/static/images/home/减去 3@2x.png b/static/images/home/减去 3@2x.png deleted file mode 100644 index b097a73..0000000 Binary files a/static/images/home/减去 3@2x.png and /dev/null differ diff --git a/static/images/home/组 326@2x.png b/static/images/home/组 326@2x.png deleted file mode 100644 index e749a89..0000000 Binary files a/static/images/home/组 326@2x.png and /dev/null differ diff --git a/static/images/home/资源 21@2x.png b/static/images/home/资源 21@2x.png deleted file mode 100644 index 6ec0dcf..0000000 Binary files a/static/images/home/资源 21@2x.png and /dev/null differ diff --git a/static/tabbarComponent/icon/icon_home.png b/static/tabbarComponent/icon/icon_home.png deleted file mode 100644 index 6fdb11a..0000000 Binary files a/static/tabbarComponent/icon/icon_home.png and /dev/null differ diff --git a/static/tabbarComponent/icon/icon_home_HL.png b/static/tabbarComponent/icon/icon_home_HL.png deleted file mode 100644 index e0d89d5..0000000 Binary files a/static/tabbarComponent/icon/icon_home_HL.png and /dev/null differ diff --git a/static/tabbarComponent/icon/icon_mine.png b/static/tabbarComponent/icon/icon_mine.png deleted file mode 100644 index 06d7264..0000000 Binary files a/static/tabbarComponent/icon/icon_mine.png and /dev/null differ diff --git a/static/tabbarComponent/icon/icon_mine_HL.png b/static/tabbarComponent/icon/icon_mine_HL.png deleted file mode 100644 index ba4e638..0000000 Binary files a/static/tabbarComponent/icon/icon_mine_HL.png and /dev/null differ diff --git a/static/tabbarComponent/icon/icon_release2.png b/static/tabbarComponent/icon/icon_release2.png deleted file mode 100644 index 198d950..0000000 Binary files a/static/tabbarComponent/icon/icon_release2.png and /dev/null differ diff --git a/static/tabbarComponent/icon/tab5-a.png b/static/tabbarComponent/icon/tab5-a.png new file mode 100644 index 0000000..130ebaf Binary files /dev/null and b/static/tabbarComponent/icon/tab5-a.png differ diff --git a/static/tabbarComponent/icon/tab5.png b/static/tabbarComponent/icon/tab5.png new file mode 100644 index 0000000..162aa7e Binary files /dev/null and b/static/tabbarComponent/icon/tab5.png differ