diff --git a/api/order.js b/api/order.js index 141e935..0887f14 100644 --- a/api/order.js +++ b/api/order.js @@ -47,6 +47,13 @@ export function changeCartNum(cartId, data) { export function cartDel(data) { return request.post('user/cart/delete', data); } +/** + * 购物车商品属性 + * @param object ids + */ +export function cartProductAttr(id) { + return request.get(`store/product/get_attr_value/${id}`); +} /** * 订单列表 * @param object data diff --git a/components/addcartWindow/index.vue b/components/addcartWindow/index.vue index ea7e509..7392081 100644 --- a/components/addcartWindow/index.vue +++ b/components/addcartWindow/index.vue @@ -21,11 +21,11 @@ - {{ attr.productSelect.wholesale_price }} - + {{ attr.productSelect.price }} + ¥{{attr.productSelect.svip_price}} - + @@ -61,13 +61,14 @@ // +---------------------------------------------------------------------- // | CRMEB [ CRMEB赋能开发者,助力企业发展 ] // +---------------------------------------------------------------------- - // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. + // | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved. // +---------------------------------------------------------------------- // | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权 // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- import { mapGetters } from "vuex"; + import { HTTP_REQUEST_URL } from '@/config/app'; export default { computed: mapGetters(['viewColor']), props: { @@ -109,10 +110,11 @@ } }, data() { - return {}; + return { + domain: HTTP_REQUEST_URL, + } }, mounted(){ - // console.log('sss',this.attr); }, methods: { // 查看大图 @@ -339,5 +341,6 @@ .product-window .joinBnt.on { background-color: #bbb; color: #fff; + background-image: none; } diff --git a/pages.json b/pages.json index 5365cdc..dc1be56 100644 --- a/pages.json +++ b/pages.json @@ -306,6 +306,14 @@ "navigationBarTitleText": "补贴", "enablePullDownRefresh": false } + }, + { + "path" : "pages/cashier/cashier", + "style" : + { + "navigationBarTitleText" : "收银", + "enablePullDownRefresh" : true + } } ], "subPackages": [{ diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index dc62c2f..23238b3 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -94,7 +94,13 @@ 支付方式: - {{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "先货后款" }} + 余额支付 + 微信支付 + 微信收款 + 现金支付 + 支付宝收款 + 商户余额支付 + 对公转账 diff --git a/pages/cashier/cashier.vue b/pages/cashier/cashier.vue new file mode 100644 index 0000000..d44447e --- /dev/null +++ b/pages/cashier/cashier.vue @@ -0,0 +1,1712 @@ + + + + + \ No newline at end of file