diff --git a/common/js/data.js b/common/js/data.js
index a5aecc1..ca74e09 100644
--- a/common/js/data.js
+++ b/common/js/data.js
@@ -1701,6 +1701,90 @@ const areaList = [[{
}]]
const defaultAddress = null;
+
+const myMoneyBag = {
+ balance: '5221.79',
+ balanceToExtract: '0.00',
+ bankNum: '***8900',
+ bill: [{
+ duration: '2022年01月',
+ income: '20478.96',
+ outgoings: '-21065.36',
+ statement: [{
+ name: '余额支付',
+ createTime: '2022-01-19 15:44:32',
+ inOutMoney: '-170.00'
+ }, {
+ name: '商城退单',
+ createTime: '2022-01-18 15:44:32',
+ inOutMoney: '+8.00'
+ }]
+ }, {
+ duration: '2022年01月',
+ income: '20478.96',
+ outgoings: '-21065.36',
+ statement: [{
+ name: '余额支付',
+ createTime: '2022-01-19 15:44:32',
+ inOutMoney: '-170.00'
+ }, {
+ name: '商城退单',
+ createTime: '2022-01-18 15:44:32',
+ inOutMoney: '+8.00'
+ }]
+ }, {
+ duration: '2022年01月',
+ income: '20478.96',
+ outgoings: '-21065.36',
+ statement: [{
+ name: '余额支付',
+ createTime: '2022-01-19 15:44:32',
+ inOutMoney: '-170.00'
+ }, {
+ name: '商城退单',
+ createTime: '2022-01-18 15:44:32',
+ inOutMoney: '+8.00'
+ }]
+ }, {
+ duration: '2022年01月',
+ income: '20478.96',
+ outgoings: '-21065.36',
+ statement: [{
+ name: '余额支付',
+ createTime: '2022-01-19 15:44:32',
+ inOutMoney: '-170.00'
+ }, {
+ name: '商城退单',
+ createTime: '2022-01-18 15:44:32',
+ inOutMoney: '+8.00'
+ }]
+ }, {
+ duration: '2022年01月',
+ income: '20478.96',
+ outgoings: '-21065.36',
+ statement: [{
+ name: '余额支付',
+ createTime: '2022-01-19 15:44:32',
+ inOutMoney: '-170.00'
+ }, {
+ name: '商城退单',
+ createTime: '2022-01-18 15:44:32',
+ inOutMoney: '+8.00'
+ }]
+ }]
+}
+
+const statementDesc = {
+ inOutMoney: '-59.00',
+ name: '同意追加费用',
+ status: '0', //0为交易成功
+ desc: '同意追加费用',
+ payRemark: '微信支付到帐',
+ extractCode: '',
+ createTime: '2022-01-20 15:44:32',
+ orderCode: '20210612337987373',
+ orderCreateTime: '2022-01-16 15:44:32'
+}
export default {
swiperList,
@@ -1727,5 +1811,7 @@ export default {
servCategory,
categoryList,
areaList,
- defaultAddress
+ defaultAddress,
+ statementDesc,
+ myMoneyBag
}
diff --git a/common/js/request.js b/common/js/request.js
index eff2420..dc9176f 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -7,7 +7,7 @@ export default {
invoke(args) {
// request 触发前拼接 url
args.url = 'https://www.opsoul.com' + args.url;
- // args.url = 'http://10.45.137.214:80' + args.url;
+ // args.url = 'http://10.45.110.67:80' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url;
if (args.data) {
args.data.deptId = globalData.deptId;
@@ -308,5 +308,25 @@ export default {
resObj = JSON.parse(resStr);
}
return resObj;
- },
+ },
+ async qryOrderGoodsPage(params = {}) {
+ let res = await uni.request({
+ url: '/order/goods/list',
+ method: 'POST',
+ data: params,
+ header: {
+ pageNum: params.pageNum,
+ pageSize: params.pageSize
+ }
+ })
+ return res[1].data;
+ },
+ async bindBankCard(params) {
+ let res = await uni.request({
+ url: '/customer/bankcard/bind',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ }
}
diff --git a/components/custom-bar/load-status-bar.vue b/components/custom-bar/load-status-bar.vue
new file mode 100644
index 0000000..bbcc14e
--- /dev/null
+++ b/components/custom-bar/load-status-bar.vue
@@ -0,0 +1,44 @@
+
+
+
+
+ 查看更多
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index f373e35..48901d0 100644
--- a/pages.json
+++ b/pages.json
@@ -45,6 +45,12 @@
"path": "my-team-member"
}, {
"path": "serv-detail"
+ }, {
+ "path": "statement-desc"
+ }, {
+ "path": "bank-account-bind"
+ }, {
+ "path": "my-money-bag"
}]
}, {
"root":"pages/publish/",
diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index 71cb123..627ee1b 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -197,7 +197,7 @@
二维码分享
-
+
钱包
@@ -319,6 +319,11 @@
uni.navigateTo({
url: '/pages/my/apply-operator'
})
+ },
+ showPage(pageUrl) {
+ uni.navigateTo({
+ url: pageUrl
+ })
}
}
}
diff --git a/pages/my/bank-account-bind.vue b/pages/my/bank-account-bind.vue
new file mode 100644
index 0000000..9026d4b
--- /dev/null
+++ b/pages/my/bank-account-bind.vue
@@ -0,0 +1,123 @@
+
+
+
+
+ 返回
+ 帐号绑定/修改
+
+
+
+ 支付宝
+ 银行卡
+
+
+
+
+ 开户人姓名
+
+
+
+ 支付宝账户
+
+
+
+
+
+
+ 开户人姓名
+
+
+
+ 身份证号
+
+
+
+ 手机号
+
+
+
+ 银行卡号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
new file mode 100644
index 0000000..e5930e4
--- /dev/null
+++ b/pages/my/my-money-bag.vue
@@ -0,0 +1,85 @@
+
+
+
+
+ 返回
+ 我的钱包
+
+
+
+ 账户余额(元)
+
+ {{myMoneyBag.balance}}
+
+
+ {{myMoneyBag.bankNum}}
+ 账户绑定
+
+
+
+
+
+
+
+
+
+ {{billItem.duration}}
+
+ 支出:{{billItem.outgoings}}
+ 收入:{{billItem.income}}
+
+
+
+
+
+
+ {{item.name}}
+ {{item.createTime}}
+
+ {{item.inOutMoney}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index a7a9d8f..eef00cd 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -105,16 +105,19 @@
-
+
+
+
+
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 08363a7..8bf3c35 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -247,6 +247,10 @@
remark: this.formInfo.comments,
isNeedBill: this.formInfo.isNeedBill,
goodsList: this.parseGoodsList()
+ // goodsList: [{
+ // goodsId: 2,
+ // num: 1
+ // }]
}
// 调用下单接口
let res = await this.$request.placeOrder(params);