From 4000806bddabd4a99c0b98cf86ec75d1ca36cabd Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 18 Mar 2022 19:01:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=81=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E8=B4=A6=E6=88=B7=E9=A1=B5=E9=9D=A2=E3=80=81=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E6=88=91=E8=A6=81=E8=AF=84=E4=BB=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
commons/flying-monkey.css | 34 ++++-
components/evan-switch/evan-switch.vue | 133 +++++++++++++++++++
components/rate.vue | 143 +++++++++++++++++++++
pagesB/i-want-evaluate/i-want-evaluate.vue | 55 ++++++--
pagesB/my-account/my-account.vue | 29 ++++-
pagesB/set-up/set-up.vue | 118 ++++++++++++++++-
static/rate/rate1_0.png | Bin 0 -> 1150 bytes
static/rate/rate1_1.png | Bin 0 -> 1149 bytes
8 files changed, 495 insertions(+), 17 deletions(-)
create mode 100644 components/evan-switch/evan-switch.vue
create mode 100644 components/rate.vue
create mode 100644 static/rate/rate1_0.png
create mode 100644 static/rate/rate1_1.png
diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
index e7a7d1b..11a96b3 100644
--- a/commons/flying-monkey.css
+++ b/commons/flying-monkey.css
@@ -279,5 +279,35 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
color: #FFFFFF;
}
/* 我要评价 */
-.evaluate-addimg {}
-
\ No newline at end of file
+.evaluate-addimg {
+ position: relative;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.evaluate-addimg::before,.evaluate-addimg::after{
+ content: '';
+ display: block;
+ width: 2rpx;
+ background-color: #959595;
+ height: 60rpx;
+}
+.evaluate-addimg::before{
+ transform: rotate(90deg);
+}
+/* 我的账户 */
+.account-active {
+ position: relative;
+ color: #03affb;
+}
+.account-active::after{
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ bottom: 0;
+ content: '';
+ display: block;
+ width: 60%;
+ height: 4rpx;
+ background-color: #03affb;
+}
\ No newline at end of file
diff --git a/components/evan-switch/evan-switch.vue b/components/evan-switch/evan-switch.vue
new file mode 100644
index 0000000..2a2f4bc
--- /dev/null
+++ b/components/evan-switch/evan-switch.vue
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
diff --git a/components/rate.vue b/components/rate.vue
new file mode 100644
index 0000000..4a3c2f7
--- /dev/null
+++ b/components/rate.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesB/i-want-evaluate/i-want-evaluate.vue b/pagesB/i-want-evaluate/i-want-evaluate.vue
index d4d3297..ed0c72e 100644
--- a/pagesB/i-want-evaluate/i-want-evaluate.vue
+++ b/pagesB/i-want-evaluate/i-want-evaluate.vue
@@ -4,41 +4,78 @@
-
- 长沙XXXXXXXXXXXX项目名称
+
+ 长沙XXXXXXXXX项目名称
GD20220108-1002
- 服务时间:2022-01-11 15 : 27
+ 服务时间:2022-01-11 15 : 27
-
+
上传图片
-
+
-
+
+
+ 您的评价
+
+ 技术服务
+ 客服态度
+
+
+
+ 提交保存
diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue
index 8183fd0..7712596 100644
--- a/pagesB/my-account/my-account.vue
+++ b/pagesB/my-account/my-account.vue
@@ -1,6 +1,26 @@
-
+
+
+
+
+ 我的账户
+ 未结算工单
+
+
+
+
+ 账户总额(元)
+ ¥266.00
+
+
+ 联系客服?
+
+
+
+
+
+
@@ -8,11 +28,14 @@
export default {
data() {
return {
-
+ current:true
}
},
methods: {
-
+ // 切换状态
+ switchStatus(status){
+ this.current = status;
+ }
}
}
diff --git a/pagesB/set-up/set-up.vue b/pagesB/set-up/set-up.vue
index 8183fd0..a0c08b2 100644
--- a/pagesB/set-up/set-up.vue
+++ b/pagesB/set-up/set-up.vue
@@ -1,18 +1,130 @@
-
+
+
+
+
+ 开启语音提醒
+
+
+
+ 接受新消息通知
+
+
+
+ 修改登录密码
+
+
+
+ 清除缓存
+ {{cacheSize}} KB
+
+
+ 上门服务条款
+
+ V3.0
+
+
+
+ 用户服务协议
+
+ V1.1
+
+
+
+ 飞猴云服务隐私政策
+
+ V1.2
+
+
+
+ 技术服务合作协议
+
+ V1.1
+
+
+
+ 关于飞猴云服务
+
+ V1.1
+
+
+
+ 版本更新
+ 当前版本 5.1.4
+
+
+
diff --git a/static/rate/rate1_0.png b/static/rate/rate1_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..53a674ff66feb75fd2bc50fb06006544aebe2309
GIT binary patch
literal 1150
zcmeAS@N?(olHy`uVBq!ia0vp^>Oic*!3HF`%#~*|Ffe*&hD4M^`1)8S=jZArrsOB3
z>Q&?x0Oc7NZ0suv5|gu2OB9k)(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWU
zl3bOYY?-2DZ^va*VFffGH?<^Dp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRdNJbs1V^B
zpx~Tel&WB=XQrEMXkw&bZmDNzW?*S#qN8ABU}&yyV6JaytZQIsWngAyY^eYRN_Jcd
zHbp6ERzWUqP|JWkTcwPWk^(Dz{qpj1y>er{{GxPyLrY6beFGzXBO_g)3f#Oz%8h977^n&))FPhz%7v_VNDS%%r4+8e0uJBp!!dxweYAG{ib^<&PDU
zn>e_RPMmznk@e;2#tT+K)*2%0d?GCDd@PPjx)h?+yZYvw=-sHbXjxap6*aNP33I2Y
z*sh;bed$Rv_xCr~e{KGj_I7L8^6RfNJ=Z7jS5*kbUzs^2NbAk(ZB0khY&sb4^spOT
zdcP?5ply36>;3Z&*42sUGUpkWJ=nyWd;Osu&)3Zb(gp1WseZrna^9yutb1U!gSY?G
z_X|5Ls+oOxzc8D396rVW?{U&;>6Mx>;T5^li_Z5vR($x>&23hO?YHYDzYNOE3@@?d
zExi8fKy3eUsT&*Dsh#0yJ9<$5@V?YrH~W@6X*1pUk#7b+XmXucjK0t^|Cm*Z3W)
zm~?Fi$0p$&jM39L+4n!x{?m|OD0TnwbDko$|7riz3-e^n5~TCQqYWBcvUT~^{LNB+
zcRq9eVUvA_L)dIv`>prJy)U&a{&A1RjBMBU
zN#|?kSSwzdcX{>kV#oZXe6N+;4LJ5Urhh#9%0O{WiNaEoqemToJMWFIMjeND2`yV=4t={
literal 0
HcmV?d00001
diff --git a/static/rate/rate1_1.png b/static/rate/rate1_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9def1ba913247af0dc921481ff4bc8ec2b5d96bb
GIT binary patch
literal 1149
zcmeAS@N?(olHy`uVBq!ia0vp^>Oic*!3HF`%#~*|Ffe*&hD4M^`1)8S=jZArrsOB3
z>Q&?x0Oc7NZ0suv5|gu2OB9k)(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWU
zl3bOYY?-2DZ^va*VFffGH?<^Dp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRdNJbs1V^B
zpx~Tel&WB=XQrEMXkw&bZmDNzW?*S#qN8ABU}&yyV6JaytZQIsWngAyY^eYRN_Jcd
zHbp6ERzWUqP|JWkTcwPWk^(Dz{qpj1y>er{{GxPyLrY6beFGzXBO_g)3f#Om971977^n&)zuSJvCJ3_{Zye@3{-J1Rh^xQeq_j(8>7prMw+q>;qV`
zl>=9wI2D*B-Eu)~W2lzf4c5Ci(lW%i^%<$uCoY*C~
zxsvt;Gk)4V|6Ox__Vang`|cNOo#n3PanLSc+x^k@+r#&Hac5rj-r4tx;egSVjoNQw
z6Vp?f`I+)m`yO;|nBKB?RnCJ=1*UI~tlm5?zyJAGql2dptv%@Bcc0_hG|o7-Ji)lb
z+LnLylih!OU20Sy{lT&Eyra$i_Y8jzg)Xt&y7s_()je|mY*)wc@U7VHeZTzB{`9Zh
z-`h-<@4C3{!~4j)I$vjPY1ieg*8cY0;#}RIzWImbj>q14{Uu2C(sd!7zGz`49N)j%;FO`7J;HaYk5vkMH_phB8O%e?+Xh_$>PWgW#H(SEV1@%uzg6
z=<{o4{(0jYZzaCpFp=nAw%&8j5%)`Mmh!t=oh>F_l|DOD_O01X%^KyU)6XyAtz1{a
z?7pe$an9~@ex3j4g!ISG;nw=o)m)h%60Ukbv1EY?+k-CAgaF)L%bl{h%7j%agiVyDxn`ET$>?SLl2+>-+Vy{uJiF>vd4y
z(feuj+egLeK#{dIVG_?eMjQU=b6h_UrMYjKCtDo=1cE=
zvj5(0acZx;&Y5?jdGjlu72B8S7e^i3Y5Z$H-+%MM)Uf}TK-vOhy8f?!+)$ET;=w*0SN#A
literal 0
HcmV?d00001
From f9330094a1ca9f2fab07b39c7ec2dc8d80da7acb Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 18 Mar 2022 19:07:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8DpayReturnVisit?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BApay-return-visit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 2 +-
pages/workOrder/{payReturnVisit .vue => pay-return-visit.vue} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename pages/workOrder/{payReturnVisit .vue => pay-return-visit.vue} (100%)
diff --git a/pages.json b/pages.json
index a2a8a58..8a5ad96 100644
--- a/pages.json
+++ b/pages.json
@@ -158,7 +158,7 @@
}
,{
- "path" : "pages/workOrder/payReturnVisit ",
+ "path" : "pages/workOrder/pay-return-visit",
"style" :
{
"navigationBarTitleText": "",
diff --git a/pages/workOrder/payReturnVisit .vue b/pages/workOrder/pay-return-visit.vue
similarity index 100%
rename from pages/workOrder/payReturnVisit .vue
rename to pages/workOrder/pay-return-visit.vue
From 4ea5a4223cf0eca24c997fe3689c922d75ea50b7 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Mon, 21 Mar 2022 14:53:40 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=81=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E3=80=81=E6=89=BE=E5=9B=9E=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E3=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E3=80=81=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jsFile/requst.js | 14 +++---
pages/forget/forget.vue | 95 +++++++++++++++++++++----------------
pages/login/login.vue | 44 ++++++++++-------
pages/register/register.vue | 24 +++++++---
pages/tabbar/my/my.vue | 17 ++++++-
5 files changed, 122 insertions(+), 72 deletions(-)
diff --git a/jsFile/requst.js b/jsFile/requst.js
index 2fa353d..240f831 100644
--- a/jsFile/requst.js
+++ b/jsFile/requst.js
@@ -72,22 +72,20 @@ const request = (method, url, options) => {
}
break;
}
+ let params = {};
+ if(options!=undefined) params = options;
+ params.token = uni.getStorageSync('token');
return new Promise((resolve, reject) => {
uni.request({
url: `${uni.getStorageSync('hostapi')}${url}`,
method: methods,
- data: options,
+ data: params,
header: headers,
success: res => {
console.log(`${url}返的结果===>`,res);
if (res.statusCode == 200) {
- if (res.data.code == 0) {
- // 接口调用成功
- resolve(res.data);
- } else {
- // 接口返回错误信息
- checkError(res);
- }
+ // 接口调用成功
+ resolve(res.data);
} else {
// 接口返回错误信息
checkError(res);
diff --git a/pages/forget/forget.vue b/pages/forget/forget.vue
index 7b4d203..9b28545 100644
--- a/pages/forget/forget.vue
+++ b/pages/forget/forget.vue
@@ -1,41 +1,46 @@
- 忘记密码?
-
- 手机号码
-
-
-
-
+
+
+
+ 忘记密码 ?
+
+ 手机号码
+
+
+
+
+
+ 手机验证码
+
+
+ {{codeText}}
+
+
+
+ 新密码
+
+
+
+
+
+ 确认密码
+
+
+
+
+
+ 单位名称
+
+
+
+
+
+
+
+ 立即修改
- 手机验证码
-
-
- {{codeText}}
-
-
-
- 新密码
-
-
-
-
-
- 确认密码
-
-
-
-
-
- 单位名称
-
-
-
-
-
-
-
- 立即修改
+
@@ -54,7 +59,8 @@
ifUnitname:false,
forget_unitname:'',
codeText:'获取验证码' ,// 获取验证码按钮文字
- flagCode:true // 允许点击获取验证码
+ flagCode:true ,// 允许点击获取验证码
+ countDown:null//验证码倒计时事件
}
},
methods: {
@@ -69,7 +75,12 @@
affiliation: this.forget_unitname ,//单位名称
}
this.$requst.post('/universal/api.login/password_find',params).then(res=>{
- this.$toolAll.tools.showToast('找回成功');
+ if(res.code==1) {
+ this.$toolAll.tools.showToast('找回成功');
+ setTimeout(()=>{uni.navigateBack({delta:1})},1000)
+ } else {
+ this.$toolAll.tools.showToast(res.msg);
+ }
})
}
},
@@ -82,12 +93,12 @@
this.flagCode = false;
let count = 60;
this.codeText = `${count}S重新获取`
- let countDown = setInterval(()=>{
+ this.countDown = setInterval(()=>{
count--;
count < 10 ? this.codeText = `0${count}S重新获取` : this.codeText = `${count}S重新获取`;
if(count==0) {
this.codeText = `重新获取`;
- clearInterval(countDown);
+ clearInterval(this.countDown);
this.flagCode = true;
}
},1000)
@@ -100,6 +111,10 @@
getMessage(phone){
this.$requst.post('/universal/api.login/send_sms',{phone}).then(res=>{
this.$toolAll.tools.showToast(res.msg);
+ if(res.code==0) {
+ clearInterval(this.countDown);
+ this.codeText = `获取验证码`
+ }
})
},
// 检测是否某个输入框为空
@@ -202,5 +217,5 @@
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 6718b5c..d280a64 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -82,22 +82,32 @@
methods: {
// 提交事件
submitEv(){
- // if(this.checkEmpty()){
- // let params = {
- // login_type: this.login_type, // 登陆手机类型: mobile:手机登陆、account:账号密码登陆
- // phone: this.login_type == 'mobile' ? this.login_phone : '', // 手机号码,login_type 为 mobile 时必填
- // password: this.login_password, // 密码,login_type 为 account 时必填
- // sms_code: this.login_code, // 短信验证码,login_type 为 mobile 时必填
- // username: this.login_type == 'account' ? this.login_phone : '', //账号,login_type 为 account 时必填
- // affiliation: this.login_unitName // 单位名称
- // }
- // this.$requst.post('/universal/api.login/login',params).then(res=>{
- // this.$toolAll.tools.showToast('登录成功');
- // })
- // }
- uni.reLaunch({
- url:'/pages/tabbar/pagehome/pagehome'
- })
+ if(this.checkEmpty()){
+ let params = {
+ login_type: this.login_type, // 登陆手机类型: mobile:手机登陆、account:账号密码登陆
+ phone: this.login_type == 'mobile' ? this.login_phone : '', // 手机号码,login_type 为 mobile 时必填
+ password: this.login_password, // 密码,login_type 为 account 时必填
+ sms_code: this.login_code, // 短信验证码,login_type 为 mobile 时必填
+ username: this.login_type == 'account' ? this.login_phone : '', //账号,login_type 为 account 时必填
+ affiliation: this.login_unitName // 单位名称
+ }
+ this.$requst.post('/universal/api.login/login',params).then(res=>{
+ console.log(res,95);
+ if(res.code==1) {
+ this.$toolAll.tools.showToast('登录成功');
+ // 缓存token和角色类型
+ uni.setStorageSync('token',res.data.token);
+ uni.setStorageSync('type_id',res.data.type_id);
+ setTimeout(()=>{
+ uni.reLaunch({
+ url:'/pages/tabbar/pagehome/pagehome'
+ })
+ },2000)
+ } else {
+ this.$toolAll.tools.showToast(res.msg);
+ }
+ })
+ }
},
// 获取验证码
getCode(){
@@ -126,7 +136,7 @@
getMessage(phone){
this.$requst.post('/universal/api.login/send_sms',{phone}).then(res=>{
this.$toolAll.tools.showToast(res.msg);
- if(res.data.length==0) {
+ if(res.code==0) {
this.codeText = '获取验证码';
clearInterval(this.countDown);
}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 3584d09..e5453bf 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -93,7 +93,8 @@
register_unitName:'', // 注册时的单位名称
ifAgreen:false ,// 注册时是否勾选协议与政策
codeText:'获取验证码' ,// 获取验证码按钮文字
- flagCode:true // 允许点击获取验证码
+ flagCode:true ,// 允许点击获取验证码
+ countDown:null//验证码倒计时事件
}
},
methods: {
@@ -108,9 +109,15 @@
affiliation: this.register_unitName //单位名称
}
this.$requst.post('/universal/api.login/register',params).then(res=>{
- this.$toolAll.tools.showToast('注册成功');
- // 调用前往登录页
- this.goLogin();
+ if(res.code==1) {
+ this.$toolAll.tools.showToast('注册成功');
+ setTimeout(()=>{
+ // 调用前往登录页
+ this.goLogin();
+ },1000)
+ } else {
+ this.$toolAll.tools.showToast(res.msg);
+ }
})
}
},
@@ -123,12 +130,12 @@
this.flagCode = false;
let count = 60;
this.codeText = `${count}S重新获取`
- let countDown = setInterval(()=>{
+ this.countDown = setInterval(()=>{
count--;
count < 10 ? this.codeText = `0${count}S重新获取` : this.codeText = `${count}S重新获取`;
if(count==0) {
this.codeText = `重新获取`;
- clearInterval(countDown);
+ clearInterval(this.countDown);
this.flagCode = true;
}
},1000)
@@ -141,6 +148,11 @@
getMessage(phone){
this.$requst.post('/universal/api.login/send_sms',{phone}).then(res=>{
this.$toolAll.tools.showToast(res.msg);
+ if(res.code==0) {
+ clearInterval(this.countDown);
+ this.codeText = `获取验证码`
+ this.flagCode = true;
+ }
})
},
// 检测是否某个输入框为空
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index 7c90159..b216166 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -45,7 +45,7 @@
- 退出登录
+ 退出登录
@@ -103,6 +103,21 @@
this.$toolAll.tools.disableShareEv();
},
methods: {
+ // 退出登录
+ logOutEv(){
+ this.$requst.post('/universal/api.login/signout').then(res=>{
+ if(res.code==1) {
+ this.$toolAll.tools.showToast('退出成功');
+ // 清除所有缓存
+ uni.clearStorageSync();
+ setTimeout(()=>{
+ uni.reLaunch({
+ url:'/pages/login/login'
+ })
+ },1000)
+ }
+ })
+ },
checkInfo(){
this.$requst.post('/api/user/info').then(res=>{
// console.log('用户信息:',res);
From b105715ccc199f6ea16ec092398c2ab42c462190 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Mon, 21 Mar 2022 16:36:07 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=A3=9E=E7=8C=B4?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=8D=E5=8A=A1=E5=8D=8F=E8=AE=AE=E3=80=81?=
=?UTF-8?q?=E9=A3=9E=E7=8C=B4=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/agreement.vue | 26 ++++++++++++++++++++++----
pages/register/register.vue | 4 +++-
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/pages/login/agreement.vue b/pages/login/agreement.vue
index a43d586..3b99326 100644
--- a/pages/login/agreement.vue
+++ b/pages/login/agreement.vue
@@ -1,6 +1,11 @@
-
+
+
+
+
+
+
@@ -8,11 +13,24 @@
export default {
data(){
return {
-
+ title:'',//标题
+ richText:''//富文本详情
}
},
- onLoad() {
-
+ onLoad(options) {
+ options.type*1 ? this.title = '飞猴隐私政策' : this.title = '飞猴用户服务协议';
+ this.checkAgreement(options.type);
+ },
+ methods:{
+ checkAgreement(type){
+ console.log(type,26);
+ let url = type*1 ? '/universal/api.login/register_user_agreement' : '/universal/api.login/register_privacy_agreement';
+ this.$requst.post(url).then(res=>{
+ if(res.code==1) {
+ // this.richText =
+ } else this.$toolAll.tools.showToast(res.msg);
+ })
+ }
}
}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index e5453bf..02c3d46 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -266,7 +266,9 @@
},
// 前往协议或政策
goXY(index){
- console.log(index);
+ uni.navigateTo({
+ url:`/pages/login/agreement?type=${index}`
+ })
}
}
}
From 2c2ab9eeaa6c2db5d02292237760722b621432cd Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Mon, 21 Mar 2022 18:20:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E8=B4=A6=E6=88=B7=E9=A1=B5=E9=9D=A2=E3=80=81=E6=9C=AA=E7=BB=93?=
=?UTF-8?q?=E7=AE=97=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 +-
commons/flying-monkey.css | 47 ++++++++++++++++
manifest.json | 16 +++++-
pages/login/login.vue | 4 +-
pagesB/my-account/my-account.vue | 74 ++++++++++++++++++++++---
static/public/icon-account-address.png | Bin 0 -> 1641 bytes
static/public/icon-account-time.png | Bin 0 -> 1185 bytes
7 files changed, 130 insertions(+), 13 deletions(-)
create mode 100644 static/public/icon-account-address.png
create mode 100644 static/public/icon-account-time.png
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 0000000000000000000000000000000000000000..65d3ecac2f637dcf4fe2c9a1ba146a97e54dee97
GIT binary patch
literal 1641
zcmX|CeN@s}8V2>~=4cI*VSbF!4;aIhFDX$Fm?jYMgDp+4oh3B|bz3+SP`##Too`3GC
z{am)Ur@toz0`ca=FcY2oR_FBli@S4ubZ=WT1Okl{A52lCB*arPq!L_uru2vqr;^B=
z_Yg=FLnTYk$Pp?KM}%2okOsWc_W%fSCJo^4NgyQ1_6f7aF>1LmNzFZ&q0Y&O%mf&8
z&nOke2_O+F(h(}jQScZ=MFal8r8wh_V?2QPqePKI1NLqZB2p6eBlbz@kzu<-5n%)(8BZYNi6kt6NFjt%NRfzl1E6~%qU4z(N+L7*9hozu0oe+L
zjDp82l}enFgp
zOg|#cRnPzczd?e3$KsTSf3MG(ymv?lI&G0V_16Way@Ej8MmfyA2P4V_RjC>Qe_Mai
z^D*WxNY
z3di*I){LFO0WdFXV
z(ErA^H(?6{rn_1+4P{B-Y$+dj(NUS#$z{e*6h1PMkyFQ+mpp<99i_-AdfGs7Cp6W?
z3K>97&91FQnLuCVE0>mDLGJ;j6dL0>=|`e&4m_>#DCs^FYvFO&C0o52zvQ23wCPug
zoU+Qp+9ixK^{j@Cvj5l|^3Cm^uku=!nQbHbfkE!KjkhZuo1y|>5B`()lc}d7F;--)
z)x4?Gw?RLsr2E3A6%=7apfNd_hP9+(nr{2ay7l$Ya8VSL>{`>vE=d}4#WM}4CIxw+
zFHdi8nVuFV#=JkEtamR(31qgO8`Olp>e2e*qUzCtvW7GeJOg%)dpy%<
zSm&1fE7;5e{v_r4c9;ips<}aA#iel`#=TgqE-&|fYd=8+Yh!>`F>bJm?o24E3!{+gUD+3f!1j;__OqlWLcU(4#16q@PUZZ+qDsp?w)1nV)C2WJUb4N}5C-t)m
zO7qOcxjBhb#33y)=7;@?gGTmc
z*yRVG#3y0H_w9^lCI$aw-d3nuYU%deF2+!&pZ5{63
zW$9Z~9T!n*9le7m{ywrCxUkqB%7DQN`d=(w7Fo+0cKxQg!Fsr-w=+O}J@j7ob->aU
zcL67GyTUr~A?z&6fHxIBGmT8xgKN2^?V-W2AAE1n0Ild!R&w%Ch`w4l$~~m*TvB)Q
zQG%++Z8L9wQBVs1HyADAK?=~_B;X9w@O4+~`uML#BfR{k*)}(BGl89}#rh&|mA@+C
zA)#sazpB`VhDK!^W#Z|5e#y^IGCTal)>O73Zr+hjqE0NdhhFveLQ7nVTyIH5e|wT^
ce+e!-Ts_OG4aoeamW>~R!{RbqKTA9LJN}UB^8f$<
literal 0
HcmV?d00001
diff --git a/static/public/icon-account-time.png b/static/public/icon-account-time.png
new file mode 100644
index 0000000000000000000000000000000000000000..62f35173b3220003df76b9f0fd6b40c1a4248fad
GIT binary patch
literal 1185
zcmeAS@N?(olHy`uVBq!ia0vp^;vmey1|%P7U0J}u!04SB5>XQ2>tmIipR1RclAn~S
zSCLx)lxJYDv9BmdOwLX%QAkQn&&;z`dcS+Wl0s&Rtx~wDuYqrYb81GWM^#a3aFt(3
za#eP+Wr~u$9hXgo70`g()RIJnirk#MVyg;UC9t_xKsHENUr7P1q$Jx`$q{6sLWFOC
zf^&XRs)DJWnQpS7iIIZ2rJkXgfu)g&j)IYap}D?+xxS&Xu7RPIfti)Dr2-Tv*>Ne@
z6s4qD1-ZCEEd%mwl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{
z^NN*0MnKGPNi9w;$}A|!%+FH*nVFcBUs__Tq@)kBL?3Dk(0lrD{{cDh5K7Gh21^mp
z|MO%L-ZL;T3wpXZhIn+&ow~7GE>z@b{qu9b#l9==j@A?_o2Jca*2FRUNCS%w%ViG1
zBrfj%jY}>bShaG|5s_$52Z4}JuKwqS;vj!0su=;r%-s&&eqC2x9{
zC&tecd}ic+>nUVE={cT27CkJDz`CT`JJns@HZ@>$C)RbRTK&10*R
zExPNj_cB2$mUi
z=gNev9(+pd~a{R@a
zB~E1S7CbD-`%$yt?zf$1RC44enyA0rdrr0Ic=EBwA4`7A{_K0P`%PEegfAQgD;SP9
zzMk~&O>=sB`bOWirRuH0mvVRgbiTyzpvq~r{>f7L0+1RFJ`Q&
z(%*cKQ_%5zsx@;)^`e6x|M|;p_^9y7ZhiIcl(dwz#LrH%R>>z^65Ox#lHv9p_XBnh
zm~Y3IrfD3=VGO#YR8YOTiH~zl$}=tN-+vdL`I9