diff --git a/common/js/request.js b/common/js/request.js
index 6cc5201..ebad12a 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -9,8 +9,8 @@ export default {
invoke(args) {
let userInfo = _this.getCurUserInfo();
// request 触发前拼接 url
- args.url = 'https://www.opsoul.com' + args.url;
- // args.url = 'http://127.0.0.1:80' + args.url;
+ // args.url = 'https://www.opsoul.com' + args.url;
+ args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://10.45.110.174:80' + args.url;
if (!args.data) {
args.data = {}
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index b7ee850..b601392 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -96,9 +96,9 @@
配件商
+ @click="chooseEntryType(1)">配件商
服务商
+ @click="chooseEntryType(0)">服务商
@@ -196,10 +196,13 @@
if (this.isAuthWxPhoneModal) {
return;
}
- this.curUserInfo = curUserInfo;
+ this.curUserInfo = curUserInfo;
+
+ // 是否展示选择入驻类型的模态框
+ this.isShowSteer = this.curUserInfo.type != null && this.curUserInfo.type != undefined ? false : true;
this.myInfo = await this.$api.data('myInfo');
- this.isShowSteer = !this.myInfo.entryType;
+ // this.isShowSteer = !this.myInfo.entryType;
let newServModules = this.servModules.concat();
if (this.myInfo.hasCheckedRule) {
newServModules[0].pageUrl = '/pages/demand-center/accept-demand-center';
@@ -213,8 +216,10 @@
}
this.servModules = newServModules;
},
- chooseEntryType(typeCode) {
-
+ async chooseEntryType(typeCode) {
+ await this.$request.updateWorker({
+ type: typeCode
+ });
},
hideModal(e) {
this.isShowSteer = false
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index c316ac5..ba194c3 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -38,7 +38,7 @@
+ class="bg-white padding flex justify-between align-center" @click="showDetail(bill[index].statement[index1])">
师傅转派
多级分销
@@ -110,12 +110,12 @@
})
// #endif
}
+ },
+ showDetail(item) {
+ uni.navigateTo({
+ url: '/pages/my/statement-desc?statementDesc=' + encodeURIComponent(JSON.stringify(item))
+ })
},
- showDetail() {
- uni.navigateTo({
- url: '/pages/my/statement-desc'
- })
- }
},
}
diff --git a/pages/my/statement-desc.vue b/pages/my/statement-desc.vue
index 2880978..68aac6b 100644
--- a/pages/my/statement-desc.vue
+++ b/pages/my/statement-desc.vue
@@ -7,37 +7,42 @@
- {{statementDesc.inOutMoney}}
- {{statementDesc.name}}
+ {{statementDesc.payMoney}}
+ {{statementDesc.remark}}
当前状态:
- {{statementDesc.status === '0' ? '交易成功' : '交易失败'}}
+ {{statementDesc.payStatus == 0 ? '未付款' : '已付款'}}
详情说明:
- {{statementDesc.desc}}
+ {{statementDesc.remark}}
到帐备注:
- {{statementDesc.payRemark}}
+
+ 微信
+ 支付宝
+ 线下
+ 支付到帐
+
提现单号:
- {{statementDesc.extractCode}}
+ {{statementDesc.extractCode}}
发起时间:
- {{statementDesc.createTime}}
+ {{statementDesc.payTime}}
订单编号:
- {{statementDesc.orderCode}}
+ {{statementDesc.orderDetailCode}}
订单时间:
- {{statementDesc.orderCreateTime}}
+ {{statementDesc.orderCreateTime}}
@@ -51,13 +56,14 @@
statementDesc: {}
}
},
- onLoad() {
- this.loadData();
+ onLoad(options) {
+ this.statementDesc = JSON.parse(decodeURIComponent(options.statementDesc));
+ // this.loadData();
},
methods: {
- async loadData() {
- this.statementDesc = await this.$api.data('statementDesc');
- }
+ // async loadData() {
+ // this.statementDesc = await this.$api.data('statementDesc');
+ // }
},
}