diff --git a/env/env.development.js b/env/env.development.js index 6eaa47b..3f3c1c5 100644 --- a/env/env.development.js +++ b/env/env.development.js @@ -2,6 +2,8 @@ export default { 'JEEPAY_BASE_URL': 'http://192.168.1.31/', // 请求URL(生产环境) 'JEEPAY_BASE_URL_H5': 'http://192.168.1.31/', 'JEEPAY_BASE_URL_WSS': 'ws://192.168.1.31:2348' ,// sockets - + // 'JEEPAY_BASE_URL': 'https://cashier.sxczgkj.com/', // 请求URL(生产环境) + // 'JEEPAY_BASE_URL_H5': 'https://cashier.sxczgkj.com/', + // 'JEEPAY_BASE_URL_WSS': 'wss://czgeatws.sxczgkj.com/wss' // sockets } \ No newline at end of file diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue index 4daeeb5..ef6346b 100644 --- a/pageProduct/add-Product/add-Product.vue +++ b/pageProduct/add-Product/add-Product.vue @@ -1214,7 +1214,7 @@ Tuesday: '周二', Wednesday: '周三', Thursday: '周四', - Friday: '周无', + Friday: '周五', Saturday: '周六', Sunday: '周日', } diff --git a/pageProduct/index/components/goods.vue b/pageProduct/index/components/goods.vue index 30e633e..9807017 100644 --- a/pageProduct/index/components/goods.vue +++ b/pageProduct/index/components/goods.vue @@ -7,8 +7,8 @@ {{data.sort}} - 库存:{{data.stockNumber}} + diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue index edbb416..36553c9 100644 --- a/pagesCreateOrder/confirm-order/confirm-order.vue +++ b/pagesCreateOrder/confirm-order/confirm-order.vue @@ -519,7 +519,7 @@ })) } if( msg.status == 0 ){ - infoBox.showToast('添加失败') + infoBox.showToast(msg.msg||'操作失败') return false; } diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue index c4bc6d5..ce062cb 100644 --- a/pagesCreateOrder/index/components/car.vue +++ b/pagesCreateOrder/index/components/car.vue @@ -32,15 +32,13 @@ ¥{{formatPrice(item.lowPrice*item.number) }} - - + {{item.number.toFixed(2)}} - - - + + @@ -253,6 +251,9 @@ function updateNumber(isAdd, index, goods) { const step = isAdd ? 1 : -1 const newval = goods.number + step + if(goods.type == 'package'&&goods.groupType == 1&&isAdd){ + return + } const par = { num: newval, index: index, @@ -294,7 +295,9 @@ width: 40rpx; height: 40rpx } - + .grayscale{ + filter: opacity(60%) + } .mask { @include fixedAll; background: rgba(51, 51, 51, 0.5); diff --git a/pagesCreateOrder/index/components/list-goods-item.vue b/pagesCreateOrder/index/components/list-goods-item.vue index 64c136d..8f9abab 100644 --- a/pagesCreateOrder/index/components/list-goods-item.vue +++ b/pagesCreateOrder/index/components/list-goods-item.vue @@ -2,7 +2,7 @@ - + {{data.name}} @@ -14,8 +14,7 @@ 称重 - - - - + +