diff --git a/app.json b/app.json index ca2ec02..252feec 100644 --- a/app.json +++ b/app.json @@ -45,18 +45,17 @@ "pages/agent/order/index", "pages/agent/detail/index", "pages/agent/result/index", - "pages/bank/index/index", "pages/bank/vindex/index", "pages/bank/create/index", "pages/bank/bill/index", "pages/bank/bill-detail/index", "pages/bank/edit/index", "pages/bank/password/index", - "pages/withdrawal/index/index", "pages/withdrawal/balance/index", "pages/withdrawal/checkout/index", "pages/withdrawal/vcheckout/index", "pages/withdrawal/detail/index", + "pages/withdrawal/payment/index", "pages/purchase/index/index", "pages/purchase/ability/index", "pages/purchase/create/index", @@ -74,7 +73,6 @@ "pages/html/rules/index", "pages/html/notice/index", "pages/html/integral/index", - "pages/payment/index", "pages/home/personal/personal", "pages/home/enterprise/enterprise", "pages/moment/paper/index", diff --git a/pages/article/article-item/index.wxml b/pages/article/article-item/index.wxml index 57cfbb9..bd492ad 100644 --- a/pages/article/article-item/index.wxml +++ b/pages/article/article-item/index.wxml @@ -33,7 +33,6 @@ - {{item.likeQuantity}} diff --git a/pages/bank/index/index.js b/pages/bank/index/index.js deleted file mode 100644 index 3eb6d1c..0000000 --- a/pages/bank/index/index.js +++ /dev/null @@ -1,134 +0,0 @@ -// pages/bank/index/index.js -import { getBankCardList, deleteBankCard, checkPayPassword, bankCardDefault } from "../../../api/saas" -import { $wuxKeyBoard, $wuxDialog } from '../../../components/index' -const util = require('../../../utils/util') -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - isSetPwd: 0, - nowIndex: -1, - bankList: [] - }, - onShow: function () { - checkPayPassword().then(res => { - this.data.isSetPwd = 1 - }).catch(err => { - this.data.isSetPwd = -1 - }) - this.fetchBankCardList() - }, - /** - * 获取用户银行卡列表 - */ - fetchBankCardList: function () { - wx.showLoading({ title: '加载中', mask: true }) - getBankCardList().then(result => { - this.setData({ bankList: result.data }) - wx.hideLoading() - }).catch(err => { - wx.hideLoading() - util.showToast(err) - }) - }, - showActionSheet(e) { - this.data.nowIndex = e.currentTarget.dataset.index - if (this.data.nowIndex < 0) { - if(!app.globalData.userInfo.isAuth){ - $wuxDialog().open({ - resetOnClose: true, - title: '温馨提示', - content: '您还没有进行个人信息认证，无法绑定银行卡，现在去进行个人信息认证？', - buttons: [{ - text: '确定', - type: 'primary', - onTap(e) { - wx.navigateTo({ url: '/pages/home/idcard/index' }) - } - }] - }) - return - } - wx.navigateTo({url: '/pages/bank/edit/index'}) - return - } - var that = this - wx.showActionSheet({ - itemList: ['设为默认', '解除绑定'], - success(res){ - if (res.tapIndex === 0){ - that.setDefault() - }else if (res.tapIndex === 1){ - that.unbindCard() - } - } - }) - }, - setDefault: function (id) { - var item = this.data.bankList[this.data.nowIndex] - wx.showLoading({ title: '处理中', mask: true }) - bankCardDefault(item.id).then(res => { - for (let index = 0; index < this.data.bankList.length; index++) { - if(index == this.data.nowIndex){ - this.data.bankList[index].isDefault = 1 - } else { - this.data.bankList[index].isDefault = 0 - } - } - this.setData({ - bankList: this.data.bankList - }) - wx.hideLoading() - util.showToast('设置成功') - }).catch(err => { - wx.hideLoading() - util.showToast(err) - }) - }, - unbindCard: function () { - var that = this - if (this.data.isSetPwd == 1) { - $wuxKeyBoard().show({ - inputText: '输入支付密码', - callback(value) { - that.postUnbindCard(value) - return true - }, - }) - } else if (this.data.isSetPwd == -1) { - $wuxDialog().open({ - resetOnClose: true, - title: '温馨提示', - content: '您还没有设置支付密码，请先设置支付密码', - buttons: [{ - text: '取消' - }, { - text: '确定', - type: 'primary', - onTap(e) { - wx.navigateTo({ - url: '/pages/bank/password/index' - }) - } - }] - }) - } - }, - postUnbindCard: function (pwd) { - wx.showLoading({ title: '处理中', mask: true }) - var item = this.data.bankList[this.data.nowIndex] - deleteBankCard(item.id, { password: pwd }).then(res => { - wx.hideLoading() - util.showToast('解除成功') - this.data.bankList.splice(this.data.nowIndex, 1); - this.setData({ bankList: this.data.bankList }) - }).catch(err => { - wx.hideLoading() - util.showToast(err) - }) - } - -}) \ No newline at end of file diff --git a/pages/bank/index/index.json b/pages/bank/index/index.json deleted file mode 100644 index 7986710..0000000 --- a/pages/bank/index/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usingComponents": { - "wux-dialog": "/components/dialog/index", - "wux-keyboard": "/components/keyboard/index" - } -} \ No newline at end of file diff --git a/pages/bank/index/index.wxml b/pages/bank/index/index.wxml deleted file mode 100644 index e0b46ea..0000000 --- a/pages/bank/index/index.wxml +++ /dev/null @@ -1,30 +0,0 @@ - - - 我的银行卡 - - - - - - - - {{item.bankName ? item.bankName : item.cardName}} - {{item.cardType=='PC'?'"预付费卡':(item.cardType=='SCC'?'准贷记卡':(item.cardType=='CC'?'信用卡':'储蓄卡'))}} - - - - - **** - **** - **** - {{item.cardNoSuffix}} - - - - - 添加银行卡 - - - - - \ No newline at end of file diff --git a/pages/bank/index/index.wxss b/pages/bank/index/index.wxss deleted file mode 100644 index f4ab641..0000000 --- a/pages/bank/index/index.wxss +++ /dev/null @@ -1,40 +0,0 @@ -/* pages/bank/index/index.wxss */ -.add-bank { - height: 150rpx; - width: 100%; - margin-top: 32rpx; - margin-bottom: 32rpx; - background: rgba(255, 255, 255, 1); - box-shadow: 0px 0px 15px -6px rgba(0, 0, 0, 0.32); - border-radius: 6px; -} - -.item-bank { - margin-top: 32rpx; - padding: 32rpx; - background: rgba(198, 79, 85, 1); - border-radius: 4px; -} - -.bank-name { - font-size: 32rpx; - font-family: PingFang-SC-Medium, PingFang-SC; - font-weight: 500; - color: rgba(255, 255, 255, 1); -} - -.bank-type { - font-size: 24rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(255, 255, 255, 0.6); -} - -.bank-suffix { - font-size: 56rpx; - font-family: SFProDisplay-Regular, SFProDisplay; - font-weight: 400; - color: rgba(255, 255, 255, 1); - line-height: 34px; - letter-spacing: 1px; -} \ No newline at end of file diff --git a/pages/mall/fragment/index.js b/pages/mall/fragment/index.js index afa1a93..aeca8b2 100644 --- a/pages/mall/fragment/index.js +++ b/pages/mall/fragment/index.js @@ -1,5 +1,6 @@ // pages/message/index.js import { getFactoryPrice, getBannerList } from "../../../api/ztb" +import { getPreferList } from "../../../api/moment" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -24,6 +25,7 @@ Component({ firstShow: false, banning: true, bannerList: [], + momentList: [], tabList: [ '黄纸', '白纸', '灰纸', '杂纸' ], tabIndex: 0, loading: true, @@ -61,6 +63,9 @@ Component({ CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80), firstShow: true }) + getPreferList().then(result => { + this.setData({ momentList: result.data.records.slice(0, 3) }) + }) this.fetchAgentList() } this.data.firstShow = true @@ -93,7 +98,11 @@ Component({ wx.navigateTo({url: `/pages/mall/search-list/index` }) }, postList: function(){ - + util.navigateTo('/pakageInfo/pages/article/index/index') + }, + postInfo: function(e){ + var item = this.data.momentList[e.currentTarget.dataset.index] + wx.navigateTo({ url: '/pakageInfo/pages/article/detail/index?id=' + item.id }) }, gridTap: function(e){ if(e.currentTarget.id == 'agent'){ diff --git a/pages/mall/fragment/index.json b/pages/mall/fragment/index.json index 9449a64..d1f6b8c 100644 --- a/pages/mall/fragment/index.json +++ b/pages/mall/fragment/index.json @@ -11,6 +11,6 @@ "wux-sticky": "/components/sticky/index", "wux-divider": "/components/divider/index", "wux-button": "/components/button/index", - "information-item": "/pages/article/information-item/index" + "information-item": "/pages/mall/information-item/index" } } \ No newline at end of file diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml index 9495b66..3e9db3b 100644 --- a/pages/mall/fragment/index.wxml +++ b/pages/mall/fragment/index.wxml @@ -45,17 +45,14 @@ - - 【预测】8月26日湖南衡山新金龙纸业废纸 - 09-07 - - - 【预测】8月26日湖南衡山新金龙纸业废纸 - 09-07 - - - 【预测】8月26日湖南衡山新金龙纸业废纸 - 09-07 + + + + + + + {{item.title}} + {{item.updateTime}} diff --git a/pages/mall/fragment/index.wxss b/pages/mall/fragment/index.wxss index ecc2547..eb18a85 100644 --- a/pages/mall/fragment/index.wxss +++ b/pages/mall/fragment/index.wxss @@ -45,4 +45,8 @@ padding: 16rpx 24rpx; border-bottom: 1rpx solid rgba(0,0,0,0.05); box-sizing: border-box +} + +.moment-pad{ + padding: 0rpx 24rpx 24rpx 24rpx; } \ No newline at end of file diff --git a/pages/article/information-item/index.js b/pages/mall/information-item/index.js similarity index 100% rename from pages/article/information-item/index.js rename to pages/mall/information-item/index.js diff --git a/pages/article/information-item/index.json b/pages/mall/information-item/index.json similarity index 100% rename from pages/article/information-item/index.json rename to pages/mall/information-item/index.json diff --git a/pages/article/information-item/index.wxml b/pages/mall/information-item/index.wxml similarity index 100% rename from pages/article/information-item/index.wxml rename to pages/mall/information-item/index.wxml diff --git a/pages/article/information-item/index.wxss b/pages/mall/information-item/index.wxss similarity index 100% rename from pages/article/information-item/index.wxss rename to pages/mall/information-item/index.wxss diff --git a/pages/morder/detail/index.js b/pages/morder/detail/index.js index 5c40faa..e0c5120 100644 --- a/pages/morder/detail/index.js +++ b/pages/morder/detail/index.js @@ -312,9 +312,9 @@ Page({ }, paymentOrder: function(){ if(this.data.orderInfo.status == 1){ - wx.navigateTo({ url: '/pages/payment/index?type=11&orderId=' + this.data.orderInfo.orderId }) + wx.navigateTo({ url: '/pages/withdrawal/payment/index?type=11&orderId=' + this.data.orderInfo.orderId }) } else if(this.data.orderInfo.status == 4){ - wx.navigateTo({ url: '/pages/payment/index?type=14&orderId=' + this.data.orderInfo.orderId }) + wx.navigateTo({ url: '/pages/withdrawal/payment/index?type=14&orderId=' + this.data.orderInfo.orderId }) } }, paymentOffOrder: function(){ diff --git a/pages/withdrawal/checkout/index.js b/pages/withdrawal/checkout/index.js index a550f99..ee54b73 100644 --- a/pages/withdrawal/checkout/index.js +++ b/pages/withdrawal/checkout/index.js @@ -1,153 +1,66 @@ // pages/withdrawal/checkout/index.js -import { checkPayPassword, getBalanceInfo, getBankCardList, postWithdraw } from "../../../api/saas" -import { $wuxKeyBoard, $wuxDialog } from '../../../components/index' -const util = require('../../../utils/util') -// const md5 = require('../../../utils/md5') -const math = require('../../../utils/math') - Page({ - /** - * 页面的初始数据 - */ - data: { - accountMoney: 0, //用户余额 - expendMoney: '', - xsaccountMoney: null, //显示余额 - banckCardList: [], //用户银行卡列表 - banckList: [], - isSetPwd: 0, - chooseBankCard: null - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.pickerView = this.pickerView || this.selectComponent('#picker-view') - this.getUserInfo() - }, - onShow: function () { - getBankCardList().then(res => { - var list = [] - for (let index = 0; index < res.data.length; index++) { - const element = res.data[index] - list.push({ - text: element.bankName + '(' + element.cardNoSuffix + ')', - value: element.id - }) - } - this.setData({ banckCardList: res.data, banckList: list }) - if (this.data.banckCardList[0] && this.data.banckCardList[0].cardName) { - const element = this.data.banckCardList[0] - var defaultCard = { cardId: element.id, cardName: element.bankName + '(' + element.cardNoSuffix + ')' } - this.setData({ chooseBankCard: defaultCard }) - } - }) - checkPayPassword().then(res => { - this.data.isSetPwd = 1 - }).catch(err => { - this.data.isSetPwd = -1 - }) - }, - /** - * 获取用户数据 - */ - getUserInfo: function () { - getBalanceInfo().then(res => { - this.setData({ - accountMoney: res.data.accountMoney, - xsaccountMoney: math.minus(res.data.accountMoney, res.data.frozenMoney) - }) - }) - }, - bindAndSet(e) { - this.setData({ expendMoney: e.detail.value }) - }, - allExpend: function () { - this.setData({ expendMoney: this.data.xsaccountMoney }) - }, - chooseCard: function () { - if (this.data.chooseBankCard) { - this.pickerView.showPicker(this.data.banckList, this.data.chooseBankCard.cardId) - } else { - $wuxDialog().open({ - resetOnClose: true, - title: '温馨提示', - content: '您还没有绑定银行卡，请先去绑定银行卡', - buttons: [{ - text: '确定', - type: 'primary', - onTap(e) { - wx.navigateTo({ - url: '/pages/bank/edit/index' - }) - } - }] - }) - } - }, - onPickerChange: function (e) { - if(!e.detail){ - return - } - this.setData({ - ['chooseBankCard.cardName']: e.detail.text, - ['chooseBankCard.cardId']: e.detail.value - }) - }, - checkoutMoney: function () { - if (Number(this.data.expendMoney) <= 0) { - util.showToast('提现金额必须大于0') - return - } - if (this.data.xsaccountMoney != null) { - if (Number(this.data.xsaccountMoney) < Number(this.data.expendMoney)) { - util.showToast('账户余额不够') - return - } - } - if (!this.data.chooseBankCard || !this.data.chooseBankCard.cardId) { - util.showToast('请选择一张银行卡') - return - } - var that = this - if (this.data.isSetPwd == 1) { - $wuxKeyBoard().show({ - inputText: '输入支付密码', - callback(value) { - that.withdrawalMoney(value) - return true - }, - onForget(type) { - wx.navigateTo({ url: '/pages/bank/password/index' }) - } - }) - } else if (this.data.isSetPwd == -1) { - $wuxDialog().open({ - resetOnClose: true, - title: '温馨提示', - content: '您还没有设置支付密码，请先设置支付密码', - buttons: [{ - text: '取消' - }, { - text: '确定', - type: 'primary', - onTap(e) { - wx.navigateTo({ - url: '/pages/bank/password/index' - }) - } - }] - }) - } - }, - withdrawalMoney: function (pwd) { - wx.showLoading({ title: '加载中', mask: true }) - postWithdraw({ bankId: this.data.chooseBankCard.cardId, money: this.data.expendMoney, password: pwd }).then(res => { - wx.hideLoading() - util.showBackToast('提现成功') - }).catch(err => { - wx.hideLoading() - util.showToast(err) - }) - } + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } }) \ No newline at end of file diff --git a/pages/withdrawal/checkout/index.json b/pages/withdrawal/checkout/index.json deleted file mode 100644 index 7638773..0000000 --- a/pages/withdrawal/checkout/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "usingComponents": { - "select-view": "/components/select-view/index", - "wux-button": "/components/button/index", - "wux-dialog": "/components/dialog/index", - "wux-keyboard": "/components/keyboard/index" - } -} \ No newline at end of file diff --git a/pages/withdrawal/checkout/index.wxml b/pages/withdrawal/checkout/index.wxml index 17179bd..bc1a69d 100644 --- a/pages/withdrawal/checkout/index.wxml +++ b/pages/withdrawal/checkout/index.wxml @@ -1,31 +1,2 @@ - - - 申请提现 - - - - 提现金额 - - ￥ - - - - 账户余额￥{{formate.numberFormat2(xsaccountMoney)}} - 全部提现 - - - - 到账银行卡 - {{chooseBankCard ? chooseBankCard.cardName: '添加银行卡'}} - - - - - - 提现 - - - - - \ No newline at end of file +pages/withdrawal/checkout/index.wxml diff --git a/pages/withdrawal/checkout/index.wxss b/pages/withdrawal/checkout/index.wxss deleted file mode 100644 index 20bf750..0000000 --- a/pages/withdrawal/checkout/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/withdrawal/checkout/index.wxss */ \ No newline at end of file diff --git a/pages/withdrawal/detail/index.js b/pages/withdrawal/detail/index.js index 512fc62..be516ee 100644 --- a/pages/withdrawal/detail/index.js +++ b/pages/withdrawal/detail/index.js @@ -1,23 +1,66 @@ // pages/withdrawal/detail/index.js -import { getWithdrawInfo} from '../../../api/saas' - Page({ - /** - * 页面的初始数据 - */ - data: { - orderDetails: {} - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - wx.showLoading({ title: '加载中', mask: true }) - getWithdrawInfo(options.id).then(result => { - this.setData({ orderDetails: result.data }) - wx.hideLoading() - }).catch(err => { - wx.hideLoading() - }) - } + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } }) \ No newline at end of file diff --git a/pages/withdrawal/detail/index.json b/pages/withdrawal/detail/index.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/withdrawal/detail/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/withdrawal/detail/index.wxml b/pages/withdrawal/detail/index.wxml index 6b2bcc4..7560563 100644 --- a/pages/withdrawal/detail/index.wxml +++ b/pages/withdrawal/detail/index.wxml @@ -1,46 +1,2 @@ - - - 记录详情 - - - - - 流水号 - - - {{orderDetails.tradeSn}} - - - - - 状态 - - - {{orderDetails.status==0?'正在处理':(orderDetails.status==1?'提现成功':'提现失败')}} - - - - - 支出 - - - {{formate.formateMoney(orderDetails.money)}} - - - - - 时间 - - - {{orderDetails.createTime}} - - - - - 余额 - - - {{formate.formateMoney(orderDetails.remainMoney)}}元 - - \ No newline at end of file +pages/withdrawal/detail/index.wxml diff --git a/pages/withdrawal/detail/index.wxss b/pages/withdrawal/detail/index.wxss deleted file mode 100644 index 5475667..0000000 --- a/pages/withdrawal/detail/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/withdrawal/detail/index.wxss */ \ No newline at end of file diff --git a/pages/withdrawal/index/index.js b/pages/withdrawal/index/index.js deleted file mode 100644 index f34988b..0000000 --- a/pages/withdrawal/index/index.js +++ /dev/null @@ -1,59 +0,0 @@ -// pages/withdrawal/index/index.js -import { getWithdrawList } from "../../../api/saas" -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight, - finished: false, - requesting: false, - taskList: [], - form: { - pageSize: 10, - pageNum: 1, - pageSize:15 - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.setData({ height: app.globalData.fragmentHeight }) - this.fetchList() - }, - fetchList: function () { - if (this.data.requesting || this.data.finished) { - return - } - this.data.requesting = true - wx.showLoading({ title: '加载中', mask: true }) - getWithdrawList(this.data.form).then(result => { - this.setData({ requesting: false, loading: false }) - if (result.data.records.length) { - var respList = result.data.records - let nowList = `taskList[${this.data.taskList.length}]` - var num = this.data.form.pageNum - var finished = this.data.form.pageNum >= result.data.pages - this.setData({ - [nowList]: respList, - total: result.data.total, - ['form.pageNum']: (num + 1), - finished - }) - } else { - this.setData({ finished: true }) - } - wx.hideLoading() - }).catch(err => { - this.setData({ requesting: false, loading: false }) - wx.hideLoading() - util.showToast(err) - }) - }, - lookItem: function(e){ - wx.navigateTo({ url: '/pages/withdrawal/detail/index?id=' + e.currentTarget.id }) - } -}) \ No newline at end of file diff --git a/pages/withdrawal/index/index.json b/pages/withdrawal/index/index.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/withdrawal/index/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/withdrawal/index/index.wxml b/pages/withdrawal/index/index.wxml deleted file mode 100644 index 0c2b030..0000000 --- a/pages/withdrawal/index/index.wxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 提现记录 - - - - - 暂无数据 - - - - - - {{formate.formateMoney(item.money)}}元 - - 正在处理 - 提现成功 - 提现失败 - - - - - \ No newline at end of file diff --git a/pages/withdrawal/index/index.wxss b/pages/withdrawal/index/index.wxss deleted file mode 100644 index 3c0d5e2..0000000 --- a/pages/withdrawal/index/index.wxss +++ /dev/null @@ -1,2 +0,0 @@ -/* pages/withdrawal/index/index.wxss */ - \ No newline at end of file diff --git a/pages/payment/index.js b/pages/withdrawal/payment/index.js similarity index 95% rename from pages/payment/index.js rename to pages/withdrawal/payment/index.js index cfd1489..8ce0467 100644 --- a/pages/payment/index.js +++ b/pages/withdrawal/payment/index.js @@ -1,6 +1,6 @@ -import { getTradeOrder, paymentFor } from "../../api/payment" -const util = require('../../utils/util') -const event = require('../../utils/event') +import { getTradeOrder, paymentFor } from "../../../api/payment" +const util = require('../../../utils/util') +const event = require('../../../utils/event') const app = getApp() Page({ diff --git a/pages/payment/index.json b/pages/withdrawal/payment/index.json similarity index 100% rename from pages/payment/index.json rename to pages/withdrawal/payment/index.json diff --git a/pages/payment/index.wxml b/pages/withdrawal/payment/index.wxml similarity index 100% rename from pages/payment/index.wxml rename to pages/withdrawal/payment/index.wxml diff --git a/pages/payment/index.wxss b/pages/withdrawal/payment/index.wxss similarity index 100% rename from pages/payment/index.wxss rename to pages/withdrawal/payment/index.wxss diff --git a/pages/ztbvip/index.js b/pages/ztbvip/index.js index 3637820..82fb12c 100644 --- a/pages/ztbvip/index.js +++ b/pages/ztbvip/index.js @@ -81,7 +81,7 @@ Page({ buyMemberInfo({ memberExpenseId: this.data.divIndex }).then(res => { wx.hideLoading() if(res.data.isNeedPay && res.data.orderId){ - wx.navigateTo({ url: '/pages/payment/index?type=2&orderId=' + res.data.orderId }) + wx.navigateTo({ url: '/pages/withdrawal/payment/index?type=2&orderId=' + res.data.orderId }) } else { app.globalData.userInfo.isVIP = 1 event.emit('EventMessage', { what: 200, desc: 'Vip' }) diff --git a/pakageInfo/assets/image/ic_save_poster.png b/pakageInfo/assets/image/ic_save_poster.png index db9d610..72edf50 100644 Binary files a/pakageInfo/assets/image/ic_save_poster.png and b/pakageInfo/assets/image/ic_save_poster.png differ diff --git a/pakageInfo/assets/image/img_poster_bg.png b/pakageInfo/assets/image/img_poster_bg.png index 1174a7c..c2761c9 100644 Binary files a/pakageInfo/assets/image/img_poster_bg.png and b/pakageInfo/assets/image/img_poster_bg.png differ diff --git a/pakageInfo/assets/image/img_poster_header_has_title.png b/pakageInfo/assets/image/img_poster_header_has_title.png index 7059c1a..7c56412 100644 Binary files a/pakageInfo/assets/image/img_poster_header_has_title.png and b/pakageInfo/assets/image/img_poster_header_has_title.png differ diff --git a/pakageInfo/assets/image/pyqicon.png b/pakageInfo/assets/image/pyqicon.png index cb8746b..56c96d4 100644 Binary files a/pakageInfo/assets/image/pyqicon.png and b/pakageInfo/assets/image/pyqicon.png differ diff --git a/pakageInfo/assets/image/weixinicon.png b/pakageInfo/assets/image/weixinicon.png index 31d324d..1c18fa3 100644 Binary files a/pakageInfo/assets/image/weixinicon.png and b/pakageInfo/assets/image/weixinicon.png differ