更新

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

components/addcartWindow/index.vue

@@ -21,11 +21,11 @@
 					<view v-else class="money">
 						<view class="acea-row row-middle">
 							<view class="acea-row row-middle">
-								<text>￥</text><text class="num">{{ attr.productSelect.wholesale_price }}</text>
+								<text>￥</text><text class="num">{{ attr.productSelect.price }}</text>
-								<view v-if="attr.productSelect && attr.productSelect.svip_price>0" class="acea-row row-middle">
+								<view v-if="attr.productSelect && attr.productSelect.svip_price" class="acea-row row-middle">
 									<text class='vip-money'>￥{{attr.productSelect.svip_price}}</text>
 									<view class="vipImg">
-										<image src="/static/images/svip.png"></image>
+										<image :src="`${domain}/static/images/svip.png`"></image>
 									</view>
 								</view>
 							</view>
@@ -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 <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	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;
 	}
 </style>

pages.json

@@ -306,6 +306,14 @@
 				"navigationBarTitleText": "补贴",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+		  "path" : "pages/cashier/cashier",
+		  "style" : 
+		  {
+		    "navigationBarTitleText" : "收银",
+		    "enablePullDownRefresh" : true
+		  }
 		}
 	],
 	"subPackages": [{

pages/admin/orderDetail/index.vue

@@ -94,7 +94,13 @@
       <view class="item acea-row row-between">
         <view>支付方式：</view>
         <view class="conter">
-          {{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "先货后款" }}
+          <span v-if="orderInfo.pay_type == 0">余额支付</span>
+          <span v-if="orderInfo.pay_type == 1">微信支付</span>
+          <span v-if="orderInfo.pay_type == 11">微信收款</span>
+          <span v-if="orderInfo.pay_type == 12">现金支付</span>
+          <span v-if="orderInfo.pay_type == 13">支付宝收款</span>
+          <span v-if="orderInfo.pay_type == 9">商户余额支付</span>
+          <span v-if="orderInfo.pay_type == 10">对公转账</span>
         </view>
       </view>
       <view class="item acea-row row-between">