From a7225fb2d5c48705e6ce803c771d2140554d2f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 29 Apr 2022 22:15:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AF=B9=E6=8E=A5=E3=80=91=20?=
=?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2=20?=
=?UTF-8?q?=E3=80=90=E5=AF=B9=E6=8E=A5=E3=80=91=20=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=20=E3=80=90=E5=AF=B9=E6=8E=A5=E3=80=91=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E9=80=81=E8=AF=84=E8=AE=A2=E5=8D=95=20=E3=80=90=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E3=80=91=20=E5=B0=81=E8=A3=85=E8=AF=B7=E6=B1=82?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7id?=
=?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=BC=A0=E5=85=A5data=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/http.interceptor.js | 4 +-
common/request.js | 10 ++--
packages/addAddress/addAddress.vue | 43 +++++++++++++----
packages/address/address.vue | 42 +++++++----------
pages/index/index.vue | 76 ++++++++++++++++++++----------
pages/login/login.vue | 8 ++--
pages/write/baseInfo.vue | 38 +++++----------
pages/write/distribution.vue | 31 +++++++++++-
service/address.js | 20 ++++++++
service/grading.js | 10 ++++
10 files changed, 186 insertions(+), 96 deletions(-)
create mode 100644 service/address.js
create mode 100644 service/grading.js
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index aef7b1b..03cb15c 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -14,10 +14,10 @@ module.exports = (vm) => {
// 响应拦截
uni.$u.http.interceptors.response.use(res => {
- if(res.code == 0) {
+ if(res.data.code == 0) {
return res;
} else {
- vm.$msg(res.msg);
+ vm.$msg(res.data.msg);
return false;
}
// res.code == 9998 手机号 res.code == 9999 用户信息
diff --git a/common/request.js b/common/request.js
index b6c8335..6bef894 100644
--- a/common/request.js
+++ b/common/request.js
@@ -69,12 +69,12 @@ export default function request(options){
data.device_info = JSON.stringify(sysInfo);
}
// 判断传入用户token和id
- let userinfo = uni.getStorageSync('userinfo') || {};
- if(userinfo && userinfo.token && !data.token){
- data.token = userinfo.token;
+ let userInfo = uni.getStorageSync('userInfo') || {};
+ if(userInfo && userInfo.token && !data.token){
+ data.token = userInfo.token;
}
- if(userinfo && userinfo.id && !data.user_id){
- data.user_id = userinfo.id;
+ if(userInfo && userInfo.id && !data.user_id){
+ data.user_id = userInfo.id;
}
// 获取页面options参数
diff --git a/packages/addAddress/addAddress.vue b/packages/addAddress/addAddress.vue
index f14c724..5c879ab 100644
--- a/packages/addAddress/addAddress.vue
+++ b/packages/addAddress/addAddress.vue
@@ -25,9 +25,13 @@
详细地址
-
+
+
+ 默认地址
+
+
@@ -39,6 +43,8 @@
@@ -413,15 +435,17 @@
left: 0;
width: 100%;
height: 100%;
+ border-radius: 50%;
}
}
.badge {
background-color: rgb(234, 43, 43);
border-radius: 17rpx;
- width: 64rpx;
+ min-width: 34rpx;
position: absolute;
- right: 284rpx;
+ // right: 284rpx;
+ left: 78rpx;
top: 0;
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ec8f27d..0f3b84b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -77,7 +77,7 @@
if(event.detail.errMsg == 'getPhoneNumber:ok'){
let encryptedData = event.detail.encryptedData;
let iv = event.detail.iv;
- // let userInfo = uni.getStorageSync('userinfo') || {};
+ // let userInfo = uni.getStorageSync('userInfo') || {};
this.$http(this.API.API_WECHAT_SETPHONE, {
encryptedData,
iv,
@@ -85,7 +85,7 @@
}).then(res => {
console.log("更新手机号", res);
this.$msg('更新成功', {icon: 'success'});
- uni.setStorageSync('userinfo', res.data);
+ uni.setStorageSync('userInfo', res.data);
setTimeout(() => {
this.$toBack();
}, 1000);
@@ -103,7 +103,7 @@
let encryptedData = result.encryptedData;
let iv = result.iv;
let signature = result.signature;
- // let userInfo = uni.getStorageSync('userinfo') || {};
+ // let userInfo = uni.getStorageSync('userInfo') || {};
this.$http(this.API.API_WECHAT_SETPROFILE, {
encryptedData,
@@ -112,7 +112,7 @@
}).then(res => {
console.log("更新用户信息", res);
this.$msg('更新成功', {icon: 'success'});
- uni.setStorageSync('userinfo', res.data);
+ uni.setStorageSync('userInfo', res.data);
setTimeout(() => {
this.$toBack();
}, 1000);
diff --git a/pages/write/baseInfo.vue b/pages/write/baseInfo.vue
index 6f04257..beac27c 100644
--- a/pages/write/baseInfo.vue
+++ b/pages/write/baseInfo.vue
@@ -35,14 +35,14 @@
{{ address.name }}
- {{ address.phone }}
+ {{ address.tel }}
- {{ address.address }}
+ {{ address.desc }}
@@ -60,13 +60,13 @@
送评人信息
-
+
送评人：
@@ -88,28 +88,11 @@
是否快评：
(价格翻倍)
-
打包照片
-
-
备注
-
-
+
寄送藏品
@@ -160,6 +140,14 @@
},
deletePic(event){
this.fileList.splice(event.index, 1);
+ },
+ next(){
+ let sonpingInfo = this.sonpingInfo;
+ if(!this.$isRight(this.address)) return this.$msg('请选择收货地址');
+ if(!sonpingInfo.name) return this.$msg('请填写送评人信息');
+ if(!sonpingInfo.phone) return this.$msg('请填写送评人手机号');
+ if(!sonpingInfo.number) return this.$msg('请填写送评数量');
+ this.$url('/pages/write/distribution');
}
}
};
diff --git a/pages/write/distribution.vue b/pages/write/distribution.vue
index 13871cb..65e6d0d 100644
--- a/pages/write/distribution.vue
+++ b/pages/write/distribution.vue
@@ -77,7 +77,7 @@
-
+
送评
稍后填写
@@ -88,6 +88,8 @@