diff --git a/main.js b/main.js
index 274967b..b4d193c 100644
--- a/main.js
+++ b/main.js
@@ -83,7 +83,8 @@ import '@/plugins/wxJsSDK.js';
import MescrollBody from "@/components/mescroll-uni/mescroll-body.vue";
import config from 'uview-ui/libs/config/config'
Vue.component("mescroll-body", MescrollBody);
-
+import commonCoupon from '@/pages/component/commonComponents/coupon/index.vue'
+Vue.component('common-coupon', commonCoupon);
// import musicPlay from '@/components/music.vue'
// Vue.component('music-play', musicPlay);
import commonAdvertisement from '@/pages/component/commonComponents/advertisement.vue'
diff --git a/manifest.json b/manifest.json
index 9636e04..950e24a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,8 +10,8 @@
"sizes": "分辨率,192x192",
"src": "图片路径"
}],
- "versionName": "1.2.67",
- "versionCode": 1267,
+ "versionName": "1.2.68",
+ "versionCode": 1268,
"app-plus": {
"compatible": {
"ignoreVersion": true
diff --git a/pages.json b/pages.json
index 19755dc..b3e41ca 100644
--- a/pages.json
+++ b/pages.json
@@ -9,6 +9,13 @@
"navigationBarTitleText": "首页"
}
},
+ {
+ "path" : "pages/mine/wallet/couponList",
+ "style" :
+ {
+ "navigationBarTitleText" : "用户优惠券列表"
+ }
+ },
{
"path": "pages/peanut/shopping",
"style": {
diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue
index 87deaf0..0a859fb 100644
--- a/pages/bookShop/commodityDetail.vue
+++ b/pages/bookShop/commodityDetail.vue
@@ -1,131 +1,220 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- ¥{{ productInfo.activityPrice }}
- 原价¥{{
- productInfo.price }}
-
-
- ¥{{ productInfo.price }}
-
-
- {{ productInfo.productName }}
- (无货)
- 已售{{ productInfo.sumSales
- }}件
-
-
-
- 商品列表
-
-
-
-
-
-
-
-
-
- {{ item.productName }}
- ¥{{
- item.activityPrice }}
- ¥{{ item.price }}
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ item.productName }}
+ ¥{{ item.activityPrice }}
+ ¥{{ item.price }}
+
+
+
+
-
+
-
-
-
- {{getCommentsNum}}
-
-
-
-
- 赠送权益
-
-
+
+
+
+ {{ getCommentsNum }}
+
+
+
+
+ 赠送权益
+
+
+
+
+
+
+
+
+ {{ item.name }}
-
-
-
-
-
-
- {{
- item.name }}
+
+
+
+
+
+
-
+
+
+
+ {{ v.name }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ v.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 商品详情
-
-
-
- 书名:{{ productInfo.productName }}
-
-
- 作者:{{ productInfo.author }}
-
-
- 出版社:{{ productInfo.publisher
- }}
-
-
- 出版时间:{{ productInfo.pubDate | formatDate
- }}
-
-
- 开本:{{ productInfo.format }}
- 页数:{{ productInfo.pageNum }}
-
-
- 内文用纸材质:{{ productInfo.quality
- }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
- 评价({{ commentsList ? commentsList.length : 0
- }})
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.createdate }}
-
-
-
- 追评内容:
-
-
-
- {{ item.followUpdate }}
-
-
-
-
-
-
- 暂无评价~
-
-
-
-
-
-
-
-
-
-
-
-
- 查看详情
-
-
-
-
-
-
-
- {{ item.productName }}
- ¥{{
- item.activityPrice }}
- ¥{{ item.price }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 评价({{ commentsList ? commentsList.length : 0 }})
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.createdate }}
+
+
+
+
+ 追评内容:
+
+
+
+
+ {{ item.followUpdate }}
+
+
+
+
+
+
+ 暂无评价~
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+ {{ item.productName }}
+ ¥{{ item.activityPrice }}
+ ¥{{ item.price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+.icon_setUp {
+ margin-right: 10px;
+}
+
diff --git a/pages/component/commonComponents/coupon/index.vue b/pages/component/commonComponents/coupon/index.vue
new file mode 100644
index 0000000..6240537
--- /dev/null
+++ b/pages/component/commonComponents/coupon/index.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+ {{ item.couponEntity.couponRange | couponType }}
+
+
+ ¥
+ {{ item.couponEntity.couponAmount }}
+ 满{{ item.couponEntity.useLevel }}元可用
+
+
+
+
+ {{
+ item.couponEntity.couponType == 0 ? "现金" : "折扣"
+ }}优惠券
+
+
+
+
+
+
+
+
+
+
+ 有效期至:{{
+ item.effectType == 0 ? "永久有效" : item.endTime
+ }}
+
+
+
+
+
+
+
+
+ {{ item.couponEntity.couponName }}
+
+
+
+
+
+
+
+
+
+
+ 使用说明:{{ item.couponEntity.remark }}
+
+
+
+
+
+
+
+
+
diff --git a/pages/mine/wallet/couponList.vue b/pages/mine/wallet/couponList.vue
new file mode 100644
index 0000000..e8b6897
--- /dev/null
+++ b/pages/mine/wallet/couponList.vue
@@ -0,0 +1,290 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/peanut/mine.vue b/pages/peanut/mine.vue
index 17ce3d5..be2ab8f 100644
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -55,9 +55,14 @@
- {{ userMes.peanutCoin }}
+ {{ userMes.peanutCoin }}
天医币
+
+ {{ userCouponNum }}
+ 优惠券
+
+