diff --git a/components/qn-datetime-picker/qn-datetime-picker.vue b/components/qn-datetime-picker/qn-datetime-picker.vue index 7c8d4f4..4ea79cf 100644 --- a/components/qn-datetime-picker/qn-datetime-picker.vue +++ b/components/qn-datetime-picker/qn-datetime-picker.vue @@ -5,7 +5,7 @@ - + diff --git a/enums/index.js b/enums/index.js index b1da3f7..3e80d18 100644 --- a/enums/index.js +++ b/enums/index.js @@ -1,6 +1,8 @@ import env from '@/env/index.js' const urlEnv = env === 'production' ? '' : `-${env}` +export const XAPPID = '503258978847966404' + /** * 账号类型 */ diff --git a/pages.json b/pages.json index 7e74dec..f32c716 100644 --- a/pages.json +++ b/pages.json @@ -118,14 +118,15 @@ "path": "pages/enquiry-list/index", "style": { "navigationBarTitleText": "询价列表", - "enablePullDownRefresh": false, - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": false } }, { "path": "pages/for-comparison/index", "style": { "navigationBarTitleText": "实单询比价", + "navigationStyle": "custom", "enablePullDownRefresh": false } }, @@ -133,6 +134,7 @@ "path": "pages/add-address-manage/index", "style": { "navigationBarTitleText": "新建收货地址", + "navigationStyle": "custom", "enablePullDownRefresh": false } }, diff --git a/pages/mine/index.vue b/pages/mine/index.vue index a804713..814bd1f 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -75,7 +75,7 @@ @@ -100,12 +100,12 @@ 账号管理 - + 我的询价 - - + + 收货地址 diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue index df4f392..9cc9267 100644 --- a/pages/order-detail/index.vue +++ b/pages/order-detail/index.vue @@ -11,7 +11,7 @@ {{ orderInfo.customerEnterpriseName }} - 联系人: {{ `${orderInfo.deliveryAddress.receiver} ${orderInfo.deliveryAddress.receiverMobile}` }} + 联系人: {{ `${orderInfo.deliveryAddress.receiver || '-'} ${orderInfo.deliveryAddress.receiverMobile || '-'}` }} @@ -27,16 +27,14 @@ 确认收货 - - 去借款 - + 去借款 - 去借款 + 去还款 {{ supplierOrderStatusMap[supplierOrder.status] }} @@ -147,7 +145,7 @@