改价与毛利

ghsApp/src/admin/changePrice/components/Item2.vue

@@ -58,7 +58,7 @@
 	<view class="level-price">
 		<text>剩余 {{info.stock?parseFloat(info.stock):0}}</text>
 		<text style="position:absolute;left:40upx;">毛利 ￥{{ info.ml ? parseFloat(info.ml) : 0 }}</text>
-		<text style="position:absolute;right:50upx;">成本 ￥{{ parseFloat(info.cost) }}</text>
+		<text style="position:absolute;right:50upx;">成本 ￥{{ info.avCost?parseFloat(info.avCost):0 }}</text>
 	</view>
 
 </view>

ghsApp/src/admin/changePrice/list2.vue

@@ -83,7 +83,7 @@ import { mapGetters } from "vuex";
 import { batchChangePrice,generatePriceTable,cancelDiscountPrice,cancelFullOffFn,cancelPreSell } from '@/api/product'
 import { changeFrontHide } from '@/api/item'
 export default {
-	name: "item_list",
+	name: "list2",
 	components: {
 		AppSearchModule,
 		AppWrapperEmpty,

hdApp/src/admin/changePrice/components/Item2.vue

@@ -58,7 +58,7 @@
 	<view class="level-price">
 		<text>剩余 {{info.stock?parseFloat(info.stock):0}}</text>
 		<text style="position:absolute;left:40upx;">毛利 ￥{{ info.ml ? parseFloat(info.ml) : 0 }}</text>
-		<text style="position:absolute;right:50upx;">成本 ￥{{ parseFloat(info.cost) }}</text>
+		<text style="position:absolute;right:50upx;">成本 ￥{{ info.avCost?parseFloat(info.avCost):0 }}</text>
 	</view>
 
 </view>

hdApp/src/admin/order/detail.vue

@@ -585,7 +585,7 @@ export default {
     copyInfo(detailInfo){
 			let receiveUserName = detailInfo.receiveUserName
 			let receiveMobile = detailInfo.receiveMobile
-			let address =  detailInfo.city+detailInfo.dist+detailInfo.address+detailInfo.floor
+			let address = detailInfo.city+detailInfo.dist+detailInfo.address+detailInfo.floor
 			if (!this.$util.isEmpty(detailInfo.showAddress) && address != detailInfo.showAddress){
 				address += "（"+detailInfo.showAddress+"）"
 			}