feat 计价新人立减

.gitignore

@@ -24,4 +24,5 @@ pnpm-debug.log*
 *.sw?
 
 #Electron-builder output
-/dist_electron
+/dist_electron
+/test_electron

src/components/orderComponents/sendOrderPopup.vue

@@ -5,7 +5,8 @@
         <div class="top-juhe" @click.stop="changeDeliveryType" :class="{ active: deliveryType == 1 }">
           <div class="left-content">
             <div class="juhe-icon">
-              <img src="../../../static/image/juhe-icon.png" />
+              <!-- <img src="../../../static/image/juhe-icon.png" /> -->
+              <img  style="width:40px;height:40px;" src="../../../static/image/juhe-icon.png" alt="">
             </div>
             <div>
               <div class="juhe-title">聚合配送</div>
@@ -76,15 +77,13 @@
                       )
                     }}</span>&nbsp;元
                   </div>
-                  <div v-if="
-                      !item.isMine &&
-                      item.deliveryAmount.toFixed(2) > couponParams.limitFee
-                    " class="item-coupon">
-                    {{
+                  <div v-if="!item.isMine" class="item-coupon">
+                    <span v-if="order.firstCoupon">{{
                       order.firstCoupon
-                        ? `新人首单立减${order.firstCoupon}元，`
+                        ? `新人首单立减${order.firstCoupon}元 `
                         : ""
-                    }}优惠合计{{
+                    }}</span>
+                    <span v-if="couponParams.couponId">优惠合计{{
                       discount(
                         item.deliveryAmount,
                         tipAmount,
@@ -92,7 +91,7 @@
                         Number(order.firstCoupon),
                         item.isMine
                       )
-                    }}元
+                    }}元</span>
                   </div>
                   <div v-if="item.isMine" class="item-coupon">绑定的自运力</div>
                 </div>

vue.config.js

@@ -38,14 +38,14 @@ module.exports = {
         },
         "win": {
           "icon": "./static/image/desk-logo.ico",
-          "artifactName": `${name}-v${version}-${process.platform}-${process.arch}-setup.exe`,
-          "target": [{
-            "target": "nsis", "arch": ["x64","ia32"]
-          }]
+          // "artifactName": `${name}-v${version}-${process.platform}-${process.arch}-setup.exe`,
+          // "target": [{
+          //   "target": "nsis", "arch": ["x64","ia32"]
+          // }]
         },
         "linux": {
           "icon": "./static/image/desk-logo.ico",
-          "artifactName": `${name}-v${version}-${process.platform}-${process.arch}-setup.exe`
+          // "artifactName": `${name}-v${version}-${process.platform}-${process.arch}-setup.exe`
         },
         // "asar": false,
         "nsis": {