diff --git a/App.vue b/App.vue
index 3ce8634..92ac298 100644
--- a/App.vue
+++ b/App.vue
@@ -8,7 +8,7 @@
// 优先于show方法
onLaunch: function() {
// 配置全局域名
- uni.setStorageSync('hostapi','http://maintain.7and5.cn');
+ uni.setStorageSync('hostapi','/web');
// 设置主色调
uni.setStorageSync('publicColor','#000000');
},
diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index 11a96b3..1ed5c5c 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -310,4 +310,51 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
width: 60%;
height: 4rpx;
background-color: #03affb;
+}
+.account-btn {
+ border: 1rpx solid #00a2e9;
+ color: #00a2e9;
+ border-radius: 16rpx;
+ padding: 8rpx 10rpx;
+}
+.account-detailed {
+ position: relative;
+ display: flex;
+ align-items: center;
+ font-size: 29rpx;
+ font-weight: bold;
+ padding-left: 20rpx;
+}
+.account-detailed::before {
+ position: absolute;
+ left: 0;
+ top: 4rpx;
+ bottom: 4rpx;
+ content: '';
+ display: block;
+ width: 4rpx;
+ background-color: #03affb;
+}
+.account-detailed-item view:nth-child(1) {
+ width: 16%;
+}
+.account-detailed-item view:nth-child(2) {
+ width: 40%;
+ text-align: center;
+}
+.account-detailed-item view:nth-child(3) {
+ width: 16%;
+ text-align: center;
+}
+.account-detailed-item view:nth-child(4) {
+ width: 22%;
+ text-align: center;
+}
+.unsettled-btn {
+ font-size: 30rpx;
+ color: #03affb;
+ border: 1rpx solid #03affb;
+ border-radius: 6rpx;
+ padding: 6rpx 20rpx;
+ margin-top: 10rpx;
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index e2a3eff..8e3e06c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -84,7 +84,21 @@
"h5" : {
"sdkConfigs" : {
"maps" : {}
- }
+ },
+ "devServer" : {
+ "https" : false,
+ "proxy": {
+ "/web": {
+ "target": "http://maintain.7and5.cn",
+ "changeOrigin": true,
+ "secure": false,
+ "pathRewrite": {
+ "^/web": ""
+ }
+ }
+ }
+ }
+
},
"mp-baidu" : {
"appid" : "24346353"
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d280a64..a9df0a5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -92,7 +92,7 @@
affiliation: this.login_unitName // 单位名称
}
this.$requst.post('/universal/api.login/login',params).then(res=>{
- console.log(res,95);
+ this.login_unitName = 95
if(res.code==1) {
this.$toolAll.tools.showToast('登录成功');
// 缓存token和角色类型
@@ -103,7 +103,7 @@
url:'/pages/tabbar/pagehome/pagehome'
})
},2000)
- } else {
+ } else {
this.$toolAll.tools.showToast(res.msg);
}
})
diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue
index 7712596..b5dc69f 100644
--- a/pagesB/my-account/my-account.vue
+++ b/pagesB/my-account/my-account.vue
@@ -7,15 +7,70 @@
我的账户
未结算工单
-
-
-
- 账户总额(元)
- ￥266.00
+
+
+
+
+
+ 账户总额(元)
+ ￥266.00
+
+
+ 联系客服?
+ 查看明细
+
-
- 联系客服?
-
+
+
+ 工单费用(元)
+ ￥266.00
+
+
+
+ 技术佣金(元)
+ ￥266.00
+
+
+
+
+
+ 收支明细
+
+ 金额
+ 工单编号
+ 方式
+ 工单日期
+
+
+ -¥1088
+ GD20220112-1001
+ 现金
+ 2019-7-24
+
+
+
+
+
+
+
+ 株洲市XXX项目名称
+ 林小雨
+
+
+ 工单编号：GD20220112-1001
+ 故障类型：模组故障
+
+
+ 2022-01-12 13:25:16
+
+
+ 维保已完成
+ ￥260.0
+
+
+ 湖南省长沙市xx区1001栋6-12
+
+ 去结算
@@ -28,7 +83,8 @@
export default {
data() {
return {
- current:true
+ current:true,
+ detailedList:[]
}
},
methods: {
diff --git a/static/public/icon-account-address.png b/static/public/icon-account-address.png
new file mode 100644
index 0000000..65d3eca
Binary files /dev/null and b/static/public/icon-account-address.png differ
diff --git a/static/public/icon-account-time.png b/static/public/icon-account-time.png
new file mode 100644
index 0000000..62f3517
Binary files /dev/null and b/static/public/icon-account-time.png differ