diff --git a/canteen/common/api.js b/canteen/common/api.js index 2c4b17f..b92a7c9 100644 --- a/canteen/common/api.js +++ b/canteen/common/api.js @@ -1,8 +1,8 @@ // appId: 正式 null | 测试 null export const DEV = "dev"; // dev 测试 | prod 正式 export const VERSION = '1.0.0'; // 版本号 -// export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址 -export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址 +export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址 +// export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址 export const PRODURL = ''; // 正式服请求地址 export const API_CANTEEN_LOGIN = '/api/canteen/login'; // 登录 diff --git a/canteen/pages/purchase/detail.vue b/canteen/pages/purchase/detail.vue index 3fead99..3243e77 100644 --- a/canteen/pages/purchase/detail.vue +++ b/canteen/pages/purchase/detail.vue @@ -121,13 +121,13 @@ key: 'supplier_name' },{ key: 'pre_tax_price', - label: '税前价格' + label: '含税价' },{ key: 'total_tax_amount', label: '含税合计' },{ key: 'after_tax_price', - label: '税后价格' + label: '不含税价' },{ key: 'total_non_tax_amount', label: '不含税合计' diff --git a/supplier/common/api.js b/supplier/common/api.js index 6878b15..c35580b 100644 --- a/supplier/common/api.js +++ b/supplier/common/api.js @@ -1,8 +1,8 @@ // appId: 正式 null | 测试 null export const DEV = "dev"; // dev 测试 | prod 正式 export const VERSION = '1.0.0'; // 版本号 -export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址 -// export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址 +// export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址 +export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址 export const PRODURL = ''; // 正式服请求地址 export const API_SUPPLIER_INDEX = '/api/supplier/index'; // 落地页 diff --git a/supplier/pages/gonghuo/detail.vue b/supplier/pages/gonghuo/detail.vue index 1696c6f..371073d 100644 --- a/supplier/pages/gonghuo/detail.vue +++ b/supplier/pages/gonghuo/detail.vue @@ -32,6 +32,14 @@ 批次号 {{order.batch_sn}} + + 预计收货时间 + {{order.deadline_text}} + + + 实际收货时间 + {{order.receive_time}} + 车辆 @@ -275,7 +283,8 @@ this.$u.throttle(() => { uni.previewImage({ urls: this[list], - current: current + current: current, + indicator: "default" }) }, 500); }, diff --git a/supplier/pages/offer/index.vue b/supplier/pages/offer/index.vue index 32865ae..5796447 100644 --- a/supplier/pages/offer/index.vue +++ b/supplier/pages/offer/index.vue @@ -99,7 +99,7 @@ label: '含税价', key: 'tax_price' },{ - label: '非含税价', + label: '不含税价', key: 'non_tax_price' },{ label: '操作', diff --git a/supplier/pages/order/detail.vue b/supplier/pages/order/detail.vue index eb8287c..70ed233 100644 --- a/supplier/pages/order/detail.vue +++ b/supplier/pages/order/detail.vue @@ -91,7 +91,7 @@ label: '含税价', key: 'tax_price' },{ - label: '非含税价', + label: '不含税价', key: 'non_tax_price' }], contents: [],