显示利润

ghsApp/src/admin/billing/affirm.vue

@@ -50,14 +50,20 @@
               <view class="operate-view" v-if="isScanEnv" @click="removeFromSave(option.customId)"> <text class="iconfont iconshanchu1"></text>清除花材 </view>
               <view class="operate-view" v-else @click="gobackEvent" style="font-size:32upx;font-weight:bold;"><text class="iconfont icongouwuche" style="margin-right:5upx;"></text>返回修改</view>
               <view class="describe-view">
-                <text>{{ selectList.length }}种</text>，
-                <text v-if="Number(totalItemNum.big)>0">{{totalItemNum.big?parseFloat(totalItemNum.big):0}}扎</text>
-                <text v-if="Number(totalItemNum.small)>0">{{totalItemNum.small?parseFloat(totalItemNum.small):0}}支</text>，{{ allCount.weight }}公斤<text>，¥{{ allPrice }}</text>
-                <text>，利润¥{{ parseFloat((Number(allPrice)-Number(allCount.cost)).toFixed(2)) }}</text>
+                <text>合计 ¥{{ allPrice }}，</text>
+                <text>成本 ¥{{ allCount.cost }}，</text>
+                <text>利润 ¥{{ parseFloat((Number(allPrice)-Number(allCount.cost)).toFixed(2)) }}</text>
               </view>
             </view>
             <view class="summary-bar">
-              <view class="operate-view" v-if="isScanEnv" @click="pageToItemList()"> <text class="iconfont iconzeng"></text>手动添加花材</view>
+              <view class="operate-view" v-if="isScanEnv" @click="pageToItemList()"><text class="iconfont iconzeng"></text>手动添加花材</view>
+              <view class="operate-view" v-if="isScanEnv == false"><text> </text></view>
+              <view class="describe-view">
+                <text>{{ selectList.length }}种，</text>
+                <text v-if="Number(totalItemNum.big)>0">{{totalItemNum.big?parseFloat(totalItemNum.big):0}}扎</text>
+                <text v-if="Number(totalItemNum.small)>0">{{totalItemNum.small?parseFloat(totalItemNum.small):0}}支</text>
+                <text>，{{ allCount.weight }}公斤</text>
+              </view>
             </view>
           </view>
         </view>

ghsApp/src/mixins/product.js

@@ -94,7 +94,7 @@ export default {
 
 					let thisCost = item.cost ? item.cost : 0
 					let currentCost = Number(thisCost)*Number(item.bigCount)
-					cost = Number(currentCost) + Number(currentCost)
+					cost = Number(cost) + Number(currentCost)
 				}
 				weight = weight.toFixed(2)
 				weight = parseFloat(weight)