diff --git a/common/request.js b/common/request.js
index c5ae941..53d04b7 100644
--- a/common/request.js
+++ b/common/request.js
@@ -71,8 +71,7 @@ export default function request(options){
// 判断传入用户token和id
let userInfo = uni.getStorageSync('userInfo') || {};
if(userInfo && userInfo.id && !data.user_id){
- // data.user_id = userInfo.id; // todo userId 暂都传
- data.user_id = 1;
+ data.user_id = userInfo.id;
}
// 获取页面options参数
diff --git a/packages/addAddress/addAddress-副本.vue b/packages/addAddress/addAddress-副本.vue
deleted file mode 100644
index 1197e9f..0000000
--- a/packages/addAddress/addAddress-副本.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/addAddress/addAddress.vue b/packages/addAddress/addAddress.vue
index 242fcc0..0d61ad8 100644
--- a/packages/addAddress/addAddress.vue
+++ b/packages/addAddress/addAddress.vue
@@ -18,7 +18,7 @@
{{ address.region.length > 0 ? address.region.join(',') : '请选择所在地区' }}
diff --git a/packages/address/address.vue b/packages/address/address.vue
index 635add4..1e633b2 100644
--- a/packages/address/address.vue
+++ b/packages/address/address.vue
@@ -16,8 +16,8 @@
-
-
+
+
@@ -48,7 +48,6 @@
}
},
onShow(){
- // todo 接口排序问题,切换默认地址时
this.addressList = [];
this.getUserAddress();
},
diff --git a/packages/ratingQueryDetail/ratingQueryDetail.vue b/packages/ratingQueryDetail/ratingQueryDetail.vue
index ba8c7bd..0a556ac 100644
--- a/packages/ratingQueryDetail/ratingQueryDetail.vue
+++ b/packages/ratingQueryDetail/ratingQueryDetail.vue
@@ -100,7 +100,7 @@
}
},
methods: {
- // 复制拍卖链接 todo
+ // 复制拍卖链接 todo 暂时不用
setClipboardData(){
uni.setClipboardData({
data: '测试'
@@ -167,7 +167,7 @@
margin-right: 78rpx;
margin-top: 6rpx;
padding: 80rpx 0;
- background-image: url('https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497793713644030.png');
+ background-image: url('https://qxk-img.leadfyy.com/qxk_app_images/pingfenkuang.png');
background-position: 0px 0px;
background-size: 100% 100%;
background-repeat: no-repeat;
diff --git a/packages/sonpingDetail/ratingTrajectory.vue b/packages/sonpingDetail/ratingTrajectory.vue
index 7a73d49..1d99c45 100644
--- a/packages/sonpingDetail/ratingTrajectory.vue
+++ b/packages/sonpingDetail/ratingTrajectory.vue
@@ -15,9 +15,9 @@
-
-
+
+
diff --git a/packages/sonpingDetail/sonpingDetail.vue b/packages/sonpingDetail/sonpingDetail.vue
index ba51428..c962b00 100644
--- a/packages/sonpingDetail/sonpingDetail.vue
+++ b/packages/sonpingDetail/sonpingDetail.vue
@@ -15,7 +15,7 @@
共{{ details.order.num }}件
@@ -25,7 +25,7 @@
{{ details.order.amount || '暂无' }}
@@ -37,7 +37,7 @@
{{ details.order.address.tel }}
@@ -48,12 +48,12 @@
{{ details.logs && details.logs[0].title }}
@@ -61,7 +61,7 @@
温馨提示:如需发票,请在订单完成后一个月内到官网申请
@@ -75,7 +75,7 @@
{{ details.order.express_type }} {{ details.order.express_numb }}
@@ -197,8 +197,8 @@
}
.image_6 {
margin: 10rpx 0 8rpx;
- width: 16rpx;
- height: 26rpx;
+ width: 44rpx;
+ height: 44rpx;
}
.equal-division-item {
margin-left: 28rpx;
@@ -449,7 +449,7 @@
.text_13 {
margin-left: 10rpx;
display: inline-block;
- width: 586rpx;
+ width: 557rpx;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
diff --git a/packages/sonpingDetail/viewDetail.vue b/packages/sonpingDetail/viewDetail.vue
index 2d7dc36..a23d41a 100644
--- a/packages/sonpingDetail/viewDetail.vue
+++ b/packages/sonpingDetail/viewDetail.vue
@@ -93,12 +93,6 @@
console.log("res", res)
this.order = res.data.datas.order;
},
- previewImage(){
- uni.previewImage({
- urls: ['https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497768927244914.png'],
- current: 0
- })
- }
}
};
diff --git a/pages/index/index - 副本.vue b/pages/index/index - 副本.vue
deleted file mode 100644
index 4be8f64..0000000
--- a/pages/index/index - 副本.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-
-
-
-
-
-
-
-
- 评级中心
-
-
-
-
-
-
-
-
-
-
-
-
- 请先登录
-
-
-
-
-
-
-
- 我的订单
-
-
- 全部
-
-
-
-
-
-
-
- 待确认
-
-
-
-
- 评级中
-
-
-
-
- 待付款
-
-
-
-
- 待收货
-
-
-
-
-
-
- 快速评级
- 7days
-
-
-
- 查看详情
-
-
-
-
-
-
-
- 全面评级
-
-
-
- 全面评级
-
-
-
-
-
- 全面评级
-
-
-
- 全面评级
-
-
-
-
-
- 阅读并同意
- 《相关协议》
-
-
- 下一步
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d241cbf..e0d8388 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,9 +7,7 @@
-
+
@@ -18,9 +16,7 @@
-
+
{{ dots.system > 99 ? '99+' : dots.system }}
@@ -37,17 +33,13 @@
我的订单
全部
-
+
-
+
{{ dots.unconfirmed }}
@@ -56,9 +48,7 @@
-
+
{{ dots.rating }}
@@ -67,9 +57,7 @@
-
+
{{ dots.paying }}
@@ -78,9 +66,7 @@
-
+
{{ dots.shipping }}
@@ -98,16 +84,11 @@
查看详情
-
+
-
全面评级
diff --git a/pages/order/order-副本.vue b/pages/order/order-副本.vue
deleted file mode 100644
index 3e031d2..0000000
--- a/pages/order/order-副本.vue
+++ /dev/null
@@ -1,329 +0,0 @@
-
-
-
-
-
-
- 全部
- 待确认
- 评级中
- 待付款
- 待收货
-
-
-
-
-
-
-
-
-
-
-
- 定价
-
- 待付款
-
-
-
- 李丽丽
- 15273936409
-
- 共2件
-
-
- 合计:
- ¥120.00
-
-
- 更多
-
- 付款
-
-
-
-
-
-
-
-
- 全选
- (已选 x1)
-
-
-
-
- 合计
- :
- ¥ 0
-
-
- 合并结算
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 1a34ba3..affaf50 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -80,13 +80,10 @@
-
- 在线送评
+
+ {{ ['在线送评','确认收货','定价','发货'][item.status-1] }}
- {{ ['','待确认','评级中','待付款','待收货'][item.status] }}
+ {{ item.status_text }}
@@ -145,6 +142,10 @@
-
-
\ No newline at end of file
diff --git a/pages/order/wodedingdan_shaixuan-副本.vue b/pages/order/wodedingdan_shaixuan-副本.vue
deleted file mode 100644
index 5718f1a..0000000
--- a/pages/order/wodedingdan_shaixuan-副本.vue
+++ /dev/null
@@ -1,349 +0,0 @@
-
-
-
-
-
-
- 全部
- 待确认
- 评级中
- 待付款
- 待收货
-
-
-
-
-
-
-
-
- 按收货确认时间
-
-
-
- 1个月内
-
-
- 3个月内
-
-
- 6个月内
-
-
- 今年
-
-
-
-
- 2021年
-
-
- 2020年
-
-
- 2019年
-
-
-
-
-
- 按送评信息
-
-
- 输入送评人姓名或手机号
-
-
- 输入标签
-
-
-
-
- 按送评信息
-
- 输入评级编号
-
-
-
-
- 重置
-
-
- 确认
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/ratingCriteria/ratingCriteria.vue b/pages/ratingCriteria/ratingCriteria.vue
index 47c87e3..61ff75c 100644
--- a/pages/ratingCriteria/ratingCriteria.vue
+++ b/pages/ratingCriteria/ratingCriteria.vue
@@ -3,28 +3,28 @@
关于我们
卡砖设计
评级标准
diff --git a/pages/write/baseInfo.vue b/pages/write/baseInfo.vue
index 9116e13..0abc8ce 100644
--- a/pages/write/baseInfo.vue
+++ b/pages/write/baseInfo.vue
@@ -5,21 +5,21 @@
填写信息
藏品寄送
评级
@@ -38,7 +38,7 @@
{{ address.tel }}
@@ -51,7 +51,7 @@
点击选择收货地址
@@ -63,7 +63,7 @@
diff --git a/pages/write/distribution.vue b/pages/write/distribution.vue
index 8f450af..8f6eaa3 100644
--- a/pages/write/distribution.vue
+++ b/pages/write/distribution.vue
@@ -6,21 +6,21 @@
填写信息
藏品寄送
评级
@@ -39,7 +39,7 @@
{{ expressIndex !== '' ? expressList[expressIndex].label : '请选择快递公司' }}
@@ -51,7 +51,7 @@
@@ -316,8 +316,8 @@
}
.image_11 {
margin: 10rpx 0 8rpx;
- width: 16rpx;
- height: 26rpx;
+ width: 44rpx;
+ height: 44rpx;
}
.image_12 {
margin: 4rpx 0;
diff --git a/static/icon/aixin.png b/static/icon/aixin.png
new file mode 100644
index 0000000..59e479a
Binary files /dev/null and b/static/icon/aixin.png differ
diff --git a/static/删除.png b/static/icon/delete.png
similarity index 100%
rename from static/删除.png
rename to static/icon/delete.png
diff --git a/static/编辑.png b/static/icon/edit.png
similarity index 100%
rename from static/编辑.png
rename to static/icon/edit.png
diff --git a/static/icon/level.png b/static/icon/level.png
new file mode 100644
index 0000000..2d4d91d
Binary files /dev/null and b/static/icon/level.png differ
diff --git a/static/icon/line.png b/static/icon/line.png
new file mode 100644
index 0000000..5732fb8
Binary files /dev/null and b/static/icon/line.png differ
diff --git a/static/待确认.png b/static/icon/order1.png
similarity index 100%
rename from static/待确认.png
rename to static/icon/order1.png
diff --git a/static/评级中.png b/static/icon/order2.png
similarity index 100%
rename from static/评级中.png
rename to static/icon/order2.png
diff --git a/static/待付款.png b/static/icon/order3.png
similarity index 100%
rename from static/待付款.png
rename to static/icon/order3.png
diff --git a/static/待收货.png b/static/icon/order4.png
similarity index 100%
rename from static/待收货.png
rename to static/icon/order4.png
diff --git a/static/icon/order_status1.png b/static/icon/order_status1.png
new file mode 100644
index 0000000..4dc2c5f
Binary files /dev/null and b/static/icon/order_status1.png differ
diff --git a/static/icon/order_status2.png b/static/icon/order_status2.png
new file mode 100644
index 0000000..2eb2b7a
Binary files /dev/null and b/static/icon/order_status2.png differ
diff --git a/static/icon/order_status3.png b/static/icon/order_status3.png
new file mode 100644
index 0000000..f2253ca
Binary files /dev/null and b/static/icon/order_status3.png differ
diff --git a/static/icon/order_status4.png b/static/icon/order_status4.png
new file mode 100644
index 0000000..f93d66c
Binary files /dev/null and b/static/icon/order_status4.png differ
diff --git a/static/icon/tianxie1.png b/static/icon/tianxie1.png
new file mode 100644
index 0000000..d4eb6fc
Binary files /dev/null and b/static/icon/tianxie1.png differ
diff --git a/static/icon/tianxie2.png b/static/icon/tianxie2.png
new file mode 100644
index 0000000..2771c8f
Binary files /dev/null and b/static/icon/tianxie2.png differ
diff --git a/static/icon/tianxie3.png b/static/icon/tianxie3.png
new file mode 100644
index 0000000..5b54d43
Binary files /dev/null and b/static/icon/tianxie3.png differ
diff --git a/static/icon/tianxie4.png b/static/icon/tianxie4.png
new file mode 100644
index 0000000..d4eb6fc
Binary files /dev/null and b/static/icon/tianxie4.png differ
diff --git a/static/icon/tianxie5.png b/static/icon/tianxie5.png
new file mode 100644
index 0000000..8db6766
Binary files /dev/null and b/static/icon/tianxie5.png differ
diff --git a/static/icon/tianxie6.png b/static/icon/tianxie6.png
new file mode 100644
index 0000000..4af379e
Binary files /dev/null and b/static/icon/tianxie6.png differ
diff --git a/static/images/logo.png b/static/images/logo.png
new file mode 100644
index 0000000..164d6e9
Binary files /dev/null and b/static/images/logo.png differ
diff --git a/static/下一步.png b/static/下一步.png
deleted file mode 100644
index ae9c6d4..0000000
Binary files a/static/下一步.png and /dev/null differ
diff --git a/static/全面评级.png b/static/全面评级.png
deleted file mode 100644
index e0bac4a..0000000
Binary files a/static/全面评级.png and /dev/null differ
diff --git a/static/勾选.png b/static/勾选.png
deleted file mode 100644
index 079bbf6..0000000
Binary files a/static/勾选.png and /dev/null differ
diff --git a/static/卡品评级.png b/static/卡品评级.png
deleted file mode 100644
index d99df05..0000000
Binary files a/static/卡品评级.png and /dev/null differ
diff --git a/static/套壳服务.png b/static/套壳服务.png
deleted file mode 100644
index e47ad27..0000000
Binary files a/static/套壳服务.png and /dev/null differ
diff --git a/static/搜索.png b/static/搜索.png
deleted file mode 100644
index fda8cfc..0000000
Binary files a/static/搜索.png and /dev/null differ
diff --git a/static/未选择.png b/static/未选择.png
deleted file mode 100644
index 7b4ac1e..0000000
Binary files a/static/未选择.png and /dev/null differ
diff --git a/static/签名评级.png b/static/签名评级.png
deleted file mode 100644
index f9a6754..0000000
Binary files a/static/签名评级.png and /dev/null differ
diff --git a/static/默认头像.png b/static/默认头像.png
deleted file mode 100644
index 53d0868..0000000
Binary files a/static/默认头像.png and /dev/null differ