diff --git a/App.vue b/App.vue
index 91e6b62..d18fe15 100644
--- a/App.vue
+++ b/App.vue
@@ -217,7 +217,9 @@
this.globalData.margin_ico = res.data.margin_ico
this.globalData.community_auth = res.data.community_auth
this.$Cache.set('WECHAT_APPID', res.data.wechat_config_appid)
- this.$store.commit("VIEW_COLOR", res.data.global_theme.theme)
+ // this.$store.commit("VIEW_COLOR", res.data.global_theme.theme)
+ let str = "--view-theme: #116636;--view-assist:#FE960F;--view-priceColor:#FE960F;--view-bgColor:rgba(254, 150, 15,.1);--view-minorColor:rgba(66, 202, 77,.1);--view-bntColor11:#FDBA00;--view-bntColor12:#FFAA00;--view-bntColor21:#116636;--view-bntColor22:#116636;"
+ this.$store.commit("VIEW_COLOR", str)
this.$store.commit("KEY_COLOR",'_' + res.data.global_theme.type)
try {
uni.setStorageSync('SUBSCRIBE_MESSAGE', res.data.tempid);
@@ -247,6 +249,7 @@
}
diff --git a/pages/huitong/huitongbao/zhenxuan.vue b/pages/huitong/huitongbao/zhenxuan.vue
new file mode 100644
index 0000000..cac7420
--- /dev/null
+++ b/pages/huitong/huitongbao/zhenxuan.vue
@@ -0,0 +1,877 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{item.store_name}}
+
+
+
+
+ ￥{{item.price}}
+
+
+ ￥{{item.svip_price}}
+
+
+
+
+
+
+ {{item.merchant.type_name}}
+ 自营
+ {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}
+ 领券
+ 包邮
+
+
+ {{item.rate}}评分 {{item.reply_count}}条评论
+
+
+ {{item.merchant.mer_name}}
+
+
+ 进店
+
+
+
+
+
+
+
+
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+ 暂无商品，快去搜索其他商品吧
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/component/blankPage.vue b/pages/index/component/blankPage.vue
index cf610b7..82af9e3 100644
--- a/pages/index/component/blankPage.vue
+++ b/pages/index/component/blankPage.vue
@@ -1,7 +1,7 @@
-
+
@@ -166,11 +191,27 @@
/* #ifdef H5 */
padding-bottom: 20rpx;
/* #endif */
- background-color: #fff;
+ // background-color: #fff;
+ background-size: cover;
+ background-image: url(http://b2.njrenzhou.com/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
+ // margin-bottom: 24rpx;
+ .indexTitle{
+ margin:0 24rpx;
+ font-family: Alibaba PuHuiTi;
+ font-weight: bold;
+ font-size: 36rpx;
+ color: #222222;
+ }
+ .xiaoxi{
+ width:44rpx;
+ height:44rpx;
+ }
.serch-wrapper {
height: 100%;
align-items: center;
- padding: 0 50rpx 0 53rpx;
+ // padding: 0 50rpx 0 53rpx;
+ padding: 0 24rpx;
+ position: relative;
image {
width: 118rpx;
height: 42rpx;
@@ -186,7 +227,7 @@
flex: 1;
width: 500rpx;
/* #endif */
- height: 58rpx;
+ height: 80rpx;
padding: 0 0 0 30rpx;
background: rgba(247, 247, 247, 1);
border: 1px solid rgba(241, 241, 241, 1);
@@ -199,10 +240,27 @@
}
.uninput {
/* #ifdef MP */
- min-width: 450rpx;
- max-width: 480rpx;
+ // min-width: 450rpx;
+ // max-width: 480rpx;
/* #endif*/
+ width: 100%;
}
+
+ }
+ .searchBtn{
+ position: absolute;
+ z-index:2;
+ width: 120rpx;
+ height: 66rpx;
+ background: linear-gradient(0deg, #89B929, #116636);
+ border-radius: 33px;
+ font-family: Alibaba PuHuiTi;
+ font-weight: 400;
+ font-size: 28rpx;
+ line-height: 66rpx;
+ text-align: center;
+ color: #FFFFFF;
+ right: 31rpx;
}
}
/* #endif */
diff --git a/pages/index/component/menus.vue b/pages/index/component/menus.vue
index 3cbbc65..a29c66c 100644
--- a/pages/index/component/menus.vue
+++ b/pages/index/component/menus.vue
@@ -83,8 +83,8 @@
display: inline-block;
margin-bottom: 20rpx;
.pictrue,/deep/.pictrue image,/deep/.pictrue .easy-loadimage,/deep/.pictrue uni-image {
- width: 82rpx;
- height: 82rpx;
+ width: 90rpx;
+ height: 90rpx;
margin: 0 auto;
}
.menu-txt {
diff --git a/pages/index/component/swiperBg.vue b/pages/index/component/swiperBg.vue
index e4cc317..36e68e0 100644
--- a/pages/index/component/swiperBg.vue
+++ b/pages/index/component/swiperBg.vue
@@ -1,5 +1,6 @@
-
+
+
@@ -135,7 +136,14 @@
.swiperBg {
position: relative;
background: #fff;
+ background-image: url(http://b2.njrenzhou.com/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
+
z-index: 1;
+ background-size: cover;
+ background-position: bottom;
+ margin-top: -1px;
+ padding-bottom: 30rpx;
+ padding-top: 10rpx;
.colorBg {
position: absolute;
left: 0;
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 2a5dc56..ef6e870 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -106,7 +106,8 @@
- ￥{{selectCountPrice}}
+
+ 合计：￥{{selectCountPrice}}
@@ -952,7 +953,7 @@
margin: 0 0 0 10rpx;
font-size: 28rpx;
color: #282828;
- font-weight: bold;
+ // font-weight: bold;
}
.icon-xiangyou {
margin-top: 6rpx;
@@ -1032,6 +1033,7 @@
font-size: 32rpx;
color: #282828;
margin-top: 28rpx;
+ font-weight: bold;
}
.shoppingCart .list .item .picTxt .carnum {
height: 47rpx;
@@ -1050,6 +1052,7 @@
}
.shoppingCart .list .item .picTxt .carnum .reduce {
border-right: 0;
+ border-radius: 3rpx 0 0 3rpx;
}
.shoppingCart .list .item .picTxt .carnum .reduce.on,
.shoppingCart .list .item .picTxt .carnum .plus.on {
@@ -1058,6 +1061,7 @@
}
.shoppingCart .list .item .picTxt .carnum .plus {
border-left: 0;
+ border-radius: 0 3rpx 3rpx 0;
}
.shoppingCart .list .item .picTxt .carnum .num {
color: #282828;
@@ -1161,13 +1165,13 @@
.shoppingCart .footer .placeOrder {
color: #fff;
font-size: 30rpx;
- width: 226rpx;
- height: 70rpx;
+ width: 186rpx;
+ height: 77rpx;
border-radius: 50rpx;
text-align: center;
- line-height: 70rpx;
+ line-height: 77rpx;
margin-left: 22rpx;
- background-color: var(--view-theme);
+ background: linear-gradient(-90deg, #89B929, #116636);
}
.shoppingCart .footer .button .bnt {
font-size: 28rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index aa9346c..36a9b4e 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,5 +1,7 @@
-
+
+
+
-
+
+
+
+ {{assets.integral_buy}}
+ 积分
+
+
+ {{assets.diamond}}
+ 钻石
+
+
+ {{assets.stock}}
+ 本票
+
+
+ {{assets.integral_withdraw}}
+ 预存金额
+
+
+
@@ -89,11 +111,12 @@
-
+
+
@@ -110,7 +133,8 @@
-
+
+
{{ item.num }}
{{item.title}}
@@ -119,7 +143,7 @@
-
+
@@ -185,22 +215,35 @@
-
+
+
+
+
+
+
+
+ 生成海报
+
+
+
-
+
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 29319b4..ef5558a 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -4,8 +4,13 @@
- {{addressInfo.real_name}}
- {{addressInfo.phone}}
+
+
+
+ {{addressInfo.real_name}}
+ {{addressInfo.phone}}
+
+
设置收货地址
-
+
-
+
@@ -94,15 +99,15 @@
￥{{goods.productAttr.price}}
- X{{goods.cart_num}}
+
-
+
@@ -141,7 +146,7 @@
免运费
-
店铺优惠券
@@ -154,7 +159,7 @@
暂无优惠券
-
+ -->
开具发票
@@ -1773,15 +1778,18 @@
box-sizing: border-box;
}
.order-submission .address .addressCon {
- width: 610rpx;
+ width:100%;
font-size: 26rpx;
- color: #666;
+ color: #999;
}
.order-submission .address .addressCon .name {
- font-size: 30rpx;
- color: #282828;
+ font-size: 32rpx;
+ color: #222;
font-weight: bold;
- margin-bottom: 10rpx;
+ margin-bottom: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
}
.order-submission .address .addressCon .name .phone {
margin-left: 50rpx;
@@ -1802,6 +1810,7 @@
}
.order-submission .allAddress {
width: 100%;
+ margin-top:20rpx;
}
.order-submission .allAddress .nav {
width: 710rpx;
@@ -1859,7 +1868,7 @@
border-radius: 6rpx 40rpx 0 0;
}
.order-submission .allAddress .address {
- height: 150rpx;
+ // height: 150rpx;
margin: 0 auto;
}
.order-submission .allAddress .line {
@@ -1934,6 +1943,7 @@
image {
width: 100%;
height: 100%;
+ border-radius: 1px;
img {
-webkit-touch-callout: none;
-webkit-user-select: none;
@@ -2019,32 +2029,32 @@
margin-top: 35rpx;
}
.order-submission .wrapper .item .list .payItem {
- border: 1px solid #eee;
+ // border: 1px solid #eee;
border-radius: 6rpx;
height: 86rpx;
width: 100%;
box-sizing: border-box;
margin-top: 20rpx;
- font-size: 28rpx;
+ // font-size: 28rpx;
color: #282828;
}
.order-submission .wrapper .item .list .payItem.on {
- border-color: var(--view-theme);
- color: var(--view-theme);
+ // border-color: var(--view-theme);
+ // color: var(--view-theme);
}
.order-submission .wrapper .item .list .payItem .name {
width: 50%;
text-align: center;
- border-right: 1px solid #eee;
+ // border-right: 1px solid #eee;
justify-content: left;
- padding-left: 80rpx;
+ // padding-left: 80rpx;
}
.order-submission .wrapper .item .list .payItem .name .iconfont {
- width: 44rpx;
- height: 44rpx;
+ width: 50rpx;
+ height: 50rpx;
border-radius: 50%;
text-align: center;
- line-height: 44rpx;
+ line-height: 50rpx;
background-color: #fe960f;
color: #fff;
font-size: 30rpx;
@@ -2061,6 +2071,9 @@
text-align: center;
font-size: 26rpx;
color: #aaa;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
}
.order-submission .moneyList {
margin-top: 12rpx;
@@ -2072,7 +2085,7 @@
color: #282828;
}
.order-submission .moneyList .item~.item {
- margin-top: 20rpx;
+ margin-top: 42rpx;
}
.order-submission .moneyList .item .money {
color: #868686;
@@ -2113,17 +2126,17 @@
}
}
.pColor{
- color: var(--view-priceColor);
+ color: #E53623;
}
.order-submission .footer .settlement {
font-size: 30rpx;
color: #fff;
- width: 240rpx;
- height: 70rpx;
- background-color: var(--view-theme);
+ width: 230rpx;
+ height: 80rpx;
+ background: linear-gradient(-90deg, #89B929, #116636);
border-radius: 50rpx;
text-align: center;
- line-height: 70rpx;
+ line-height: 80rpx;
&.disabled {
background-color: #cccccc;
}
@@ -2163,12 +2176,13 @@
display: flex;
padding: 25rpx 30rpx;
border-top: 1px solid #F0F0F0;
+ align-items: center;
.img-box {
- width: 130rpx;
- height: 130rpx;
+ width: 180rpx;
+ height: 180rpx;
image {
- width: 130rpx;
- height: 130rpx;
+ width: 180rpx;
+ height: 180rpx;
border-radius: 16rpx;
}
}
@@ -2179,6 +2193,10 @@
font-size: 28rpx;
color: #282828;
overflow: hidden;
+ .name{
+ font-size: 34rpx;
+ color: #333333;
+ }
&.event_content {
.line1 {
width: 360rpx;
@@ -2209,13 +2227,15 @@
margin-top: 10rpx;
}
.label {
- margin-top: 10rpx;
- color: #868686;
- font-size: 20rpx;
+ margin-top: 23rpx;
+
+ font-size: 24rpx;
+ color: #C0C5CA;
}
.price {
- margin-top: 20rpx;
- color: var(--view-priceColor);
+ margin-top: 27rpx;
+ // color: var(--view-priceColor);
+ color: #E53623;
position: relative;
text {
margin-left: 10rpx;
@@ -2309,6 +2329,8 @@
.integral_checked {
margin-left: 10rpx;
display: inline;
+ position: relative;
+ top: -2rpx;
.iconfont{
font-size: 38rpx;
}
@@ -2339,7 +2361,7 @@
color: #282828;
.price {
margin-left: 10rpx;
- color: var(--view-priceColor);
+ color: #E53623;
font-size: 28rpx;
font-weight: bold;
text {
diff --git a/pages/users/user_integral1/benpiao.vue b/pages/users/user_integral1/benpiao.vue
new file mode 100644
index 0000000..01323e2
--- /dev/null
+++ b/pages/users/user_integral1/benpiao.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+ 分值明细
+
+
+
+ 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
+
+
+
+ {{item.type}}
+ {{item.create_time}}
+
+
+
+
+ {{getLable(item.status)}}
+
+ {{item.count}}
+ {{item.count}}
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 积分说明
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/users/user_integral1/fenhong.vue b/pages/users/user_integral1/fenhong.vue
new file mode 100644
index 0000000..406604e
--- /dev/null
+++ b/pages/users/user_integral1/fenhong.vue
@@ -0,0 +1,535 @@
+
+
+
+
+
+
+
+ 分值明细
+
+
+
+ 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
+
+
+
+ {{item.type}}
+ {{item.create_time}}
+
+
+
+
+ {{getLable(item.status)}}
+
+ {{item.count}}
+ {{item.count}}
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 积分说明
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/users/user_integral1/index.vue b/pages/users/user_integral1/index.vue
new file mode 100644
index 0000000..31eb380
--- /dev/null
+++ b/pages/users/user_integral1/index.vue
@@ -0,0 +1,542 @@
+
+
+
+
+
+
+
+ 分值明细
+
+
+
+ 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
+
+
+
+ {{item.type}}
+ {{item.create_time}}
+
+
+
+
+ {{getLable(item.status)}}
+
+ {{item.count}}
+ {{item.count}}
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 积分说明
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/css/base.css b/static/css/base.css
index a8c8b94..dbf8efa 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -163,7 +163,7 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked,
checkbox .wx-checkbox-input.wx-checkbox-input-checked{border:1px solid #e93323!important;background-color:#e93323!important;color:#fff!important;}
checkbox .uni-checkbox-input.uni-checkbox-input-checked::before{font-size: 35rpx}
.line1{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
-.line2{word-break:break-all;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;white-space:pre-wrap;}
+.line2{word-break:break-all;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;overflow:hidden;white-space:pre-wrap;}
.mask{position:fixed;top: 0;left:0;right:0;bottom:0;background-color:#000;opacity:.5;z-index:30}
@keyframes load {
from {
diff --git a/static/images/1-001.png b/static/images/1-001.png
deleted file mode 100644
index 3c9ac39..0000000
Binary files a/static/images/1-001.png and /dev/null differ
diff --git a/static/images/1-002.png b/static/images/1-002.png
deleted file mode 100644
index f05682b..0000000
Binary files a/static/images/1-002.png and /dev/null differ
diff --git a/static/images/2-001.png b/static/images/2-001.png
deleted file mode 100644
index 4a4ce02..0000000
Binary files a/static/images/2-001.png and /dev/null differ
diff --git a/static/images/2-002.png b/static/images/2-002.png
deleted file mode 100644
index 5069750..0000000
Binary files a/static/images/2-002.png and /dev/null differ
diff --git a/static/images/3-001.png b/static/images/3-001.png
deleted file mode 100644
index 8637fed..0000000
Binary files a/static/images/3-001.png and /dev/null differ
diff --git a/static/images/3-002.png b/static/images/3-002.png
deleted file mode 100644
index 5aa6e9c..0000000
Binary files a/static/images/3-002.png and /dev/null differ
diff --git a/static/images/4-001.png b/static/images/4-001.png
deleted file mode 100644
index 5fb279c..0000000
Binary files a/static/images/4-001.png and /dev/null differ
diff --git a/static/images/4-002.png b/static/images/4-002.png
deleted file mode 100644
index e79368c..0000000
Binary files a/static/images/4-002.png and /dev/null differ
diff --git a/static/images/5-001.png b/static/images/5-001.png
deleted file mode 100644
index 12dbfe7..0000000
Binary files a/static/images/5-001.png and /dev/null differ
diff --git a/static/images/5-002.png b/static/images/5-002.png
deleted file mode 100644
index ffd4e51..0000000
Binary files a/static/images/5-002.png and /dev/null differ
diff --git a/static/images/fenlei1.png b/static/images/fenlei1.png
new file mode 100644
index 0000000..6ae2705
Binary files /dev/null and b/static/images/fenlei1.png differ
diff --git a/static/images/fenlei2.png b/static/images/fenlei2.png
new file mode 100644
index 0000000..8a67d39
Binary files /dev/null and b/static/images/fenlei2.png differ
diff --git a/static/images/gwc1.png b/static/images/gwc1.png
new file mode 100644
index 0000000..93ed1ae
Binary files /dev/null and b/static/images/gwc1.png differ
diff --git a/static/images/gwc2.png b/static/images/gwc2.png
new file mode 100644
index 0000000..873e2d5
Binary files /dev/null and b/static/images/gwc2.png differ
diff --git a/static/images/headwear.png b/static/images/headwear.png
new file mode 100644
index 0000000..6808231
Binary files /dev/null and b/static/images/headwear.png differ
diff --git a/static/images/m1.png b/static/images/m1.png
new file mode 100644
index 0000000..ab87bfe
Binary files /dev/null and b/static/images/m1.png differ
diff --git a/static/images/m2.png b/static/images/m2.png
new file mode 100644
index 0000000..5ea937b
Binary files /dev/null and b/static/images/m2.png differ
diff --git a/static/images/m3.png b/static/images/m3.png
new file mode 100644
index 0000000..cbdf293
Binary files /dev/null and b/static/images/m3.png differ
diff --git a/static/images/m4.png b/static/images/m4.png
new file mode 100644
index 0000000..c9ac5c9
Binary files /dev/null and b/static/images/m4.png differ
diff --git a/static/images/m5.png b/static/images/m5.png
new file mode 100644
index 0000000..1d8e5ce
Binary files /dev/null and b/static/images/m5.png differ
diff --git a/static/images/p.png b/static/images/p.png
new file mode 100644
index 0000000..d651380
Binary files /dev/null and b/static/images/p.png differ
diff --git a/static/images/setting.png b/static/images/setting.png
new file mode 100644
index 0000000..4934ef3
Binary files /dev/null and b/static/images/setting.png differ
diff --git a/static/images/shouye1.png b/static/images/shouye1.png
new file mode 100644
index 0000000..b8525e7
Binary files /dev/null and b/static/images/shouye1.png differ
diff --git a/static/images/shouye2.png b/static/images/shouye2.png
new file mode 100644
index 0000000..b13e2f7
Binary files /dev/null and b/static/images/shouye2.png differ
diff --git a/static/images/v1.png b/static/images/v1.png
new file mode 100644
index 0000000..d6f0b17
Binary files /dev/null and b/static/images/v1.png differ
diff --git a/static/images/v2.png b/static/images/v2.png
new file mode 100644
index 0000000..ea98346
Binary files /dev/null and b/static/images/v2.png differ
diff --git a/static/images/wode1.png b/static/images/wode1.png
new file mode 100644
index 0000000..8e28006
Binary files /dev/null and b/static/images/wode1.png differ
diff --git a/static/images/wode2.png b/static/images/wode2.png
new file mode 100644
index 0000000..b818080
Binary files /dev/null and b/static/images/wode2.png differ
diff --git a/static/images/xiaoxi.png b/static/images/xiaoxi.png
new file mode 100644
index 0000000..a747383
Binary files /dev/null and b/static/images/xiaoxi.png differ
diff --git a/uni.scss b/uni.scss
index 6328906..a6d8a31 100644
--- a/uni.scss
+++ b/uni.scss
@@ -13,7 +13,7 @@
*/
/* 颜色变量 */
-
+@import 'uview-ui/theme.scss';
/* 行为相关颜色 */
$uni-color-primary: #007aff;
$uni-color-success: #4cd964;