diff --git a/api/index.js b/api/index.js index ac890d4..a6819f6 100644 --- a/api/index.js +++ b/api/index.js @@ -85,4 +85,28 @@ export default { // 所有接口 setSaveActivity: (param) => ajax.post('zksr.zksrservice.autonomous/autonomous-plan-activity/saveActivity?application=true', param), // 保存问卷 uploadImg: () => ajax.getUrl('qiniu/uploadImg'), //上传图片 + + // 积分签到 + getIntegralSetting: (param) => ajax.get(`integral/integralSetting/getIntegralSetting`, param), // 获取用户积分设置 + getUserIntegral: (param) => ajax.get(`integral/userIntegral/getUserIntegral`, param), // 获取用户积分 + getUserIntegralFlow: (param) => ajax.get(`integral/userIntegralFlow/getUserIntegralFlow`, param), // 获取用户积分流水 + getUserSignFlow: (param) => ajax.get(`integral/userSignFlow/getUserSignFlow`, param), // 获取用户签到记录 + userSign: (param) => ajax.get(`integral/userSignFlow/userSign`, param), // 签到 + // 积分商城 + + getCommoditys: (param) => ajax.get(`commodity/commodity/getCommoditysByVo`, param), // 条件获取商品信息 + getCommodityBrands: (param) => ajax.get(`commodity/commodityBrand/getCommodityBrands`, param), // 获取商品品牌 + getCommodityCategorys: (param) => ajax.get(`commodity/commodityCategory/getCommodityCategorys`, param), // 获取商品类别 + + // 积分订单 + + dindan: (param) => ajax.get('order/integralOrderMaster/lookLogistics', param), + + createIntegralOrder: (param) => ajax.post('order/integralOrderMaster/createIntegralOrder?application=true', + param), //订单生成 + getIntegralOrderDetail: (param) => ajax.get(`order/integralOrderMaster/getIntegralOrderMaster`, param), // 获取订单主表 + getIntegralOrderDetailFlow: (param) => ajax.get(`order/integralOrderDetail/getIntegralOrderDetailFlow`, + param), // 获取商品兑换记录 + // getIntegralOrderDetailFlow: (param) => ajax.get(`order/integralOrderDetail/getIntegralOrderDetailFlow`, param), // 获取商品兑换记录 + } diff --git a/src/App.vue b/src/App.vue index 6719108..98ca1b3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,6 +4,7 @@ console.log('option',option); uni.setStorageSync('userId', option.query.userId) uni.setStorageSync('openId', option.query.openId) + uni.setStorageSync('info', option.query) console.log('App Launch') }, onShow: function() { diff --git a/src/pages.json b/src/pages.json index a566e70..55f4181 100644 --- a/src/pages.json +++ b/src/pages.json @@ -73,6 +73,34 @@ "navigationBarTitleText": "评估报告", "onReachBottomDistance": 50 } + }, + { + "path": "pages/Integral/home/home", + "style": { + "navigationBarTitleText": "积分兑换", + "onReachBottomDistance": 50 + } + }, + { + "path": "pages/Integral/exchangeRecords/exchangeRecords", + "style": { + "navigationBarTitleText": "兑换记录", + "onReachBottomDistance": 50 + } + }, + { + "path": "pages/Integral/home/details/details", + "style": { + "navigationBarTitleText": "商品详情", + "onReachBottomDistance": 50 + } + }, + { + "path": "pages/Integral/home/Confirmed/Confirmed", + "style": { + "navigationBarTitleText": "确认兑换", + "onReachBottomDistance": 50 + } } ], diff --git a/src/pages/Integral/Records/recordsList.scss b/src/pages/Integral/Records/recordsList.scss new file mode 100644 index 0000000..cf7f572 --- /dev/null +++ b/src/pages/Integral/Records/recordsList.scss @@ -0,0 +1,111 @@ + + +.pageBox{ + display: flex; + flex-direction: column; + width: 100vw; + height: 100vh; + .grey{ + color: #909292; + } + .topBg{ + width: 100vw; + height: 314rpx; + position: fixed; + top: 0; + background: $uni-color; + } + .contioner{ + padding: 16rpx 32rpx 88rpx; + height: calc(314rpx - 104rpx); + color: #fff; + .caret-down-small.png{ + $wh:32rpx; + width: $wh; + height: $wh; + } + .posabition{ + position: absolute; + bottom: -44rpx; + z-index: 1; + .tabber{ + display: flex; + justify-content: space-between; + align-items: center; + width: calc(100vw - 160rpx); + padding: 0 48rpx; + height: 94rpx; + background: #FFFFFF; + color: #909292; + font-weight: bold; + box-shadow: 0rpx 2rpx 20rpx 0rpx rgba(56,176,184,0.5); + border-radius: 50rpx; + } + } + } + .cardPadding{ + padding: 92rpx 32rpx; + .cutt{ + width: 100%; + height: 1rpx; + background: #EEEEEE; + margin: 34rpx 0 20rpx 0; + + } + } + + .swiper{ + flex: 1; + height: 0; + .scrol { + height: 97%; + background-color: #E6EFF1; + padding: 20rpx; + .box{ + margin-right: 35rpx; + background: #fff; + padding: 20rpx; + border-radius: 10px; + margin-bottom: 40rpx; + .box_txt{ + font-size: 32rpx; + font-weight: 500; + color: #112950; + } + .flex_box{ + // margin-top: 40rpx; + background: #FFFFFF; + border-bottom: 1px solid #C3C9D3; + // border-radius: 10px; + .flex_item{ + margin-top: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + height: 120rpx; + + .img_txt{ + font-size: 36rpx; + font-weight: 400; + color: #FE8025; + } + .top_txt{ + font-size: 28rpx; + font-weight: 500; + color: #112950; + margin-bottom: 10rpx; + } + .bot_txt{ + font-size: 24rpx; + font-weight: 400; + color: #8F98A6; + } + } + } + } + } + } + + + +} \ No newline at end of file diff --git a/src/pages/Integral/Records/recordsList.vue b/src/pages/Integral/Records/recordsList.vue new file mode 100644 index 0000000..7639435 --- /dev/null +++ b/src/pages/Integral/Records/recordsList.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/pages/Integral/exchangeRecords/exchangeRecords.vue b/src/pages/Integral/exchangeRecords/exchangeRecords.vue new file mode 100644 index 0000000..7cbcbc2 --- /dev/null +++ b/src/pages/Integral/exchangeRecords/exchangeRecords.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/pages/Integral/home/Confirmed/Confirmed.scss b/src/pages/Integral/home/Confirmed/Confirmed.scss new file mode 100644 index 0000000..a9fef4f --- /dev/null +++ b/src/pages/Integral/home/Confirmed/Confirmed.scss @@ -0,0 +1,132 @@ +.pageBox{ + background-color: #E6EFF1; + // padding-top: 20rpx; + display: flex; + flex-direction: column; + height: 100vh; + .top{ + background-color: #fff; + padding: 30rpx; + // margin-top: 20rpx; + border-radius: 10rpx; + width: 700rpx; + margin: auto; + box-sizing: border-box; + .one{ + display: flex; + justify-content: space-between; + align-items: center; + font-size: 32rpx; + font-weight: 500; + color: #323232; + .one_img{ + width: 32rpx; + height: 32rpx; + vertical-align: middle; + } + } + .two{ + + .two_top{ + display: flex; + justify-content: space-between; + align-items: center; + padding-bottom: 30rpx; + border-bottom: 1px solid #C3C9D3; + .two_flex{ + display: flex; + justify-content: space-between; + align-items: center;width: 80%; + .two_img{ + width: 32rpx; + height: 32rpx; + vertical-align: middle; + } + } + } + .two_bot{ + display: flex; + justify-content: space-between; + align-items: center; + padding-top: 30rpx; + } + } + + } + .center{ + background-color: #fff; + padding: 30rpx; + border-radius: 10rpx; + width: 700rpx; + margin: 30rpx auto; + box-sizing: border-box; + display: flex; + .center_left{ + .center_img{ + width: 120rpx; + height: 120rpx; + vertical-align: middle; + } + } + .center_right{ + margin-left: 25rpx; + .center_top{ + margin-bottom: 20rpx; + } + .center_bot{ + height: 50rpx; + line-height: 50rpx; + img{ + width: 50rpx; + height: 50rpx; + vertical-align: middle; + margin-left: 20rpx; + } + } + } + } + .bottom{ + background-color: #fff; + padding: 30rpx; + border-radius: 10rpx; + width: 700rpx; + margin: auto; + box-sizing: border-box; + .bot_top{ + display: flex; + justify-content: space-between; + align-items: center; + padding-bottom: 30rpx; + border-bottom: 1px solid #C3C9D3; + } + .bot_bot{ + display: flex; + justify-content: space-between; + align-items: center; + padding-top: 30rpx; + } + } + .btn{ + width: 100%; + height: 120rpx; + background: #fff; + display: flex; + align-items: center; + justify-content: space-around; + position: fixed; + bottom: 0; + .btn_left{ + + } + .btn_right{ + width: 400rpx; + height: 80rpx; + background: #3AAFB8; + text-align: center; + border-radius: 21px; + line-height: 80rpx; + color: #fff; + } + } + +} \ No newline at end of file diff --git a/src/pages/Integral/home/Confirmed/Confirmed.vue b/src/pages/Integral/home/Confirmed/Confirmed.vue new file mode 100644 index 0000000..d28358e --- /dev/null +++ b/src/pages/Integral/home/Confirmed/Confirmed.vue @@ -0,0 +1,267 @@ + + + + + diff --git a/src/pages/Integral/home/Logistics/Logistics.scss b/src/pages/Integral/home/Logistics/Logistics.scss new file mode 100644 index 0000000..a07367a --- /dev/null +++ b/src/pages/Integral/home/Logistics/Logistics.scss @@ -0,0 +1,117 @@ +.pageBox{ + padding-top: 20rpx; + background-color: #E6EFF1; + .top{ + width: 700rpx; + margin: auto; + display: flex; + align-items: center; + padding: 20rpx; + background-color: #fff; + box-sizing: border-box; + border-radius: 10px; + .top_img{ + width: 80rpx; + height: 80rpx; + vertical-align: middle; + margin-right: 30rpx; + } + .txt{ + font-size: 28rpx; + font-weight: 400; + color: #7C8A9F; + margin-right: 20rpx; + } + .txt1{ + + } + } + .center{ + display: flex; + width: 700rpx; + padding: 30rpx; + box-sizing: border-box; + background-color: #fff; + border-radius: 10px; + margin: 20rpx auto; + .center_left{ + margin-right: 30rpx; + .center_img{ + height: 120rpx; + width: 120rpx; + } + } + .center_right{ + width: 100%; + .center_flex{ + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + .center_flex_left{ + font-size: 32rpx; + font-weight: 500; + color: #112950; + } + .center_flex_right{ + margin-right: 30rpx; + font-size: 28rpx; + font-weight: 500; + color: #3AAFB8; + } + } + .center_txt{ + margin-top: 10rpx; + font-size: 28rpx; + font-weight: 400; + color: #7C8A9F; + width: 100%; + } + + } + + } + .bottom{ + width: 700rpx; + margin: auto; + background-color: #fff; + border-radius: 10px; + padding: 30rpx; + box-sizing: border-box; + .title{ + padding-left: 20rpx; + border-left: 3px solid #3AAFB8; + font-size: 32rpx; + font-weight: 500; + color: #112950; + } + .body{ + margin-top: 30rpx; + display: flex; + .body_left{ + width: 30rpx; + padding-top: 10rpx; + .box{ + width: 20rpx; + height: 20rpx; + + border-radius: 50%; + } + } + .body_right{ + width: 100%; + .body_top{ + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20rpx; + } + .body_bot{ + font-size: 24rpx; + font-weight: 400; + color: #112950; + } + } + } + } +} \ No newline at end of file diff --git a/src/pages/Integral/home/Logistics/Logistics.vue b/src/pages/Integral/home/Logistics/Logistics.vue new file mode 100644 index 0000000..1a5e5d3 --- /dev/null +++ b/src/pages/Integral/home/Logistics/Logistics.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/pages/Integral/home/details/details.scss b/src/pages/Integral/home/details/details.scss new file mode 100644 index 0000000..00e8d5b --- /dev/null +++ b/src/pages/Integral/home/details/details.scss @@ -0,0 +1,102 @@ +.pageBox{ + background-color: #E6EFF1; + // padding-top: 20rpx; + display: flex; + flex-direction: column; + min-height: 100vh; + + .top{ + width: 700rpx; + margin: auto; + border-radius: 10px; + padding-bottom: 20rpx; + background-color: #fff; + .img{ + width: 100%; + height: 300px; + } + .bot_box{ + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10rpx; + } + } + .center{ + width: 700rpx; + margin: auto; + padding: 20rpx; + background-color: #fff; + box-sizing: border-box; + margin-top: 20rpx; + border-radius: 10px; + .center_top{ + // margin-bottom: 20rpx; + padding-bottom: 20rpx; + border-bottom: 1px solid #C3C9D3; + .center_txt{ + font-size: 32rpx; + font-weight: 500; + color: #112950; + padding-left: 10rpx; + border-left: 3px solid #3AAFB8; + padding-bottom: 10rpx; + } + } + .center_bot{ + margin-top: 20rpx; + font-size: 26rpx + } + } + .bottom{ + width: 700rpx; + margin: auto; + padding: 20rpx; + background-color: #fff; + box-sizing: border-box; + margin-top: 20rpx; + border-radius: 10px; + // margin-bottom: 50rpx; + .bottom_top{ + // margin-bottom: 20rpx; + padding-bottom: 20rpx; + border-bottom: 1px solid #C3C9D3; + .bottom_txt{ + font-size: 32rpx; + font-weight: 500; + color: #112950; + padding-left: 10rpx; + border-left: 3px solid #3AAFB8; + padding-bottom: 10rpx; + } + } + .bottom_bot{ + margin-top: 20rpx; + font-size: 26rpx + } + } + .btnbox{ + background-color: #fff; + width: 100%; + height: 100rpx; + position: fixed; + bottom: 0rpx; + // padding: 0 25rpx; + left: 0; + .btn{ + width: 700rpx; + border-radius: 21px; + height: 80rpx; + line-height: 80rpx; + background-color: #3AAFB8; + color: #fff; + font-size: 28rpx; + text-align: center; + margin: 10rpx 25rpx; + } + } + .box{ + height: 140rpx; + width: 100%; + } +} \ No newline at end of file diff --git a/src/pages/Integral/home/details/details.vue b/src/pages/Integral/home/details/details.vue new file mode 100644 index 0000000..3fafa94 --- /dev/null +++ b/src/pages/Integral/home/details/details.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/pages/Integral/home/home.scss b/src/pages/Integral/home/home.scss new file mode 100644 index 0000000..34da42a --- /dev/null +++ b/src/pages/Integral/home/home.scss @@ -0,0 +1,189 @@ +.pageBox{ + width: 100%; + // height: 100%; + background: #E6EFF1; + .top{ + background-color: #fff; + } + .center{ + .flexbox{ + display: flex; + justify-content: space-between; + width: 700rpx; + margin: 20rpx auto; + .box{ + width: 250rpx; + height: 90rpx; + background: #FFFFFF; + border-radius: 10px; + padding: 30rpx 40rpx; + display: flex; + justify-content: space-between; + .lefttext{ + .p{ + height: 40rpx; + line-height: 40rpx; + font-weight: 500; + color: #112950; + font-size: 28rpx; + + } + .txt{ + font-size: 22rpx; + font-weight: 400; + width:170rpx; + color: #8E9AAB; + height: 28rpx; + line-height: 28rpx; + margin-top:10rpx; + } + } + .rightimg{ + .img{ + width: 74rpx; + height: 74rpx; + vertical-align:middle; + margin-top: 5rpx; + } + } + } + } + } + .bottom{ + width: 700rpx; + margin: auto; + .tabs{ + height: 88rpx; + display: flex; + align-items: center; + justify-content: space-between; + padding: 10rpx 30rpx; + background-color: #FFFFFF; + border-radius: 10px; + // width: 100%; + .tabs_top{ + padding-bottom: 20rpx; + font-size: 28rpx; + font-weight: 400; + color: #8E9AAB; + } + .active{ + border-bottom: 3px solid #3AAFB8; + font-weight: 500; + color: #112950; + } + } + .drawerContent { + padding:50rpx 30rpx 30rpx; + font-size: 28rpx; + .row { + margin-bottom: 50rpx; + .btn_box { + display: flex; + flex-wrap: wrap; + margin-top: 20rpx; + // box-sizing: border-box; + .noselde,.selde { + padding: 10rpx 10rpx; + margin: 14rpx; + border-radius: 10rpx; + text-align: center; + + } + .noselde { + background-color: #E6EFF1; + border: 1px solid #E6EFF1; + } + .selde { + border: 1px solid #FE8025; + color: #FE8025; + background-color: #fdf2df; + } + } + } + .bom_btn { + position: fixed; + bottom: 0rpx; + right: 0; + width: 280px; + height: 80rpx; + background-color: #fff; + display: flex; + justify-content: space-around; + flex-wrap: wrap; + font-size: 28rpx; + view { + width:100rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + border-radius: 10rpx; + + } + .left { + color: #333; + border: 1px solid #8E9AAB; + } + .right { + color: #fff; + background-color: #FE8025; + } + } + + + } + .tabs_center{ + width: 700rpx; + margin: auto; + .ComBox { + width: 700rpx; //根据微信定义设置 如非必要不建议改为100%； + // padding: 10rpx 30rpx; + // background-color: #f7f7f7; + display: flex; + justify-content: space-between; + flex-wrap: wrap; + .ComList { + //未设置高度 + width: 270rpx; + padding: 30rpx; + background: #fff; + border-radius: 8rpx; + margin-top: 30rpx; + .ImgBOX { + width: 270rpx; + height: 270rpx; + border-radius: 12rpx; + .Img { + width: 100%; + height: 100%; + } + } + .Title { + width: 270rpx; + font-size: 28rpx; + line-height: 44rpx; + height: 88rpx; + padding-top: 15rpx; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + line-clamp: 2; + -webkit-box-orient: vertical; + } + .Price { + width: 100%; + height: 44rpx; + line-height: 44rpx; + padding-top: 15rpx; + font-size: 26rpx; + font-family: PingFang SC; + font-weight: 500; + color: #3AAFB8; + } + } + } + } + } +} \ No newline at end of file diff --git a/src/pages/Integral/home/home.vue b/src/pages/Integral/home/home.vue new file mode 100644 index 0000000..6e4bc91 --- /dev/null +++ b/src/pages/Integral/home/home.vue @@ -0,0 +1,488 @@ + + + + + diff --git a/src/pages/Integral/home/images/1.png b/src/pages/Integral/home/images/1.png new file mode 100644 index 0000000..1383452 Binary files /dev/null and b/src/pages/Integral/home/images/1.png differ diff --git a/src/pages/Integral/home/images/2.png b/src/pages/Integral/home/images/2.png new file mode 100644 index 0000000..ea0ec3b Binary files /dev/null and b/src/pages/Integral/home/images/2.png differ diff --git a/src/pages/Integral/home/images/3.png b/src/pages/Integral/home/images/3.png new file mode 100644 index 0000000..817341c Binary files /dev/null and b/src/pages/Integral/home/images/3.png differ diff --git a/src/pages/Integral/home/images/4.png b/src/pages/Integral/home/images/4.png new file mode 100644 index 0000000..d628e32 Binary files /dev/null and b/src/pages/Integral/home/images/4.png differ diff --git a/src/pages/Integral/home/images/5.png b/src/pages/Integral/home/images/5.png new file mode 100644 index 0000000..c8d0c81 Binary files /dev/null and b/src/pages/Integral/home/images/5.png differ diff --git a/src/pages/Integral/home/orderDetails/orderDetails.scss b/src/pages/Integral/home/orderDetails/orderDetails.scss new file mode 100644 index 0000000..c2d53f8 --- /dev/null +++ b/src/pages/Integral/home/orderDetails/orderDetails.scss @@ -0,0 +1,128 @@ +.pageBox{ + background-color: #E6EFF1; + // padding-top: 20rpx; + .background{ + background-color: #3AAFB8; + height: 250rpx; + position: relative; + margin-bottom: 150rpx; + + .top{ + background-color: #fff; + padding: 30rpx; + border-radius: 10rpx; + width: 700rpx; + margin: auto; + box-sizing: border-box; + position: absolute; + bottom: -120rpx; + left: 50%; + margin-left: -350rpx; + .two{ + .two_top{ + display: flex; + justify-content: space-between; + align-items: center; + padding-bottom: 30rpx; + border-bottom: 1px solid #C3C9D3; + .two_flex{ + align-items: center; + width: 80%; + + } + } + .two_bot{ + display: flex; + justify-content: space-between; + align-items: center; + padding-top: 30rpx; + } + } + + } + + + } + + .center{ + background-color: #fff; + padding: 30rpx; + border-radius: 10rpx; + width: 700rpx; + margin: 30rpx auto; + box-sizing: border-box; + display: flex; + .center_left{ + .center_img{ + width: 120rpx; + height: 120rpx; + vertical-align: middle; + } + } + .center_right{ + margin-left: 25rpx; + .center_top{ + margin-bottom: 20rpx; + } + .center_bot{ + height: 50rpx; + line-height: 50rpx; + img{ + width: 50rpx; + height: 50rpx; + vertical-align: middle; + margin-left: 20rpx; + } + } + } + } + .bottom{ + background-color: #fff; + padding: 30rpx; + border-radius: 10rpx; + width: 700rpx; + margin: auto; + box-sizing: border-box; + .bot_top{ + display: flex; + justify-content: space-between; + align-items: center; + padding-bottom: 30rpx; + margin-top: 20rpx; + border-bottom: 1px solid #C3C9D3; + .bot_top_img{ + height: 24rpx; + width: 24rpx; + margin-left: 10rpx; + vertical-align: middle; + } + } + .bot_bot{ + display: flex; + justify-content: space-between; + align-items: center; + padding-top: 30rpx; + .bot_top_img{ + height: 24rpx; + width: 24rpx; + margin-left: 10rpx; + vertical-align: middle; + } + } + } + .btn{ + width: 700rpx; + position: fixed; + bottom: 20rpx; + left: 50%; + margin-left: -350rpx; + border-radius: 21px; + height: 80rpx; + line-height: 80rpx; + background-color: #3AAFB8; + color: #fff; + font-size: 28rpx; + text-align: center; + } + +} \ No newline at end of file diff --git a/src/pages/Integral/home/orderDetails/orderDetails.vue b/src/pages/Integral/home/orderDetails/orderDetails.vue new file mode 100644 index 0000000..03d2119 --- /dev/null +++ b/src/pages/Integral/home/orderDetails/orderDetails.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/pages/Integral/static/images/1.png b/src/pages/Integral/static/images/1.png new file mode 100644 index 0000000..f2d74e6 Binary files /dev/null and b/src/pages/Integral/static/images/1.png differ diff --git a/src/pages/Integral/static/images/10.png b/src/pages/Integral/static/images/10.png new file mode 100644 index 0000000..ce0b8de Binary files /dev/null and b/src/pages/Integral/static/images/10.png differ diff --git a/src/pages/Integral/static/images/11.png b/src/pages/Integral/static/images/11.png new file mode 100644 index 0000000..67edc5e Binary files /dev/null and b/src/pages/Integral/static/images/11.png differ diff --git a/src/pages/Integral/static/images/12.png b/src/pages/Integral/static/images/12.png new file mode 100644 index 0000000..1964c17 Binary files /dev/null and b/src/pages/Integral/static/images/12.png differ diff --git a/src/pages/Integral/static/images/2.png b/src/pages/Integral/static/images/2.png new file mode 100644 index 0000000..ff61b27 Binary files /dev/null and b/src/pages/Integral/static/images/2.png differ diff --git a/src/pages/Integral/static/images/3.png b/src/pages/Integral/static/images/3.png new file mode 100644 index 0000000..a2ed63f Binary files /dev/null and b/src/pages/Integral/static/images/3.png differ diff --git a/src/pages/Integral/static/images/4.png b/src/pages/Integral/static/images/4.png new file mode 100644 index 0000000..258bc49 Binary files /dev/null and b/src/pages/Integral/static/images/4.png differ diff --git a/src/pages/Integral/static/images/5.png b/src/pages/Integral/static/images/5.png new file mode 100644 index 0000000..079ab9f Binary files /dev/null and b/src/pages/Integral/static/images/5.png differ diff --git a/src/pages/Integral/static/images/6.png b/src/pages/Integral/static/images/6.png new file mode 100644 index 0000000..68631bf Binary files /dev/null and b/src/pages/Integral/static/images/6.png differ diff --git a/src/pages/Integral/static/images/7.png b/src/pages/Integral/static/images/7.png new file mode 100644 index 0000000..8e5ed45 Binary files /dev/null and b/src/pages/Integral/static/images/7.png differ diff --git a/src/pages/Integral/static/images/8.png b/src/pages/Integral/static/images/8.png new file mode 100644 index 0000000..c61f81c Binary files /dev/null and b/src/pages/Integral/static/images/8.png differ diff --git a/src/pages/Integral/static/images/9.png b/src/pages/Integral/static/images/9.png new file mode 100644 index 0000000..36eeb54 Binary files /dev/null and b/src/pages/Integral/static/images/9.png differ diff --git a/src/pages/Integral/static/images/day.png b/src/pages/Integral/static/images/day.png new file mode 100644 index 0000000..d349b74 Binary files /dev/null and b/src/pages/Integral/static/images/day.png differ diff --git a/src/pages/Integral/static/images/nth2.png b/src/pages/Integral/static/images/nth2.png new file mode 100644 index 0000000..8801df3 Binary files /dev/null and b/src/pages/Integral/static/images/nth2.png differ diff --git a/src/uni_modules/uni-drawer/changelog.md b/src/uni_modules/uni-drawer/changelog.md new file mode 100644 index 0000000..6d2488c --- /dev/null +++ b/src/uni_modules/uni-drawer/changelog.md @@ -0,0 +1,13 @@ +## 1.2.1（2021-11-22） +- 修复 vue3中个别scss变量无法找到的问题 +## 1.2.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-drawer](https://uniapp.dcloud.io/component/uniui/uni-drawer) +## 1.1.1（2021-07-30） +- 优化 vue3下事件警告的问题 +## 1.1.0（2021-07-13） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.7（2021-05-12） +- 新增 组件示例地址 +## 1.0.6（2021-02-04） +- 调整为uni_modules目录规范 diff --git a/src/uni_modules/uni-drawer/components/uni-drawer/keypress.js b/src/uni_modules/uni-drawer/components/uni-drawer/keypress.js new file mode 100644 index 0000000..62dda46 --- /dev/null +++ b/src/uni_modules/uni-drawer/components/uni-drawer/keypress.js @@ -0,0 +1,45 @@ +// #ifdef H5 +export default { + name: 'Keypress', + props: { + disable: { + type: Boolean, + default: false + } + }, + mounted () { + const keyNames = { + esc: ['Esc', 'Escape'], + tab: 'Tab', + enter: 'Enter', + space: [' ', 'Spacebar'], + up: ['Up', 'ArrowUp'], + left: ['Left', 'ArrowLeft'], + right: ['Right', 'ArrowRight'], + down: ['Down', 'ArrowDown'], + delete: ['Backspace', 'Delete', 'Del'] + } + const listener = ($event) => { + if (this.disable) { + return + } + const keyName = Object.keys(keyNames).find(key => { + const keyName = $event.key + const value = keyNames[key] + return value === keyName || (Array.isArray(value) && value.includes(keyName)) + }) + if (keyName) { + // 避免和其他按键事件冲突 + setTimeout(() => { + this.$emit(keyName, {}) + }, 0) + } + } + document.addEventListener('keyup', listener) + // this.$once('hook:beforeDestroy', () => { + // document.removeEventListener('keyup', listener) + // }) + }, + render: () => {} +} +// #endif diff --git a/src/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue b/src/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue new file mode 100644 index 0000000..2471521 --- /dev/null +++ b/src/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/src/uni_modules/uni-drawer/package.json b/src/uni_modules/uni-drawer/package.json new file mode 100644 index 0000000..dd056e4 --- /dev/null +++ b/src/uni_modules/uni-drawer/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-drawer", + "displayName": "uni-drawer 抽屉", + "version": "1.2.1", + "description": "抽屉式导航，用于展示侧滑菜单，侧滑导航。", + "keywords": [ + "uni-ui", + "uniui", + "drawer", + "抽屉", + "侧滑导航" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/src/uni_modules/uni-drawer/readme.md b/src/uni_modules/uni-drawer/readme.md new file mode 100644 index 0000000..dcf6e6b --- /dev/null +++ b/src/uni_modules/uni-drawer/readme.md @@ -0,0 +1,10 @@ + + +## Drawer 抽屉 +> **组件名：uni-drawer** +> 代码块： `uDrawer` + +抽屉侧滑菜单。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-drawer) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file diff --git a/src/uni_modules/uni-search-bar/changelog.md b/src/uni_modules/uni-search-bar/changelog.md new file mode 100644 index 0000000..b41fdd3 --- /dev/null +++ b/src/uni_modules/uni-search-bar/changelog.md @@ -0,0 +1,33 @@ +## 1.2.3（2022-05-24） +- 新增 readonly 属性，组件只读 +## 1.2.2（2022-05-06） +- 修复 vue3 input 事件不生效的bug +## 1.2.1（2022-05-06） +- 修复 多余代码导致的bug +## 1.2.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar) +## 1.1.2（2021-08-30） +- 修复 value 属性与 modelValue 属性不兼容的Bug +## 1.1.1（2021-08-24） +- 新增 支持国际化 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.9（2021-05-12） +- 新增 项目示例地址 +## 1.0.8（2021-04-21） +- 优化 添加依赖 uni-icons, 导入后自动下载依赖 +## 1.0.7（2021-04-15） +- uni-ui 新增 uni-search-bar 的 focus 事件 + +## 1.0.6（2021-02-05） +- 优化 组件引用关系，通过uni_modules引用组件 + +## 1.0.5（2021-02-05） +- 调整为uni_modules目录规范 +- 新增 支持双向绑定 +- 更改 input 事件的返回值，e={value:Number} --> e=value +- 新增 支持图标插槽 +- 新增 支持 clear、blur 事件 +- 新增 支持 focus 属性 +- 去掉组件背景色 diff --git a/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json new file mode 100644 index 0000000..dd083a5 --- /dev/null +++ b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json @@ -0,0 +1,4 @@ +{ + "uni-search-bar.cancel": "cancel", + "uni-search-bar.placeholder": "Search enter content" +} \ No newline at end of file diff --git a/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js new file mode 100644 index 0000000..de7509c --- /dev/null +++ b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js @@ -0,0 +1,8 @@ +import en from './en.json' +import zhHans from './zh-Hans.json' +import zhHant from './zh-Hant.json' +export default { + en, + 'zh-Hans': zhHans, + 'zh-Hant': zhHant +} diff --git a/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json new file mode 100644 index 0000000..d4e5c12 --- /dev/null +++ b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json @@ -0,0 +1,4 @@ +{ + "uni-search-bar.cancel": "cancel", + "uni-search-bar.placeholder": "请输入搜索内容" +} diff --git a/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json new file mode 100644 index 0000000..318b6ef --- /dev/null +++ b/src/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json @@ -0,0 +1,4 @@ +{ + "uni-search-bar.cancel": "cancel", + "uni-search-bar.placeholder": "請輸入搜索內容" +} diff --git a/src/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/src/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue new file mode 100644 index 0000000..5a518a8 --- /dev/null +++ b/src/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/uni_modules/uni-search-bar/package.json b/src/uni_modules/uni-search-bar/package.json new file mode 100644 index 0000000..9352c57 --- /dev/null +++ b/src/uni_modules/uni-search-bar/package.json @@ -0,0 +1,89 @@ +{ + "id": "uni-search-bar", + "displayName": "uni-search-bar 搜索栏", + "version": "1.2.3", + "description": "搜索栏组件，通常用于搜索商品、文章等", + "keywords": [ + "uni-ui", + "uniui", + "搜索框", + "搜索栏" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [ + "uni-scss", + "uni-icons" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/src/uni_modules/uni-search-bar/readme.md b/src/uni_modules/uni-search-bar/readme.md new file mode 100644 index 0000000..253092f --- /dev/null +++ b/src/uni_modules/uni-search-bar/readme.md @@ -0,0 +1,14 @@ + + +## SearchBar 搜索栏 + +> **组件名：uni-search-bar** +> 代码块： `uSearchBar` + + +搜索栏组件 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 + +