新增我的账户页面、未结算工单页面

App.vue

@@ -8,7 +8,7 @@
 		// 优先于show方法
 		onLaunch: function() {
 			// 配置全局域名
-			uni.setStorageSync('hostapi','http://maintain.7and5.cn'); 
+			uni.setStorageSync('hostapi','/web'); 
 			// 设置主色调
 			uni.setStorageSync('publicColor','#000000');
 		},

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;
 }

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"

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);
 						}
 					})

pagesB/my-account/my-account.vue

@@ -7,15 +7,70 @@
 					<view @tap="switchStatus(true)" class="width50 pad-x30" :class="current ? 'account-active' : ''">我的账户</view>
 					<view @tap="switchStatus(false)" class="width50 pad-x30" :class="!current ? 'account-active' : ''">未结算工单</view>
 				</view>
-				<view class="bacf pad-sx30 mar-s20 mar-zy20 radius10">
+				<!-- 我的账户 -->
-					<view class="bbot mar-zy20 disjbac">
+				<view v-if="current">
-						<view class="disjcac fc">
+					<view class="bacf pad-sx30 mar-s20 mar-zy20 radius10" style="box-shadow: 0 5rpx 20rpx rgba(0,0,0,.2);">
-							<view class="fon22 col9">账户总额(元)</view>
+						<view class="bbot mar-zy20 disjbac pad-x30">
-							<view class="fon42 bold">￥266.00</view>
+							<view class="disjcac fc">
+								<view class="fon22 col9">账户总额(元)</view>
+								<view class="fon42 bold mar-s20">￥266.00</view>
+							</view>
+							<view class="disjcac fc">
+								<view class="fon22 col9">联系客服?</view>
+								<view class="fon26 mar-s10 account-btn">查看明细</view>
+							</view>
 						</view>
-						<view class="disjcac fc">
+						<view class=" mar-zy20 disjbac pad-s30">
-							<view class="fon22 col9">联系客服?</view>
+							<view class="disjcac fc">
-							<view class="fon42 bold"></view>
+								<view class="fon22 col9">工单费用(元)</view>
+								<view class="fon42 bold mar-s20">￥266.00</view>
+							</view>
+							<view style="width: 2rpx;height: 120rpx;background-color: #dddddd;margin-top: -10rpx;margin-bottom: -10rpx;"></view>
+							<view class="disjcac fc">
+								<view class="fon22 col9">技术佣金(元)</view>
+								<view class="fon42 bold mar-s20">￥266.00</view>
+							</view>
+						</view>
+					</view>
+					<!-- 收支明细 -->
+					<view class="pad-zy30">
+						<view class="account-detailed mar-s50 mar-x30">收支明细</view>
+						<view class="fon28 disjbac bold account-detailed-item" style="color: #222222;">
+							<view>金额</view>
+							<view>工单编号</view>
+							<view>方式</view>
+							<view>工单日期</view>
+						</view>
+						<view class="fon24 disjbac account-detailed-item mar-s20" v-for="(item,index) in 20" :key="index" style="color: #4c4c4c;">
+							<view class="clips1">-¥1088</view> 
+							<view class="clips1">GD20220112-1001</view>
+							<view>现金</view>
+							<view class="clips1">2019-7-24</view>
+						</view>
+					</view>
+				</view>
+				<!-- 未结算工单 -->
+				<view v-else class="mar-s20 pad-zy10">
+					<view class="bacf pad-sx20 pad-zy30 radius10 mar-x10" v-for="(item,index) in 10" :key="index">
+						<view class="fon28 disjbac">
+							<view class="col3">株洲市XXX项目名称</view>
+							<view class="col9">林小雨</view>
+						</view>
+						<view class="fon24 disjbac mar-sx10">
+							<view class="col9">工单编号：GD20220112-1001</view>
+							<view style="color: #00a2e9;">故障类型：模组故障</view>
+						</view>
+						<view class="fon24">
+							<view class="col9 disac width100"><image src="/static/public/icon-account-time.png" mode="scaleToFill" style="width: 23rpx;height: 23rpx;" lazy-load class="pad-y10 flexs"></image>2022-01-12  13:25:16</view>
+						</view>
+						<view class="fon26 disjbac mar-s10">
+							<view class="" style="color: #ff0000;">维保已完成</view>
+							<view class="fon36"><text style="font-size: 24rpx;">￥</text>260.0</view>
+						</view>
+						<view class="bbot" style="margin: 20rpx -30rpx;"></view>
+						<view class="fon24 col9 disac"><image src="/static/public/icon-account-address.png" mode="scaleToFill" style="width: 19rpx;height: 25rpx;" class="flexs mar-y10"></image>湖南省长沙市xx区1001栋6-12</view>
+						<view class="dis fe">
+							<view class="unsettled-btn">去结算</view>
 						</view>
 					</view>
 				</view>
@@ -28,7 +83,8 @@
 	export default {
 		data() {
 			return {
-				current:true
+				current:true,
+				detailedList:[]
 			}
 		},
 		methods: {