diff --git a/app.wxss b/app.wxss
index bf66b39..683d317 100644
--- a/app.wxss
+++ b/app.wxss
@@ -46,6 +46,9 @@
.pdl20 {
padding-left: 20rpx;
}
+.pdl30 {
+ padding-left: 30rpx;
+}
.pdr10 {
padding-right: 10rpx;
}
@@ -632,7 +635,6 @@ background: #ffe3e2;
.fs24{
font-size: 24rpx !important;
}
-
.fs26{
font-size: 26rpx;
}
@@ -651,7 +653,7 @@ background: #ffe3e2;
font-size:35rpx;
}
.fs36 {
- font-size: 36rpx;
+ font-size: 36rpx !important;
}
.fs38 {
font-size: 38rpx;
diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss
index a2823ce..d935875 100644
--- a/pages/goods/categoryList/categoryList.wxss
+++ b/pages/goods/categoryList/categoryList.wxss
@@ -1,6 +1,6 @@
/*---nyf 2018-9-7---*/
-page{height: 100%; background: #fff;}
+page{height: 100%; background: #fff !important;}
.top_view{ width: 100%;background: #fff;}
.swiper-tab{
@@ -30,11 +30,14 @@ swiper{
/*--搜索--*/
.search-box {
- width: 100%;
- height: 88rpx;
- z-index: 10;
+ width: 100% !important;
+ height: 88rpx !important;
+ z-index: 10 !important;
+ border-radius: 0 !important;
/*-background: linear-gradient(rgba(0,0,0,.2),rgba(255,255,255,0));-*/
- background: #f2f2f2;
+ background: #f2f2f2 !important;
+ padding: 0 !important;
+ font-size: medium !important;
}
.logo {
@@ -208,7 +211,7 @@ margin-top: 8rpx;
background-color: #f2f2f2;
}
.project_height{
- height: 90%;
+ height: 100%;
}
.project_type{
@@ -292,14 +295,14 @@ width: 60%;
}
.classify_name{
- width: 90%;
- margin: auto;
+ /* width: 90%;
+ margin: auto; */
height: 70rpx;
border-bottom: 1rpx solid #f5f6f6;
- line-height: 85rpx;
- font-weight: 600;
-
-
+ line-height: 70rpx;
+ font-weight: 600;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
}
.classify_content{
width: 100%
@@ -425,7 +428,7 @@ margin: auto;
.no_child_lev{width: 100%; text-align: center; color: #adadad; padding-top: 30rpx}
.classify_title {
- width: 80%;
+ /* width: 80%; */
}
.brand_img_name {color: #666;}
@@ -521,22 +524,30 @@ margin: auto;
}
.classify_content > view:only-child .classify_content-frame {
- padding-bottom: 0;
+ /* padding-bottom: 0; */
}
.classify_content > .classify_content-frame {
padding-bottom: 118rpx;
}
-
-
- page {
- /* overflow-x: hidden; */
- /* padding-bottom: 40rpx; */
- }
- /* .my-container {
- padding-bottom: 118rpx;
- } */
+ .img-wrap {
+ width: 180rpx !important;
+ height: 180rpx !important;
+ }
+
+ .rmb::before {
+ content: '￥';
+ font-size: 24rpx;
+ }
+
+
+ .item-cont .title {
+ margin-bottom: 0 !important;
+ }
+
+
+
/* 风格三商品列表样式引入 */
@import "../goodsList/goodsList.wxss";
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index df55b2b..abcc6d5 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1481,13 +1481,13 @@
-
+
-
+
+
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 4a471a4..8a4e258 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2731,7 +2731,7 @@ button.custom-service::after{
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- width: calc(100% - 120rpx);
+ width: calc(100% - 220rpx);
z-index: 1000;
}
.mask {
@@ -2741,7 +2741,7 @@ button.custom-service::after{
width: 100%;
height: 100%;
z-index: 999;
- background-color: rgba(0,0,0,.4);
+ background-color: rgba(0,0,0,.6);
}
.poster-wrapper {
width: 100%;
@@ -2750,7 +2750,7 @@ button.custom-service::after{
.poster {
box-sizing: border-box;
width: 100%;
- height: 1055rpx;
+ height: 915rpx;
border-radius: 20rpx;
/* box-shadow: 0 8px 12px #666; */
position: relative;
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 4984781..2318104 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -22,6 +22,7 @@ Page({
is_hot:0,
prom_goods_list:null,
rq_data:null,
+ isToggle: false, //切换商品视图控制符
},
onLoad: function(t) {
@@ -273,6 +274,15 @@ Page({
func(ob);
})
},
+
+
+
+ // 切换显示
+ bindToggleDisplay() {
+ this.setData({
+ isToggle: !this.data.isToggle,
+ });
+ },
});
\ No newline at end of file
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 7b04967..9a35814 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -1,8 +1,8 @@
-
+
-
+
满{{item.condition}}元 件
减{{item.content.money}}元
打{{item.content.sale}}折
@@ -13,7 +13,16 @@
-
+
+
+
+
+ 搜索店铺商品
+
+
+
+
+
综合
@@ -40,29 +49,37 @@
-->
-
+
-
+
+
- {{item.goods_name}}
+ {{item.goods_name}}
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ {{item.market_price}}
+
+
-
@@ -79,56 +96,201 @@
{{card_name}}
-
- ￥{{item.shop_price}}
-
-
- ￥{{item.shop_price}}
-
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{item[card_field]}}
+
+
+ {{card_name}}
+
+
+
+
+
+ ￥{{item.shop_price}}
+
+
+
+
+
+
+ {{item.shop_price}}
+ {{item.market_price}}
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+ {{item.shop_price}}
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
没有相关的数据
diff --git a/pages/goods/goodsList/goodsList.wxss b/pages/goods/goodsList/goodsList.wxss
index daf9b92..6cf7864 100644
--- a/pages/goods/goodsList/goodsList.wxss
+++ b/pages/goods/goodsList/goodsList.wxss
@@ -1,23 +1,34 @@
+page {
+ background-color: #f0f0f0;
+}
+
.container {
color: #666;
}
+.nav {
+ display: flex;
+ border-radius: 30rpx 30rpx 0 0;
+ overflow: hidden;
+}
+
.nav-item {
- float: left;
- width: 30%;
- height: 90rpx;
- line-height: 90rpx;
+ /* float: left; */
+ flex: 1;
+ /* width: 30%; */
+ height: 80rpx;
+ /* line-height: 90rpx; */
display: flex;
align-items: center;
justify-content: center;
- font-size: 32rpx;
- border-bottom: 1px solid #dfefef;
+ font-size: 26rpx;
+ border-bottom: 1px solid #f5f5f5;
background-color: #fff;
}
.nav-item .ico-dg {
- width: 18rpx;
- height: 12rpx;
+ width: 12rpx;
+ height: 8rpx;
margin-left: 10rpx;
line-height: 0;
}
@@ -46,6 +57,19 @@
background-position-x: -32rpx;
}
+.search-box {
+ color: #BEBEBE;
+ font-size: 24rpx;
+ /* border: 2rpx solid #f23030; */
+ border-radius: 40rpx;
+ padding: 16rpx;
+ background-color: #e0e0e0;
+}
+
+.icon-sousuo {
+ font-size: 26rpx !important;
+}
+
.search {
width: 10%;
}
@@ -57,22 +81,31 @@
.choice_list {
background-color: #fff;
+ /* padding-left: 20rpx;
+ padding-right: 20rpx; */
}
.choice_item {
position: relative;
width: 100%;
- min-height: 200rpx;
- padding: 10rpx 0;
- border-bottom: 1px solid #f5f6f6;
+ /* min-height: 200rpx; */
+ /* padding: 10rpx 0; */
+ /* border-bottom: 1px solid #f5f6f6; */
font-size: 30rpx;
+ display: flex;
+ padding: 20rpx;
+ box-sizing: border-box;
}
.img-wrap {
- float: left;
- width: 180rpx;
- height: 180rpx;
- padding: 0 10rpx 10rpx;
+ /* float: left; */
+ width: 270rpx;
+ height: 270rpx;
+ margin-right: 22rpx;
+ border-radius: 15rpx;
+ overflow: hidden;
+ flex-shrink: 0;
+ /* padding: 0 10rpx 10rpx; */
}
.img-wrap image {
@@ -81,25 +114,36 @@
}
.item-cont .title {
+ font-size: 26rpx;
height: 72rpx;
- margin: 16rpx 0;
- padding-right: 10rpx;
+ margin-bottom: 20rpx;
+ /* padding-right: 10rpx; */
line-height: 36rpx;
- color: #333;
+ color: #2C2C2C;
+ text-align: justify;
overflow: hidden;
}
.price {
display: inline-block;
color: #f23030;
- line-height: 24rpx;
+ /* line-height: 24rpx; */
+ font-size: 30rpx;
+ /* font-weight: bold;
+ font-size: 28rpx; */
/* padding-bottom: 20rpx; */
}
+.rmb::before {
+ content: '￥';
+ font-size: 24rpx;
+}
+
.comment {
- font-size: 25rpx;
- margin-top: 4rpx;
- padding-right: 30rpx;
+ font-size: 24rpx;
+ /* margin-top: 4rpx; */
+ color: #8d8d8d;
+ /* padding-right: 30rpx; */
}
.filter-modal {
@@ -207,9 +251,55 @@
.mk_price {
margin-left: 10rpx;
- font-size: 25rpx;
+ font-size: 24rpx;
}
.item-cont {
line-height: 38rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ flex: 1;
+}
+
+
+.choice_list.on {
+ display: flex;
+ flex-wrap: wrap;
+ padding-bottom: 12rpx;
+ padding-left: 16rpx;
+ padding-right: 16rpx;
+ background-color: #f0f0f0;
+}
+
+.choice_list.on .choice_item {
+ padding: 0;
+ margin-top: 16rpx;
+ display: block;
+ width: 350rpx;
+ background-color: white;
+ border-radius: 15rpx;
+}
+
+.choice_list.on .choice_item:nth-child(even) {
+ margin-left: 18rpx;
+}
+
+.choice_list.on .img-wrap {
+ width: 350rpx;
+ height: 350rpx;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+}
+
+.choice_list.on .item-cont {
+ padding: 10rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+
+
+.choice_list.on .item-cont .flex.on {
+ display: block;
}
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index d7654e5..744d2ce 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -866,6 +866,108 @@ Page({
});
},
-
+
+ // 保存图片到手机
+ savePic() {
+ console.log('保存图片');
+ var self = this;
+ // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
+ this.getSetting().then((res) => {
+ // 判断用户是否授权了保存到相册的权限，如果没有发起授权
+ if (!res.authSetting['scope.writePhotosAlbum']) {
+ this.authorize().then(() => {
+ // 同意授权后保存下载文件
+ this.saveImage(self.data.shareImgPath)
+ .then(() => {
+ self.setData({
+ showPoster: false
+ });
+ });
+ })
+ } else {
+ // 如果已经授权，保存下载文件
+ this.saveImage(self.data.shareImgPath)
+ .then(() => {
+ self.setData({
+ showPoster: false
+ });
+ });
+ }
+
+ })
+ },
+
+
+ // 保存图片到系统相册
+ saveImage(saveUrl) {
+ var self = this;
+ return new Promise((resolve, reject) => {
+ wx.saveImageToPhotosAlbum({
+ filePath: saveUrl,
+ success: (res) => {
+ wx.showToast({
+ title: '保存成功',
+ duration: 1000,
+ });
+ self.setData({
+ showPlaybill: 'true'
+ });
+ resolve();
+ },
+ fail: () => {
+ wx.showToast({
+ title: '保存失败',
+ duration: 1000,
+ });
+ }
+ })
+ })
+ },
+
+ // 获取用户已经授予了哪些权限
+ getSetting() {
+ return new Promise((resolve, reject) => {
+ wx.getSetting({
+ success: res => {
+ resolve(res)
+ }
+ })
+ })
+ },
+
+ // 发起首次授权请求
+ authorize() {
+ // isFirst 用来记录是否为首次发起授权，
+ // 如果首次授权拒绝后，isFirst赋值为1
+ let isFirst = wx.getStorageSync('isFirst') || 0;
+ return new Promise((resolve, reject) => {
+ wx.authorize({
+ scope: 'scope.writePhotosAlbum',
+ // 同意授权
+ success: () => {
+ resolve();
+ },
+ // 拒绝授权,这里是用户拒绝授权后的回调
+ fail: res => {
+ if(isFirst === 0) {
+ wx.setStorageSync('isFirst', 1);
+ wx.showToast({
+ title: '保存失败',
+ icon: 'none',
+ duration: 1000
+ })
+ } else {
+ this.showModal();
+ }
+ console.log('拒绝授权');
+ reject();
+ }
+ })
+ })
+ },
+
+
+
+
})
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index 2bef8aa..ad0c66a 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -333,10 +333,10 @@
-
- -->
+
diff --git a/pages/team/team_success/team_success.wxss b/pages/team/team_success/team_success.wxss
index 6fd7af1..9d13c9f 100644
--- a/pages/team/team_success/team_success.wxss
+++ b/pages/team/team_success/team_success.wxss
@@ -901,7 +901,7 @@ height:40rpx;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- width: calc(100% - 120rpx);
+ width: calc(100% - 210rpx);
z-index: 1000;
}
.mask {
@@ -920,7 +920,7 @@ height:40rpx;
.poster {
box-sizing: border-box;
width: 100%;
- height: 1055rpx;
+ height: 905rpx;
border-radius: 20rpx;
/* box-shadow: 0 8px 12px #666; */
position: relative;