浏览代码

优化项目新人折扣

yuhao 2 年之前
父节点
当前提交
4a698d1b28
共有 3 个文件被更改,包括 9 次插入1 次删除
  1. 5 0
      package-lock.json
  2. 1 0
      package.json
  3. 3 1
      src/pages/confirmOrder/details/index.vue

+ 5 - 0
package-lock.json

@@ -4583,6 +4583,11 @@
4583
       "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
4583
       "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
4584
       "dev": true
4584
       "dev": true
4585
     },
4585
     },
4586
+    "console": {
4587
+      "version": "0.7.2",
4588
+      "resolved": "https://registry.npmmirror.com/console/-/console-0.7.2.tgz",
4589
+      "integrity": "sha512-+JSDwGunA4MTEgAV/4VBKwUHonP8CzJ/6GIuwPi6acKFqFfHUdSGCm89ZxZ5FfGWdZfkdgAroy5bJ5FSeN/t4g=="
4590
+    },
4586
     "console-browserify": {
4591
     "console-browserify": {
4587
       "version": "1.2.0",
4592
       "version": "1.2.0",
4588
       "resolved": "https://registry.npmmirror.com/console-browserify/-/console-browserify-1.2.0.tgz",
4593
       "resolved": "https://registry.npmmirror.com/console-browserify/-/console-browserify-1.2.0.tgz",

+ 1 - 0
package.json

@@ -12,6 +12,7 @@
12
   },
12
   },
13
   "dependencies": {
13
   "dependencies": {
14
     "axios": "^0.27.2",
14
     "axios": "^0.27.2",
15
+    "console": "^0.7.2",
15
     "crypto-js": "^3.1.9-1",
16
     "crypto-js": "^3.1.9-1",
16
     "element-ui": "^2.8.2",
17
     "element-ui": "^2.8.2",
17
     "js-cookie": "^3.0.1",
18
     "js-cookie": "^3.0.1",

+ 3 - 1
src/pages/confirmOrder/details/index.vue

@@ -514,6 +514,7 @@ import minePupop from '../../../components/minePupop/index.vue'
514
 import QRCode from 'qrcodejs2'
514
 import QRCode from 'qrcodejs2'
515
 import api from '../../../server/home'
515
 import api from '../../../server/home'
516
 import internal from 'assert';
516
 import internal from 'assert';
517
+import { log } from 'console';
517
 
518
 
518
 export default {
519
 export default {
519
   components: { minePupop },
520
   components: { minePupop },
@@ -1172,8 +1173,9 @@ export default {
1172
       let payWayList = this.payList.filter(res => {
1173
       let payWayList = this.payList.filter(res => {
1173
         return res.isSelect == true
1174
         return res.isSelect == true
1174
       })
1175
       })
1176
+      console.log(this.discountList);
1175
       // 卡券,项目券数据包, id:订单项目ID, coupon_id:优惠券ID, 如:[{ "id": 1220, coupon_id: 199 }]isSelectCoup
1177
       // 卡券,项目券数据包, id:订单项目ID, coupon_id:优惠券ID, 如:[{ "id": 1220, coupon_id: 199 }]isSelectCoup
1176
-      this.discountList = this.card_data.length > 0||this.order_data.discount!=0 ? 0 : this.discountList.sort(this.compare("priceSet"))[0].id
1178
+      this.discountList = this.card_data.length > 0||this.order_data.discount!=0 ? 0 :this.discountList.length!=0?this.discountList.sort(this.compare("priceSet"))[0].id:0
1177
       let params = {
1179
       let params = {
1178
         id: this.id,
1180
         id: this.id,
1179
         pay_way: payWayList[0].pay_way,
1181
         pay_way: payWayList[0].pay_way,