开单确认界面、

hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/admin/order/components/card-name.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/module/app-commodity.wxss

@@ -1 +1 @@
-.item-cmd_bx.data-v-55383521{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-55383521{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-55383521{padding-left:177rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-55383521{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-55383521{color:#999;font-size:24rpx;padding:8rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-55383521{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-55383521{font-size:28rpx;color:#ff2842;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-55383521{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconfont.data-v-55383521{color:#3385ff;font-size:42rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .position.data-v-55383521{display:block;width:70rpx;text-align:center}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconcachu.data-v-55383521{margin:0 6rpx 0 20rpx;color:#ccc}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconcachu.edit.data-v-55383521{color:#3385ff}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx > .num.data-v-55383521{display:inline-block;width:120rpx;height:45rpx;text-align:center;margin:0 8rpx;color:#868686;border-radius:22rpx;background-color:#f5f5f5;padding:3rpx 0;font-size:25rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .change-input.data-v-55383521{width:164rpx;height:60rpx;line-height:60rpx;text-align:center;background:#fff;border:1rpx solid #ddd;border-radius:4rpx;font-size:25rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .btn-box.data-v-55383521{width:100rpx;height:60rpx;line-height:60rpx;color:#fff;background:#3385ff;text-align:center;border-radius:10rpx}
+.item-cmd_bx.data-v-5d1a7f58{position:relative;margin-bottom:20rpx}.item-cmd_bx .img_bx.data-v-5d1a7f58{height:160rpx;width:160rpx;position:absolute;left:0rpx;top:0rpx}.item-cmd_bx .cmd-info_bx.data-v-5d1a7f58{padding-left:177rpx}.item-cmd_bx .cmd-info_bx .tit.data-v-5d1a7f58{font-size:28rpx;font-weight:400;color:#333;padding-top:10rpx}.item-cmd_bx .cmd-info_bx .kc.data-v-5d1a7f58{color:#999;font-size:24rpx;padding:8rpx 0 24rpx}.item-cmd_bx .cmd-info_bx .num-open_bx.data-v-5d1a7f58{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .price.data-v-5d1a7f58{font-size:28rpx;color:#ff2842;-webkit-box-flex:1;-webkit-flex:1;flex:1}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx.data-v-5d1a7f58{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconfont.data-v-5d1a7f58{color:#3385ff;font-size:42rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .position.data-v-5d1a7f58{display:block;width:70rpx;text-align:center}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconcachu.data-v-5d1a7f58{margin:0 6rpx 0 20rpx;color:#ccc}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .iconcachu.edit.data-v-5d1a7f58{color:#3385ff}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx > .num.data-v-5d1a7f58{display:inline-block;width:120rpx;height:45rpx;text-align:center;margin:0 8rpx;color:#868686;border-radius:22rpx;background-color:#f5f5f5;padding:3rpx 0;font-size:25rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .change-input.data-v-5d1a7f58{width:164rpx;height:60rpx;line-height:60rpx;text-align:center;background:#fff;border:1rpx solid #ddd;border-radius:4rpx;font-size:25rpx}.item-cmd_bx .cmd-info_bx .num-open_bx .open-bx .btn-box.data-v-5d1a7f58{width:100rpx;height:60rpx;line-height:60rpx;color:#fff;background:#3385ff;text-align:center;border-radius:10rpx}

hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/badge.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/components/plugin/rate.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

hdApp/src/admin/billing/affirmGoods.vue

@@ -42,7 +42,7 @@
 							<view class="describe-view">
 								共{{ allGoodsCount }}种,
 								<!-- 共16扎9支， -->
-								合计 ¥<text class="price">{{ allGoodsPriceFun }}</text>
+								合计 ¥<text class="price">{{ allGoodsPrice }}</text>
 							</view>
 						</view>
 					</view>
@@ -79,7 +79,7 @@
 			<view class="price-view">
 				<text class="price-title">收款</text>
 				<text class="price-number">
-					¥ <text class="large">{{ Number(freight)+Number(allGoodsPriceFun)  }}</text>
+					¥ <text class="large">{{ Number(freight)+Number(allGoodsPrice)  }}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>

hdApp/src/components/module/app-commodity.vue

@@ -7,7 +7,8 @@
 			<view class="tit" @click="addEvents">{{ info.itemName || "" }}</view>
 			<view class="kc" @click="addEvents">库存 {{ info.stock }}</view>
 			<view class="num-open_bx">
-				<view class="price">￥{{ showPrice }}</view>
+				<view class="price" v-if="isShowPrice">￥{{ showPrice }}</view>
+				<view class="price" v-else></view>
 				<view class="open-bx" v-if="type == COMMODITY_TYPE.COMMON">
 					<i class="iconfont iconjian" :class="delAnimationData?'animation':''" @click="delEvent" v-if="bigCount > 0 || smallCount > 0"></i>
 					<text class="num" @click="customNum">
@@ -65,6 +66,10 @@ export default {
 			type: Number,
 			default: 0
 		},
+		isShowPrice: {
+			type: Boolean,
+			default: true
+		},
 		autoPrice: {},
 	},
 	data() {

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -41,6 +41,7 @@
 							>
 								<Commondity
 									:info="productItem"
+									:isShowPrice="false"
 									:bigCount="
 										getSelectItemById(productItem.id, classItem.classId).bigCount
 									"