diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 180aed4..a68b7d2 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -98,7 +98,7 @@
-
+
参与{{ involvemenGroupInfo[0].member_nickname }}的拼团
diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue
index 10661a6..7a6821d 100644
--- a/pageC/classify/goods.vue
+++ b/pageC/classify/goods.vue
@@ -106,7 +106,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.scrollHeight = res.windowHeight - (90 / 2) + 'px';
+ this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
},
setTitle(title) {
uni.setNavigationBarTitle({
diff --git a/pageC/components/merchant/image-top.vue b/pageC/components/merchant/image-top.vue
index 2435234..fc02c84 100644
--- a/pageC/components/merchant/image-top.vue
+++ b/pageC/components/merchant/image-top.vue
@@ -1,16 +1,17 @@
-
+
@@ -21,6 +22,6 @@ export default {
return {
}
},
- props:['url']
+ props:['url'],
}
\ No newline at end of file
diff --git a/pageC/components/merchant/list-item.vue b/pageC/components/merchant/list-item.vue
index 4897cbd..1affed0 100644
--- a/pageC/components/merchant/list-item.vue
+++ b/pageC/components/merchant/list-item.vue
@@ -1,17 +1,18 @@
-
+
diff --git a/pageC/groupBuy/index.vue b/pageC/groupBuy/index.vue
index 94c6265..9b3ad21 100644
--- a/pageC/groupBuy/index.vue
+++ b/pageC/groupBuy/index.vue
@@ -104,7 +104,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+ this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
},
}
};
diff --git a/pageC/merchant/classifyGoods.vue b/pageC/merchant/classifyGoods.vue
index 469cf36..d6e2ce5 100644
--- a/pageC/merchant/classifyGoods.vue
+++ b/pageC/merchant/classifyGoods.vue
@@ -125,7 +125,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.scrollHeight = res.windowHeight - 90 / 2 + 'px';
+ this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
// console.log(this.scrollHeight);
},
toDetailsPage(id) {
diff --git a/pageC/merchant/goods.vue b/pageC/merchant/goods.vue
index 7fa1e8c..964ae95 100644
--- a/pageC/merchant/goods.vue
+++ b/pageC/merchant/goods.vue
@@ -115,7 +115,7 @@ export default {
setViewHeight() {
const res = uni.getSystemInfoSync();
const otherHeight = 347 + 140 + 20 + 98;
- this.scrollHeight = res.windowHeight - otherHeight / 2 + 'px';
+ this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
// console.log(this.scrollHeight);
},
toDetailsPage(id) {
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index 1871373..83921d5 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -38,12 +38,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -109,6 +109,12 @@ export default {
// if(e.index == 0) this.show = true;
},
methods: {
+ toDetailsPage(id) {
+ // console.log(11);
+ this.$u.route('pageB/photo/index', {
+ id: id
+ });
+ },
switchCurrent(current) {
this.cur = current;
if(current == 0) {
@@ -123,15 +129,15 @@ export default {
uni.stopPullDownRefresh();
})
},
- getStoreImgVideoList() {
- this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
- if(res.data.length) {
- this.indextop = [res.data[0], res.data[1]];
- this.indexlist = res.data.slice(2,);
- }
- uni.stopPullDownRefresh();
- })
- },
+ // getStoreImgVideoList() {
+ // this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
+ // if(res.data.length) {
+ // this.indextop = [res.data[0], res.data[1]];
+ // this.indexlist = res.data.slice(2,);
+ // }
+ // uni.stopPullDownRefresh();
+ // })
+ // },
attentionMember() {
this.$u.api.attentionMember({ member_id: this.info.member_id }).then(res => {
if(res.errCode == 0) {
@@ -149,13 +155,15 @@ export default {
uni.stopPullDownRefresh();
if (res.errCode == 0) {
// this.articleList = res.data.list;
- if(res.data.list.length > 0) {
- this.indextop = [res.data.list[0]]
- this.indextop = [res.data.list[0], res.data.list[1]];
- }
- if(res.data.list.length > 1) {
- this.indextop.push(res.data.list[1]);
- this.indexlist.push(...res.data.list.slice(2,));
+ if(JSON.stringify(res.data) != '[]') {
+ if(res.data.list.length > 0) {
+ this.indextop = [res.data.list[0]]
+ // this.indextop = [res.data.list[0], res.data.list[1]];
+ }
+ if(res.data.list.length > 1) {
+ this.indextop.push(res.data.list[1]);
+ this.indexlist.push(...res.data.list.slice(2,));
+ }
}
}
})
@@ -288,9 +296,23 @@ export default {
.video-image {
padding-bottom: 98rpx;
}
- > view {
- margin-top: 20rpx;
+ .container-top {
+ > view {
+ margin-bottom: 10rpx;
+ }
}
+ .container-bottom {
+ margin-top: 20rpx;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ .bottom-item {
+ margin-bottom: 10rpx;
+ }
+ }
+ // > view {
+ // margin-top: 20rpx;
+ // }
}
.tabbar {
border-top: 1rpx #DBDADA solid;
diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue
index 87e8342..ffe3365 100644
--- a/pageE/mine/EditUserInfo.vue
+++ b/pageE/mine/EditUserInfo.vue
@@ -98,8 +98,37 @@ export default {
},
onNavigationBarButtonTap(e) {
if( e.index == 0 ) uni.navigateBack();
+ if( e.index == 1 ) this.customers();
},
methods: {
+ customers(){
+ function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+ this.uuid = uuid;
+ this.name = name;
+ this.avatar = avatar;
+ this.online = false;
+ this.unReadMessage = 0;
+ this.text = text;
+ this.time = time;
+ this.date = date
+ }
+ // console.log(123)
+ this.$u.api.getAtwillUserInfo({
+ id: 1 // 平台店铺 id
+ }).then((res)=>{
+ // console.log(res)
+ let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+ this.$u.route({
+ url:"/pageD/privateChat/privateChat",
+ params:{
+ id:JSON.stringify(user)
+ }
+
+ })
+ }).catch((err)=>{
+ console.log(err)
+ })
+ },
changeAvatar() {
const url = this.$u.http.config.baseUrl + '/Upload/uploadfile';
uni.chooseImage({
diff --git a/pageE/mine/Integral.vue b/pageE/mine/Integral.vue
index b0378de..ec34744 100644
--- a/pageE/mine/Integral.vue
+++ b/pageE/mine/Integral.vue
@@ -40,7 +40,7 @@ export default {
setIntegralHeight() {
const res = uni.getSystemInfoSync();
// console.log(res.windowHeight);
- this.integralHeight = res.windowHeight - 251 / 2 + 'px';
+ this.integralHeight = res.windowHeight - (res.windowWidth / 750) * 251 + 'px';
},
getMemberPointsStat() {
this.$u.api.getMemberPointsStat().then((res)=>{
diff --git a/pageE/mine/MedalIntroduction.vue b/pageE/mine/MedalIntroduction.vue
index 1265c43..2d6d74d 100644
--- a/pageE/mine/MedalIntroduction.vue
+++ b/pageE/mine/MedalIntroduction.vue
@@ -3,7 +3,7 @@
- 了解勋章
+ {{ title }}
@@ -18,6 +18,7 @@ export default {
data() {
return {
nodes: '',
+ title: '',
}
},
created() {
@@ -27,7 +28,8 @@ export default {
getMemberPointsStat() {
this.$u.api.getMemberPointsStat().then((res)=>{
if (res.errCode == 0) {
- const nodes = res.data.grade_rule;
+ this.title = res.data.grade_rule.document_title;
+ const nodes = res.data.grade_rule.document_content;
this.nodes = common.unescapeHTML(nodes);
}
})
diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue
index b459e2f..3e9a2a5 100644
--- a/pageE/mine/MemberServe.vue
+++ b/pageE/mine/MemberServe.vue
@@ -117,9 +117,9 @@ export default {
setViewHeight() {
const res = uni.getSystemInfoSync();
// console.log(res.windowHeight);
- this.richHeight = res.windowHeight - (88 + 250) / 2 + 'px';
+ this.richHeight = res.windowHeight - (88 + 250) * (res.windowWidth / 750) + 'px';
// console.log(this.richHeight);
- this.swiperHeight = res.windowHeight - 88 / 2 + 'px';
+ this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
},
viewProgress() {
this.$u.route({
diff --git a/pageE/mine/MemberServeCoupon.vue b/pageE/mine/MemberServeCoupon.vue
index 61a3c3b..a20dac1 100644
--- a/pageE/mine/MemberServeCoupon.vue
+++ b/pageE/mine/MemberServeCoupon.vue
@@ -7,11 +7,11 @@
-
+
-
-
+
+
@@ -49,7 +49,7 @@ export default {
},
watch: {
couponCurrent(index) {
- this.couponList = [];
+ // this.couponList = [];
const id = this.couponGroupList[index].gc_id;
this.getCouponList({ gc_id: id, load: 'reload' });
},
@@ -89,9 +89,10 @@ export default {
})
this.timer = true;
if(res.errCode == 0) {
- if(load == 'reload') this.couponList = res.data;
- else if(load == 'loadmore') this.couponList.push(...res.data);
+ if(load == 'reload') this.couponList[this.couponCurrent] = res.data;
+ else if(load == 'loadmore') this.couponList[this.couponCurrent].push(...res.data);
}
+ this.$forceUpdate();
return res.data.length;
},
exchangeCoupon(id) {
@@ -109,7 +110,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.swiperHeight = res.windowHeight - ((88 + 10 + 88) / 2) + 'px';
+ this.swiperHeight = res.windowHeight - ((88 + 10 + 88) * (res.windowWidth / 750)) + 'px';
},
},
};
diff --git a/pageE/mine/MineProgress.vue b/pageE/mine/MineProgress.vue
index 79c56c7..2140941 100644
--- a/pageE/mine/MineProgress.vue
+++ b/pageE/mine/MineProgress.vue
@@ -13,7 +13,7 @@
距离下一级还需要 {{ memberInfo.next_member_level_exppoints_diff }} 经验值
-
+
{{ memberInfo.level_rule.document_title }}
@@ -121,7 +121,7 @@ export default {
}
}
.body {
- margin-top: 60rpx;
+ margin-top: 20rpx;
.title {
height: 88rpx;
display: flex;
@@ -131,7 +131,7 @@ export default {
font-weight: 500;
color: rgba(51,51,51,1);
// border-bottom: #ECECEC 1rpx solid;
- margin-bottom: 30rpx;
+ margin-bottom: 20rpx;
> image {
width: 29rpx;
height: 36rpx;
diff --git a/pageE/tool/Manicure.vue b/pageE/tool/Manicure.vue
index c62ea13..c185975 100644
--- a/pageE/tool/Manicure.vue
+++ b/pageE/tool/Manicure.vue
@@ -90,7 +90,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+ this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
},
tabsChange(index) {
this.swiperCurrent = index;
diff --git a/pageE/tool/MineCoupon.vue b/pageE/tool/MineCoupon.vue
index 4e6e1a9..bda33d4 100644
--- a/pageE/tool/MineCoupon.vue
+++ b/pageE/tool/MineCoupon.vue
@@ -6,7 +6,7 @@
-
+
@@ -68,12 +68,22 @@ export default {
this.$forceUpdate();
})
},
- useCoupon(id) {
- console.log(id);
+ useCoupon(coupon) {
+ // console.log(coupon);
+ if(coupon.type == 1) {
+ this.$u.route({
+ type: 'switchTab',
+ url: 'pages/shop/index',
+ })
+ } else if(coupon.type == 2) {
+ this.$u.route('pageC/merchant/index', {
+ id: coupon.voucher_store_id,
+ });
+ }
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.swiperHeight = res.windowHeight - (88 / 2 + 11 / 2) + 'px';
+ this.swiperHeight = res.windowHeight - (100 * (res.windowWidth / 750)) + 'px';
},
tabsChange(index) {
this.swiperCurrent = index;
diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue
index 2d4041e..65089b0 100644
--- a/pageE/tool/MineHistory.vue
+++ b/pageE/tool/MineHistory.vue
@@ -4,12 +4,12 @@
-
+
- {{ item.store_name }}
+ {{ item.store_name }}
-
-
+
+
{{ item.goods_name }}
@@ -34,6 +34,22 @@ export default {
this.getBrowseList();
},
methods: {
+ viewStoreDetails(sid) {
+ this.$u.route({
+ url: 'pageC/merchant/index',
+ params: {
+ id: sid,
+ }
+ })
+ },
+ viewGoodsDetails(id) {
+ this.$u.route({
+ url: 'pageB/sdetails/index',
+ params: {
+ id: id,
+ }
+ })
+ },
async getBrowseList () {
const res = await this.$u.api.getBrowseList({ page: this.page });
this.timer = false;
diff --git a/pageE/tool/SendWash.vue b/pageE/tool/SendWash.vue
index dd42526..e07c7e8 100644
--- a/pageE/tool/SendWash.vue
+++ b/pageE/tool/SendWash.vue
@@ -44,7 +44,7 @@
确认完成
-
+
去评价
@@ -192,7 +192,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
- this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+ this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
},
toComment(id) {
this.$u.route('/pageE/tool/washComment', {
diff --git a/pageE/tool/WashOrder.vue b/pageE/tool/WashOrder.vue
index a4513e9..43ff53d 100644
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -175,7 +175,7 @@