From 2b3ee8f6d3721ff88dd379271ff8d56fcd2924db Mon Sep 17 00:00:00 2001
From: 905166056 <905166056@qq.com>
Date: Mon, 12 Apr 2021 09:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/init/initApi.js | 4 +-
auth/AppLogin.js | 3 +-
core/vcRoute.js | 4 +-
pages/appraiseRepair/appraiseRepair.vue | 50 +++++++++++++++----
pages/my/my.vue | 49 ++++++++++++------
.../myRoomRenovationRecordDetail.vue | 16 +++---
pages/repairPay/repairPay.vue | 1 -
pages/roomFee/roomFee.vue | 4 --
8 files changed, 89 insertions(+), 42 deletions(-)
diff --git a/api/init/initApi.js b/api/init/initApi.js
index 9d75afb..5642f82 100644
--- a/api/init/initApi.js
+++ b/api/init/initApi.js
@@ -59,12 +59,12 @@ export function getWAppId(){
* 页面加载方法
* @param {Object} _option 页面参数对象
*/
-export function onLoad(_option){
+export function onLoad(_option, callback = () => {}){
// #ifdef H5
let _key = _option.key;
if (isNotNull(_key)) {
//根据key 去做登录
- doLoginOwnerByKey(_key);
+ doLoginOwnerByKey(_key, callback);
}
// #endif
//初始化wAppId
diff --git a/auth/AppLogin.js b/auth/AppLogin.js
index 7c3ec49..0853484 100644
--- a/auth/AppLogin.js
+++ b/auth/AppLogin.js
@@ -11,7 +11,7 @@ import {getWAppId} from '../api/init/initApi.js'
* @param {Object} _key 自登陆key
* add by wuxw QQ 928255095
*/
-export function doLoginOwnerByKey(_key) {
+export function doLoginOwnerByKey(_key, callback = () => {}) {
requestNoAuth({
url: url.loginOwnerByKey,
method: 'post',
@@ -51,6 +51,7 @@ export function doLoginOwnerByKey(_key) {
wx.setStorageSync(mapping.TOKEN, _param.token);
//保存临时 钥匙
wx.setStorageSync(mapping.OWNER_KEY, _param.key);
+ callback();
},
fail: function(error) {
// 调用服务端登录接口失败
diff --git a/core/vcRoute.js b/core/vcRoute.js
index 0448767..6451d02 100644
--- a/core/vcRoute.js
+++ b/core/vcRoute.js
@@ -43,7 +43,7 @@ import {
* 跳转功能封装
* @param {Object} _param 跳转入参
*/
-export function navigateTo(_param) {
+export function navigateTo(_param, callback = () => {}) {
//参数中刷入wAppId
let _url = _param.url;
@@ -87,7 +87,7 @@ export function navigateTo(_param) {
//小程序登录
// #ifdef MP-WEIXIN
- doLogin();
+ doLogin(callback);
// #endif
// #ifdef APP-PLUS
diff --git a/pages/appraiseRepair/appraiseRepair.vue b/pages/appraiseRepair/appraiseRepair.vue
index 9cfd779..fb4c76e 100644
--- a/pages/appraiseRepair/appraiseRepair.vue
+++ b/pages/appraiseRepair/appraiseRepair.vue
@@ -1,15 +1,27 @@
-
- 服务评分
-
-
+
+ 综合评分
+
+
+
+
+
+ 维修速度
+
+
+
+
+
+ 维修员服务
+
+
服务评价
-
+
@@ -30,9 +42,13 @@
data() {
return {
fontSize:'60upx',
- rateSync: 2,
+ rateSync1: 2,
+ rateSync2: 2,
+ rateSync3: 2,
animation: true,
- curAppraise: 4,
+ curAppraise: 2,
+ curDoorSpeed: 2,
+ curRepairmanService: 2,
context: '',
repairId:'',
userId:'',
@@ -53,9 +69,15 @@
});
},
methods: {
- onChange(e) {
+ appraiseScoreChange(e) {
this.curAppraise = e;
},
+ doorSpeedScoreChange(e) {
+ this.curDoorSpeed = e;
+ },
+ repairmanServiceScoreChange(e) {
+ this.curRepairmanService = e;
+ },
submitAppraiseRepair:function(){
if(this.context == ''){
uni.showToast({
@@ -74,6 +96,8 @@
let _data = {
"appraiseScore":this.curAppraise,
+ "doorSpeedScore":this.curDoorSpeed,
+ "repairmanServiceScore":this.curRepairmanService,
"appraiseType":"10001",
"context":this.context,
"appraiseUserId":this.userId,
@@ -93,7 +117,6 @@
uni.navigateBack({
delta: 1
});
-
})
.then((error)=>{
wx.showToast({
@@ -101,7 +124,7 @@
icon: 'none',
duration: 2000
});
- });
+ });
}
}
}
@@ -111,4 +134,11 @@
.content {
height: 100%;
}
+ .item-title{
+ width: 200rpx;
+ }
+ .item-star, .item-title{
+ vertical-align: middle;
+ line-height: 100rpx;
+ }
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 17701cd..10b335e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -111,7 +111,9 @@
components: {},
props: {},
onLoad: function(options) {
- context.onLoad(options);
+ context.onLoad(options, () => {
+ this.refreshPageLoginInfo();
+ });
let _that = this;
let login = context.checkLoginStatus();
if (login) {
@@ -122,27 +124,28 @@
}
},
onShow: function() {
- let _that = this; //查询用户信息
-
- if (!_that.ckeckUserInfo()) {
- _that.login = false;
- return;
- }
- _that.login = true;
-
-
- _that.loadOwenrInfo();
- _that.userInfo = context.getUserInfo();
- this.loadOwnerHeaderImg();
- // _that.setData({
- // userInfo: context.getUserInfo()
- // });
+ this.refreshPageLoginInfo();
},
methods: {
+ // 原onShow方法
+ // 自动登录后 刷新页面登录信息
+ refreshPageLoginInfo: function(){
+ let _that = this; //查询用户信息
+ if (!_that.ckeckUserInfo()) {
+ _that.login = false;
+ return;
+ }
+ _that.login = true;
+ _that.loadOwenrInfo();
+ _that.userInfo = context.getUserInfo();
+ this.loadOwnerHeaderImg();
+ },
bindingOwner: function() {
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
@@ -154,6 +157,8 @@
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
@@ -184,6 +189,8 @@
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
@@ -196,6 +203,8 @@
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
@@ -212,6 +221,8 @@
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
@@ -224,6 +235,8 @@
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
@@ -235,6 +248,8 @@
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
@@ -246,6 +261,8 @@
if (!this.ckeckUserInfo()) {
this.vc.navigateTo({
url: '../showlogin/showlogin'
+ }, () => {
+ this.refreshPageLoginInfo();
});
return;
}
diff --git a/pages/myRoomRenovationRecordDetail/myRoomRenovationRecordDetail.vue b/pages/myRoomRenovationRecordDetail/myRoomRenovationRecordDetail.vue
index 2068e3e..d2ec7b3 100644
--- a/pages/myRoomRenovationRecordDetail/myRoomRenovationRecordDetail.vue
+++ b/pages/myRoomRenovationRecordDetail/myRoomRenovationRecordDetail.vue
@@ -22,7 +22,7 @@
图片
-
+
@@ -32,13 +32,11 @@
-