retail update

src/subpackage/order/pages/retail/detail/detail.vue

@@ -40,7 +40,7 @@
                 <view class="rgl-item" v-for="(e, i) in orderInfo.retail_order_goods" :key="i">
                     <view class="rgl-item-desc">
 											<view>{{ e.erp_retail_goods ? (e.erp_retail_goods.goods_name || '-') : (e.name || '-') }}</view>
-											<view>￥{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_price : 0) : 0 }}</view>
+											<view>￥{{ e.erp_retail_goods ? e.erp_retail_goods.assistant_price || 0 : 0 }}</view>
 										</view>
 										<view class="rgl-item-sku">sku：{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_sku : '-') : '-' }}</view>
 										<view class="rgl-item-type-spec">

src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue

@@ -20,7 +20,7 @@
 						
 						<view class="item-right-price-count">
 							<view class="item-right-price-row">
-								<view><text>￥</text>{{ item.erp_goods.erp_goods_price }}</view>
+								<view><text>￥</text>{{ item.assistant_price }}</view>
 							</view>
 							
 							<view class="item-right-count-row">

src/subpackage/retail/pages/confirm_goods/confirm_goods.vue

@@ -23,7 +23,7 @@
 						
 						<view class="item-right-price-count">
 							<view class="item-right-price-row">
-								<view><text>￥</text>{{ item.erp_goods.erp_goods_price }}</view>
+								<view><text>￥</text>{{ item.assistant_price }}</view>
 							</view>
 						</view>
 					</view>

src/subpackage/retail/pages/confirm_order/confirm_order.vue

@@ -120,7 +120,7 @@
 						id: this.cartListFinal[i].id,
 						// name: this.cartListFinal[i].erp_goods.erp_goods_name,
 						name: this.cartListFinal[i].goods_name,
-						price: this.cartListFinal[i].erp_goods.erp_goods_price,
+						price: this.cartListFinal[i].assistant_price,
 						nums: this.cartListFinal[i].count,
 						unit: this.cartListFinal[i].erp_goods.erp_goods_unit,
 					});

src/subpackage/retail/pages/index/index.vue

@@ -46,7 +46,7 @@
 						
 						<view class="item-right-price-count">
 							<view class="item-right-price-row" :style="{color:item.erp_goods.stock_num?'#FF873D':'#9A9A9D'}">
-								<view><text>￥</text>{{ item.erp_goods.erp_goods_price }}</view>
+								<view><text>￥</text>{{ item.assistant_price }}</view>
 							</view>
 							
 							<view class="item-right-count-row">
@@ -225,11 +225,6 @@ export default {
 					url: `/subpackage/retail/pages/search/search?data=${encodeURIComponent(JSON.stringify(data))}`
 				});
 			},
-			// 购物车输入确认
-			cartInputConfirm(value, i) {
-				this.cartList[i].erp_goods_price = value;
-				this.calcTotalPriceAndCount();	// 计算购物车总价跟总量
-			},
 			// 清空购物车
 			clearCart() {
 				this.cartList = [];
@@ -359,7 +354,7 @@ export default {
 				let count = 0;
 				
 				for (let i = 0; i < this.cartList.length; ++i) {
-					price = parseFloat(price) + parseFloat(this.cartList[i].count * this.cartList[i].erp_goods.erp_goods_price);
+					price = parseFloat(price) + parseFloat(this.cartList[i].count * this.cartList[i].assistant_price);
 					count += this.cartList[i].count;
 				}
 				this.totalPrice = price.toFixed(2);