diff --git a/pages.json b/pages.json
index 78d7c311..94c130f4 100644
--- a/pages.json
+++ b/pages.json
@@ -643,6 +643,36 @@
}
}
]
+ },
+ {
+ "root": "pages/bargain",
+ "pages": [
+ {
+ "path": "index",
+ "style": {
+ "navigationBarTitleText": "砍价"
+ },
+ "meta": {
+ "auth": false,
+ "sync": true,
+ "title": "砍价详情",
+ "group": "砍价"
+ }
+ },
+ {
+ "path" : "details/details",
+ "style" :
+ {
+ "navigationBarTitleText" : "砍价详情"
+ },
+ "meta": {
+ "auth": false,
+ "sync": true,
+ "title": "砍价详情",
+ "group": "砍价"
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/pages/bargain/details/details.vue b/pages/bargain/details/details.vue
new file mode 100644
index 00000000..f11bdb7b
--- /dev/null
+++ b/pages/bargain/details/details.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/bargain/index.vue b/pages/bargain/index.vue
new file mode 100644
index 00000000..3cec3aee
--- /dev/null
+++ b/pages/bargain/index.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item.nickname }}
+ 拿了
+ {{ item.activityName }}
+
+
+
+
+
+
+ 已有{{ bargainTotal }}人砍成功
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+ 后结束
+
+
+ 最低:¥{{item.bargainMinPrice}}
+ 参与砍价
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sheep/api/promotion/bargain.js b/sheep/api/promotion/bargain.js
new file mode 100644
index 00000000..108f40f0
--- /dev/null
+++ b/sheep/api/promotion/bargain.js
@@ -0,0 +1,20 @@
+import request from '@/sheep/request';
+// vue3的
+const BargainApi = {
+ // 活动砍价活动列表
+ getBargainActivityList: (params) => {
+ return request({
+ url: '/promotion/bargain-activity/page',
+ method: 'GET',
+ params,
+ });
+ },
+ // 活动砍价记录概要
+ getActivitySuccess: () => {
+ return request({
+ url: '/promotion/bargain-record/get-summary',
+ method: 'GET',
+ });
+ },
+};
+export default BargainApi;
\ No newline at end of file
diff --git a/sheep/components/countDown/index.vue b/sheep/components/countDown/index.vue
new file mode 100644
index 00000000..291c6e6e
--- /dev/null
+++ b/sheep/components/countDown/index.vue
@@ -0,0 +1,162 @@
+
+
+ {{ tipText }}
+ {{ day }}{{bgColor.isDay?'天':''}}
+ {{ dayText }}
+ {{ hour }}
+ {{ hourText }}
+ {{ minute }}
+ {{ minuteText }}
+ {{ second }}
+ {{ secondText }}
+
+
+
+
+
+
diff --git a/static/bargain/bargainBg.jpg b/static/bargain/bargainBg.jpg
new file mode 100644
index 00000000..e47be569
Binary files /dev/null and b/static/bargain/bargainBg.jpg differ
diff --git a/static/bargain/beijing.png b/static/bargain/beijing.png
new file mode 100644
index 00000000..5c8f523e
Binary files /dev/null and b/static/bargain/beijing.png differ
diff --git a/static/bargain/cheng.png b/static/bargain/cheng.png
new file mode 100644
index 00000000..0ae30485
Binary files /dev/null and b/static/bargain/cheng.png differ
diff --git a/static/bargain/chengh.png b/static/bargain/chengh.png
new file mode 100644
index 00000000..4b7d3297
Binary files /dev/null and b/static/bargain/chengh.png differ
diff --git a/static/bargain/de-img1.png b/static/bargain/de-img1.png
new file mode 100644
index 00000000..d52fda33
Binary files /dev/null and b/static/bargain/de-img1.png differ
diff --git a/static/bargain/de-img2png.png b/static/bargain/de-img2png.png
new file mode 100644
index 00000000..4489d847
Binary files /dev/null and b/static/bargain/de-img2png.png differ
diff --git a/static/bargain/lun.png b/static/bargain/lun.png
new file mode 100644
index 00000000..e4be7831
Binary files /dev/null and b/static/bargain/lun.png differ
diff --git a/static/bargain/share-info.png b/static/bargain/share-info.png
new file mode 100644
index 00000000..c6824d89
Binary files /dev/null and b/static/bargain/share-info.png differ
diff --git a/static/bargain/you2.png b/static/bargain/you2.png
new file mode 100644
index 00000000..cf80147d
Binary files /dev/null and b/static/bargain/you2.png differ
diff --git a/static/bargain/zuo2.png b/static/bargain/zuo2.png
new file mode 100644
index 00000000..a686c9e5
Binary files /dev/null and b/static/bargain/zuo2.png differ
diff --git a/uni.scss b/uni.scss
index eadc5cd4..1c4f5a44 100644
--- a/uni.scss
+++ b/uni.scss
@@ -13,6 +13,13 @@
*/
/* 颜色变量 */
+/* crmeb颜色变量 */
+$theme-color:#E93323;
+$theme-color-opacity:rgba(233,51,35,.6);
+$bg-star: #f62c2c;
+$bg-end:#f96e29;
+$bg-star1: #F73730; // 主题渐变色1-开始
+$bg-end1:#F86429; // 主题渐变色1-结束
/* 行为相关颜色 */
$uni-color-primary: #007aff;