diff --git a/App.vue b/App.vue
index 03c21fb..73ac7a4 100644
--- a/App.vue
+++ b/App.vue
@@ -12,12 +12,14 @@
\ No newline at end of file
diff --git a/components/couponPopup/couponPopup.vue b/components/couponPopup/couponPopup.vue
new file mode 100644
index 0000000..24f3913
--- /dev/null
+++ b/components/couponPopup/couponPopup.vue
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/product/productItem.vue b/components/product/productItem.vue
index c9755db..9d0f64e 100644
--- a/components/product/productItem.vue
+++ b/components/product/productItem.vue
@@ -70,6 +70,7 @@
display: flex;
box-sizing: border-box;
border-bottom: 1rpx solid #00000012;
+ background: white;
.item-image {
width: 140rpx;
diff --git a/components/user/productList.vue b/components/user/productList.vue
index 1cc1ff2..eadcb93 100644
--- a/components/user/productList.vue
+++ b/components/user/productList.vue
@@ -1,133 +1,130 @@
-
-
+
-
-
+
+
{{ item.title }}
-
-
- ¥{{ item.price }}/件
-
-
- ¥{{ item.oldPrice }}/件
-
-
-
-
- 已售卖5000+件
-
- 购买
-
-
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 99308e9..7befa21 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx0839bc52e7849c13",
+ "appid" : "wxf7152f59d366236b",
"setting" : {
"urlCheck" : false
},
diff --git a/package.json b/package.json
index 136edbc..bbac28a 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,8 @@
"license": "ISC",
"dependencies": {
"ali-oss": "^6.21.0",
- "dayjs": "^1.11.12"
+ "dayjs": "^1.11.12",
+ "swiper": "^5.4.5",
+ "vue-awesome-swiper": "^4.1.0"
}
}
diff --git a/pages.json b/pages.json
index bc8ffff..dc17df4 100644
--- a/pages.json
+++ b/pages.json
@@ -48,7 +48,12 @@
},
"subPackages": [{
"root": "pages_order",
- "pages": [
+ "pages": [{
+ "path": "mine/card"
+ },
+ {
+ "path": "mine/partner"
+ },
{
"path": "order/orderDetail",
"style": {
@@ -82,23 +87,17 @@
{
"path": "home/journalism"
},
- {
- "path": "mine/recommend",
- "style": {
- "enablePullDownRefresh": true
- }
- },
{
"path": "home/introduce"
},
{
- "path" : "home/newsDetail"
+ "path": "home/newsDetail"
},
{
- "path" : "order/createOrder"
+ "path": "order/createOrder"
},
{
- "path" : "mine/balance"
+ "path": "mine/balance"
},
{
"path": "mine/commission"
@@ -120,12 +119,21 @@
},
{
"path": "home/addEnterprise"
+ },
+ {
+ "path": "mine/memberCenter"
+ },
+ {
+ "path": "mine/recruit"
+ },
+ {
+ "path": "mine/moreCommodity"
}
]
}],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "酒店桌布",
+ "navigationBarTitleText": "珠宝商城",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
"navigationStyle": "custom"
diff --git a/pages/index/category.vue b/pages/index/category.vue
index c4677f6..34b543a 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,37 +1,32 @@
+
+
-
+
+
-
+
+
-
+
-
+
+
@@ -40,28 +35,32 @@
\ No newline at end of file
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 4ace98f..4334858 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -3,153 +3,147 @@
+
-
+
-
-
- {{ userInfo.nickName }}
-
-
-
+
+
+
+
+ 倾心.临时决定离开军队费时费力士大夫
+
+
+
+
+
+
+
+
+ 合伙人
+
+
+
+
+
+
+ 修改资料
+
-
- ID:{{ userInfo.id }}
-
-
- 注册时间:{{ userInfo.createTime }}
+
+
+ 手机号:1820000000
-
+
-
- 会员等级:{{ vipType[userInfo.isPay] }}
- 查看权益>
-
-
-
-
- {{ riceInfo.income || 0 }}
- 收益明细(元)
+
+
+
+
+
+
+
+ 已开通29天
+
- 收益明细
-
-
-
-
-
-
- {{ riceInfo.balance || 0 }}
- 余额(元)
-
- 去充值
-
-
-
-
- {{ riceInfo.canWithdraw || 0 }}
- 可提现(元)
-
- 去提现
-
- 我的订单
-
- 查看全部>
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ 我的服务
+
+
-
-
- 待付款
+
+
+ 我的订单
-
-
- 已付款
+
+
+ 我的团队
-
-
- 待发货
+
+
+ 联系客服
-
-
- 待收货
-
-
-
- 已完成
+
+
+ 邀请好友
-
-
-
-
-
- 常用功能
+
+
+
+ 广告招商
+
+
+
+ 会员权益
+
+
+
+ 优惠券
+
+
+
+ 帮助与反馈
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -157,7 +151,9 @@
@@ -190,249 +205,262 @@
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a4f1439..3661f09 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,71 +1,97 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+ 新人专享
+
+
+ 领199元大礼包
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ¥100
+
+
+
-
-
+
+
+
+ 视频
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- 推荐宝贝
+
+
+ 推荐宝贝
+ 更多
+
-
+
-
+
+
-
-
+
+
+
+
+
+
+
@@ -73,30 +99,34 @@
import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue'
import Position from '@/utils/position.js'
import tabber from '@/components/base/tabbar.vue'
- import { mapState } from 'vuex'
+ import couponPopup from "@/components/couponPopup/couponPopup.vue"
+ import {
+ mapState
+ } from 'vuex'
import customerServicePopup from '@/components/config/customerServicePopup.vue'
import productList from '@/components/user/productList.vue'
import mixinsList from '@/mixins/list.js'
export default {
- mixins : [mixinsList],
+ mixins: [mixinsList],
components: {
tabber,
PrivacyAgreementPoup,
customerServicePopup,
productList,
+ couponPopup
},
data() {
return {
notice: '',
bannerList: [],
- baseList: [
- ],
+ baseList: [],
productList: [],
keyword: '',
- commonProductList : [],//常规产品
- riceProductList : [],//体验产品
- newList : [],//新闻列表
- mixinsListApi : 'getClassShopPageList',
+ commonProductList: [], //常规产品
+ riceProductList: [], //体验产品
+ newList: [], //新闻列表
+ mixinsListApi: 'getClassShophomeList',
+ showCouponPopup : true
}
},
computed: {},
@@ -108,144 +138,121 @@
onShow() {
this.getBanner()
this.getRiceNoticeList()
- // this.getRiceCommonProductList()
- // this.getRiceProductList()
- // this.getRiceNewsList()
this.getRiceIconList()
+ this.getRiceCommonProductList()
},
onPullDownRefresh() {
this.getBanner()
this.getRiceNoticeList()
- // this.getRiceCommonProductList()
- // this.getRiceProductList()
- // this.getRiceNewsList()
},
methods: {
// 搜素
- search(){
+ search() {
uni.navigateTo({
- url: '/pages/index/category?search=' + this.keyword
+ url: '/homes/index/category?search=' + this.keyword
})
this.keyword = ''
},
+
// 获取轮播图
- getBanner(){
+ getBanner() {
this.$api('getRiceBanner', res => {
- if(res.code == 200){
+ if (res.code == 200) {
this.bannerList = res.result
}
})
},
+
// 获取公告
- getRiceNoticeList(){
+ getRiceNoticeList() {
this.$api('getRiceNoticeList', res => {
- if(res.code == 200){
+ if (res.code == 200) {
this.notice = res.result.title
}
})
},
+
// 获取常规产品
- getRiceCommonProductList(){
+ getRiceCommonProductList() {
this.$api('getRiceCommonProductList', res => {
uni.stopPullDownRefresh()
- if(res.code == 200){
+ if (res.code == 200) {
this.commonProductList = res.result
}
})
},
+
// 获取首页体验产品
- getRiceProductList(){
+ getRiceProductList() {
this.$api('getRiceProductList', res => {
- if(res.code == 200){
+ if (res.code == 200) {
this.riceProductList = res.result
}
})
},
+
// 获取首页新闻列表
- getRiceNewsList(){
+ getRiceNewsList() {
this.$api('getRiceNewsList', res => {
- if(res.code == 200){
+ if (res.code == 200) {
this.newList = res.result.records
}
})
},
- // 获取首页跳转图标
- getRiceIconList(){
+
+ // 获取首页菜单图标
+ getRiceIconList() {
this.$api('getRiceIconList', res => {
- if(res.code == 200){
- this.baseList = res.result
+ if (res.code == 200) {
+ this.baseList = res.result.slice(0, 5)
}
})
},
- toUrl(url){
- if(!url){
+
+ //跳转
+ toUrl(url) {
+ if (!url) {
uni.showToast({
title: '功能暂未开放'
})
return
}
-
- if(url == '::phone'){
+
+ if (url == '::phone') {
this.$refs.customerServicePopup.open()
return
}
-
+
uni.navigateTo({
url
})
},
- saveImage(image){
- /* 获取图片的信息 */
- uni.getImageInfo({
- src: image,
- success: function(image) {
- /* 保存图片到手机相册 */
- uni.saveImageToPhotosAlbum({
- filePath: image.path,
- success: function() {
- uni.showModal({
- title: '保存成功',
- content: '图片已成功保存到相册',
- showCancel: false
- });
- },
- complete(res) {
- console.log(res);
- }
- });
- }
- });
+
+ //视频播放错误
+ videoErrorCallback: function(e) {
+ uni.showModal({
+ content: e.target.errMsg,
+ showCancel: false
+ })
+ },
+
+ //左右滚动视频
+ scroll: function(e) {
+
},
},
}
\ No newline at end of file
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 038c1d6..5e857a7 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -7,8 +7,6 @@
欢迎使用{{ configList.logo_name }}
-
-
@@ -19,20 +17,6 @@
-
-
取消登录
diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue
index 7bfa93a..0d034f8 100644
--- a/pages_order/components/product/submit.vue
+++ b/pages_order/components/product/submit.vue
@@ -1,37 +1,21 @@
-
+
+
+
+
+ 客服
-
-
-
- 购物车
-
- -->
-
-
-
-
+
+
{{ submiitTitle }}
@@ -40,83 +24,86 @@
+
\ No newline at end of file
diff --git a/pages_order/mine/card.vue b/pages_order/mine/card.vue
new file mode 100644
index 0000000..782a967
--- /dev/null
+++ b/pages_order/mine/card.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂未开通
+
+
+
+ 立即开通
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/mine/memberCenter.vue b/pages_order/mine/memberCenter.vue
new file mode 100644
index 0000000..ccac3c3
--- /dev/null
+++ b/pages_order/mine/memberCenter.vue
@@ -0,0 +1,406 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂未开通
+
+
+
+ 立即开通
+
+
+
+
+
+
+
+
+ 充值套餐
+
+
+
+
+ 限时折扣
+
+ {{ item.title }}
+
+ ¥{{ item.money }}
+
+
+
+
+ (不同会员等级商品价格不一样,可以设置给与推荐人佣金。)
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+ {{ lindex + 1 }}
+
+
+ {{ litem }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/mine/moreCommodity.vue b/pages_order/mine/moreCommodity.vue
new file mode 100644
index 0000000..6098430
--- /dev/null
+++ b/pages_order/mine/moreCommodity.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/mine/partner.vue b/pages_order/mine/partner.vue
new file mode 100644
index 0000000..028cce8
--- /dev/null
+++ b/pages_order/mine/partner.vue
@@ -0,0 +1,270 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 18200000000
+ 合伙人
+
+
+
+
+
+ 直推及间推业绩
+
+
+ ¥666
+
+
+
+
+ 去提现
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户138xxxxxxxx
+
+
+ 已加入平台120天
+
+
+
+
+
+
+ 下单量: 666
+
+ |
+
+ 佣金:666元
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/mine/recommend - 副本.vue b/pages_order/mine/recommend - 副本.vue
deleted file mode 100644
index fa4bce3..0000000
--- a/pages_order/mine/recommend - 副本.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
- {{ total }}
- 直推人数
-
-
-
- 推广明细
-
-
-
-
-
- {{ vipType[item.isPay] }}
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_order/mine/recommend.vue b/pages_order/mine/recommend.vue
deleted file mode 100644
index febb759..0000000
--- a/pages_order/mine/recommend.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ total }}
- 直推人数
-
-
-
-
-
-
-
-
-
-
- 昵称:
- {{ item.nickName }}
-
-
- 上级ID:
- {{ item.shareId && item.shareId.substring(0, 8) }}...
-
-
-
-
-
- 级别:
- 直属下级
-
-
- 时间:
- {{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_order/mine/recruit.vue b/pages_order/mine/recruit.vue
new file mode 100644
index 0000000..fc334dd
--- /dev/null
+++ b/pages_order/mine/recruit.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合伙人
+
+
+ 您的姓名
+
+
+
+ 联系方式
+
+
+
+ 所在地区
+
+
+
+ 详细地址
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 42fe134..66525ce 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -1,96 +1,111 @@
-
+
+
+
+
-
-
-
-
- {{ address.name }}
-
-
- {{ address.address }}
-
-
-
+
+
+
+
-
-
-
-
-
+
+ MOMEIREN双面黑钻项链
+
+
+ 材质:S25银
+
+
+
+
-
-
- {{ item.title }}
-
-
- {{ item.sku }}
-
-
-
-
-
-
-
-
- 会员价¥{{ item.vipPrice }}
-
-
-
-
- ¥{{ item.price }}
-
-
+
+ 已售出 666+ 单
-
-
-
-
- 配送方式
+
+
+
+
+
+ 李满和
+ 城南故事C3栋2802数据都是佛山佛挡杀佛
+
+
+
+
+
+
+
+
+
+
+
+
+ 账户余额
+ (余额: 300)
-
- 商家自行配送
+
+
-
-
- 付款金额
+
+
+
+
+
+
+ 微信支付
+
-
- ¥{{ totalPrice }}
+
+
-
-
-
-
- 确认下单
+
+
+
+
+
+ 优惠券
+ $20
+
+
+
+
-
+
+
+ 温馨提示,下单前请仔细查看下单需知
+
+
+
+
+ 本人已同意《用户使用协议》
+
+
+
+
+
+ 合计
+ ¥{{ count }}元
+
+
+
+ 立即支付
+
+
+
@@ -102,7 +117,10 @@
+
\ No newline at end of file
diff --git a/pages_order/static/card/diamond-min.png b/pages_order/static/card/diamond-min.png
new file mode 100644
index 0000000..f7c3ebf
Binary files /dev/null and b/pages_order/static/card/diamond-min.png differ
diff --git a/pages_order/static/card/diamond.png b/pages_order/static/card/diamond.png
new file mode 100644
index 0000000..b480a96
Binary files /dev/null and b/pages_order/static/card/diamond.png differ
diff --git a/pages_order/static/card/gold-min.png b/pages_order/static/card/gold-min.png
new file mode 100644
index 0000000..43b236a
Binary files /dev/null and b/pages_order/static/card/gold-min.png differ
diff --git a/pages_order/static/card/gold.png b/pages_order/static/card/gold.png
new file mode 100644
index 0000000..c4e097a
Binary files /dev/null and b/pages_order/static/card/gold.png differ
diff --git a/pages_order/static/card/profilePhoto.png b/pages_order/static/card/profilePhoto.png
new file mode 100644
index 0000000..9d12256
Binary files /dev/null and b/pages_order/static/card/profilePhoto.png differ
diff --git a/pages_order/static/card/silver.png b/pages_order/static/card/silver.png
new file mode 100644
index 0000000..a145a50
Binary files /dev/null and b/pages_order/static/card/silver.png differ
diff --git a/pages_order/static/card/sliver-min.png b/pages_order/static/card/sliver-min.png
new file mode 100644
index 0000000..d8bacb6
Binary files /dev/null and b/pages_order/static/card/sliver-min.png differ
diff --git a/pages_order/static/coupon/bg.png b/pages_order/static/coupon/bg.png
new file mode 100644
index 0000000..beba2ca
Binary files /dev/null and b/pages_order/static/coupon/bg.png differ
diff --git a/pages_order/static/coupon/close-btn.png b/pages_order/static/coupon/close-btn.png
new file mode 100644
index 0000000..2ad8dc6
Binary files /dev/null and b/pages_order/static/coupon/close-btn.png differ
diff --git a/pages_order/static/coupon/examine.png b/pages_order/static/coupon/examine.png
new file mode 100644
index 0000000..57b7e9d
Binary files /dev/null and b/pages_order/static/coupon/examine.png differ
diff --git a/pages_order/static/coupon/register-success.png b/pages_order/static/coupon/register-success.png
new file mode 100644
index 0000000..5a559fd
Binary files /dev/null and b/pages_order/static/coupon/register-success.png differ
diff --git a/pages_order/static/createOrder/account.png b/pages_order/static/createOrder/account.png
new file mode 100644
index 0000000..b5c5585
Binary files /dev/null and b/pages_order/static/createOrder/account.png differ
diff --git a/pages_order/static/createOrder/address.png b/pages_order/static/createOrder/address.png
new file mode 100644
index 0000000..a6f36d0
Binary files /dev/null and b/pages_order/static/createOrder/address.png differ
diff --git a/pages_order/static/createOrder/coupon.png b/pages_order/static/createOrder/coupon.png
new file mode 100644
index 0000000..2cae06c
Binary files /dev/null and b/pages_order/static/createOrder/coupon.png differ
diff --git a/pages_order/static/createOrder/wx.png b/pages_order/static/createOrder/wx.png
new file mode 100644
index 0000000..6267617
Binary files /dev/null and b/pages_order/static/createOrder/wx.png differ
diff --git a/pages_order/static/memberCenter/descript1.png b/pages_order/static/memberCenter/descript1.png
new file mode 100644
index 0000000..731d1fd
Binary files /dev/null and b/pages_order/static/memberCenter/descript1.png differ
diff --git a/pages_order/static/memberCenter/descript2.png b/pages_order/static/memberCenter/descript2.png
new file mode 100644
index 0000000..c6e56fa
Binary files /dev/null and b/pages_order/static/memberCenter/descript2.png differ
diff --git a/pages_order/static/memberCenter/equity.png b/pages_order/static/memberCenter/equity.png
new file mode 100644
index 0000000..3cff831
Binary files /dev/null and b/pages_order/static/memberCenter/equity.png differ
diff --git a/pages_order/static/productDetail/service.png b/pages_order/static/productDetail/service.png
new file mode 100644
index 0000000..0600ef9
Binary files /dev/null and b/pages_order/static/productDetail/service.png differ
diff --git a/pages_order/static/recruit/bg.png b/pages_order/static/recruit/bg.png
new file mode 100644
index 0000000..ba1bc69
Binary files /dev/null and b/pages_order/static/recruit/bg.png differ
diff --git a/static/image/center/1.png b/static/image/center/1.png
new file mode 100644
index 0000000..5a5d98d
Binary files /dev/null and b/static/image/center/1.png differ
diff --git a/static/image/center/11.svg b/static/image/center/11.svg
deleted file mode 100644
index 99950a8..0000000
--- a/static/image/center/11.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/static/image/center/13.png b/static/image/center/13.png
deleted file mode 100644
index 86f6736..0000000
Binary files a/static/image/center/13.png and /dev/null differ
diff --git a/static/image/center/14.png b/static/image/center/14.png
deleted file mode 100644
index 4cdec2f..0000000
Binary files a/static/image/center/14.png and /dev/null differ
diff --git a/static/image/center/15.png b/static/image/center/15.png
deleted file mode 100644
index 892d354..0000000
Binary files a/static/image/center/15.png and /dev/null differ
diff --git a/static/image/center/16.png b/static/image/center/16.png
deleted file mode 100644
index 5989763..0000000
Binary files a/static/image/center/16.png and /dev/null differ
diff --git a/static/image/center/17.png b/static/image/center/17.png
deleted file mode 100644
index 8ae1997..0000000
Binary files a/static/image/center/17.png and /dev/null differ
diff --git a/static/image/center/2.png b/static/image/center/2.png
new file mode 100644
index 0000000..87cb9bf
Binary files /dev/null and b/static/image/center/2.png differ
diff --git a/static/image/center/3.png b/static/image/center/3.png
index 8b521ac..5dc9f6b 100644
Binary files a/static/image/center/3.png and b/static/image/center/3.png differ
diff --git a/static/image/center/4.png b/static/image/center/4.png
new file mode 100644
index 0000000..12a3368
Binary files /dev/null and b/static/image/center/4.png differ
diff --git a/static/image/center/5.png b/static/image/center/5.png
new file mode 100644
index 0000000..faabfa7
Binary files /dev/null and b/static/image/center/5.png differ
diff --git a/static/image/center/6.png b/static/image/center/6.png
new file mode 100644
index 0000000..2ac854d
Binary files /dev/null and b/static/image/center/6.png differ
diff --git a/static/image/center/7.png b/static/image/center/7.png
new file mode 100644
index 0000000..64b8b01
Binary files /dev/null and b/static/image/center/7.png differ
diff --git a/static/image/center/8.png b/static/image/center/8.png
new file mode 100644
index 0000000..2d65985
Binary files /dev/null and b/static/image/center/8.png differ
diff --git a/static/image/center/ad-tag.png b/static/image/center/ad-tag.png
new file mode 100644
index 0000000..2b0a180
Binary files /dev/null and b/static/image/center/ad-tag.png differ
diff --git a/static/image/center/ad.png b/static/image/center/ad.png
new file mode 100644
index 0000000..5436279
Binary files /dev/null and b/static/image/center/ad.png differ
diff --git a/static/image/center/balance.png b/static/image/center/balance.png
new file mode 100644
index 0000000..77ccad7
Binary files /dev/null and b/static/image/center/balance.png differ
diff --git a/static/image/center/brokerage.png b/static/image/center/brokerage.png
new file mode 100644
index 0000000..382921d
Binary files /dev/null and b/static/image/center/brokerage.png differ
diff --git a/static/image/center/c1.png b/static/image/center/c1.png
deleted file mode 100644
index 854d9c5..0000000
Binary files a/static/image/center/c1.png and /dev/null differ
diff --git a/static/image/center/c2.png b/static/image/center/c2.png
deleted file mode 100644
index 8757f15..0000000
Binary files a/static/image/center/c2.png and /dev/null differ
diff --git a/static/image/center/c3.png b/static/image/center/c3.png
deleted file mode 100644
index ec0e71a..0000000
Binary files a/static/image/center/c3.png and /dev/null differ
diff --git a/static/image/center/close.png b/static/image/center/close.png
new file mode 100644
index 0000000..3dc1825
Binary files /dev/null and b/static/image/center/close.png differ
diff --git a/static/image/center/diamond-min.png b/static/image/center/diamond-min.png
new file mode 100644
index 0000000..f7c3ebf
Binary files /dev/null and b/static/image/center/diamond-min.png differ
diff --git a/static/image/center/edit-icon.png b/static/image/center/edit-icon.png
new file mode 100644
index 0000000..e857abf
Binary files /dev/null and b/static/image/center/edit-icon.png differ
diff --git a/static/image/center/gold-min.png b/static/image/center/gold-min.png
new file mode 100644
index 0000000..43b236a
Binary files /dev/null and b/static/image/center/gold-min.png differ
diff --git a/static/image/center/head-img.png b/static/image/center/head-img.png
new file mode 100644
index 0000000..fc0ad41
Binary files /dev/null and b/static/image/center/head-img.png differ
diff --git a/static/image/center/icon1.png b/static/image/center/icon1.png
deleted file mode 100644
index 4d52c10..0000000
Binary files a/static/image/center/icon1.png and /dev/null differ
diff --git a/static/image/center/sliver-min.png b/static/image/center/sliver-min.png
new file mode 100644
index 0000000..d8bacb6
Binary files /dev/null and b/static/image/center/sliver-min.png differ
diff --git a/static/image/home/exclusive.png b/static/image/home/exclusive.png
new file mode 100644
index 0000000..d1b15cb
Binary files /dev/null and b/static/image/home/exclusive.png differ
diff --git a/static/image/home/necklace.png b/static/image/home/necklace.png
new file mode 100644
index 0000000..5e44b20
Binary files /dev/null and b/static/image/home/necklace.png differ
diff --git a/static/image/home/red-packet.png b/static/image/home/red-packet.png
new file mode 100644
index 0000000..fff8f24
Binary files /dev/null and b/static/image/home/red-packet.png differ
diff --git a/static/image/home/view-more.png b/static/image/home/view-more.png
new file mode 100644
index 0000000..3fb02c8
Binary files /dev/null and b/static/image/home/view-more.png differ
diff --git a/static/image/tabbar/cart-a.png b/static/image/tabbar/cart-a.png
deleted file mode 100644
index 0ae87df..0000000
Binary files a/static/image/tabbar/cart-a.png and /dev/null differ
diff --git a/static/image/tabbar/cart.png b/static/image/tabbar/cart.png
deleted file mode 100644
index ae2cf30..0000000
Binary files a/static/image/tabbar/cart.png and /dev/null differ
diff --git a/static/image/tabbar/center-a.png b/static/image/tabbar/center-a.png
deleted file mode 100644
index 30d2017..0000000
Binary files a/static/image/tabbar/center-a.png and /dev/null differ
diff --git a/static/image/tabbar/center.png b/static/image/tabbar/center.png
deleted file mode 100644
index f42631a..0000000
Binary files a/static/image/tabbar/center.png and /dev/null differ
diff --git a/static/image/tabbar/home-a.png b/static/image/tabbar/home-a.png
deleted file mode 100644
index ef08e3b..0000000
Binary files a/static/image/tabbar/home-a.png and /dev/null differ
diff --git a/static/image/tabbar/home-active.png b/static/image/tabbar/home-active.png
new file mode 100644
index 0000000..786e7c4
Binary files /dev/null and b/static/image/tabbar/home-active.png differ
diff --git a/static/image/tabbar/home.png b/static/image/tabbar/home.png
index ac5f02b..1d470bf 100644
Binary files a/static/image/tabbar/home.png and b/static/image/tabbar/home.png differ
diff --git a/static/image/tabbar/member-a.png b/static/image/tabbar/member-a.png
deleted file mode 100644
index 594578f..0000000
Binary files a/static/image/tabbar/member-a.png and /dev/null differ
diff --git a/static/image/tabbar/member.png b/static/image/tabbar/member.png
deleted file mode 100644
index 8873b5a..0000000
Binary files a/static/image/tabbar/member.png and /dev/null differ
diff --git a/static/image/tabbar/order-active.png b/static/image/tabbar/order-active.png
new file mode 100644
index 0000000..792c804
Binary files /dev/null and b/static/image/tabbar/order-active.png differ
diff --git a/static/image/tabbar/order.png b/static/image/tabbar/order.png
new file mode 100644
index 0000000..a61a1e5
Binary files /dev/null and b/static/image/tabbar/order.png differ
diff --git a/static/image/tabbar/product-list-active.png b/static/image/tabbar/product-list-active.png
new file mode 100644
index 0000000..41f5dbd
Binary files /dev/null and b/static/image/tabbar/product-list-active.png differ
diff --git a/static/image/tabbar/product-list.png b/static/image/tabbar/product-list.png
new file mode 100644
index 0000000..a77faba
Binary files /dev/null and b/static/image/tabbar/product-list.png differ
diff --git a/static/image/tabbar/user-center-active.png b/static/image/tabbar/user-center-active.png
new file mode 100644
index 0000000..e358aba
Binary files /dev/null and b/static/image/tabbar/user-center-active.png differ
diff --git a/static/image/tabbar/user-center.png b/static/image/tabbar/user-center.png
new file mode 100644
index 0000000..aab92d8
Binary files /dev/null and b/static/image/tabbar/user-center.png differ
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3(2022-01-21)
+- 优化 组件示例
+## 1.0.2(2021-11-22)
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1(2021-11-22)
+- 修复 vue3中scss语法兼容问题
+## 1.0.0(2021-11-18)
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+ "id": "uni-scss",
+ "displayName": "uni-scss 辅助样式",
+ "version": "1.0.3",
+ "description": "uni-sass是uni-ui提供的一套全局样式 ,通过一些简单的类名和sass变量,实现简单的页面布局操作,比如颜色、边距、圆角等。",
+ "keywords": [
+ "uni-scss",
+ "uni-ui",
+ "辅助样式"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ },
+ "dcloudext": {
+ "category": [
+ "JS SDK",
+ "通用 SDK"
+ ],
+ "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": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "u"
+ },
+ "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"
+ },
+ "快应用": {
+ "华为": "n",
+ "联盟": "n"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ,通过一些简单的类名和`sass`变量,实现简单的页面布局操作,比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+ border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ,需要用户使用变量实现 ,如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// @if $k == size or $k == weight{
+// font-#{$k}:#{$c}
+// }@else{
+// #{$k}:#{$c}
+// }
+// }
+$uni-ui-color:(
+ // 主色
+ primary: $uni-primary,
+ primary-disable: $uni-primary-disable,
+ primary-light: $uni-primary-light,
+ // 辅助色
+ success: $uni-success,
+ success-disable: $uni-success-disable,
+ success-light: $uni-success-light,
+ warning: $uni-warning,
+ warning-disable: $uni-warning-disable,
+ warning-light: $uni-warning-light,
+ error: $uni-error,
+ error-disable: $uni-error-disable,
+ error-light: $uni-error-light,
+ info: $uni-info,
+ info-disable: $uni-info-disable,
+ info-light: $uni-info-light,
+ // 中性色
+ main-color: $uni-main-color,
+ base-color: $uni-base-color,
+ secondary-color: $uni-secondary-color,
+ extra-color: $uni-extra-color,
+ // 背景色
+ bg-color: $uni-bg-color,
+ // 边框颜色
+ border-1: $uni-border-1,
+ border-2: $uni-border-2,
+ border-3: $uni-border-3,
+ border-4: $uni-border-4,
+ // 黑色
+ black:$uni-black,
+ // 白色
+ white:$uni-white,
+ // 透明
+ transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+ .uni-#{"" + $key} {
+ color: $child;
+ }
+ .uni-#{"" + $key}-bg {
+ background-color: $child;
+ }
+}
+.uni-shadow-sm {
+ box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+ box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+ box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+ background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+ $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+ // Key exists within the $uni-radius variable
+ @if (map-has-key($uni-radius, $r) and $d){
+ @if $d == t {
+ border-top-left-radius:$radius-value;
+ border-top-right-radius:$radius-value;
+ }@else if $d == r {
+ border-top-right-radius:$radius-value;
+ border-bottom-right-radius:$radius-value;
+ }@else if $d == b {
+ border-bottom-left-radius:$radius-value;
+ border-bottom-right-radius:$radius-value;
+ }@else if $d == l {
+ border-top-left-radius:$radius-value;
+ border-bottom-left-radius:$radius-value;
+ }@else if $d == tl {
+ border-top-left-radius:$radius-value;
+ }@else if $d == tr {
+ border-top-right-radius:$radius-value;
+ }@else if $d == br {
+ border-bottom-right-radius:$radius-value;
+ }@else if $d == bl {
+ border-bottom-left-radius:$radius-value;
+ }
+ }@else{
+ border-radius:$radius-value;
+ }
+}
+
+@each $key, $child in $uni-radius {
+ @if($key){
+ .uni-radius-#{"" + $key} {
+ @include radius($key)
+ }
+ }@else{
+ .uni-radius {
+ @include radius($key)
+ }
+ }
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+ @each $key, $child in $uni-radius {
+ @if($key){
+ .uni-radius-#{"" + $direction}-#{"" + $key} {
+ @include radius($key,$direction,false)
+ }
+ }@else{
+ .uni-radius-#{$direction} {
+ @include radius($key,$direction,false)
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+ @if $n {
+ #{$space}-#{$direction}: #{$size*$uni-space-root}px
+ } @else {
+ #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+ }
+}
+@mixin get-styles($direction,$i,$space,$n){
+ @if $direction == t {
+ @include fn($space, top,$i,$n);
+ }
+ @if $direction == r {
+ @include fn($space, right,$i,$n);
+ }
+ @if $direction == b {
+ @include fn($space, bottom,$i,$n);
+ }
+ @if $direction == l {
+ @include fn($space, left,$i,$n);
+ }
+ @if $direction == x {
+ @include fn($space, left,$i,$n);
+ @include fn($space, right,$i,$n);
+ }
+ @if $direction == y {
+ @include fn($space, top,$i,$n);
+ @include fn($space, bottom,$i,$n);
+ }
+ @if $direction == a {
+ @if $n {
+ #{$space}:#{$i*$uni-space-root}px;
+ } @else {
+ #{$space}:#{-$i*$uni-space-root}px;
+ }
+ }
+}
+
+@each $orientation in m,p {
+ $space: margin;
+ @if $orientation == m {
+ $space: margin;
+ } @else {
+ $space: padding;
+ }
+ @for $i from 0 through 16 {
+ @each $direction in t, r, b, l, x, y, a {
+ .uni-#{$orientation}#{$direction}-#{$i} {
+ @include get-styles($direction,$i,$space,true);
+ }
+ .uni-#{$orientation}#{$direction}-n#{$i} {
+ @include get-styles($direction,$i,$space,false);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+ color: #fff;
+ background-color: $color;
+ border-color: mix($-color-black, $color, 8%);
+ &:not([hover-class]):active {
+ background: mix($-color-black, $color, 10%);
+ border-color: mix($-color-black, $color, 20%);
+ color: $-color-white;
+ outline: none;
+ }
+}
+@mixin is-color($color) {
+ @include base-style($color);
+ &[loading] {
+ @include base-style($color);
+ &::before {
+ margin-right:5px;
+ }
+ }
+ &[disabled] {
+ &,
+ &[loading],
+ &:not([hover-class]):active {
+ color: $-color-white;
+ border-color: mix(darken($color,10%), $-color-white);
+ background-color: mix($color, $-color-white);
+ }
+ }
+
+}
+@mixin base-plain-style($color) {
+ color:$color;
+ background-color: mix($-color-white, $color, 90%);
+ border-color: mix($-color-white, $color, 70%);
+ &:not([hover-class]):active {
+ background: mix($-color-white, $color, 80%);
+ color: $color;
+ outline: none;
+ border-color: mix($-color-white, $color, 50%);
+ }
+}
+@mixin is-plain($color){
+ &[plain] {
+ @include base-plain-style($color);
+ &[loading] {
+ @include base-plain-style($color);
+ &::before {
+ margin-right:5px;
+ }
+ }
+ &[disabled] {
+ &,
+ &:active {
+ color: mix($-color-white, $color, 40%);
+ background-color: mix($-color-white, $color, 90%);
+ border-color: mix($-color-white, $color, 80%);
+ }
+ }
+ }
+}
+
+
+.uni-btn {
+ margin: 5px;
+ color: #393939;
+ border:1px solid #ccc;
+ font-size: 16px;
+ font-weight: 200;
+ background-color: #F9F9F9;
+ // TODO 暂时处理边框隐藏一边的问题
+ overflow: visible;
+ &::after{
+ border: none;
+ }
+
+ &:not([type]),&[type=default] {
+ color: #999;
+ &[loading] {
+ background: none;
+ &::before {
+ margin-right:5px;
+ }
+ }
+
+
+
+ &[disabled]{
+ color: mix($-color-white, #999, 60%);
+ &,
+ &[loading],
+ &:active {
+ color: mix($-color-white, #999, 60%);
+ background-color: mix($-color-white,$-color-black , 98%);
+ border-color: mix($-color-white, #999, 85%);
+ }
+ }
+
+ &[plain] {
+ color: #999;
+ background: none;
+ border-color: $uni-border-1;
+ &:not([hover-class]):active {
+ background: none;
+ color: mix($-color-white, $-color-black, 80%);
+ border-color: mix($-color-white, $-color-black, 90%);
+ outline: none;
+ }
+ &[disabled]{
+ &,
+ &[loading],
+ &:active {
+ background: none;
+ color: mix($-color-white, #999, 60%);
+ border-color: mix($-color-white, #999, 85%);
+ }
+ }
+ }
+ }
+
+ &:not([hover-class]):active {
+ color: mix($-color-white, $-color-black, 50%);
+ }
+
+ &[size=mini] {
+ font-size: 16px;
+ font-weight: 200;
+ border-radius: 8px;
+ }
+
+
+
+ &.uni-btn-small {
+ font-size: 14px;
+ }
+ &.uni-btn-mini {
+ font-size: 12px;
+ }
+
+ &.uni-btn-radius {
+ border-radius: 999px;
+ }
+ &[type=primary] {
+ @include is-color($uni-primary);
+ @include is-plain($uni-primary)
+ }
+ &[type=success] {
+ @include is-color($uni-success);
+ @include is-plain($uni-success)
+ }
+ &[type=error] {
+ @include is-color($uni-error);
+ @include is-plain($uni-error)
+ }
+ &[type=warning] {
+ @include is-color($uni-warning);
+ @include is-plain($uni-warning)
+ }
+ &[type=info] {
+ @include is-color($uni-info);
+ @include is-plain($uni-info)
+ }
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+ @if $k == size or $k == weight{
+ font-#{$k}:#{$c}
+ }@else{
+ #{$k}:#{$c}
+ }
+}
+
+@each $key, $child in $uni-headings {
+ /* #ifndef APP-NVUE */
+ .uni-#{$key} {
+ @each $k, $c in $child {
+ @include get-styles($k,$c)
+ }
+ }
+ /* #endif */
+ /* #ifdef APP-NVUE */
+ .container .uni-#{$key} {
+ @each $k, $c in $child {
+ @include get-styles($k,$c)
+ }
+ }
+ /* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+ (
+ 0: 0,
+ // TODO 当前版本暂时不支持 sm 属性
+ // 'sm': math.div($uni-radius-root, 2),
+ null: $uni-radius-root,
+ 'lg': $uni-radius-root * 2,
+ 'xl': $uni-radius-root * 6,
+ 'pill': 9999px,
+ 'circle': 50%
+ ),
+ $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+ (
+ 'h1': (
+ size: 32px,
+ weight: 300,
+ line-height: 50px,
+ // letter-spacing:-0.01562em
+ ),
+ 'h2': (
+ size: 28px,
+ weight: 300,
+ line-height: 40px,
+ // letter-spacing: -0.00833em
+ ),
+ 'h3': (
+ size: 24px,
+ weight: 400,
+ line-height: 32px,
+ // letter-spacing: normal
+ ),
+ 'h4': (
+ size: 20px,
+ weight: 400,
+ line-height: 30px,
+ // letter-spacing: 0.00735em
+ ),
+ 'h5': (
+ size: 16px,
+ weight: 400,
+ line-height: 24px,
+ // letter-spacing: normal
+ ),
+ 'h6': (
+ size: 14px,
+ weight: 500,
+ line-height: 18px,
+ // letter-spacing: 0.0125em
+ ),
+ 'subtitle': (
+ size: 12px,
+ weight: 400,
+ line-height: 20px,
+ // letter-spacing: 0.00937em
+ ),
+ 'body': (
+ font-size: 14px,
+ font-weight: 400,
+ line-height: 22px,
+ // letter-spacing: 0.03125em
+ ),
+ 'caption': (
+ 'size': 12px,
+ 'weight': 400,
+ 'line-height': 20px,
+ // 'letter-spacing': 0.03333em,
+ // 'text-transform': false
+ )
+ ),
+ $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
+$uni-main-color: #3a3a3a !default; // 主要文字
+$uni-base-color: #6a6a6a !default; // 常规文字
+$uni-secondary-color: #909399 !default; // 次要文字
+$uni-extra-color: #c7c7c7 !default; // 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+ $result: $parent-map;
+ @each $key, $child in $child-map {
+ $parent-has-key: map-has-key($result, $key);
+ $parent-value: map-get($result, $key);
+ $parent-type: type-of($parent-value);
+ $child-type: type-of($child);
+ $parent-is-map: $parent-type == map;
+ $child-is-map: $child-type == map;
+
+ @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+ $result: map-merge($result, ( $key: $child ));
+ }@else {
+ $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+ }
+ }
+ @return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
+$uni-main-color: #3a3a3a; // 主要文字
+$uni-base-color: #6a6a6a; // 常规文字
+$uni-secondary-color: #909399; // 次要文字
+$uni-extra-color: #c7c7c7; // 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-section/changelog.md b/uni_modules/uni-section/changelog.md
new file mode 100644
index 0000000..738f2b3
--- /dev/null
+++ b/uni_modules/uni-section/changelog.md
@@ -0,0 +1,2 @@
+## 0.0.1(2022-07-22)
+- 初始化
diff --git a/uni_modules/uni-section/components/uni-section/uni-section.vue b/uni_modules/uni-section/components/uni-section/uni-section.vue
new file mode 100644
index 0000000..9a52e0b
--- /dev/null
+++ b/uni_modules/uni-section/components/uni-section/uni-section.vue
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-section/package.json b/uni_modules/uni-section/package.json
new file mode 100644
index 0000000..0a31fb5
--- /dev/null
+++ b/uni_modules/uni-section/package.json
@@ -0,0 +1,87 @@
+{
+ "id": "uni-section",
+ "displayName": "uni-section 标题栏",
+ "version": "0.0.1",
+ "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"
+ ],
+ "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/uni_modules/uni-section/readme.md b/uni_modules/uni-section/readme.md
new file mode 100644
index 0000000..d47faab
--- /dev/null
+++ b/uni_modules/uni-section/readme.md
@@ -0,0 +1,8 @@
+## Section 标题栏
+> **组件名:uni-section**
+> 代码块: `uSection`
+
+uni-section 组件主要用于文章、列表详情等标题展示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
diff --git a/uni_modules/uv-icon/components/uv-icon/props.js b/uni_modules/uv-icon/components/uv-icon/props.js
index 4653f88..7668cf9 100644
--- a/uni_modules/uv-icon/components/uv-icon/props.js
+++ b/uni_modules/uv-icon/components/uv-icon/props.js
@@ -13,7 +13,7 @@ export default {
// 字体大小,单位px
size: {
type: [String, Number],
- default: '30rpx'
+ default: '16px'
},
// 是否显示粗体
bold: {
diff --git a/uni_modules/uv-number-box/components/uv-number-box/props.js b/uni_modules/uv-number-box/components/uv-number-box/props.js
index f0e1cba..64b633b 100644
--- a/uni_modules/uv-number-box/components/uv-number-box/props.js
+++ b/uni_modules/uv-number-box/components/uv-number-box/props.js
@@ -51,7 +51,7 @@ export default {
// 输入框宽度,单位为px
inputWidth: {
type: [String, Number],
- default: 160
+ default: 35
},
// 是否显示减少按钮
showMinus: {
@@ -81,7 +81,7 @@ export default {
// 按钮大小,宽高等于此值,单位px,输入框高度和此值保持一致
buttonSize: {
type: [String, Number],
- default: 60
+ default: 30
},
// 输入框和按钮的背景颜色
bgColor: {
diff --git a/uni_modules/uv-number-box/components/uv-number-box/uv-number-box.vue b/uni_modules/uv-number-box/components/uv-number-box/uv-number-box.vue
index 36c1d9e..6937e89 100644
--- a/uni_modules/uv-number-box/components/uv-number-box/uv-number-box.vue
+++ b/uni_modules/uv-number-box/components/uv-number-box/uv-number-box.vue
@@ -336,12 +336,12 @@
$uv-numberBox-hover-bgColor: #E6E6E6 !default;
$uv-numberBox-disabled-color: #c8c9cc !default;
$uv-numberBox-disabled-bgColor: #f7f8fa !default;
- $uv-numberBox-plus-radius: 8px !default;
- $uv-numberBox-minus-radius: 8px !default;
+ $uv-numberBox-plus-radius: 4px !default;
+ $uv-numberBox-minus-radius: 4px !default;
$uv-numberBox-input-text-align: center !default;
$uv-numberBox-input-font-size: 15px !default;
$uv-numberBox-input-padding: 0 !default;
- $uv-numberBox-input-margin: 0 4px !default;
+ $uv-numberBox-input-margin: 0 2px !default;
$uv-numberBox-input-disabled-color: #c8c9cc !default;
$uv-numberBox-input-disabled-bgColor: #f2f3f5 !default;
.uv-number-box {
diff --git a/uni_modules/uv-ui-tools/libs/css/color.scss b/uni_modules/uv-ui-tools/libs/css/color.scss
index 02ed321..ce65743 100644
--- a/uni_modules/uv-ui-tools/libs/css/color.scss
+++ b/uni_modules/uv-ui-tools/libs/css/color.scss
@@ -6,8 +6,7 @@ $uv-border-color: #dadbde !default;
$uv-bg-color: #f3f4f6 !default;
$uv-disabled-color: #c8c9cc !default;
-$uv-primary: #A3D250 !default;
-// $uv-primary: #3c9cff !default;
+$uv-primary: #3c9cff !default;
$uv-primary-dark: #398ade !default;
$uv-primary-disabled: #9acafc !default;
$uv-primary-light: #ecf5ff !default;