other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2023-2-25

Browse Source 
功能完善
This commit is contained in:
guoxing
2023-02-25 09:11:17 +08:00
parent f5fb47d585
commit 2395459103
3 changed files with 166 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mallplusui-uniapp-app/pages.json
View File

@@ -744,9 +744,11 @@
}, { }, {
"path": "user/forget", "path": "user/forget",
"style": { "style": {
"navigationBarTitleText": "忘记密码", "navigationBarTitleText": "",
"navigationStyle": "custom",
"app-plus": { "app-plus": {
"bounce": "none" "titleNView": false,
"animationType": "slide-in-bottom"
} }
} }
}, { }, {

197
mallplusui-uniapp-app/pages/order/createStoreOrder.vue
View File

@@ -9,7 +9,8 @@
<text class="name">{{ addressData.name }}</text> <text class="name">{{ addressData.name }}</text>
<text class="mobile">{{ addressData.phoneNumber }}</text> <text class="mobile">{{ addressData.phoneNumber }}</text>
</view> </view>
<text class="address">{{ addressData.region }}-{{ addressData.detailAddress }}</text> <text
class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text>
</view> </view>
<view class="cen" v-else> <view class="cen" v-else>
<text>请设置收货地址</text> <text>请设置收货地址</text>
@@ -22,15 +23,16 @@
<text class="yticon icon-you"></text> <text class="yticon icon-you"></text>
</view> </view>
<image <image class="a-bg"
class="a-bg" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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">
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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" </image>
></image>
</navigator> </navigator>
<view class="goods-section" v-for="(item1, index1) in confirmOrderResultList" :key="index1"> <view class="goods-section" v-for="(item1, index1) in confirmOrderResultList" :key="index1">
<view class="g-header b-b"> <view class="g-header b-b">
<image class="logo" src="http://yjlive160322.oss-cn-beijing.aliyuncs.com/mall/images/20190807/QQ%E5%9B%BE%E7%89%8720190807191952.jpg"></image> <image class="logo"
src="http://yjlive160322.oss-cn-beijing.aliyuncs.com/mall/images/20190807/QQ%E5%9B%BE%E7%89%8720190807191952.jpg">
</image>
<text class="name"> 共{{ item1.cartPromotionItemList.length }}件商品,店铺 【{{item1.storeName }}】</text> <text class="name"> 共{{ item1.cartPromotionItemList.length }}件商品,店铺 【{{item1.storeName }}】</text>
<text class="name" v-if="groupActivity">团购-{{groupActivity.name}}</text> <text class="name" v-if="groupActivity">团购-{{groupActivity.name}}</text>
</view> </view>
@@ -68,7 +70,8 @@
</view> </view>
<view class="yt-list-cell desc-cell"> <view class="yt-list-cell desc-cell">
<text class="cell-tit clamp">备注</text> <text class="cell-tit clamp">备注</text>
<input class="desc" type="text" v-model="desc" placeholder="请填写备注信息" placeholder-class="placeholder" /> <input class="desc" type="text" v-model="desc" placeholder="请填写备注信息"
placeholder-class="placeholder" />
</view> </view>
</view> </view>
</view> </view>
@@ -92,8 +95,10 @@
<script> <script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api'; import Api from '@/common/api';
import { mapState } from 'vuex'; import {
mapState
} from 'vuex';
export default { export default {
components: { components: {
mallplusCopyright mallplusCopyright
@@ -105,27 +110,27 @@ import Api from '@/common/api';
payType: 1, //1微信 2支付宝 payType: 1, //1微信 2支付宝
type: 1, type: 1,
groupType: '', groupType: '',
memberIntegration:0, memberIntegration: 0,
groupActivityId:'', groupActivityId: '',
totalPayAmount: 0, totalPayAmount: 0,
basicGiftsVar:'', basicGiftsVar: '',
skillId:0, skillId: 0,
goodsId: 0, goodsId: 0,
mgId: 1, mgId: 1,
cartId: '', cartId: '',
cartIds: '', cartIds: '',
addressId: '', addressId: '',
couponId: '', couponId: '',
memberCouponId:'', memberCouponId: '',
coupon:{ coupon: {
amount:0, amount: 0,
coupon:{ coupon: {
amount:0 amount: 0
} }
}, },
groupActivity:null, groupActivity: null,
memberReceiveAddressList: [], memberReceiveAddressList: [],
basicGiftsList:[], basicGiftsList: [],
cartPromotionItemList: [], cartPromotionItemList: [],
confirmOrderResultList: [], confirmOrderResultList: [],
calcAmount: { calcAmount: {
@@ -148,35 +153,54 @@ import Api from '@/common/api';
let data; let data;
this.type = option.type; this.type = option.type;
if (option.groupActivityId) { // 团购 if (option.groupActivityId) { // 团购
let params = { groupId: option.groupActivityId }; let params = {
groupId: option.groupActivityId
};
data = await Api.apiCall('get', Api.order.preGroupActivityOrder, params); data = await Api.apiCall('get', Api.order.preGroupActivityOrder, params);
this.groupActivityId=option.groupActivityId; this.groupActivityId = option.groupActivityId;
this.groupActivity=data.groupActivity; this.groupActivity = data.groupActivity;
this.type = 1; this.type = 1;
}else{ } else {
if (option.groupType) { // 拼团 if (option.groupType) { // 拼团
this.groupType = option.groupType; this.groupType = option.groupType;
this.goodsId = option.id; this.goodsId = option.id;
this.mgId = option.mgid; this.mgId = option.mgid;
if (option.skuId) { if (option.skuId) {
let params = { groupId: option.groupId, goodsId: option.id, skuId: option.skuId }; let params = {
groupId: option.groupId,
goodsId: option.id,
skuId: option.skuId
};
data = await Api.apiCall('post', Api.order.addGroup, params); data = await Api.apiCall('post', Api.order.addGroup, params);
} else { } else {
let params = { groupId: option.groupId, goodsId: option.id }; let params = {
groupId: option.groupId,
goodsId: option.id
};
data = await Api.apiCall('post', Api.order.addGroup, params); data = await Api.apiCall('post', Api.order.addGroup, params);
} }
} else { } else {
if (option.type == 1) { // 详情 if (option.type == 1) { // 详情
this.cartId = option.id; this.cartId = option.id;
let params = { goodsId: option.goodsId,skuId: option.goodsId, type: option.type }; let params = {
goodsId: option.goodsId,
skuId: option.goodsId,
type: option.type
};
data = await Api.apiCall('get', Api.order.submitStorePreview, params); data = await Api.apiCall('get', Api.order.submitStorePreview, params);
} else if (option.type == 2) { // 购物车 } else if (option.type == 2) { // 购物车
let params = { cartIds: option.cartIds, type: option.type }; let params = {
cartIds: option.cartIds,
type: option.type
};
data = await Api.apiCall('get', Api.order.submitStorePreview, params); data = await Api.apiCall('get', Api.order.submitStorePreview, params);
this.cartIds = option.cartIds; this.cartIds = option.cartIds;
}else if (option.type == 6) { // 秒杀 } else if (option.type == 6) { // 秒杀
let params = { skillId: option.skillId, type: option.type }; let params = {
skillId: option.skillId,
type: option.type
};
data = await Api.apiCall('get', Api.order.submitStorePreview, params); data = await Api.apiCall('get', Api.order.submitStorePreview, params);
this.skillId = option.skillId; this.skillId = option.skillId;
} }
@@ -189,20 +213,20 @@ import Api from '@/common/api';
this.confirmOrderResultList = data.confirmOrderResultList; this.confirmOrderResultList = data.confirmOrderResultList;
this.calcAmount = data.calcAmount; this.calcAmount = data.calcAmount;
if (this.basicGiftsList) { if (this.basicGiftsList) {
let basicGiftsVar =''; let basicGiftsVar = '';
let basicGiftsVar1 =''; let basicGiftsVar1 = '';
this.basicGiftsList.forEach(item => { this.basicGiftsList.forEach(item => {
basicGiftsVar1=basicGiftsVar1+item.id+':'; basicGiftsVar1 = basicGiftsVar1 + item.id + ':';
console.log('1='+item.giftsList); console.log('1=' + item.giftsList);
if (item.giftsList ) { if (item.giftsList) {
item.giftsList.forEach(item1 => { item.giftsList.forEach(item1 => {
basicGiftsVar1 = basicGiftsVar1 + item1.id + ','; basicGiftsVar1 = basicGiftsVar1 + item1.id + ',';
}); });
} }
basicGiftsVar=basicGiftsVar+basicGiftsVar1.substr(0, basicGiftsVar1.length - 1)+'@'; basicGiftsVar = basicGiftsVar + basicGiftsVar1.substr(0, basicGiftsVar1.length - 1) + '@';
basicGiftsVar1=''; basicGiftsVar1 = '';
}); });
this.basicGiftsVar=basicGiftsVar.substr(0, basicGiftsVar.length - 1); this.basicGiftsVar = basicGiftsVar.substr(0, basicGiftsVar.length - 1);
console.log(this.basicGiftsVar); console.log(this.basicGiftsVar);
} }
this.addressData = data.address; this.addressData = data.address;
@@ -218,14 +242,14 @@ import Api from '@/common/api';
...mapState(['hasLogin', 'userInfo']) ...mapState(['hasLogin', 'userInfo'])
}, },
methods: { methods: {
getSource(){ getSource() {
let source =Api.source; let source = Api.source;
return source; return source;
}, },
selectCoupon(item){ selectCoupon(item) {
this.coupon=item.coupon; this.coupon = item.coupon;
this.couponId= item.couponId; this.couponId = item.couponId;
this.memberCouponId=item.id; this.memberCouponId = item.id;
console.log(this.coupon); console.log(this.coupon);
this.toggleMask(); this.toggleMask();
}, },
@@ -263,7 +287,7 @@ import Api from '@/common/api';
mgId: this.mgId, mgId: this.mgId,
groupType: this.groupType, groupType: this.groupType,
type: 1, type: 1,
orderType:2, orderType: 2,
goodsId: this.goodsId, goodsId: this.goodsId,
addressId: this.addressId, addressId: this.addressId,
couponId: this.couponId, couponId: this.couponId,
@@ -275,26 +299,60 @@ import Api from '@/common/api';
} else { } else {
// detail // detail
if (this.type == 1) { if (this.type == 1) {
params = {basicGiftsVar:this.basicGiftsVar,orderType:1, type: 1, goodsId: option.goodsId,skuId: option.goodsId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc }; params = {
basicGiftsVar: this.basicGiftsVar,
orderType: 1,
type: 1,
goodsId: option.goodsId,
skuId: option.goodsId,
addressId: this.addressId,
couponId: this.couponId,
memberCouponId: this.memberCouponId,
content: this.desc
};
if (this.groupActivityId) { if (this.groupActivityId) {
params = {groupActivityId:this.groupActivityId,orderType:3, type: 1, goodsId: option.goodsId,skuId: option.goodsId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc }; params = {
groupActivityId: this.groupActivityId,
orderType: 3,
type: 1,
goodsId: option.goodsId,
skuId: option.goodsId,
addressId: this.addressId,
couponId: this.couponId,
memberCouponId: this.memberCouponId,
content: this.desc
};
} }
params.source = this.getSource(); params.source = this.getSource();
data = await Api.apiCall('post', Api.order.generateStoreOrder, params); data = await Api.apiCall('post', Api.order.generateStoreOrder, params);
} }
// 购物车 // 购物车
if (this.type == 2) { if (this.type == 2) {
params = {orderType:1, type: 2, cartIds: this.cartIds, addressId: this.addressId, couponId: this.couponId, content: this.desc }; params = {
orderType: 1,
type: 2,
cartIds: this.cartIds,
addressId: this.addressId,
couponId: this.couponId,
content: this.desc
};
params.source = this.getSource(); params.source = this.getSource();
console.log(params) console.log(params)
console.log(params.source) console.log(params.source)
data = await Api.apiCall('post', Api.order.generateStoreOrder, params); data = await Api.apiCall('post', Api.order.generateStoreOrder, params);
console.log("data=======:"+data) console.log("data=======:" + data)
} }
// 秒杀 // 秒杀
if (this.type == 6) { if (this.type == 6) {
params = { type: 6, skillId: this.skillId, addressId: this.addressId, couponId: this.couponId, content: this.desc ,orderType:6}; params = {
type: 6,
skillId: this.skillId,
addressId: this.addressId,
couponId: this.couponId,
content: this.desc,
orderType: 6
};
params.source = this.getSource(); params.source = this.getSource();
data = await Api.apiCall('post', Api.order.generateStoreOrder, params); data = await Api.apiCall('post', Api.order.generateStoreOrder, params);
} }
@@ -303,7 +361,7 @@ import Api from '@/common/api';
if (data && data.order) { if (data && data.order) {
let id = data.order.id; let id = data.order.id;
// let url = `/pages/money/pay?id=${id}`; // let url = `/pages/money/pay?id=${id}`;
let url = '/pages/order/payment/index?order_id=' + data.order.id + '&type=1' ; let url = '/pages/order/payment/index?order_id=' + data.order.id + '&type=1';
uni.navigateTo({ uni.navigateTo({
url: url url: url
@@ -442,6 +500,7 @@ import Api from '@/common/api';
.price { .price {
margin-bottom: 4upx; margin-bottom: 4upx;
} }
.number { .number {
font-size: 26upx; font-size: 26upx;
color: $font-color-base; color: $font-color-base;
@@ -454,6 +513,7 @@ import Api from '@/common/api';
} }
} }
} }
.yt-list { .yt-list {
margin-top: 16upx; margin-top: 16upx;
background: #fff; background: #fff;
@@ -520,6 +580,7 @@ import Api from '@/common/api';
&.active { &.active {
color: $base-color; color: $base-color;
} }
&.red { &.red {
color: $base-color; color: $base-color;
} }
@@ -543,6 +604,7 @@ import Api from '@/common/api';
padding-left: 40upx; padding-left: 40upx;
margin-top: 16upx; margin-top: 16upx;
background: #fff; background: #fff;
.pay-item { .pay-item {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -551,16 +613,19 @@ import Api from '@/common/api';
height: 110upx; height: 110upx;
position: relative; position: relative;
} }
.icon-weixinzhifu { .icon-weixinzhifu {
width: 80upx; width: 80upx;
font-size: 40upx; font-size: 40upx;
color: #6bcc03; color: #6bcc03;
} }
.icon-alipay { .icon-alipay {
width: 80upx; width: 80upx;
font-size: 40upx; font-size: 40upx;
color: #06b4fd; color: #06b4fd;
} }
.icon-xuanzhong2 { .icon-xuanzhong2 {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -570,6 +635,7 @@ import Api from '@/common/api';
font-size: 40upx; font-size: 40upx;
color: $base-color; color: $base-color;
} }
.tit { .tit {
font-size: 32upx; font-size: 32upx;
color: $font-color-dark; color: $font-color-dark;
@@ -592,17 +658,21 @@ import Api from '@/common/api';
z-index: 998; z-index: 998;
color: $font-color-base; color: $font-color-base;
box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1); box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
.price-content { .price-content {
padding-left: 30upx; padding-left: 30upx;
} }
.price-tip { .price-tip {
color: $base-color; color: $base-color;
margin-left: 8upx; margin-left: 8upx;
} }
.price { .price {
font-size: 36upx; font-size: 36upx;
color: $base-color; color: $base-color;
} }
.submit { .submit {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -637,9 +707,11 @@ import Api from '@/common/api';
transition: 0.3s; transition: 0.3s;
overflow-y: scroll; overflow-y: scroll;
} }
&.none { &.none {
display: none; display: none;
} }
&.show { &.show {
background: rgba(0, 0, 0, 0.4); background: rgba(0, 0, 0, 0.4);
@@ -655,12 +727,14 @@ import Api from '@/common/api';
flex-direction: column; flex-direction: column;
margin: 20upx 24upx; margin: 20upx 24upx;
background: #fff; background: #fff;
.con { .con {
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
height: 120upx; height: 120upx;
padding: 0 30upx; padding: 0 30upx;
&:after { &:after {
position: absolute; position: absolute;
left: 0; left: 0;
@@ -672,6 +746,7 @@ import Api from '@/common/api';
transform: scaleY(50%); transform: scaleY(50%);
} }
} }
.left { .left {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -680,15 +755,18 @@ import Api from '@/common/api';
overflow: hidden; overflow: hidden;
height: 100upx; height: 100upx;
} }
.title { .title {
font-size: 32upx; font-size: 32upx;
color: $font-color-dark; color: $font-color-dark;
margin-bottom: 10upx; margin-bottom: 10upx;
} }
.time { .time {
font-size: 24upx; font-size: 24upx;
color: $font-color-light; color: $font-color-light;
} }
.right { .right {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -698,20 +776,24 @@ import Api from '@/common/api';
color: $font-color-base; color: $font-color-base;
height: 100upx; height: 100upx;
} }
.price { .price {
font-size: 44upx; font-size: 44upx;
color: $base-color; color: $base-color;
&:before { &:before {
content: '￥'; content: '￥';
font-size: 34upx; font-size: 34upx;
} }
} }
.tips { .tips {
font-size: 24upx; font-size: 24upx;
color: $font-color-light; color: $font-color-light;
line-height: 60upx; line-height: 60upx;
padding-left: 30upx; padding-left: 30upx;
} }
.circle { .circle {
position: absolute; position: absolute;
left: -6upx; left: -6upx;
@@ -721,22 +803,26 @@ import Api from '@/common/api';
height: 20upx; height: 20upx;
background: #f3f3f3; background: #f3f3f3;
border-radius: 100px; border-radius: 100px;
&.r { &.r {
left: auto; left: auto;
right: -6upx; right: -6upx;
} }
} }
} }
/* 分类推荐楼层 */ /* 分类推荐楼层 */
.hot-floor { .hot-floor {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
margin-bottom: 20upx; margin-bottom: 20upx;
.floor-img-box { .floor-img-box {
width: 100%; width: 100%;
height: 220upx; height: 220upx;
position: relative; position: relative;
display: flex; display: flex;
&:after { &:after {
padding: 10 30upx; padding: 10 30upx;
content: ''; content: '';
@@ -746,15 +832,18 @@ import Api from '@/common/api';
background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8); background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
} }
} }
.name { .name {
font-size: 30upx; font-size: 30upx;
color: $font-color-base; color: $font-color-base;
margin-left: 24upx; margin-left: 24upx;
} }
.floor-img { .floor-img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.floor-list { .floor-list {
white-space: nowrap; white-space: nowrap;
padding: 20upx; padding: 20upx;
@@ -767,25 +856,30 @@ import Api from '@/common/api';
position: relative; position: relative;
z-index: 1; z-index: 1;
} }
.scoll-wrapper { .scoll-wrapper {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.floor-item { .floor-item {
width: 180upx; width: 180upx;
margin-right: 20upx; margin-right: 20upx;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-dark; color: $font-color-dark;
line-height: 1.8; line-height: 1.8;
image { image {
width: 180upx; width: 180upx;
height: 180upx; height: 180upx;
border-radius: 6upx; border-radius: 6upx;
} }
.price { .price {
color: $uni-color-primary; color: $uni-color-primary;
} }
} }
.more { .more {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -798,6 +892,7 @@ import Api from '@/common/api';
background: #f3f3f3; background: #f3f3f3;
font-size: $font-base; font-size: $font-base;
color: $font-color-light; color: $font-color-light;
text:first-child { text:first-child {
margin-bottom: 4upx; margin-bottom: 4upx;
} }

3
mallplusui-uniapp-app/pagesU/user/forget.vue
View File

@@ -206,7 +206,8 @@ import Api from '@/common/api';
_this.getConfirms=_this.verifTime _this.getConfirms=_this.verifTime
},1000) },1000)
let params = { phone: this.phone}; let params = { phone: this.phone,
type:2};
let data = await Api.apiCall('post', Api.index.sendCodes, params); let data = await Api.apiCall('post', Api.index.sendCodes, params);
} }
}else{ }else{