From 02639fc9e1415c65f4dd1d96a862c2c6e0f7f856 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Thu, 13 Aug 2020 11:54:44 +0800
Subject: [PATCH] store 8.13
---
components/mine/order-item/index.vue | 2 +-
components/shop/special-shop/index.vue | 6 +-
pageB/sdetails/index.vue | 9 +-
pageC/merchant/goods.vue | 16 ++--
pageC/merchant/index.vue | 119 +++++++++++++++----------
pageE/order/Comment.vue | 39 +++++---
pageE/order/Details.vue | 2 +-
pageE/order/commentItem.vue | 6 +-
pages.json | 1 +
pages/mine/index.vue | 2 +-
static/image/shop/14.png | Bin 0 -> 1615 bytes
static/image/tabbar/mine2.png | Bin 4898 -> 1876 bytes
12 files changed, 118 insertions(+), 84 deletions(-)
create mode 100644 static/image/shop/14.png
diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index 93ea2cf..7dcd6f2 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -15,7 +15,7 @@
{{ spec + ';' }}
- 结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}
+
总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}
diff --git a/components/shop/special-shop/index.vue b/components/shop/special-shop/index.vue
index 2e54829..96749f5 100644
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -5,8 +5,8 @@
{{ item.goods_name }}
- {{ item.groupbuy_price }}
- {{ item.goods_price }}
+ ￥{{ item.groupbuy_price }}
+ ￥{{ item.goods_price }}
剩余{{ item.inventory }}件
@@ -19,7 +19,7 @@
{{ item.pintuan_goods_name }}
- {{ item.pintuan_goods_price }}
+ ￥{{ item.pintuan_goods_price }}
立即拼团
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index aa62571..9ab07cb 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -103,7 +103,7 @@
- 参与{{ involvemenGroupInfo[0].member_nickname }}的拼团
+ 参与{{ involvemenGroupInfo[0].member_nickname }}的拼团
@@ -988,6 +988,13 @@ export default {
font-size: 32rpx;
color: rgba(51,51,51,1);
position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .user-name {
+ display: inline-block;
+ max-width: 200rpx;
+ }
&::after {
content: '';
position: absolute;
diff --git a/pageC/merchant/goods.vue b/pageC/merchant/goods.vue
index 51f25b2..845e730 100644
--- a/pageC/merchant/goods.vue
+++ b/pageC/merchant/goods.vue
@@ -14,7 +14,7 @@
-
+
@@ -28,7 +28,7 @@ import goodsItem from "@/components/shop/list/item"
export default {
data() {
return {
- pageSize: 15,
+ pageSize: 5,
cid: '',
page: 1,
current: 0,
@@ -83,7 +83,7 @@ export default {
page: this.page,
order: sort,
})
- this.timer = true;
+ // this.timer = true;
if(res.errCode == 0) {
this.pageSize = res.data.per_page;
if(load == 'reload') this.goodsList = res.data.data;
@@ -92,8 +92,8 @@ export default {
return res.data.data.length;
},
loadMore() {
- if(this.goodsList.length < this.pageSize) return false;
- if(!this.timer) return false;
+ // if(this.goodsList.length < this.pageSize) return false;
+ // if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getStoreGoodsList({ load: 'loadmore' }).then(length => {
@@ -118,12 +118,6 @@ export default {
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
// console.log(this.scrollHeight);
},
- toDetailsPage(id) {
- this.$u.route('/pageB/sdetails/index', {
- id: id,
- type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
- });
- }
}
};
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index febbe51..858e903 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -14,15 +14,18 @@
我的
-->
-
-
-
- {{info.store_name}}
- 粉丝数：{{info.store_collect}}
-
-
-
- {{ info.is_attention == 0 ? "关注" : "已关注" }}
+
+
+
+
+
+ {{info.store_name}}
+ 粉丝数：{{info.store_collect}}
+
+
+
+ {{ info.is_attention == 0 ? "关注" : "已关注" }}
+
@@ -104,8 +107,8 @@ export default {
// this.getStoreImgVideoList();
},
onNavigationBarButtonTap(e) {
- // console.log(e.index);
- if(e.index == 1) this.$u.route('/pageC/cart/index');
+ console.log(e.index);
+ if(e.index == 0) this.$u.route('/pageC/cart/index');
// if(e.index == 0) this.show = true;
},
methods: {
@@ -127,7 +130,7 @@ export default {
this.time = time;
this.date = date
}
- console.log(123)
+ // console.log(123)
this.$u.api.getAtwillUserInfo({
id:this.sid
}).then((res)=>{
@@ -232,48 +235,66 @@ export default {
z-index: 9;
width: 750rpx;
height: 350rpx;
- background-color: #999999;
- display: flex;
- align-items: center;
- padding: 168rpx 60rpx 0 30rpx;
- > image {
- margin-right: 40rpx;
- width: 140rpx;
- height: 140rpx;
- border-radius: 50%;
- background-color: aqua;
+ // background-color: #999999;
+ .mantle {
+ width: 750rpx;
+ height: 350rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 10;
+ background-color: #999999;
+ opacity: 0.7;
}
- .info {
- width: 220rpx;
- color: rgba(255,255,255,1);
- .name {
- margin-bottom: 30rpx;
- font-size: 28rpx;
- font-weight: 500;
- }
- .num {
- font-size: 24rpx;
- }
- }
- .btn {
- margin-left: auto;
- width: 162rpx;
- height: 60rpx;
- border: 2rpx solid rgba(255,255,255,1);
- border-radius: 30rpx;
+ .main-container {
display: flex;
align-items: center;
- justify-content: center;
+ padding: 54rpx 60rpx 0 30rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 19;
+ width: 750rpx;
+ height: 350rpx;
> image {
- width: 28rpx;
- height: 28rpx;
- flex-shrink: 0;
- margin-right: 14rpx;
+ margin-right: 40rpx;
+ width: 140rpx;
+ height: 140rpx;
+ border-radius: 50%;
+ // background-color: aqua;
}
- > view {
- white-space: nowrap;
- font-size: 26rpx;
+ .info {
+ width: 220rpx;
color: rgba(255,255,255,1);
+ .name {
+ margin-bottom: 30rpx;
+ font-size: 28rpx;
+ font-weight: 500;
+ }
+ .num {
+ font-size: 24rpx;
+ }
+ }
+ .btn {
+ margin-left: auto;
+ width: 162rpx;
+ height: 60rpx;
+ border: 2rpx solid rgba(255,255,255,1);
+ border-radius: 30rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ > image {
+ width: 28rpx;
+ height: 28rpx;
+ flex-shrink: 0;
+ margin-right: 14rpx;
+ }
+ > view {
+ white-space: nowrap;
+ font-size: 26rpx;
+ color: rgba(255,255,255,1);
+ }
}
}
}
@@ -312,7 +333,7 @@ export default {
margin-right: 35rpx;
}
text-align: center;
- width: 90rpx;
+ width: 96rpx;
> image {
width: 60rpx;
height: 60rpx;
diff --git a/pageE/order/Comment.vue b/pageE/order/Comment.vue
index 0540318..fb376b0 100644
--- a/pageE/order/Comment.vue
+++ b/pageE/order/Comment.vue
@@ -8,14 +8,15 @@
物流评分
-
+
服务态度
-
+
发表意见
+