Merge branch 'dev' into 'test'

缺陷修改

See merge request quanshu/mp-ui-user!66

src/packagePrize/goods/index.vue

@@ -159,6 +159,12 @@
 							...res.data,
 							...this.info,
 							picUrl: env.filePublic + res.data.goodsPicUrl.split(',')[0],
+							couponTitle: res.data && res.data.couponList && res.data.couponList.length &&
+								res
+								.data.couponList[0].title,
+							couponId: res.data && res.data.couponList && res.data.couponList.length && res
+								.data
+								.couponList[0].id
 						}
 						this.payInfo = info
 						this.payShow = true