From 854976c8f0fe9b3b2e912473bc6953d2f5208337 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Sat, 1 Aug 2020 16:36:48 +0800
Subject: [PATCH] comment 8.1
---
components/comment/index.vue | 4 +-
components/mine/order-item/index.vue | 12 ++-
pageB/comment/index.vue | 3 +
pageB/sdetails/index.vue | 23 ++--
pageB/triedDress/index.vue | 16 ++-
pageC/cart/ConfirmOrder.vue | 2 +-
pageC/cart/index.vue | 4 +
pageE/mine/EditUserInfo.vue | 4 +-
pageE/mine/MineInfo.vue | 2 +-
pageE/order/Comment.vue | 150 +++++++++++++++------------
pageE/order/Details.vue | 2 +-
pageE/order/commentItem.vue | 138 ++++++++++++++++++++++++
pageE/tool/Manicure.vue | 39 ++++---
pages.json | 25 ++++-
pages/index/index.vue | 3 +
pages/mine/index.vue | 10 +-
pages/shop/index.vue | 39 +++++--
static/fonts/cart.ttf | Bin 0 -> 1776 bytes
18 files changed, 356 insertions(+), 120 deletions(-)
create mode 100644 pageE/order/commentItem.vue
create mode 100644 static/fonts/cart.ttf
diff --git a/components/comment/index.vue b/components/comment/index.vue
index e933943..3795916 100644
--- a/components/comment/index.vue
+++ b/components/comment/index.vue
@@ -3,7 +3,7 @@
{{ content.geval_frommembername }}
-
+
{{ content.geval_content }}
@@ -30,7 +30,7 @@ export default {
data() {
return {
count: 5,
- rate: 2,
+ rate: 0,
}
},
props: {
diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index 445a5d9..d844a2b 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -24,11 +24,12 @@
-
- 查看物流
+
+ 申请退款
+ 查看物流
确认收货
- 取消支付
+ 取消支付
立即支付
联系官方客服
提交官方审核
@@ -79,6 +80,9 @@ export default {
}
this.$u.toast(res.message);
})
+ },
+ applyRefund() {
+
},
confirmReceive() {
this.$u.api.confirmReceive({
@@ -204,7 +208,7 @@ export default {
.logistics, .comment, .payment {
@include btn-class($width: 160rpx, $color: rgba(255,119,15,1));
}
- .calcel {
+ .cancel {
@include btn-class($width: 160rpx, $color: rgba(155,153,153,1));
}
.service {
diff --git a/pageB/comment/index.vue b/pageB/comment/index.vue
index a8f7600..fef17bc 100644
--- a/pageB/comment/index.vue
+++ b/pageB/comment/index.vue
@@ -35,6 +35,9 @@ export default {
// this.getAllEvalue();
this.getEvaluateSpec();
},
+ onNavigationBarButtonTap(e) {
+ if(e.index == 0) this.$u.route('/pageC/cart/index');
+ },
watch: {
current(value) {
this.page = 0;
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 6e9f3c2..f467767 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -19,7 +19,8 @@
- {{ goodsInfo.store_name }}{{ goodsInfo.goods_name }}
+ {{ goodsInfo.store_name }}
+ {{ goodsInfo.goods_name }}
￥{{ goodsInfo.goods_price }}
@@ -40,7 +41,7 @@
-
+
@@ -227,6 +228,9 @@ export default {
this.showGroupUser = false;
this.showInvolvementUser = false;
},
+ onNavigationBarButtonTap(e) {
+ if(e.index == 0) this.$u.route('/pageC/cart/index');
+ },
beforeDestroy() {
clearInterval(this.timer);
},
@@ -379,7 +383,7 @@ export default {
},
/*
* @description 下单 订单步骤1：展示结算数据
- * @params {Number} type 拼团或者开团
+ * @params {Number} type involvement 拼团或者 默认开团
* @params {Number} num 数量
* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
**/
@@ -553,17 +557,20 @@ export default {
.title{
flex-wrap: wrap;
margin-bottom: 30rpx;
- line-height: 1.2;
- >text{
- display: inline-block;
+ .store-name {
+ display: inline-block;
padding: 8rpx 10rpx;
margin: 0 10rpx 4rpx 0;
vertical-align: middle;
font-size: 20rpx;
color: #fff;
border-radius: 30rpx;
- background-color: #FF780F;
- }
+ background-color: #FF780F;
+ margin-bottom: 10rpx;
+ }
+ .goods-name {
+ line-height: 1.5;
+ }
}
.pic{
>text{
diff --git a/pageB/triedDress/index.vue b/pageB/triedDress/index.vue
index bc6f2c1..ec82949 100644
--- a/pageB/triedDress/index.vue
+++ b/pageB/triedDress/index.vue
@@ -97,7 +97,7 @@ export default {
return false;
}
if(!this.$u.test.mobile(this.phone)) {
- this.$u.toast('请填写正确的新手机号');
+ this.$u.toast('请正确填写手机号');
return false;
}
if(this.$u.test.isEmpty(this.address)) {
@@ -116,6 +116,10 @@ export default {
this.$u.toast('预约时间错误');
return false;
}
+ if(this.number > this.goodsInfo.goods_storage) {
+ this.$u.toast('库存不足');
+ return false;
+ }
return true;
},
chooseDate(e) {
@@ -134,9 +138,17 @@ export default {
store_id: this.store.store_id,
appointment_time: new Date(this.time),
}).then(res => {
- this.$u.toast(res.message);
if (res.errCode == 0) {
// this.$u.route({ type: 'navigateBack' });
+ this.$refs.uToast.show({
+ title: res.message,
+ back: true,
+ })
+ } else {
+ this.$refs.uToast.show({
+ title: res.message,
+ type: 'error',
+ })
}
})
},
diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue
index a0522d6..870d14f 100644
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -297,7 +297,7 @@ export default {
},
setTotalPrice() {
const goods = this.orderInfo.store_goods_total;
- console.log(this.freight);
+ // console.log(this.freight);
const freight = this.freight;
let price = 0;
// 商品价格加上运费
diff --git a/pageC/cart/index.vue b/pageC/cart/index.vue
index 0a62e00..6cab6b4 100644
--- a/pageC/cart/index.vue
+++ b/pageC/cart/index.vue
@@ -73,6 +73,9 @@ export default {
deep: true
}
},
+ onPullDownRefresh() {
+ this.getCartList();
+ },
onShow() {
this.getCartList();
},
@@ -111,6 +114,7 @@ export default {
getCartList() {
this.$u.api.getCartTreeList().then(res => {
if (res.errCode == 0) {
+ uni.stopPullDownRefresh();
let list = res.data.store_cart_list;
list.forEach((item, l_index) => {
// 判断有无 checked 属性,如果有取值再赋值, 没有给默认值 false
diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue
index 8698222..b896a70 100644
--- a/pageE/mine/EditUserInfo.vue
+++ b/pageE/mine/EditUserInfo.vue
@@ -113,7 +113,7 @@ export default {
filePath: res.tempFilePaths[0]
}).then(result => {
// console.log(result);
- this.$set(this, 'avatar', result.file_path);
+ // this.$set(this, 'avatar', result.file_path);
// this.avatar = result.file_path;
this.uploadPath = result.file_name;
}, error => {
@@ -142,7 +142,7 @@ export default {
userInfo.member_mobile,
userInfo.member_birthday,
userInfo.member_sex,
- userInfo.member_avatar,
+ userInfo.member_avatar + '?' + new Date().getTime(),
];
}
})
diff --git a/pageE/mine/MineInfo.vue b/pageE/mine/MineInfo.vue
index 120ae70..74f885f 100644
--- a/pageE/mine/MineInfo.vue
+++ b/pageE/mine/MineInfo.vue
@@ -1,7 +1,7 @@
-
+
昵称
diff --git a/pageE/order/Comment.vue b/pageE/order/Comment.vue
index f6a7895..0540318 100644
--- a/pageE/order/Comment.vue
+++ b/pageE/order/Comment.vue
@@ -2,33 +2,7 @@
+
\ No newline at end of file
diff --git a/pageE/tool/Manicure.vue b/pageE/tool/Manicure.vue
index d8318ff..3476049 100644
--- a/pageE/tool/Manicure.vue
+++ b/pageE/tool/Manicure.vue
@@ -16,7 +16,7 @@
美甲人姓名：{{ item.manicure_name }}
时间：{{ item.manicure_time | dateFormat }}
-
+
@@ -32,6 +32,7 @@
export default {
data() {
return {
+ pageSize: 1,
list: [{
name: '我的订单'
}, {
@@ -42,18 +43,16 @@ export default {
page: 1,
orderList: [],
loadStatus: 'loadmore',
+ timer: true,
}
},
+ onPullDownRefresh() {
+ this.getManicureList({ load: 'reload' });
+ },
onShow() {
this.current = 0;
this.swiperCurrent = 0;
- this.getManicureList().then(order => {
- // console.log(order);
-
- this.orderList = this.orderList.concat(order);
- // console.log(this.orderList);
-
- });
+ this.getManicureList({ load: 'reload' });
},
filters: {
dateFormat(value) {
@@ -66,27 +65,33 @@ export default {
}
},
methods: {
- async getManicureList() {
- let res = await this.$u.api.getManicureList({
+ async getManicureList({ load }) {
+ const res = await this.$u.api.getManicureList({
page: this.page
})
+ uni.stopPullDownRefresh();
+ this.timer = true;
if (res.errCode == 0) {
- return res.data.list;
+ if(load == 'reload') this.orderList = res.data.list;
+ else if(load == 'loadmore') this.orderList.push(...res.data.list);
}
+ return res.data.list.length;
},
// 加载更多
reachBottom() {
- // 修改当前的 loadStatus
+ if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
- this.getManicureList().then(order => {
- if (!order.length) {
- // 如果没有数据page-1
+ this.getManicureList({ load: 'loadmore' }).then(length => {
+ if(length == 0) {
this.page--;
- this.loadStatus = "nomore";
+ this.loadStatus = 'nomore';
} else {
- this.orderList = this.orderList.concat(order);
+ this.loadStatus = 'loading';
}
+ }).catch(() => {
+ this.loadStatus = "nomore";
+ this.page--;
})
},
tabsChange(index) {
diff --git a/pages.json b/pages.json
index 1a9be83..9d1f793 100644
--- a/pages.json
+++ b/pages.json
@@ -115,7 +115,16 @@
"navigationBarTitleText": "商品详情",
"app-plus":{
"titleNView":{
- "backgroundColor":"#ffffff"
+ "backgroundColor":"#ffffff",
+ "buttons": [
+ {
+ "type":"none",
+ "text":"\ue636",
+ "float":"right",
+ "fontSize":"18",
+ "fontSrc": "/static/fonts/cart.ttf"
+ }
+ ]
}
}
}
@@ -137,7 +146,16 @@
"navigationBarTitleText": "商品评价",
"app-plus":{
"titleNView":{
- "backgroundColor":"#ffffff"
+ "backgroundColor":"#ffffff",
+ "buttons": [
+ {
+ "type":"none",
+ "text":"\ue636",
+ "float":"right",
+ "fontSize":"18",
+ "fontSrc": "/static/fonts/cart.ttf"
+ }
+ ]
}
}
}
@@ -241,6 +259,7 @@
{
"path": "cart/index",
"style": {
+ "enablePullDownRefresh": true,
"navigationBarTitleText": "购物车",
"app-plus": {
"titleSize": "36px",
@@ -608,6 +627,7 @@
{
"path": "tool/Manicure",
"style": {
+ "enablePullDownRefresh": true,
"navigationBarTitleText": "美甲",
"app-plus": {
"titleSize": "36px",
@@ -916,6 +936,7 @@
{
"path": "pages/index/index",
"style": {
+ "enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d8197f4..c8947a4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -224,6 +224,9 @@
this.getZhiBoSwiper();
this.tabLiveList();
},
+ onPullDownRefresh() {
+ // this.getManicureList({ load: 'reload' });
+ },
methods: {
tabLiveList() {
this.$u.api.tabLiveList().then((res) => {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 761e967..16ea173 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -2,7 +2,7 @@
-
+
{{ userInfo.member_nickname }}
@@ -68,13 +68,13 @@
试穿试送
-
- 待评价
-
-
售后
+
+
+ 待评价
+
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 42238ff..8f59b76 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -45,7 +45,9 @@
-
+
+
+
@@ -87,12 +89,14 @@
seckillTime: {}, // 秒杀时间
// couponGroupList: [], // 优惠券拼团分类
pinTuanPush: {}, // 拼团推荐
+ activityInfo: {},
areaList: [], // 位置信息
}
},
onLoad() {
this.getShopTopList();
this.getLocation(); // 获取定位
+ this.getStoreActivity();
// this.area = uni.getStorageSync("address") || "请选择";
},
onShow() {
@@ -195,6 +199,25 @@
url: '/pageC/classify/index'
});
},
+ getStoreActivity() {
+ this.$u.api.getStoreActivity().then(res => {
+ if(res.errCode == 0) {
+ this.activityInfo = res.data;
+ }
+ })
+ },
+ activityLink({ type, id }) {
+ if(type == 0 || type == 2) return false;
+ // type 1 商品详情页, 2 店铺详情页
+ const url = type == 1 ? 'pageB/sdetails/index' : '';
+ let params = { id: id };
+ // type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+ if(type == 1) Object.assign(params, { type: 1 });
+ this.$u.route({
+ url: url,
+ params: params
+ })
+ },
},
}
@@ -291,12 +314,14 @@
}
}
- .lingquan {
- width: 750rpx;
- height: 177rpx;
- margin-left: -33rpx;
- margin-top: 29rpx;
- background-color: #ececec;
+ .activity-view {
+ padding: 20rpx 30rpx;
+ text-align: center;
+ .lingquan {
+ background-color: #ececec;
+ width: 688rpx;
+ height: 138rpx;
+ }
}
.cart {
diff --git a/static/fonts/cart.ttf b/static/fonts/cart.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..25c4fbd5cfe86298562a448e50f3e39d2ebb1bc5
GIT binary patch
literal 1776
zcmd^9&u<$=6#iz{c3j(}o0udHB4*cV?TSRUV^=1sLO>}^kXogv4Y^Q(Txb2G*j~%t
zltu!{65_xKP8|3Psuqb#sGN}C4qOnIiY7ur3Wur^2aveL=9}FyNNN8Ab~Q8K``-87
zym_8A1b`^|(2?J``sUib!B>v~u}pUD^3_~n<%`$P(0-rxcBNJB{QmaWmuNra=+v5f
z)tB%6v=8W8^#5JA%R968@7yQ;m7`QAF?OJTNc;`Qsd~%36((Tp&z!rvj6g`Sv;z>IB8af|vGxPmPyAIpLP0QALr^FCl;@4=g&n+l
zSUN2E=hyq_Q>IQYw^GFf31yB&pAuV2vq@H}7rF9OE?^TlZKcu~J(Crg`BdoH>6v0-`UMeB
ziWzHFoK45m^OmHGR$*p(Odl8X!Euok#nY?erFbbVq(=IKBcN{%rlN*coC_{lnV4b3
zGSLZbt{BW);?XmPv7DGc`cu+c>_jLc^4dgfP>mUy5fh(V`Cv|u9(_M+S%p+ed^ej)
z6)fwn5f$&=wid)h!VpI6_TV#OVI&M~>^WoB7>i8~{)nASipd101yf8+ojF<-79$Im
zP%BS9i38OKVCvtV$a_DfcnxFhir*`p{3(S4#Qc^R1AY-voK-kP{uPBISipwDQN+=e
zw>WTu5ijB+g#`?Jsj!A|e5dF^$IxhhPX@;Rv=xT;V9vq7gaYwac!(
zV_x4g8x^Nrb=q!Z1g_Y%-DbHvGDqvS-R(7;wz-tekEjj1ZFfg`dN*qY*R7h>uG2Et
znb2-F9kbJQZrBw!TX)^gxm-?eB>8N`Y4Kw{&tuyt!{xjK6W6iFxq%8Cv{ChDm%8K3
z73yo)MU%1JC%nhi+f;YaqfTZuv4kx0Peg4{)%KLf>*?VpcPp?;mo=FjU1n+#t*Z)c
zR?;Lk(eZpYn5RN@7IiPGgLBC79i3>T&w3|q$$K*Tua^JIPkS_>@%IeZoZa_!D|K5+
F{sE&6?aKfF
literal 0
HcmV?d00001