theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan 2020-08-15 15:38:05 +08:00
commit 686955424b
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
14 changed files with 177 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/api/shop.js
View File

@ -192,7 +192,7 @@ export default {
}); });
}, },
// 商品搜索 // 商品搜索
ShopSearch({keyword,page = 1,order = 'goods_salenum'}){ ShopSearch({keyword, page = 1, order = 'goods_salenum'}){
return vm.$u.post('ShopSearch/search',{ return vm.$u.post('ShopSearch/search',{
keyword,page,order keyword,page,order
}) })

22
components/mine/order-item/index.vue
View File

@ -25,11 +25,15 @@
<view class="order-btn" v-if="[1, 2, 3, 4, 8, 11].indexOf(order.view_type) >= 0"> <view class="order-btn" v-if="[1, 2, 3, 4, 8, 11].indexOf(order.view_type) >= 0">
<!-- || order.view_type == 2 --> <!-- || order.view_type == 2 -->
<view class="cancel" v-if="(order.view_type == 3) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view> <view class="cancel" v-if="(order.view_type == 3) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view> <view class="cancel" v-if="order.view_type == 3 && order.shipping_code" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view> <view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view> <view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view> <view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
<!-- <view class="cancel" v-if="order.view_type == 9" @click="cancelOrder">取消订单</view> --> <!-- <view class="cancel" v-if="order.view_type == 9" @click="cancelOrder">取消订单</view> -->
<view class="phone" v-if="order.view_type == 3 && order.takeawayer_phone" @click="makePhone(order.takeawayer_phone)">
<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
<text>联系骑手</text>
</view>
<!-- || order.view_type == 9 --> <!-- || order.view_type == 9 -->
<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view> <view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
<view class="service" v-if="order.view_type == 8">联系官方客服</view> <view class="service" v-if="order.view_type == 8">联系官方客服</view>
@ -136,6 +140,11 @@ export default {
order_id: id order_id: id
}); });
}, },
makePhone(phone) {
uni.makePhoneCall({
phoneNumber: phone
});
}
}, },
}; };
</script> </script>
@ -225,7 +234,7 @@ export default {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@mixin btn-class($width, $color) { @mixin btn-class($width, $color) {
width: $width; // width: $width;
height: 60rpx; height: 60rpx;
border: 2rpx solid $color; border: 2rpx solid $color;
color: $color; color: $color;
@ -248,6 +257,15 @@ export default {
.submit { .submit {
@include btn-class($width: 216rpx, $color: rgba(255,119,15,1)); @include btn-class($width: 216rpx, $color: rgba(255,119,15,1));
} }
.phone {
@include btn-class($width: 206rpx, $color: rgba(255,119,15,1));
display: flex;
align-items: center;
justify-content: center;
.u-icon {
margin-right: 10rpx;
}
}
} }
} }
</style> </style>

10
package-lock.json generated
View File

@ -6,13 +6,13 @@
"dependencies": { "dependencies": {
"blueimp-md5": { "blueimp-md5": {
"version": "2.17.0", "version": "2.17.0",
"resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.17.0.tgz?cache=0&sync_timestamp=1595922448921&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fblueimp-md5%2Fdownload%2Fblueimp-md5-2.17.0.tgz", "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz",
"integrity": "sha1-9PysCIsRX3tARfGfXaWenQGxu5Y=" "integrity": "sha512-x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw=="
}, },
"uview-ui": { "uview-ui": {
"version": "1.5.0", "version": "1.6.2",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.0.tgz", "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.6.2.tgz",
"integrity": "sha512-1UdMUGJqWx60ALbXXXs3rQHKUNBARDIV5XHc06mKFxpccO/i0tzoSqS6RuPdmYwXU1q59wnIU+NLABvcU5u4vw==" "integrity": "sha512-AvTXUk8A/AdJazxTziApw0NMv61jlE9cEO+Jxe84cTvcm2Ej7Ngf8zb3a6aSPVi6OVu81vTCC71R1wN7dZC3ig=="
}, },
"vuex": { "vuex": {
"version": "3.5.1", "version": "3.5.1",

2
package.json
View File

@ -14,7 +14,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"blueimp-md5": "^2.17.0", "blueimp-md5": "^2.17.0",
"uview-ui": "^1.5.0", "uview-ui": "^1.6.2",
"vuex": "^3.5.1" "vuex": "^3.5.1"
} }
} }

10
pageB/photo/index.vue
View File

@ -52,7 +52,7 @@
</view> </view>
<view class="child_content">{{ child.content }}</view> <view class="child_content">{{ child.content }}</view>
</view> </view>
<view class="more-reply" v-if="item.reply_count && is_more" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view> <view class="more-reply" v-if="item.reply_count" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view>
</view> </view>
</block> </block>
<view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view> <view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
@ -292,6 +292,7 @@
height: 90rpx; height: 90rpx;
& > input { & > input {
width: 80%; width: 80%;
font-size: 24rpx;
padding: 4rpx 20rpx; padding: 4rpx 20rpx;
border-radius: 20rpx; border-radius: 20rpx;
} }
@ -575,7 +576,6 @@ export default {
}) })
if (!this.page_[id] === 0) { if (!this.page_[id] === 0) {
} }
console.log(this.page_[id]);
this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => { this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.errCode == 0) { if (res.errCode == 0) {
@ -583,10 +583,8 @@ export default {
// this.is_more = false; // this.is_more = false;
// } // }
this.page_[id]++; this.page_[id]++;
console.log(this.page_[id]); this.allList[id] = res.data;
this.$nextTick(() => { this.$forceUpdate();
this.allList[id] = res.data;
})
console.log(this.allList); console.log(this.allList);
} }
}) })

9
pageB/sdetails/index.vue
View File

@ -19,7 +19,7 @@
</view> </view>
<view class="info"> <view class="info">
<view class="title u-line-2"> <view class="title u-line-2">
<text class="store-name">{{ goodsInfo.store_name }}</text> <text class="store-name" @click="toStorePage(goodsInfo.store_id)">{{ goodsInfo.store_name }}</text>
<text class="goods-name">{{ goodsInfo.goods_name }}</text> <text class="goods-name">{{ goodsInfo.goods_name }}</text>
</view> </view>
<view class="price-collect"> <view class="price-collect">
@ -662,7 +662,12 @@ export default {
this.$u.toast(res.message); this.$u.toast(res.message);
} }
}) })
} },
toStorePage(id) {
this.$u.route('pageC/merchant/index', {
id: id
});
},
}, },
} }
</script> </script>

86
pageB/video/video.nvue
View File

@ -77,9 +77,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="send-box"> <view class="send-box" @click="openKeyInput">
<input class="send-val" type="text" :placeholder="edit_text" placeholder-class="placeholder-class" <input class="send-val" type="text" :placeholder="edit_text" placeholder-class="placeholder-class"
disabled="true" @blur="blue" @click="openKeyInput" value="" /> disabled="true" @click="openKeyInput" />
<text class="btn-send">发送</text> <text class="btn-send">发送</text>
</view> </view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'"> <loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
@ -89,13 +89,13 @@
</scroller> </scroller>
</cover-view> </cover-view>
<!-- 评论框 --> <!-- 评论框 -->
<cover-view class="edit-box" :style="videoSize" v-if="is_edit"> <cover-view class="edit-box" :style="videoSize" v-if="is_edit" @click="hideEdit">
<view class="input-main" :style="{ bottom: editTop }"> <view class="input-main">
<input class="edit-input" type="text" value="" :focus="is_focus" :placeholder=" edit_text_other ? edit_text_other : edit_text" <input class="edit-input" type="text" :focus="is_focus" :placeholder=" edit_text_other ? edit_text_other : edit_text"
placeholder-class="placeholder-class" v-model="send_value" /> placeholder-class="placeholder-class" v-model="send_value" />
<text class="btn-send" @click="sendComment">发送</text> <text class="btn-send" @click="sendComment">发送</text>
</view> </view>
<view></view> <!-- <view class="key-height" :style="{ height: editTop }"></view> -->
</cover-view> </cover-view>
<!-- 购物车 --> <!-- 购物车 -->
<cover-view class="cart-box" v-if="cart_type"> <cover-view class="cart-box" v-if="cart_type">
@ -124,9 +124,10 @@
<cover-image class="close" @click="goBack" src="../../static/close.png"> <cover-image class="close" @click="goBack" src="../../static/close.png">
</cover-image> </cover-image>
<!-- 暂停按钮 --> <!-- 暂停按钮 -->
<cover-image class="pause" :style="{ top: fixTop + 100 }" @click="stoping" src="../../static/videoPlay.png" <cover-view class="pause" :style="{ top: fixTop + 100 }">
v-if="!is_play"> <cover-image class="pause-img" src="../../static/videoPlay.png" @click="stoping" v-if="!is_play">
</cover-image> </cover-image>
</cover-view>
</view> </view>
</template> </template>
@ -242,9 +243,12 @@
}, },
// 发布评论 // 发布评论
sendComment() { sendComment() {
console.log(this.article_id,this.send_value,this.pid,this.reply_id); console.log(this.article_id, this.send_value, this.pid, this.reply_id);
if (this.send_value.length == 0) { if (this.send_value.length == 0) {
this.$u.toast("内容不能为空！"); uni.showToast({
title: "输入内容不能为空！",
icon: "none"
})
return; return;
} }
uni.request({ uni.request({
@ -266,7 +270,7 @@
this.send_value = ""; this.send_value = "";
this.comment_num = res.data.num; this.comment_num = res.data.num;
let p_id = res.data.data.data.pid; let p_id = res.data.data.data.pid;
console.log(this.pid,this.reply_id,this.comment_id); console.log(this.pid, this.reply_id, this.comment_id);
if (res.data.data.data.pid) { if (res.data.data.data.pid) {
this.commentList[this.comment_id].reply_count = true; this.commentList[this.comment_id].reply_count = true;
console.log(this.allList[p_id]); console.log(this.allList[p_id]);
@ -305,8 +309,7 @@
uni.showLoading({ uni.showLoading({
title: "loading..." title: "loading..."
}) })
if (!this.page_[id] === 0) { if (!this.page_[id] === 0) {}
}
console.log(id); console.log(id);
uni.request({ uni.request({
url: temp_url + "article/articleReplyList", url: temp_url + "article/articleReplyList",
@ -325,11 +328,10 @@
this.is_more = false; this.is_more = false;
} }
this.page_[id]++; this.page_[id]++;
console.log(this.page_[id]); this.allList[id] = res.data.data;
this.$nextTick(function(){ this.$forceUpdate();
this.allList[id] = res.data.data; // console.log(this.page_[id]);
}) // console.log(this.allList);
console.log(this.allList);
} }
} }
}) })
@ -404,7 +406,7 @@
}, },
// 打开评论输入 // 打开评论输入
openKeyInput(data, index) { openKeyInput(data, index) {
console.log(data); // console.log(data);
let me = this; let me = this;
this.is_focus = true; this.is_focus = true;
setTimeout(() => { setTimeout(() => {
@ -416,7 +418,7 @@
me.is_focus = false; me.is_focus = false;
me.is_edit = false; me.is_edit = false;
} else { } else {
me.editTop = res.height; me.editTop = res.height + "rpx";
} }
}) })
this.comment_id = index; this.comment_id = index;
@ -458,6 +460,8 @@
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1, url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
}) })
}, },
// 收起键盘
hideEdit() {},
// stop // stop
stopClick(event) { stopClick(event) {
event.stopPropagation(); event.stopPropagation();
@ -478,6 +482,7 @@
/* 关闭 */ /* 关闭 */
.close { .close {
z-index: 99;
position: fixed; position: fixed;
top: 100rpx; top: 100rpx;
right: 70rpx; right: 70rpx;
@ -493,6 +498,11 @@
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
} }
.pause-img {
width: 100rpx;
height: 100rpx;
}
/* 用户操作 */ /* 用户操作 */
.user-info { .user-info {
@ -561,7 +571,7 @@
} }
.mask { .mask {
z-index: 999999; z-index: 10000;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@ -569,7 +579,7 @@
} }
.content-box { .content-box {
z-index: 99; z-index: 999;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -604,7 +614,7 @@
flex-direction: row; flex-direction: row;
padding-left: 100rpx; padding-left: 100rpx;
} }
.content-style { .content-style {
width: 600rpx; width: 600rpx;
@ -612,39 +622,37 @@
color: #333; color: #333;
lines: 2; lines: 2;
} }
.more-content-box { .more-content-box {
margin-left: 100rpx; margin-left: 100rpx;
} }
.child-box { .child-box {}
}
.child-info { .child-info {
margin: 10rpx 0; margin: 10rpx 0;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.child-avatar { .child-avatar {
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
margin-right: 10rpx; margin-right: 10rpx;
border-radius: 50%; border-radius: 50%;
} }
.child-name { .child-name {
font-size: 22rpx; font-size: 22rpx;
color: #333; color: #333;
} }
.child_content { .child_content {
padding: 4rpx 0; padding: 4rpx 0;
margin-left: 40rpx; margin-left: 40rpx;
font-size: 26rpx; font-size: 26rpx;
} }
.more-comment { .more-comment {
margin: 10rpx 0; margin: 10rpx 0;
font-size: 22rpx; font-size: 22rpx;
@ -725,6 +733,7 @@
.input-main { .input-main {
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 0;
/* #ifdef H5 */ /* #ifdef H5 */
display: flex; display: flex;
/* #endif */ /* #endif */
@ -735,6 +744,13 @@
padding: 0 20rpx; padding: 0 20rpx;
line-height: 80rpx; line-height: 80rpx;
background-color: #fff; background-color: #fff;
border-top-right-radius: 10rpx;
border-top-left-radius: 10rpx;
}
.key-height {
width: 750rpx;
background-color: #fff;
} }
.edit-input { .edit-input {
@ -746,7 +762,7 @@
} }
.cart-box { .cart-box {
z-index: 99; z-index: 1000;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;

2
pageE/mine/MineConcerns.vue
View File

@ -2,7 +2,7 @@
<view class="concerns"> <view class="concerns">
<view> <view>
<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" :is-scroll="false" <u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" :is-scroll="false"
swiperWidth="750"></u-tabs-swiper> swiperWidth="750" active-color="#FF780F"></u-tabs-swiper>
</view> </view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" style="width:750rpx" :style="{'height':height}"> <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" style="width:750rpx" :style="{'height':height}">
<swiper-item class="swiper-item" > <swiper-item class="swiper-item" >

22
pageE/order/Details.vue
View File

@ -71,11 +71,15 @@
<view class="btn" v-if="['1', '2', '6'].indexOf(orderstate) >= 0"> <view class="btn" v-if="['1', '2', '6'].indexOf(orderstate) >= 0">
<!-- orderstate == '4' || --> <!-- orderstate == '4' || -->
<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view> <view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view> <view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view> <view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view> <view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> --> <!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code" @click="toOtherPage('Logistics')">查看物流</view>
<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_phone" @click="makePhone(order.takeawayer_phone)">
<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
<text>联系骑手</text>
</view>
<!-- || orderstate == '8' --> <!-- || orderstate == '8' -->
<view class="payment" v-if="orderstate == '6'" @click="payNow">立即支付</view> <view class="payment" v-if="orderstate == '6'" @click="payNow">立即支付</view>
<view class="service" v-if="orderstate == '7'">联系官方客服</view> <view class="service" v-if="orderstate == '7'">联系官方客服</view>
@ -289,6 +293,11 @@ export default {
this.$u.route('/pageE/order/' + url, { this.$u.route('/pageE/order/' + url, {
oid: this.orderInfo.order_id, oid: this.orderInfo.order_id,
}); });
},
makePhone(phone) {
uni.makePhoneCall({
phoneNumber: phone
});
} }
}, },
}; };
@ -462,7 +471,7 @@ export default {
justify-content: flex-end; justify-content: flex-end;
padding: 19rpx 30rpx; padding: 19rpx 30rpx;
@mixin btn-class($width, $color) { @mixin btn-class($width, $color) {
width: $width; // width: $width;
height: 60rpx; height: 60rpx;
border: 2rpx solid $color; border: 2rpx solid $color;
color: $color; color: $color;
@ -485,6 +494,15 @@ export default {
.submit { .submit {
@include btn-class($width: 216rpx, $color: rgba(255,119,15,1)); @include btn-class($width: 216rpx, $color: rgba(255,119,15,1));
} }
.phone {
@include btn-class($width: 206rpx, $color: rgba(255,119,15,1));
display: flex;
align-items: center;
justify-content: center;
.u-icon {
margin-right: 10rpx;
}
}
} }
} }
</style> </style>

5
pageE/order/Index.vue
View File

@ -195,8 +195,8 @@ export default {
this.current = current; this.current = current;
}, },
setViewHeight() { setViewHeight() {
const sys = uni.getSystemInfoSync(); const res = uni.getSystemInfoSync();
this.swiperHeight = sys.windowHeight - 88 / 2 + 'px'; this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
}, },
} }
}; };
@ -207,6 +207,7 @@ export default {
background-color: #ECECEC; background-color: #ECECEC;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden;
.swiper-item { .swiper-item {
.order-scroll { .order-scroll {
.item-container { .item-container {

5
pages.json
View File

@ -104,10 +104,7 @@
{ {
"path" : "video/video", "path" : "video/video",
"style" : { "style" : {
"navigationStyle":"custom", "navigationStyle":"custom"
"app-plus": {
"softinputMode": "adjustResize"
}
} }
}, },
{ {

62
pages/mine/index.vue
View File

@ -4,7 +4,7 @@
<view class="top"> <view class="top">
<u-avatar @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar> <u-avatar @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
<view class="user-info"> <view class="user-info">
<view class="info-left"> <!-- <view class="info-left">
<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view> <view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')"> <view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
<image src="/static/image/mine/13.png"></image> <image src="/static/image/mine/13.png"></image>
@ -14,6 +14,17 @@
<view class="info-right"> <view class="info-right">
<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view> <view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
<view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view> <view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view>
</view> -->
<view class="info-top">
<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
</view>
<view class="info-bottom">
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
<image src="/static/image/mine/13.png"></image>
<view class="rank-title">{{ userInfo.member_grade_name }}</view>
</view>
<view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view>
</view> </view>
</view> </view>
<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view> <view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
@ -188,7 +199,7 @@ export default {
margin-bottom: 40rpx; margin-bottom: 40rpx;
.user-info { .user-info {
margin-left: 30rpx; margin-left: 30rpx;
display: flex; // display: flex;
.info-left { .info-left {
margin-right: 15rpx; margin-right: 15rpx;
.user-nickname { .user-nickname {
@ -228,6 +239,53 @@ export default {
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
} }
} }
.info-top {
height: 30rpx;
display: flex;
align-items: center;
margin-bottom: 19rpx;
.user-nickname {
min-width: 110rpx;
max-width: 200rpx;
font-size: 30rpx;
color: rgba(51,51,51,1);
margin-right: 19rpx;
}
.info-phone {
font-size: 24rpx;
color: rgba(51,51,51,1);
// margin-bottom: 26rpx;
}
}
.info-bottom {
height: 25rpx;
display: flex;
align-items: center;
.user-medal {
display: flex;
width: 110rpx;
height: 25rpx;
background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
border-radius: 13rpx;
align-items: center;
padding: 0 17rpx 0 10rpx;
margin-right: 20rpx;
> image {
margin-right: 9rpx;
width: 20rpx;
height: 22rpx;
flex-shrink: 0;
}
.rank-title {
font-size: 16rpx;
color: rgba(51,51,51,1);
}
}
.user-rank {
font-size: 24rpx;
color: rgba(51,51,51,1);
}
}
} }
.member-service { .member-service {
height: 52rpx; height: 52rpx;

2
pages/shop/index.vue
View File

@ -165,6 +165,8 @@
}, },
// 拼团推荐 // 拼团推荐
getPinTuanPush() { getPinTuanPush() {
// 初始化拼团
this.pinTuanPush = {};
this.$u.api.getPinTuanPush().then(res => { this.$u.api.getPinTuanPush().then(res => {
if (res.errCode == 0) { if (res.errCode == 0) {
this.pinTuanPush = res.data; this.pinTuanPush = res.data;

2
pages/zhibo/index.nvue
View File

@ -1,6 +1,6 @@
<template> <template>
<view> <view>
<video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors" > <video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors">
</video> </video>
<view class="user" :style="{'top': top}"> <view class="user" :style="{'top': top}">