Merge branch 'dev_7.1.0' into fixbug-ZYW

src/component/selectCoupon/selectCoupon.js

@@ -54,7 +54,7 @@ Component({
       // 1 抵用券  2 折扣券 
       const { id,index,type } = e.currentTarget.dataset
       const { couponList } = this.data
-      console.log('2222', id,index, type)
+      console.log('type---1 抵用券  2 折扣券 ', id,index, type)
       couponList.forEach(item=>{
         item.checked = false
       })

src/pages/confirmOrder/confirmOrder.js

@@ -68,7 +68,7 @@ wxService.page({
     if(e.detail){
       this.setData({
         haveCoupon: true,
-        currentCoupon: e.detail
+        currentCoupon: `- ${e.detail}`
       })
     }
   },