diff --git a/pages/order/order.vue b/pages/order/order.vue
index a5cc6af..bc2deeb 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -101,7 +101,7 @@
更改地址
-
+
付款
diff --git a/pages/write/distribution.vue b/pages/write/distribution.vue
index d6242a6..0ad722d 100644
--- a/pages/write/distribution.vue
+++ b/pages/write/distribution.vue
@@ -36,7 +36,7 @@
快递公司:
- {{ expressIndex !== '' ? expressList[expressIndex].label : '请选择快递公司' }}
+ {{expressList[expressIndex].label}}
import { addGrading } from '@/service/grading.js';
+ import { sendAddr } from '@/service/address.js';
import logistics from './logistics.json';
export default {
@@ -96,12 +97,12 @@
return {
oddNumber: '',
expressList: logistics,
- expressIndex: '',
+ expressIndex: 0,
baseInfoCache: {},
sendAddress: {
- name: '评分卡部',
- tel: '18268905349',
- address: '北京北京市西城区5号设计总院A座203室'
+ name: '...',
+ tel: '...',
+ address: '...'
}
};
},
@@ -109,6 +110,9 @@
if(this.$valueType(options.base_data) !== 'undefined'){
this.baseInfoCache = JSON.parse(decodeURIComponent(options.base_data));
}
+ sendAddr().then((res) => {
+ this.sendAddress = res.data.datas;
+ });
},
methods: {
setClipboardData(){
diff --git a/pages/write/logistics.json b/pages/write/logistics.json
index cc10b3a..0ceb01a 100644
--- a/pages/write/logistics.json
+++ b/pages/write/logistics.json
@@ -1,4 +1,6 @@
[{
+ "label": "顺丰快递"
+},{
"label": "百世快递"
},{
"label": "德邦快递"
@@ -6,8 +8,6 @@
"label": "丹鸟"
},{
"label": "京东快递"
-},{
- "label": "顺丰快递"
},{
"label": "圆通快递"
},{
diff --git a/service/address.js b/service/address.js
index d936966..8c1bf4d 100644
--- a/service/address.js
+++ b/service/address.js
@@ -14,7 +14,14 @@ export async function addNewAddress(data){
url: '/api/v1/new_addr',
method: 'post',
data
- })
+ });
+}
+
+export async function sendAddr(){
+ return await request({
+ url:'/api/v1/send_address',
+ method:'post'
+ });
}
// 根据地址id查询详细地址
diff --git a/static/images/logo.png b/static/images/logo.png
index ea69017..475851b 100644
Binary files a/static/images/logo.png and b/static/images/logo.png differ