diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css
index cc3e19b..3e3b650 100644
--- a/common/styles/iconfont.css
+++ b/common/styles/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "lf-iconfont"; /* Project id 2779107 */
- src: url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.woff2?t=1632991726658') format('woff2'),
- url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.woff?t=1632991726658') format('woff'),
- url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.ttf?t=1632991726658') format('truetype');
+ src: url('//at.alicdn.com/t/font_2779107_d2jv9auseui.woff2?t=1633937660899') format('woff2'),
+ url('//at.alicdn.com/t/font_2779107_d2jv9auseui.woff?t=1633937660899') format('woff'),
+ url('//at.alicdn.com/t/font_2779107_d2jv9auseui.ttf?t=1633937660899') format('truetype');
}
.lf-iconfont {
@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-xiangshang_shouqi:before {
+ content: "\e797";
+}
+
+.icon-xiangxia_shousuo:before {
+ content: "\e798";
+}
+
.icon-kefufenxiermaikefu:before {
content: "\e889";
}
diff --git a/components/index-banner/index-banner.vue b/components/index-banner/index-banner.vue
index 4b1e8fa..af59b2f 100644
--- a/components/index-banner/index-banner.vue
+++ b/components/index-banner/index-banner.vue
@@ -14,7 +14,7 @@
:style="
'height: ' +
imgHeight +
- 'px; padding-left: ' +
+ 'rpx; padding-left: ' +
meta.padding_left +
'px; padding-right: ' +
meta.padding_right +
@@ -41,7 +41,7 @@ export default {
// 对应data
data() {
return {
- imgHeight: '450'
+ imgHeight: 900
};
},
options: {
diff --git a/components/lf-payPassword/lf-payPassword.vue b/components/lf-payPassword/lf-payPassword.vue
index bb98b97..0029404 100644
--- a/components/lf-payPassword/lf-payPassword.vue
+++ b/components/lf-payPassword/lf-payPassword.vue
@@ -50,7 +50,8 @@
data(){
return {
code: '', // 密码
- time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime()
+ time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime(),
+ is_auto: false
}
},
created(){
@@ -64,12 +65,18 @@
this.code = event;
if(this.code.length >= 6){
this.comfirm();
+ this.is_auto = true;
+ }else{
+ this.is_auto = false;
}
},
comfirm(){
if(this.code.length < 6){
return this.$msg('请输入完整支付密码');
}
+ if(this.is_auto){
+ return;
+ }
this.$emit('comfirm', this.code);
}
}
diff --git a/pages/address/add/add.vue b/pages/address/add/add.vue
index a398968..543b6f8 100644
--- a/pages/address/add/add.vue
+++ b/pages/address/add/add.vue
@@ -44,6 +44,7 @@
+
diff --git a/pages/article/details.vue b/pages/article/details.vue
index c846790..34acc92 100644
--- a/pages/article/details.vue
+++ b/pages/article/details.vue
@@ -1,22 +1,22 @@
-
+
- 苦等一年！阳澄湖大闸蟹又肥了，让你安心吃螃蟹的文章也来了
+ {{title_content.article.title}}
- 金诚优选线上商城
+ {{title_content.article.author}}
- 2021.09.01 16:28:22
+ {{title_content.article.created_at}}
-
+
@@ -36,15 +36,39 @@
onLoad(e){
this.notice_id = e.notice_id;
if(this.notice_id) {
- // this.getData();
+ this.getData();
}
},
methods: {
+ // 富文本处理
+ formatRichText(richText){
+ if(richText != null){
+ let newRichText= richText.replace(/]*>/gi, function(match, capture){
+ match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+ match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+ match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+ return match;
+ });
+ newRichText = newRichText.replace(/style="[^"]+"/gi,function(match, capture){
+ match = match.replace(/width:[^;]+;/gi, 'width:100%;').replace(/width:[^;]+;/gi, 'width:100%;');
+ return match;
+ });
+ newRichText = newRichText.replace(/]*\/>/gi, '');
+ newRichText = newRichText.replace(/\![]()
{
- this.content = res.data?.content;
- this.title_content = res.data
- })
+ this.$http.get({
+ api: '/api/article/detail/'+this.notice_id
+ }).then(res => {
+ this.content = res.data.data?.article.article_detail;
+ this.title_content = res.data.data
+
+ console.log(res.data)
+ });
}
}
}
diff --git a/pages/coupon/index/index.vue b/pages/coupon/index/index.vue
index 2320165..13da3b7 100644
--- a/pages/coupon/index/index.vue
+++ b/pages/coupon/index/index.vue
@@ -250,10 +250,12 @@
align-items: flex-start;
display: flex;
flex-direction: column;
- margin-left: 84rpx;
+ margin-left: 54rpx;
+ width: 380rpx;
}
.coupon-left {
- margin-left: 20rpx;
+ // margin-left: 20rpx;
+ width: 182rpx;
display: flex;
flex-direction: column;
justify-content: center;
diff --git a/pages/index/category/category.vue b/pages/index/category/category.vue
index 88da584..19110d0 100644
--- a/pages/index/category/category.vue
+++ b/pages/index/category/category.vue
@@ -70,7 +70,8 @@
-
+
+
@@ -637,6 +638,9 @@
margin-top: 30rpx;
}
}
+ .brand-item:last-child{
+ margin-bottom: 0rpx;
+ }
.img{
width: 150rpx;
height: 150rpx;
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 52a10d7..d3106e4 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -74,7 +74,7 @@
-
+
直播间
@@ -152,7 +152,8 @@
show_ad: false, // 是否显示ad广告
ad_modal_list: [], // ad广告列表
nav_bg_color: 'rgba(255,255,255,0)' ,// 导航背景颜色
- car_num: 0
+ car_num: 0,
+ live_roomid: 0
};
},
// 注册组件
@@ -189,14 +190,14 @@
}
},
onShow(e) {
-
+ this.getLiveRoom();
this.isLogin=!!this.$cookieStorage.get('user_token')
let toekn = this.$cookieStorage.get('user_token');
if (toekn) {
this.getUserInfo();
- this.getcarNum()
+ this.getcarNum();
}
@@ -266,15 +267,28 @@
onPullDownRefresh(){
wx.showLoading();
this.queryMicroData();
+ this.getLiveRoom();
},
// 方法，需要将小程序的方法都放到这个里面
methods: {
goLive() {
- this.$msg('敬请期待!');
- return
- // wx.navigateTo({
- // url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=1`
- // })
+ // this.$msg('敬请期待!');
+ // return
+ wx.navigateTo({
+ url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=`+this.live_roomid
+ })
+ },
+ //获取直播房间号
+ getLiveRoom(){
+ this.$http.get({
+ api: '/api/live'
+ }).then(res => {
+ console.log('=======',res.data.data)
+ if(res.data.data != null) {
+ this.live_roomid = res.data.data.number;
+ }
+ uni.stopPullDownRefresh();
+ });
},
getAlertAd(){
this.$http.get({
diff --git a/pages/index/list/monthlyList.vue b/pages/index/list/monthlyList.vue
index 61083ed..d75f183 100644
--- a/pages/index/list/monthlyList.vue
+++ b/pages/index/list/monthlyList.vue
@@ -2,31 +2,39 @@
-
- 热销榜单
+
+ {{activity_content.topic.name}}
-
-
-
-
-
- {{ item+1 }}
-
-
-
-
-
- SK-II秋日宠粉体验套装
- 月销量：324
-
-
-
- ¥888
+
+
+
+
+
+
+
+
+
+ {{item.goods.name}}
+ 月销量：{{item.goods.sale_count}}
+
+
+
+ ¥{{item.goods.sell_price}}
+
+
+
+
+ {{ loadingText }}
+
+
-
-
+
@@ -34,14 +42,83 @@
export default {
data(){
return {
-
+ page: 1,
+ topic_id: 1,
+ activity_content: '',
+ list: [],
+ isPage: true,
+ loadingClass: true,
+ loadingText: '正在加载中',
+ scrollH: 0,
+ nav_height: 0,
+ isRefresher: true,
}
},
onLoad(){
-
+ let info = uni.getSystemInfoSync();
+ this.scrollH = info.screenHeight;
+ this.getActivityList();
+ },
+ computed: {
+ autoHeight() {
+ return `calc(${this.scrollH}px - ${this.nav_height}px - 430rpx)`;
+ }
},
methods: {
-
+ // 页面触底，加载下一页
+ onScrolltolower() {
+ if (this.isPage) {
+ this.page = this.page + 1;
+ this.getActivityList();
+ }
+ },
+ // 下拉刷新处理
+ refreshFn(options) {
+ this.page = 1;
+ this.isPage = true;
+ this.loadingClass = true;
+ this.list = []
+ this.loadingText = '正在加载中';
+ this.getActivityList(options);
+ },
+ // scroll-view 下拉刷新
+ onRefresherrefresh() {
+ this.isRefresher = true;
+ this.refreshFn({
+ type: 'scrollRefresh'
+ });
+ },
+ getActivityList(options = {}){
+ this.$http.get({
+ api: 'api/topic/list',
+ data: {
+ topic_id: this.topic_id,
+ page: this.page
+ },
+ header: {
+ Authorization: this.$cookieStorage.get('user_token')
+ }
+ }).then(res => {
+ this.activity_content = res.data.data
+ console.log('====',res.data.data)
+ let isPage = this.page < res.data.data.goods.total ? true : false;
+ this.isPage = isPage;
+ if (!isPage) {
+ this.loadingClass = false;
+ this.loadingText = '没有更多数据啦~';
+ }
+ if (options.type == 'pageRefresh') {
+ uni.stopPullDownRefresh();
+ } else if (options.type == 'scrollRefresh') {
+ this.isRefresher = false;
+ }
+ if (this.page == 1) {
+ this.list = res.data.data.goods.data;
+ } else {
+ this.list.push(...res.data.data.goods.data);
+ }
+ })
+ },
}
}
@@ -69,7 +146,7 @@
display: flex;
justify-content: center;
align-items: center;
- font-size: 100rpx;
+ font-size: 60rpx;
color: #FFFFFF;
font-weight: bold;
font-family: '楷体';
diff --git a/pages/order/cashier/cashier.vue b/pages/order/cashier/cashier.vue
index 5663edd..b4ba6f9 100644
--- a/pages/order/cashier/cashier.vue
+++ b/pages/order/cashier/cashier.vue
@@ -129,7 +129,7 @@
this.confirm();
},
// 支付
- confirm() {
+ confirm(event) {
if (this.clickContinue == true) {
this.clickContinue = false;
if (this.is_date_finish) return this.$msg('订单超时未支付');
@@ -143,6 +143,9 @@
this.show_pw = true;
return;
}
+ uni.showLoading({
+ title: '正在支付，请稍后'
+ })
this.getOpenid().then(res => {
var data = {
@@ -164,6 +167,7 @@
Authorization: this.token
}
}).then(res => {
+ uni.hideLoading()
res = res.data;
if (res.status) {
// this.formId = e.detail.formId || '';
@@ -184,6 +188,7 @@
this.setData({
loading: false
});
+ uni.hideLoading()
wx.showModal({
content: '支付失败',
showCancel: false
diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue
index 0b2b1b3..a8dce23 100644
--- a/pages/order/confirm/confirm.vue
+++ b/pages/order/confirm/confirm.vue
@@ -83,10 +83,10 @@
运费
+¥{{ order_detail.order.payable_freight_yuan || 0 }}
-
+
@@ -107,11 +107,11 @@
-
+
-
+
+
+
@@ -338,8 +330,6 @@
address_id: this.address.id,
note: this.value,
}
-
- // 是否选择了优惠券 TODO 优惠券id是否传对？
if(this.coupon_index != null){
par.coupon_id = this.order_detail.coupons[this.coupon_index].id;
}
@@ -472,8 +462,8 @@
height: max-content;
background-color: #FFFFFF;
border-top: 1rpx solid #e5e5e5;
- padding-bottom: constant(safe-area-inset-bottom);
- padding-bottom: env(safe-area-inset-bottom);
+ // padding-bottom: constant(safe-area-inset-bottom);
+ // padding-bottom: env(safe-area-inset-bottom);
.fixed-content{
width: 100%;
height: 118rpx;
@@ -500,9 +490,10 @@
width: 750rpx;
height: max-content;
max-height: 70vh;
- overflow-y: scroll;
+ // overflow-y: scroll;
padding: 40rpx 32rpx;
background: #FFFFFF;
+ padding-bottom: 0rpx;
}
.coupon-circle1 {
width: 40rpx;
@@ -544,10 +535,12 @@
align-items: flex-start;
display: flex;
flex-direction: column;
- margin-left: 90rpx;
+ margin-left: 54rpx;
+ width: 380rpx;
}
.coupon-left {
- margin-left: 30rpx;
+ // margin-left: 30rpx;
+ width: 182rpx;
display: flex;
flex-direction: column;
justify-content: center;
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index a9557de..caf935b 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -291,9 +291,13 @@
Authorization: this.$cookieStorage.get('user_token')
}
}).then(res => {
- this.$msg(res.data.message).then(() => {
- this.getOrderDetails();
- })
+ if(res.data.status){
+ this.$msg('确认收货成功', {icon: 'success'}).then(() => {
+ this.getOrderDetails();
+ })
+ }else{
+ this.$msg(res.data.message || '确认收货失败');
+ }
})
},
searchLogistics() {
diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue
index 464e6e7..b997a48 100644
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@@ -1,5 +1,5 @@
-
+
@@ -63,15 +63,15 @@
优惠
-
- {{ item.title }}
-
+
+ {{ item.title }};
+
-
+
@@ -169,7 +169,7 @@
商品详情
-
+
@@ -293,7 +293,8 @@
coupons: [], // 优惠
goods_num: 1,
is_date_finish: false,
- car_num: 0
+ car_num: 0,
+ goods_content: ''
}
},
computed: {
@@ -358,16 +359,9 @@
}else {
this.car_num = res.data.data;
}
- } else {
- wx.showModal({
- content: '请下拉页面刷新重试',
- showCancel: false
- });
}
})
.catch(() => {
- wx.stopPullDownRefresh();
- wx.hideLoading();
wx.showModal({
content: '请求失败',
showCancel: false
@@ -542,6 +536,7 @@
}).then(res => {
if(res.data.code == 200){
this.$msg('加入购物车成功', {icon: 'success'})
+ this.getcarNum()
}else{
this.$msg('加入购物车失败', {icon: 'error'})
}
@@ -635,6 +630,7 @@
this.goods_detail = goods_detail;
this.pictures = [res.data.data.img];
this.is_collect = Boolean(res.data.data.is_collect) || false;
+ this.goods_content = this.formatRichText(goods_detail.content);
let type = 'mail';
if(this.$isRight(goods_detail.is_largess)){
type = 'point';
@@ -1005,6 +1001,7 @@
padding: 0;
width: 88rpx;
position: relative;
+ color: #555555;
&:first-child{
padding-left: 0;
}
@@ -1013,6 +1010,7 @@
width: 50rpx;
font-size: 40rpx;
line-height: 1;
+ color: #555555;
}
}
.btn1{
diff --git a/pages/shop/shopdetail.vue b/pages/shop/shopdetail.vue
index 14de2f3..3a6cb59 100644
--- a/pages/shop/shopdetail.vue
+++ b/pages/shop/shopdetail.vue
@@ -79,8 +79,12 @@
-
+
+
+
+
+
@@ -119,7 +123,8 @@
brand_id: 0,
detail: {},
search_val: '',
- is_collect: false
+ is_collect: false,
+ sort: 'desc'
}
},
onLoad(options){
@@ -127,6 +132,14 @@
this.getShopDetail();
},
methods: {
+ changeSort(sort) {
+ if(this.sort == 'desc') {
+ this.sort = 'asc';
+ }else {
+ this.sort = 'desc';
+ }
+ this.getData();
+ },
// 切换商品收藏
switchCollect(){
let userInfo = this.$cookieStorage.get('user_token') || {};
@@ -212,7 +225,8 @@
},
getData() {
let par = {
- brand_id: this.brand_id
+ brand_id: this.brand_id,
+ sort: this.sort
}
let orderBy = ['','sale_count','updated_at','sell_price'][this.current];
if(orderBy){
@@ -308,6 +322,9 @@