Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
This commit is contained in:
commit
4004f3715b
GPG Key ID:
A7972FD973317FF3
@ -278,6 +278,17 @@ export default {
|
||||
searchwordlist() {
|
||||
return vm.$u.post('ShopSearch/searchwordlist')
|
||||
},
|
||||
saveGoodsTry({ member_name, member_mobile, area_info, address_detail, goods_id, num, store_id }) {
|
||||
return vm.$u.post('Order/saveGoodsTry', {
|
||||
member_name: member_name,
|
||||
member_mobile: member_mobile,
|
||||
area_info: area_info,
|
||||
address_detail: address_detail,
|
||||
goods_id: goods_id,
|
||||
num: num,
|
||||
store_id: store_id,
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -240,6 +240,10 @@ export default {
|
||||
getAfterSaleList({ page }) {
|
||||
return vm.$u.post('order/afterSaleList', { page: page });
|
||||
},
|
||||
// 试穿列表
|
||||
goodsTryOrderList() {
|
||||
return vm.$u.post('order/goodsTryOrderList');
|
||||
},
|
||||
// 订单详情
|
||||
getOrderInfo({ order_id }) {
|
||||
return vm.$u.post('Order/orderInfo', { order_id: order_id });
|
||||
|
||||
@ -42,17 +42,6 @@ export default {
|
||||
// this.loadStatus = "nomore";
|
||||
// this.tpage--;
|
||||
// })
|
||||
// this.$parent.callback({ page: this.tpage }).then(length => {
|
||||
// if(length == 0) {
|
||||
// this.tpage--;
|
||||
// this.status = 'nomore';
|
||||
// } else {
|
||||
// this.status = 'loading';
|
||||
// }
|
||||
// }).catch(() => {
|
||||
// this.loadStatus = "nomore";
|
||||
// this.tpage--;
|
||||
// })
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -96,6 +96,7 @@ export default {
|
||||
if(res.errCode == 0) {
|
||||
this.$emit("refreshOrderList", { reload: 'again' });
|
||||
}
|
||||
this.$u.toast(res.message);
|
||||
})
|
||||
},
|
||||
toOtherPage(url) {
|
||||
|
||||
@ -14,12 +14,10 @@
|
||||
</swiper>
|
||||
<!-- 加载更多 -->
|
||||
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20"></u-loadmore>
|
||||
<!-- <loadmore ref="loadmore" @callback="getGoodsRecommend" bgColor="#FFF" :page="page"></loadmore> -->
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import item from "./item";
|
||||
import loadmore from "@/components/loadmore/index";
|
||||
export default {
|
||||
name:"list",
|
||||
data() {
|
||||
@ -36,10 +34,10 @@ export default {
|
||||
},
|
||||
components: {
|
||||
item,
|
||||
loadmore
|
||||
},
|
||||
watch: {
|
||||
current(index) {
|
||||
this.page = 1;
|
||||
const id = this.classifyList[index].gc_id;
|
||||
this.getGoodsRecommend({gc_id: id});
|
||||
}
|
||||
@ -68,8 +66,6 @@ export default {
|
||||
this.loadStatus = "nomore";
|
||||
this.page--;
|
||||
})
|
||||
// this.$refs.loadmore.reachBottom();
|
||||
// this.getGoodsRecommend(this.classifyList[this.current].gc_id);
|
||||
},
|
||||
getGoodsClassRecommend(gc_id) {
|
||||
this.$u.api.getGoodsClassRecommend().then(res => {
|
||||
@ -77,7 +73,6 @@ export default {
|
||||
// 初始化 current
|
||||
this.current = 0;
|
||||
this.classifyList = res.data.gc_recommend;
|
||||
// this.getGoodsRecommend(this.classifyList[0].gc_id);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="comment">
|
||||
<scroll-view scroll-y class="comment" @scrolltolower="loadMore">
|
||||
<view class="label-list">
|
||||
<view v-for="(label, index) in evaluateSpec" :key="index" :class="{'active': current == index}" @click="current=index">{{ index + '(' + label + '}' }}</view>
|
||||
</view>
|
||||
@ -9,7 +9,9 @@
|
||||
</view>
|
||||
<u-empty text="暂无评论" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 加载更多 -->
|
||||
<u-loadmore :status="loadStatus" bgColor="#EEEBEE" margin-top="20" margin-bottom="20" v-if="evalueList.length >= 12"></u-loadmore>
|
||||
</scroll-view>
|
||||
</template>
|
||||
<script>
|
||||
import comment from "@/components/comment/index";
|
||||
@ -21,6 +23,8 @@ export default {
|
||||
page: 0,
|
||||
evalueList: [],
|
||||
evaluateSpec: {},
|
||||
loadStatus: 'loadmore',
|
||||
timer: true,
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@ -33,13 +37,31 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
current(value) {
|
||||
this.getAllEvalue(value);
|
||||
this.page = 0;
|
||||
this.getAllEvalue({ type: value });
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
loadMore() {
|
||||
if(this.evalueList.length < 12) return false;
|
||||
if(!this.timer) return false;
|
||||
this.loadStatus = "loading";
|
||||
this.page++;
|
||||
this.getAllEvalue({ type: this.current, load: 'more' }).then(length => {
|
||||
if(length == 0) {
|
||||
this.page--;
|
||||
this.loadStatus = 'nomore';
|
||||
} else {
|
||||
this.loadStatus = 'loading';
|
||||
}
|
||||
}).catch(() => {
|
||||
this.loadStatus = "nomore";
|
||||
this.page--;
|
||||
})
|
||||
},
|
||||
getEvaluateSpec() {
|
||||
this.$u.api.getEvaluateSpec({
|
||||
id: this.id
|
||||
id: this.id,
|
||||
}).then(res => {
|
||||
if(res.errCode == 0) {
|
||||
this.evaluateSpec = res.data;
|
||||
@ -47,19 +69,20 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
getAllEvalue(type) {
|
||||
async getAllEvalue({ type, load } = {}) {
|
||||
let params = {
|
||||
goods_id: this.id,
|
||||
page: this.page,
|
||||
}
|
||||
if(type) Object.assign(params, { type: type });
|
||||
this.$u.api.getAllEvalue(params).then(res => {
|
||||
if(res.errCode == 0) {
|
||||
this.evalueList = res.data;
|
||||
} else {
|
||||
this.evalueList = [];
|
||||
}
|
||||
})
|
||||
const res = await this.$u.api.getAllEvalue(params);
|
||||
if (res.errCode == 0) {
|
||||
if(load) this.evalueList.push(...res.data);
|
||||
else this.evalueList = res.data;
|
||||
} else {
|
||||
this.evalueList = [];
|
||||
}
|
||||
return res.data.length;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -9,10 +9,13 @@
|
||||
</view>
|
||||
<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件</view>
|
||||
</view>
|
||||
<view class="right">
|
||||
<view class="right" v-if="!isSpike">
|
||||
<view class="title">秒杀倒计时</view>
|
||||
<view class="time">{{ spikeTime }}</view>
|
||||
</view>
|
||||
<view class="right" v-else>
|
||||
<view class="title">时间已结束</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="info">
|
||||
<view class="title u-line-2">
|
||||
@ -49,7 +52,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="bottom">
|
||||
<view class="left" @click="showGroupUser=true">
|
||||
<view class="left" @click="showGroupUser=true" v-if="user_suc.length">
|
||||
<view class="avatar">
|
||||
<image v-for="(user, i) in user_suc" :src="user[0].member_avatar" :key="i"></image>
|
||||
</view>
|
||||
@ -139,7 +142,7 @@
|
||||
<image src="/static/image/common/19.png"></image>
|
||||
客服
|
||||
</view>
|
||||
<view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1">试穿试送</view>
|
||||
<view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1" @click="tryDress">试穿试送</view>
|
||||
<view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
|
||||
<view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>
|
||||
</view>
|
||||
@ -190,6 +193,7 @@ export default {
|
||||
involvemenGroupInfo: [], // 参团的人
|
||||
groupbuyInfo: {}, // 秒杀详情
|
||||
spikeTime: '',
|
||||
isSpike: false, // 是否超过秒杀时间
|
||||
timer: '', // 秒杀时间定时器
|
||||
spec_id: '', // 规格 id, 下单用的
|
||||
evaluate: {}, // 评价内容
|
||||
@ -272,6 +276,7 @@ export default {
|
||||
// const time = this.groupbuyInfo.groupbuy_endtime;
|
||||
this.timer = setInterval(() => {
|
||||
let spikeTime = time * 1000 - new Date().getTime();
|
||||
if(spikeTime <= 0) this.isSpike = true;
|
||||
// 计算天数
|
||||
const days = Math.floor(spikeTime/(24*3600*1000));
|
||||
//计算出小时数
|
||||
@ -363,6 +368,15 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
// 试穿
|
||||
tryDress() {
|
||||
this.$u.route({
|
||||
url: '/pageB/triedDress/index',
|
||||
params: {
|
||||
id: this.id,
|
||||
}
|
||||
})
|
||||
},
|
||||
/*
|
||||
* @description 下单 订单步骤1：展示结算数据
|
||||
* @params {Number} type 拼团或者开团
|
||||
|
||||
260
pageB/triedDress/index.vue
Normal file
260
pageB/triedDress/index.vue
Normal file
@ -0,0 +1,260 @@
|
||||
<template>
|
||||
<view class="tried">
|
||||
<view class="user-info">
|
||||
<view>
|
||||
<label for="name">试穿人:</label>
|
||||
<input type="text" id="name" placeholder="" v-model="name" />
|
||||
</view>
|
||||
<view>
|
||||
<label for="phone">手机号:</label>
|
||||
<input type="text" id="phone" placeholder="" maxlength="11" v-model="phone" />
|
||||
</view>
|
||||
<view class="area" @click="show=true">
|
||||
<label for="address">省市区:</label>
|
||||
<input type="text" id="address" placeholder="" v-model="address" disabled />
|
||||
<view>
|
||||
<image src="/static/image/mine/24.png"></image>
|
||||
<text>定位</text>
|
||||
</view>
|
||||
</view>
|
||||
<view>
|
||||
<label for="area">详细地址:</label>
|
||||
<input type="text" id="area" placeholder="" v-model="area" />
|
||||
</view>
|
||||
<view>
|
||||
<label for="time">预约时间:</label>
|
||||
<input type="text" id="time" placeholder="" v-model="time" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="goods-container">
|
||||
<view class="store">
|
||||
<image :src="store.store_avatar"></image>
|
||||
<text>{{ store.store_name }}</text>
|
||||
</view>
|
||||
<view class="goods">
|
||||
<image :src="goodsInfo.goods_image"></image>
|
||||
<view class="right">
|
||||
<view class="name u-line-2">{{ goodsInfo.goods_name }}</view>
|
||||
<u-number-box v-model="number" bg-color="#FFFFFF" :min="1" :input-width="38" :input-height="38" color="#FF780F"></u-number-box>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="edit-btn" @click="confirmBtn">确认试穿</view>
|
||||
<u-select v-model="show"
|
||||
mode="mutil-column-auto"
|
||||
:list="areaList"
|
||||
value-name="area_id"
|
||||
label-name="area_name"
|
||||
child-name="_child"
|
||||
@confirm="setArea">
|
||||
</u-select>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
show: false,
|
||||
areaList: [],
|
||||
checked: false, // 是否设为默认地址
|
||||
name: '',
|
||||
phone: '',
|
||||
address: '', // 选择地址
|
||||
area: '', // 详细地址
|
||||
time: '',
|
||||
number: 1, // 商品数量
|
||||
area_id: '', // 地区id 省
|
||||
city_id: '', // 城市id
|
||||
goodsInfo: {},
|
||||
store: {},
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getAreaData();
|
||||
},
|
||||
onLoad(option) {
|
||||
this.ordinaryDetails(option.id);
|
||||
},
|
||||
methods: {
|
||||
verification() {
|
||||
if(this.$u.test.isEmpty(this.name)) {
|
||||
this.$u.toast('姓名不可为空');
|
||||
return false;
|
||||
}
|
||||
if(this.$u.test.isEmpty(this.phone)) {
|
||||
this.$u.toast('手机号不可为空');
|
||||
return false;
|
||||
}
|
||||
if(!this.$u.test.mobile(this.phone)) {
|
||||
this.$u.toast('请填写正确的新手机号');
|
||||
return false;
|
||||
}
|
||||
if(this.$u.test.isEmpty(this.address)) {
|
||||
this.$u.toast('地址不可为空');
|
||||
return false;
|
||||
}
|
||||
if(this.$u.test.isEmpty(this.area)) {
|
||||
this.$u.toast('详细地址不可为空');
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
confirmBtn() {
|
||||
if(!this.verification) return false;
|
||||
this.$u.api.saveGoodsTry({
|
||||
member_name: this.name,
|
||||
member_mobile: this.phone,
|
||||
area_info: this.address,
|
||||
address_detail: this.area,
|
||||
goods_id: this.goodsInfo.goods_id,
|
||||
num: this.number,
|
||||
store_id: this.store.store_id,
|
||||
}).then((res)=>{
|
||||
this.$u.toast(res.message);
|
||||
if (res.errCode == 0) {
|
||||
// this.$u.route({ type: 'navigateBack' });
|
||||
}
|
||||
})
|
||||
},
|
||||
getAreaData() {
|
||||
this.$u.api.getArea().then((res)=>{
|
||||
if (res.errCode == 0) {
|
||||
this.areaList = res.data;
|
||||
}
|
||||
})
|
||||
},
|
||||
setArea(area) {
|
||||
// console.log(area);
|
||||
this.area_id = area[0].value;
|
||||
this.city_id = area[1].value;
|
||||
let temp = '';
|
||||
area.forEach(e => {
|
||||
temp += e.label + ' ';
|
||||
});
|
||||
this.address = temp;
|
||||
},
|
||||
ordinaryDetails(id) {
|
||||
this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
|
||||
if (res.errCode == 0) {
|
||||
this.goodsInfo = res.data.goods;
|
||||
this.store = res.data.store;
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.tried {
|
||||
.user-info {
|
||||
border-top: 1rpx solid rgba(235,235,235,1);
|
||||
> view {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 98rpx;
|
||||
padding: 30rpx;
|
||||
border-bottom: 2rpx solid rgba(235,235,235,1);
|
||||
font-size: 30rpx;
|
||||
> label {
|
||||
width: 150rpx;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
> input {
|
||||
flex: 1;
|
||||
outline: none;
|
||||
}
|
||||
}
|
||||
.area {
|
||||
padding: 0 30rpx;
|
||||
display: flex;
|
||||
> input {
|
||||
padding: 30rpx 0;
|
||||
flex: 1;
|
||||
}
|
||||
> view {
|
||||
margin-left: 30rpx;
|
||||
width: 50rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 22rpx;
|
||||
color: rgba(255,120,15,1);
|
||||
> image {
|
||||
width: 26rpx;
|
||||
height: 32rpx;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.goods-container {
|
||||
padding: 30rpx;
|
||||
.store {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 20rpx;
|
||||
> image {
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
border-radius: 50%;
|
||||
margin-right: 16rpx;
|
||||
background-color: antiquewhite;
|
||||
}
|
||||
> text {
|
||||
font-size: 28rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
}
|
||||
}
|
||||
.goods {
|
||||
display: flex;
|
||||
> image {
|
||||
width: 180rpx;
|
||||
height: 160rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-right: 30rpx;
|
||||
background-color: aquamarine;
|
||||
}
|
||||
.right {
|
||||
flex: 1;
|
||||
.name {
|
||||
font-size: 30rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
line-height: 44rpx;
|
||||
margin-bottom: 30rpx;
|
||||
}
|
||||
/deep/ .u-numberbox {
|
||||
border: 1rpx solid rgba(217,215,215,1);
|
||||
.u-icon-minus, .u-icon-plus {
|
||||
width: 38rpx;
|
||||
.u-icon {
|
||||
.u-icon__icon {
|
||||
font-size: 11rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.u-number-input {
|
||||
margin: 0;
|
||||
border: 1rpx solid rgba(229,229,229,1) {
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.edit-btn {
|
||||
margin: 122rpx auto 0;
|
||||
width: 690rpx;
|
||||
height: 98rpx;
|
||||
background: rgba(255,119,15,1);
|
||||
border-radius: 49rpx;
|
||||
font-size: 36rpx;
|
||||
color:rgba(255,255,255,1);
|
||||
line-height: 98rpx;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -68,13 +68,13 @@
|
||||
<u-popup v-model="couponStatus" mode="bottom">
|
||||
<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 1">
|
||||
<view class="title">优惠券详情</view>
|
||||
<view class="text">店铺优惠券</view>
|
||||
<view class="text">平台优惠券</view>
|
||||
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index"></Coupon>
|
||||
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length"></u-empty>
|
||||
</scroll-view>
|
||||
<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 2">
|
||||
<view class="title">优惠券详情</view>
|
||||
<view class="text">平台优惠券</view>
|
||||
<view class="text">店铺优惠券</view>
|
||||
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index"></Coupon>
|
||||
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length"></u-empty>
|
||||
</scroll-view>
|
||||
@ -121,7 +121,6 @@ export default {
|
||||
choiceCoupon: {}, // 使用的平台优惠券
|
||||
goodsClass: [],
|
||||
orderType: '', // 订单类型 1 普通订单 2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
|
||||
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@ -147,11 +146,13 @@ export default {
|
||||
onLoad(option) {
|
||||
this.orderType = this.$store.state.orderType;
|
||||
this.orderInfo = this.$store.state.orderInfo;
|
||||
console.log(this.orderType);
|
||||
// console.log(this.orderType);
|
||||
console.log(this.orderInfo);
|
||||
this.getGoodsClass();
|
||||
},
|
||||
onShow() {
|
||||
this.storeCoupon = {};
|
||||
this.choiceCoupon = {};
|
||||
// 判断是不是从选择地址页面返回
|
||||
if(JSON.stringify(this.$store.state.orderAddress) == '{}') {
|
||||
this.$store.commit('updateAddress', this.orderInfo.address_info);
|
||||
@ -256,6 +257,7 @@ export default {
|
||||
this.$u.api.sendOrder(params).then(res => {
|
||||
if(res.errCode == 0) {
|
||||
this.$u.route({
|
||||
type: 'redirect',
|
||||
url: '/pageC/cart/cashier',
|
||||
params: {
|
||||
pay_sn: res.data.pay_sn,
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<swiper-item class="swiper-item" v-for="(_, index) in tabList" :key="index">
|
||||
<scroll-view scroll-y style="height: 800rpx;width: 100%;" @scrolltolower="onreachBottom">
|
||||
<SpecialGoods v-for="(item, index) in pinTuanList" :key="index" :item="item" type='group'></SpecialGoods>
|
||||
<!-- <loadmore ref="loadmore" @callback="getPinTuanList" bgColor="#FFF"></loadmore> -->
|
||||
<loadmore ref="loadmore" @callback="getPinTuanList" bgColor="#FFF"></loadmore>
|
||||
<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList.length"></u-empty>
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
@ -39,8 +39,7 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
current(index) {
|
||||
// console.log(this.tabList);
|
||||
this.getPinTuanList({id: this.tabList[index].gc_id });
|
||||
this.getPinTuanList({ id: this.tabList[index].gc_id });
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@ -81,20 +80,20 @@ export default {
|
||||
// scroll-view到底部加载更多
|
||||
onreachBottom() {
|
||||
this.$$refs.loadmore.reachBottom();
|
||||
// if(!this.timer) return false;
|
||||
// this.loadStatus = "loading";
|
||||
// this.page++;
|
||||
// this.getPinTuanList().then(length => {
|
||||
// if(length == 0) {
|
||||
// this.page--;
|
||||
// this.status = 'nomore';
|
||||
// } else {
|
||||
// this.status = 'loading';
|
||||
// }
|
||||
// }).catch(() => {
|
||||
// this.loadStatus = "nomore";
|
||||
// this.page--;
|
||||
// })
|
||||
if(!this.timer) return false;
|
||||
this.loadStatus = "loading";
|
||||
this.page++;
|
||||
this.getPinTuanList().then(length => {
|
||||
if(length == 0) {
|
||||
this.page--;
|
||||
this.status = 'nomore';
|
||||
} else {
|
||||
this.status = 'loading';
|
||||
}
|
||||
}).catch(() => {
|
||||
this.loadStatus = "nomore";
|
||||
this.page--;
|
||||
})
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
|
||||
@ -13,11 +13,25 @@
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import common from '@/static/js/common.js';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
nodes: '<h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1>'
|
||||
nodes: '',
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getMemberPointsStat();
|
||||
},
|
||||
methods: {
|
||||
getMemberPointsStat() {
|
||||
this.$u.api.getMemberPointsStat().then((res)=>{
|
||||
if (res.errCode == 0) {
|
||||
const nodes = res.data.grade_rule;
|
||||
this.nodes = common.unescapeHTML(nodes);
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -34,6 +34,8 @@ export default {
|
||||
couponGroupList: [],
|
||||
couponList: [],
|
||||
page: 0,
|
||||
loadStatus: 'loadmore',
|
||||
timer: true,
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@ -50,6 +52,27 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
loadMore(page) {
|
||||
if(!this.timer) return false;
|
||||
this.loadStatus = "loading";
|
||||
this.page++;
|
||||
this.getGoodsRecommend({
|
||||
gc_id: this.classifyList[this.current].gc_id,
|
||||
page: this.page,
|
||||
reload: false,
|
||||
}).then(length => {
|
||||
// console.log(length);
|
||||
if(length == 0) {
|
||||
this.page--;
|
||||
this.loadStatus = 'nomore';
|
||||
} else {
|
||||
this.loadStatus = 'loading';
|
||||
}
|
||||
}).catch(() => {
|
||||
this.loadStatus = "nomore";
|
||||
this.page--;
|
||||
})
|
||||
},
|
||||
getGoodsClass() {
|
||||
this.$u.api.getGoodsClass().then(res => {
|
||||
if(res.errCode == 0) {
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
<template>
|
||||
<view class="progress">
|
||||
<view class="progress" v-if="memberInfo">
|
||||
<view class="header">
|
||||
<view class="line-progress">
|
||||
<view class="rank-value">lv1</view>
|
||||
<view class="rank-value">lv{{ memberInfo.member_level }}</view>
|
||||
<view class="line-box">
|
||||
<u-line-progress :percent="70" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30"></u-line-progress>
|
||||
<text>78/99</text>
|
||||
<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
|
||||
<text>{{ memberInfo.member_exppoints | percentExp(rank[memberInfo.member_level - 1])}}</text>
|
||||
</view>
|
||||
<view class="rank-value">lv2</view>
|
||||
<view class="rank-value">lv{{ memberInfo.member_level + 1 }}</view>
|
||||
</view>
|
||||
<view class="exp-value">经验值<span>78</span></view>
|
||||
<view class="distance">距离下一级还需要21经验值</view>
|
||||
<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
|
||||
<view class="distance">距离下一级还需要{{ memberInfo.member_exppoints | residualExp(rank[memberInfo.member_level - 1]) }}经验值</view>
|
||||
</view>
|
||||
<view class="body">
|
||||
<view class="title">
|
||||
@ -66,8 +66,37 @@ export default {
|
||||
min: 5000,
|
||||
max: '--',
|
||||
}
|
||||
]
|
||||
],
|
||||
percent: 0,
|
||||
memberInfo: {},
|
||||
}
|
||||
},
|
||||
filters: {
|
||||
percentExp(value, rank) {
|
||||
// console.log(rank);
|
||||
let result = '0/0';
|
||||
if(rank) result = value + '/' + rank.max;
|
||||
return result;
|
||||
},
|
||||
residualExp(value, rank) {
|
||||
let result = 0;
|
||||
if(rank) result = rank.max - value;
|
||||
return result;
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
this.getMemberPointsStat();
|
||||
},
|
||||
methods: {
|
||||
getMemberPointsStat() {
|
||||
this.$u.api.getMemberPointsStat().then((res)=>{
|
||||
if (res.errCode == 0) {
|
||||
this.memberInfo = res.data;
|
||||
this.percent = (this.memberInfo.member_exppoints / this.rank[this.memberInfo.member_level - 1].max) * 100;
|
||||
// console.log(this.percent);
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -55,6 +55,13 @@ export default {
|
||||
this.page = 0;
|
||||
// again 重新请求列表 不然往列表里添加
|
||||
value == 6 ? this.getAfterSaleList({ reload: 'again' }): this.getOrderList({ reload: 'again' });
|
||||
if(value == 6) {
|
||||
this.getAfterSaleList({ reload: 'again' });
|
||||
} else if(value == 4) {
|
||||
this.goodsTryOrderList({ reload: 'again' });
|
||||
} else {
|
||||
this.getOrderList({ reload: 'again' });
|
||||
}
|
||||
},
|
||||
},
|
||||
onLoad(option) {
|
||||
@ -113,6 +120,17 @@ export default {
|
||||
}
|
||||
return res;
|
||||
},
|
||||
async goodsTryOrderList({ reload = '' } = {}) {
|
||||
const res = await this.$u.api.goodsTryOrderList({
|
||||
page: this.page,
|
||||
})
|
||||
this.timer = true;
|
||||
if(res.errCode == 0) {
|
||||
if(reload) this.orderList = res.data;
|
||||
else this.orderList.push(...res.data);
|
||||
}
|
||||
return res;
|
||||
},
|
||||
reachBottom() {
|
||||
// 大于15条才会加载更多
|
||||
if(this.orderList.length < 15) return false;
|
||||
@ -122,6 +140,7 @@ export default {
|
||||
this.page++;
|
||||
let promise;
|
||||
if(this.current == 6) promise = this.getAfterSaleList();
|
||||
else if(this.current == 4) promise = this.goodsTryOrderList();
|
||||
else promise = this.getOrderList();
|
||||
promise.then(res => {
|
||||
this.loadStatus.splice(this.current, 1, "nomore");
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="wash">
|
||||
<view>
|
||||
<view class="title">
|
||||
<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
|
||||
</view>
|
||||
<swiper :current="swiperCurrent" @animationfinish="animationfinish">
|
||||
@ -19,6 +19,11 @@
|
||||
<view>所属公司：xx公司</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="send-btn">
|
||||
<view class="btn" v-if="btn_show">
|
||||
确认完成
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
@ -35,6 +40,14 @@
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
<view class="popup" v-if="showPopup" @click="onTap">
|
||||
<view class="popup_cont" @click="replaces(1)">
|
||||
实体店历史订单
|
||||
</view>
|
||||
<view class="popup_cont" @click="replaces(2)">
|
||||
平台历史订单
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@ -42,15 +55,17 @@ import Comment from '@/components/mine/comment/index'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
showPopup: false,
|
||||
list: [{
|
||||
name: '我的订单'
|
||||
name: '平台历史订单'
|
||||
}, {
|
||||
name: '申请表'
|
||||
}, {
|
||||
name: '评价'
|
||||
}],
|
||||
current: 0,
|
||||
swiperCurrent: 0
|
||||
swiperCurrent: 0,
|
||||
btn_show:true
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@ -59,6 +74,7 @@ export default {
|
||||
onShow() {
|
||||
this.current = 0;
|
||||
this.swiperCurrent = 0;
|
||||
this.showPopup= false
|
||||
},
|
||||
methods: {
|
||||
tabsChange(index) {
|
||||
@ -72,11 +88,30 @@ export default {
|
||||
this.toApplyPage(current);
|
||||
},
|
||||
toApplyPage(index) {
|
||||
var that = this;
|
||||
if(index == 1) {
|
||||
this.showPopup = false
|
||||
uni.navigateTo({
|
||||
url: '/pageE/tool/WashOrder'
|
||||
});
|
||||
}else if(index ==0){
|
||||
this.history();
|
||||
}else{
|
||||
this.showPopup = false
|
||||
}
|
||||
},
|
||||
history(){
|
||||
this.showPopup = true;
|
||||
},
|
||||
replaces(e){
|
||||
if(e == 1){
|
||||
this.$set(this.list,0,{name: '实体店历史订单'} )
|
||||
}else{
|
||||
this.$set(this.list,0,{name: '平台历史订单'} )
|
||||
}
|
||||
},
|
||||
onTap(){
|
||||
this.showPopup = false
|
||||
}
|
||||
},
|
||||
};
|
||||
@ -89,6 +124,10 @@ export default {
|
||||
flex-direction: column;
|
||||
> uni-swiper {
|
||||
flex: 1;
|
||||
height: 85vh;
|
||||
}
|
||||
.title{
|
||||
|
||||
}
|
||||
.swiper-item {
|
||||
padding-top: 20rpx;
|
||||
@ -100,7 +139,7 @@ export default {
|
||||
.order-item {
|
||||
padding: 30rpx;
|
||||
width:690rpx;
|
||||
height: 308rpx;
|
||||
height: 362rpx;
|
||||
background: rgba(255,255,255,1);
|
||||
border-radius: 10rpx;
|
||||
margin-bottom: 20rpx;
|
||||
@ -135,6 +174,24 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.send-btn {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 30rpx;
|
||||
.btn{
|
||||
width: 154rpx;
|
||||
height: 54rpx;
|
||||
border-radius: 49rpx;
|
||||
transform: translate(-50%, 0);
|
||||
font-size: 26rpx;
|
||||
border: 1rpx solid rgba(255,120,15,1);
|
||||
color:rgba(255,120,15,1);
|
||||
text-align: center;
|
||||
line-height: 54rpx;
|
||||
margin-right: -80rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.comment {
|
||||
@ -145,5 +202,35 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.popup{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
top: 88px;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 2;
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
transform: scale(1);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: top;
|
||||
align-items: center;
|
||||
transition-duration: 0.3s;
|
||||
|
||||
.popup_cont{
|
||||
border-top: 1px solid RGBA(239, 236, 240, 1);
|
||||
background-color: #fff;
|
||||
width: 100%;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
font-size:28rpx;
|
||||
font-family:PingFang SC;
|
||||
font-weight:400;
|
||||
color:rgba(102,102,102,1);
|
||||
padding-left: 41rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -1,69 +1,334 @@
|
||||
<template>
|
||||
<view class="wash-order">
|
||||
<view class="order-info">
|
||||
<view class="order-name">
|
||||
<view class="title">送洗人：</view>
|
||||
<input type="text" v-model="name" />
|
||||
</view>
|
||||
<view class="order-phone">
|
||||
<view class="title">手机号：</view>
|
||||
<input type="text" v-model="phone" />
|
||||
</view>
|
||||
<view class="order-area">
|
||||
<view class="title">省市区：</view>
|
||||
<input type="text" v-model="area" />
|
||||
<view class="location">
|
||||
<image src="../static/mine/28.png"></image>
|
||||
<view>定位</view>
|
||||
<view>
|
||||
<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
|
||||
</view>
|
||||
<swiper :current="swiperCurrent" @animationfinish="animationfinish">
|
||||
<swiper-item class="swiper-item">
|
||||
<view class="order-info">
|
||||
<view class="order-name" @click="order()">
|
||||
<view class="title titles" >
|
||||
<text>选择订单：</text>
|
||||
<image src="../../static/image/shop/2.png" mode=""></image>
|
||||
</view>
|
||||
<u-icon name="arrow-dwon" color="#2979ff" size="28"></u-icon>
|
||||
</view>
|
||||
<view class="choose-info" v-if="choose">
|
||||
<view class="store">
|
||||
<view>
|
||||
<image src="../../static/image/mine/23.png" mode=""></image>胖胖的店
|
||||
</view>
|
||||
<view>
|
||||
订单编号：2222222222222
|
||||
</view>
|
||||
</view>
|
||||
<view class="store_info">
|
||||
<view class="info_img">
|
||||
<image src="../../static/image/mine/23.png" mode="">
|
||||
</view>
|
||||
<view class="info_txt">
|
||||
<view class="content">
|
||||
木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
|
||||
</view>
|
||||
<view class="much">
|
||||
<text>￥99</text>
|
||||
<text>x1</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="order-name">
|
||||
<view class="title">送洗人：</view>
|
||||
<input type="text" v-model="name" />
|
||||
</view>
|
||||
<view class="order-phone">
|
||||
<view class="title">手机号：</view>
|
||||
<input type="text" v-model="phone" />
|
||||
</view>
|
||||
<view class="order-area">
|
||||
<view class="title">省市区：</view>
|
||||
<input type="text" v-model="area" />
|
||||
<view class="location">
|
||||
<image src="../static/mine/28.png"></image>
|
||||
<view>定位</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="order-address">
|
||||
<view class="title">详细地址：</view>
|
||||
<input type="text" v-model="address" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="upload-image">
|
||||
<view class="title">上传商品图片</view>
|
||||
<u-upload
|
||||
ref="uUpload"
|
||||
@on-uploaded="onUploaded"
|
||||
:custom-btn="true"
|
||||
:max-count="count"
|
||||
:auto-upload="false"
|
||||
>
|
||||
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
|
||||
<img src="../static/mine/27.png" />
|
||||
</view>
|
||||
</u-upload>
|
||||
</view>
|
||||
<view class="wash-btn" @click="reset()">确认送洗</view>
|
||||
</swiper-item>
|
||||
<swiper-item class="swiper-item">
|
||||
<view class="order-info">
|
||||
<view class="order-name">
|
||||
<view class="title">商品名称：</view>
|
||||
<input type="text" v-model="name" />
|
||||
</view>
|
||||
<view class="order-phone">
|
||||
<view class="title">商品类型：</view>
|
||||
<input type="text" v-model="name" />
|
||||
</view>
|
||||
<view class="order-phone">
|
||||
<view class="title">衣服状况：</view>
|
||||
<input type="text" v-model="name" />
|
||||
</view>
|
||||
<view class="order-name">
|
||||
<view class="title">送洗人：</view>
|
||||
<input type="text" v-model="name" />
|
||||
</view>
|
||||
<view class="order-area">
|
||||
<view class="title">省市区：</view>
|
||||
<input type="text" v-model="area" />
|
||||
<view class="location">
|
||||
<image src="../static/mine/28.png"></image>
|
||||
<view>定位</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="order-address">
|
||||
<view class="title">详细地址：</view>
|
||||
<input type="text" v-model="address" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="upload-image">
|
||||
<view class="title">上传商品图片</view>
|
||||
<u-upload
|
||||
ref="uUpload"
|
||||
@on-uploaded="onUploaded"
|
||||
:custom-btn="true"
|
||||
:max-count="count"
|
||||
:auto-upload="false"
|
||||
>
|
||||
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
|
||||
<img src="../static/mine/27.png" />
|
||||
</view>
|
||||
</u-upload>
|
||||
</view>
|
||||
<view class="wash-btn">确认送洗</view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
<view class="popup" v-if="showPopup">
|
||||
<view class="popup_cont" >
|
||||
<view class="check">
|
||||
<text>选择订单</text>
|
||||
<image src="../../static/image/common/17.png" @click="close()"></image>
|
||||
</view>
|
||||
<swiper style="height: 1000px;" vertical="true">
|
||||
<swiper-item class="swiper-item">
|
||||
<scroll-view scroll-y class="order-list">
|
||||
<view v-for="(items, index) in 3" :key="index">
|
||||
<view class="store">
|
||||
<view>
|
||||
<image src="../../static/image/mine/23.png" mode=""></image>胖胖的店
|
||||
</view>
|
||||
<view>
|
||||
订单编号：2222222222222
|
||||
</view>
|
||||
</view>
|
||||
<view class="checkd">
|
||||
<radio-group @change="er">
|
||||
<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in checkLidt" :key="index">
|
||||
<view class="radio">
|
||||
<radio color="#F0AD4E" :value="item.id" :checked="a==item.id"/>
|
||||
</view>
|
||||
<view class="store_info">
|
||||
<view class="info_img">
|
||||
<image src="../../static/image/mine/23.png" mode="">
|
||||
</view>
|
||||
<view class="info_txt">
|
||||
<view class="content">
|
||||
木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
|
||||
</view>
|
||||
<view class="much">
|
||||
<text>￥99</text>
|
||||
<text>x1</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</label>
|
||||
</radio-group>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
<view class="bottom_btn" style="width: 100%;background-color: #fff;">
|
||||
<view class="wash-btn" @click="confirm()">确认</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="order-address">
|
||||
<view class="title">详细地址：</view>
|
||||
<input type="text" v-model="address" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="upload-image">
|
||||
<view class="title">上传商品图片</view>
|
||||
<u-upload
|
||||
ref="uUpload"
|
||||
@on-uploaded="onUploaded"
|
||||
:custom-btn="true"
|
||||
:max-count="count"
|
||||
:auto-upload="false"
|
||||
>
|
||||
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
|
||||
<img src="../static/mine/27.png" />
|
||||
</view>
|
||||
</u-upload>
|
||||
</view>
|
||||
<view class="wash-btn">确认送洗</view>
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
items: [],
|
||||
count: 4, // 最大图片数量
|
||||
name: '',
|
||||
phone: '',
|
||||
area: '',
|
||||
address: ''
|
||||
address: '',
|
||||
list: [{
|
||||
name: '平台历史订单'
|
||||
}, {
|
||||
name: '实体店历史订单'
|
||||
}],
|
||||
current: 0,
|
||||
swiperCurrent: 0,
|
||||
showPopup : false,
|
||||
a:"",
|
||||
checkLidt:[
|
||||
{id:'1'},
|
||||
{id:'2'},
|
||||
{id:'3'}
|
||||
]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onShow() {
|
||||
this.current = 0;
|
||||
this.swiperCurrent = 0;
|
||||
this.showPopup = false;
|
||||
this.choose = false
|
||||
},
|
||||
submit() {
|
||||
this.$refs.uUpload.upload();
|
||||
},
|
||||
onUploaded(list) {
|
||||
console.log(list)
|
||||
}
|
||||
},tabsChange(index) {
|
||||
this.swiperCurrent = index;
|
||||
},
|
||||
er(e){
|
||||
console.log(e)
|
||||
this.a =e.detail.value;
|
||||
console.log(this.a)
|
||||
},
|
||||
animationfinish(e) {
|
||||
let current = e.detail.current;
|
||||
this.swiperCurrent = current;
|
||||
this.current = current;
|
||||
this.toApplyPage(current);
|
||||
},
|
||||
order(){
|
||||
this.showPopup = true;
|
||||
},
|
||||
toApplyPage(index) {
|
||||
console.log(index)
|
||||
if(index == 1) {
|
||||
this.showPopup = false;
|
||||
this.choose = false
|
||||
}
|
||||
},
|
||||
// replaces(){
|
||||
// if(this.list[0].name=='实体店历史订单'){
|
||||
// this.$set(this.list,0,{name: '平台历史订单'} )
|
||||
// }else{
|
||||
// this.$set(this.list,0,{name: '实体店历史订单'} )
|
||||
// }
|
||||
// },
|
||||
confirm(){
|
||||
this.showPopup = false;
|
||||
if(this.a ==''){
|
||||
this.choose =false
|
||||
}else{
|
||||
this.choose = true
|
||||
}
|
||||
|
||||
},
|
||||
close(){
|
||||
this.showPopup = false
|
||||
},
|
||||
reset(){
|
||||
this.choose = false
|
||||
},
|
||||
radioChange: function(evt) {
|
||||
for (let i = 0; i < this.items.length; i++) {
|
||||
if (this.items[i].value === evt.target.value) {
|
||||
this.current = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.wash-order {
|
||||
border-top: 1rpx solid #ECECEC;
|
||||
> uni-swiper {
|
||||
flex: 1;
|
||||
height: 95vh;
|
||||
}
|
||||
|
||||
.order-info {
|
||||
|
||||
.choose-info{
|
||||
display: flex;flex-wrap: wrap;
|
||||
height: 335rpx;
|
||||
.store{
|
||||
>view{
|
||||
>image{
|
||||
width:60rpx;
|
||||
height:60rpx;
|
||||
border-radius:50%;
|
||||
vertical-align: middle;
|
||||
padding-right:13rpx
|
||||
}
|
||||
}
|
||||
|
||||
font-size:28rpx;
|
||||
font-family:PingFang SC;
|
||||
font-weight:400;
|
||||
color:rgba(51,51,51,1);
|
||||
line-height: 60rpx;
|
||||
|
||||
}
|
||||
.store_info{
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
width: 100%;
|
||||
height: 150rpx;
|
||||
.info_img{
|
||||
>image{
|
||||
width: 180rpx;
|
||||
height: 160rpx;
|
||||
}
|
||||
}
|
||||
.info_txt{
|
||||
padding-left: 30rpx;
|
||||
padding-right: 30rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
width: 100%;
|
||||
.content{
|
||||
line-height: 44rpx;
|
||||
font-size: 30rpx;
|
||||
color:rgba(51,51,51,1);
|
||||
}
|
||||
.much{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
> view {
|
||||
width: 750rpx;
|
||||
height: 98rpx;
|
||||
@ -87,6 +352,20 @@ export default {
|
||||
color: rgba(51,51,51,1);
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
.titles {
|
||||
font-size: 30rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
margin-right: 10rpx;
|
||||
display: flex;
|
||||
width: 100%;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
>image{
|
||||
width: 27rpx;
|
||||
height: 12rpx;
|
||||
|
||||
}
|
||||
}
|
||||
> input {
|
||||
flex: 1;
|
||||
text-align: right;
|
||||
@ -127,6 +406,12 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.bottom_btn{
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
bottom: 0;
|
||||
}
|
||||
.wash-btn {
|
||||
width: 690rpx;
|
||||
height: 98rpx;
|
||||
@ -141,5 +426,132 @@ export default {
|
||||
text-align: center;
|
||||
line-height: 98rpx;
|
||||
}
|
||||
.popup{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 2;
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
transform: scale(1);
|
||||
align-items: center;
|
||||
transition-duration: 0.3s;
|
||||
|
||||
.popup_cont{
|
||||
border-top: 1px solid RGBA(239, 236, 240, 1);
|
||||
background-color: #fff;
|
||||
width: 100%;
|
||||
height: 1072rpx;
|
||||
line-height: 80rpx;
|
||||
font-size:28rpx;
|
||||
font-family:PingFang SC;
|
||||
font-weight:400;
|
||||
color:rgba(102,102,102,1);
|
||||
transform: scale(1);
|
||||
position: fixed;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
bottom: 0px;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
/* top: 0px; */
|
||||
transition-duration: 0.3s;
|
||||
border-radius:20px 20px 0px 0px;
|
||||
> uni-swiper {
|
||||
flex: 1;
|
||||
height: 100vh;
|
||||
|
||||
.order-list{
|
||||
height: 60vh;
|
||||
padding-bottom: 140rpx;
|
||||
}
|
||||
}
|
||||
.check{
|
||||
font-size:30rpx;
|
||||
font-family:PingFang SC;
|
||||
font-weight:500;
|
||||
color:rgba(51,51,51,1);
|
||||
height:88rpx;
|
||||
width: 100%;
|
||||
padding-left: 30rpx;
|
||||
border-bottom: 1px solid rgba(236, 236, 236, 1);
|
||||
|
||||
>image{
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
vertical-align: middle;
|
||||
float: right;
|
||||
padding-top: 30rpx;
|
||||
padding-right:30rpx
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.store{
|
||||
>view{
|
||||
padding-left: 30rpx;
|
||||
padding-top: 30rpx;
|
||||
>image{
|
||||
width:60rpx;
|
||||
height:60rpx;
|
||||
border-radius:50%;
|
||||
vertical-align: middle;
|
||||
padding-right:13rpx
|
||||
}
|
||||
}
|
||||
|
||||
font-size:28rpx;
|
||||
font-family:PingFang SC;
|
||||
font-weight:400;
|
||||
color:rgba(51,51,51,1);
|
||||
line-height: 60rpx;
|
||||
|
||||
}
|
||||
.checkd{
|
||||
>radio-group .uni-list-cell{
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.radio{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-left: 30rpx;
|
||||
}
|
||||
.store_info{
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
width: 100%;
|
||||
|
||||
.info_img{
|
||||
>image{
|
||||
width: 180rpx;
|
||||
height: 160rpx;
|
||||
}
|
||||
}
|
||||
.info_txt{
|
||||
padding-left: 30rpx;
|
||||
padding-right: 30rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
width: 100%;
|
||||
.content{
|
||||
line-height: 44rpx;
|
||||
font-size: 30rpx;
|
||||
color:rgba(51,51,51,1);
|
||||
}
|
||||
.much{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
22
pages.json
22
pages.json
@ -120,6 +120,28 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "triedDress/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "试穿订单",
|
||||
"app-plus":{
|
||||
"titleNView":{
|
||||
"backgroundColor":"#ffffff"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "comment/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "商品评价",
|
||||
"app-plus":{
|
||||
"titleNView":{
|
||||
"backgroundColor":"#ffffff"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "search/index",
|
||||
"style": {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
<view class="user-nickname">{{ userInfo.member_nickname }}</view>
|
||||
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
|
||||
<img src="/static/image/mine/13.png" />
|
||||
<view class="rank-title">勋章</view>
|
||||
<view class="rank-title">{{ userInfo.member_grade_name }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="info-right">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user