shish 7 месяцев назад
Родитель
Сommit
5f9efa22ae
2 измененных файлов с 14 добавлено и 9 удалено
  1. 13 8
      ghsApp/src/admin/billing/affirm.vue
  2. 1 1
      hdApp/src/admin/billing/affirm.vue

+ 13 - 8
ghsApp/src/admin/billing/affirm.vue

@@ -31,15 +31,17 @@
 
                       <text style="position: absolute;right:300upx;top:2upx;font-size:28upx;color:green;font-weight:bold;" v-if="item.bigCount > 0">¥{{ parseFloat((Number(item.bigCount)*Number(item.userPrice)).toFixed(2)) }}</text>
                       <text style="position: absolute;right:300upx;top:2upx;font-size:28upx;color:green;font-weight:bold;" v-else>¥{{ parseFloat((Number(item.smallCount)*Number(item.userPrice)).toFixed(2)) }}</text>
-                      <text v-if="showFinance==1" :class="[Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0 ? 'warning-price' : 'normal-price']" style="position: absolute;right:0upx;top:55upx;font-size:24upx;font-weight:bold;width:350upx;text-align:right;">
-                        成本¥{{ item.avCost?parseFloat(item.avCost):0 }}<text style="margin-left:8upx;" v-if="Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0">售价过低</text>
+                      <text v-if="showFinance==1" :class="[Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0 ? 'warning-price' : 'normal-price']" style="position: absolute;right:0upx;top:55upx;font-size:26upx;font-weight:bold;width:380upx;text-align:right;">
+                        成本 ¥{{ item.avCost?parseFloat(item.avCost):0 }}
+                        <text style="margin-left:8upx;" v-if="Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0">毛利 ¥{{ parseFloat((Number(item.userPrice)-Number(item.avCost)).toFixed(2)) }}</text>
+                        <text style="margin-left:8upx;" v-else>毛利 ¥{{ parseFloat((Number(item.userPrice)-Number(item.avCost)).toFixed(2)) }}</text>
                       </text>
 
                       <view class="open-bx" >
                         <i class="iconfont iconjian" @click="reduceItemFn(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
                         <text class="num" @click="showAddModelFn(item)">
-                          <text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
-                          <text v-if="item.smallCount > 0" style="font-size:24upx;">{{ item.smallCount }}</text>
+                          <text v-if="item.bigCount > 0" style="font-size:26upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
+                          <text v-if="item.smallCount > 0" style="font-size:26upx;">{{ item.smallCount }}</text>
                         </text>
                         <i class="iconfont iconzeng" @click="addItemFn(item)"></i>
                       </view>
@@ -62,9 +64,12 @@
             </view>
             <view class="summary-bar" v-if="hasFinance==1">
               <view class="operate-view"></view>
-              <view class="describe-view" style="color:#3385ff;font-weight:bold;font-size:30upx;">
-                  <text v-if="showFinance==1" @click="getMyFinance">成本 ¥{{ allCount.avCost }},利润 ¥{{ parseFloat((Number(allPrice)-Number(allCount.avCost)).toFixed(2)) }}</text>
-                  <text v-else @click="getMyFinance">查看财务</text>
+              <view class="describe-view" style="color:#3385ff;font-weight:bold;font-size:32upx;">
+                  <text v-if="showFinance==1" @click="getMyFinance">
+                    成本 ¥{{ allCount.avCost }},利润 ¥{{ parseFloat((Number(allPrice)-Number(allCount.avCost)).toFixed(2)) }}
+                    <text style="margin-left:20upx;text-decoration:underline;">关闭财务</text>
+                  </text>
+                  <text v-else @click="getMyFinance" style="text-decoration:underline;">查看财务</text>
               </view>
             </view>
           </view>
@@ -148,7 +153,7 @@
 <block v-else>
   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
     <view class="tui-title">配送方式</view>
-    <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送</button>
+    <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送</button>
     <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
     <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
     <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>

+ 1 - 1
hdApp/src/admin/billing/affirm.vue

@@ -143,7 +143,7 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">配送方式</view>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>