root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

master
tianyi 4 weeks ago
parent
aa73a02333 b6e3d87146
commit
3bd9c56a41
4 changed files with 249 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 240
      package1/address/addressList.vue
  2. 43
      package1/buyFood/buyFood.vue
  3. 1
      package1/group/groupBuyList.vue
  4. 14
      package1/group/groupBuySingle.vue

240
package1/address/addressList.vue
View File

@ -1,49 +1,82 @@
<template> <template>
<view class="address-popup-box"> <view class="address-popup-box">
<view style="height: 60px;line-height: 60px;font-size: 18px;font-weight: 700;text-align: center;"> <view style="height: 60px;line-height: 60px;font-size: 18px;font-weight: 700;text-align: center;position:relative;">
收货地址 收货地址
<uni-icons type="closeempty" size="24" @tap="$emit('close')" style="position:absolute;right:15px;top:18px;"></uni-icons>
</view> </view>
<view <view style="padding-bottom: 70px;">
style="margin-bottom: 10px;display: flex;padding: 10px 20px 20px;background: #eee;border-radius: 10px;"> <view v-for="(item, index) in addressList" :key="index" @tap="selectAddress(item)"
<view style="flex: 1;"> style="margin-bottom: 10px;display: flex;padding: 10px 20px 20px;background: #eee;border-radius: 10px;">
<view style="height: 35px;line-height: 35px;display: flex;"> <view style="flex: 1;">
<text style="font-size: 15px;font-weight: 700;">沁园春第三食堂A20窗口</text> <view style="height: 35px;line-height: 35px;display: flex;align-items: center;">
<text v-if="item.isDefault == 1" style="font-size: 10px;color: white;background: red;padding: 2px 6px;border-radius: 4px;margin-right: 5px;line-height:1;">默认</text>
<text style="font-size: 15px;font-weight: 700;">{{item.areaName || ''}}{{item.floor ? item.floor + '层' : ''}}{{item.roomNum || ''}}</text>
</view>
<view style="color: #777;">
{{item.receiverName}} {{item.receiverPhone}}
</view>
</view> </view>
<view style="color: #777;"> <view style="display: flex; align-items: center; gap: 10px;">
刘柳柳 18827381928 <view @tap.stop="openEdit(item)"
style="width: 44px;height: 25px;line-height: 25px;text-align: center;border: 1px solid #777;border-radius: 25px;color: #777;">
编辑
</view>
<view @tap.stop="deleteAddress(item.id)"
style="width: 44px;height: 25px;line-height: 25px;text-align: center;border: 1px solid #e43d33;border-radius: 25px;color: #e43d33;">
删除
</view>
</view> </view>
</view> </view>
<view
style="margin-top: 15px;width: 44px;height: 25px;line-height: 25px;text-align: center;border: 1px solid #777;border-radius: 25px;color: #777;"> <view v-if="addressList.length === 0" style="text-align: center;color: #999;margin-top: 50px;">
编辑 暂无收货地址
</view> </view>
</view> </view>
<view class="bottom-btn" @tap="$refs.addBookPopup.open('bottom')"> <view class="bottom-btn" @tap="openAdd">
新增地址 新增地址
</view> </view>
<!-- 新增地址弹出层 --> <!-- 新增地址弹出层 -->
<uni-popup ref="addBookPopup" background-color="#fff"> <uni-popup ref="addBookPopup" background-color="#fff">
<view class="book-popup-content" style="height: 335px;"> <view class="book-popup-content" style="height: 400px;padding-top:20px;">
<view style="height: 60px;line-height: 60px;font-size: 18px;font-weight: 700;text-align: center;"> <view style="height: 40px;line-height: 40px;font-size: 18px;font-weight: 700;text-align: center;">
填写地址 {{addressForm.id ? '编辑地址' : '填写地址'}}
</view>
<view style="margin-bottom: 10px;background: #fff;border-radius: 10px;">
<uni-combox :candidates="areaTitleList" placeholder="请搜索选择楼座区域" v-model="areaTitleInput" emptyTips="未找到匹配的楼座" @focus="isComboxFocused = true" @blur="isComboxFocused = false"></uni-combox>
</view> </view>
<view <view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;">
style="margin-bottom: 10px;background: #eee;border-radius: 10px;overflow: hidden;"> <input v-show="!isComboxFocused" type="number" v-model="addressForm.floor" placeholder="请填写所在楼层(仅限整数)" style="width: 100%;" />
<uni-data-select v-model="value" :localdata="range" @change="change"></uni-data-select> <view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;">
<text v-if="addressForm.floor">{{addressForm.floor}}</text>
<text v-else style="color: grey;">请填写所在楼层(仅限整数)</text>
</view>
</view> </view>
<view <view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;">
style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <input v-show="!isComboxFocused" type="text" v-model="addressForm.roomNum" placeholder="请填写门牌号或所在机构科室" style="width: 100%;" />
<input type="text" placeholder="请填写详细地址" /> <view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;">
<text v-if="addressForm.roomNum">{{addressForm.roomNum}}</text>
<text v-else style="color: grey;">请填写门牌号或所在机构科室</text>
</view>
</view> </view>
<view <view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;">
style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <input v-show="!isComboxFocused" type="text" v-model="addressForm.receiverName" placeholder="收货人名字" style="width: 100%;" />
<input type="text" placeholder="收货人名字" /> <view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;">
<text v-if="addressForm.receiverName">{{addressForm.receiverName}}</text>
<text v-else style="color: grey;">收货人名字</text>
</view>
</view> </view>
<view <view style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;">
style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;"> <input v-show="!isComboxFocused" type="number" maxlength="11" v-model="addressForm.receiverPhone" placeholder="联系电话" style="width: 100%;" />
<input type="text" placeholder="联系电话" /> <view v-show="isComboxFocused" style="width: 100%; height: 21px; line-height: 21px;">
<text v-if="addressForm.receiverPhone">{{addressForm.receiverPhone}}</text>
<text v-else style="color: grey;">联系电话</text>
</view>
</view> </view>
<view class="bottom-btn"> <view style="margin-bottom: 10px;display: flex;padding: 10px;justify-content: space-between;align-items: center;">
<text>设为默认地址</text>
<switch :checked="addressForm.isDefault === 1" @change="e => addressForm.isDefault = e.detail.value ? 1 : 0" color="#a6ffea" />
</view>
<view class="bottom-btn" @tap="submitAddress" style="position: relative; margin-top: 20px;">
确认 确认
</view> </view>
</view> </view>
@ -55,23 +88,148 @@
export default { export default {
data() { data() {
return { return {
selected: 'phone', isComboxFocused: false,
range: [{ addressList: [],
"value": 0, areaList: [],
"text": "篮球运动" areaTitleList: [],
}, { areaTitleInput: '',
"value": 1, addressForm: {
"text": "足球运动", id: '',
}, { areaId: '',
"value": 2, areaName: '',
"text": "游泳健身运动" floor: '',
}] roomNum: '',
receiverName: '',
receiverPhone: '',
isDefault: 0
}
} }
}, },
created() {
this.getAddressList();
this.getAreaList();
},
methods: { methods: {
openAddressBook() { getAddressList() {
this.$refs.bookPopup.open('bottom') let that = this;
that.tui.request("/app/userAddress/list", "GET", {userId:uni.getStorageSync('id')}, false, true).then((res) => {
if (res.code == 200) {
that.addressList = res.result || [];
that.syncCache();
}
}).catch(() => {});
},
syncCache() {
let cached = uni.getStorageSync('selectedAddress');
let nextSelect = null;
if (this.addressList.length > 0) {
if (cached && cached.id) {
// Look for the cached address in the fresh list to obtain updated fields if any
nextSelect = this.addressList.find(a => a.id === cached.id);
}
if (!nextSelect) {
// If cached address was deleted or none existed, fallback to default or first
nextSelect = this.addressList.find(a => a.isDefault == 1) || this.addressList[0];
}
}
if (nextSelect) {
uni.setStorageSync('selectedAddress', nextSelect);
this.$emit('syncAddress', nextSelect);
} else {
uni.removeStorageSync('selectedAddress');
this.$emit('syncAddress', null);
}
},
getAreaList() {
let that = this;
that.tui.request("/app/shopArea/getByParentId/"+JSON.parse(uni.getStorageSync('area')).id, "GET", {}, false, true).then((res) => {
if (res.code == 200 && res.result) {
that.areaList = res.result;
that.areaTitleList = res.result.map(item => item.title);
}
}).catch(() => {});
},
selectAddress(item) {
this.$emit('selectAddress', item);
},
openAdd() {
this.addressForm = {
id: '',
areaId: '',
areaName: '',
floor: '',
roomNum: '',
receiverName: '',
receiverPhone: '',
isDefault: 0
};
this.areaTitleInput = '';
this.$refs.addBookPopup.open('bottom');
},
openEdit(item) {
this.addressForm = {
id: item.id,
areaId: item.areaId,
areaName: item.areaName || '',
floor: item.floor || '',
roomNum: item.roomNum,
receiverName: item.receiverName,
receiverPhone: item.receiverPhone,
isDefault: item.isDefault || 0
};
let match = this.areaList.find(a => a.id === item.areaId);
this.areaTitleInput = match ? match.title : (item.areaName || '');
this.$refs.addBookPopup.open('bottom');
},
submitAddress() {
if(this.areaTitleInput) {
let match = this.areaList.find(a => a.title === this.areaTitleInput);
if (match) {
this.addressForm.areaId = match.id;
this.addressForm.areaName = match.title;
} else {
return this.tui.toast('请搜索并选择有效的楼座');
}
}
if(!this.addressForm.areaId) return this.tui.toast('请搜索并选择楼座');
if(!this.addressForm.floor) return this.tui.toast('请填写所在楼层');
if(!/^-?\d+$/.test(this.addressForm.floor)) return this.tui.toast('楼层必须为整数');
if(!this.addressForm.roomNum) return this.tui.toast('请填写详细地址门牌号');
if(!this.addressForm.receiverName) return this.tui.toast('请填写收件人');
if(!this.addressForm.receiverPhone) return this.tui.toast('请填写联系电话');
if(!/^1[3-9]\d{9}$/.test(this.addressForm.receiverPhone)) return this.tui.toast('请输入有效的11位手机号码');
let url = this.addressForm.id ? "/app/userAddress/edit" : "/app/userAddress/save";
let that = this;
this.addressForm.userId = uni.getStorageSync('id')
that.tui.request(url, "POST", this.addressForm, false, true).then((res) => {
if (res.code == 200) {
that.tui.toast("保存成功");
that.$refs.addBookPopup.close();
that.getAddressList();
} else {
that.tui.toast(res.message);
}
}).catch(() => {});
},
deleteAddress(id) {
let that = this;
uni.showModal({
title: '提示',
content: '确定要删除该地址吗？',
success: function (res) {
if (res.confirm) {
that.tui.request("/app/userAddress/delById", "POST", {id: id}, false, true).then((res) => {
if (res.code == 200) {
that.tui.toast("删除成功");
that.getAddressList();
} else {
that.tui.toast(res.message);
}
}).catch(() => {});
}
}
});
} }
} }
} }

43
package1/buyFood/buyFood.vue
View File

@ -57,11 +57,16 @@
</view> </view>
</view> </view>
<view class="address-box" v-if="isPaotui"> <view class="address-box" v-if="isPaotui">
<view v-if="formData.address == ''" @tap="openAddressBook"> <view v-if="!formData.address" @tap="openAddressBook">
请选择收货地址 <uni-icons type="right" size="16"></uni-icons> 请选择收货地址 <uni-icons type="right" size="16"></uni-icons>
</view> </view>
<view v-else> <view v-else style="display: flex; justify-content: space-between; align-items: center;">
男生宿舍楼2楼211 <view @tap="openAddressBook" style="flex: 1; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">
{{formData.address.areaName || ''}}{{formData.address.floor ? formData.address.floor + '层' : ''}}{{formData.address.roomNum || ''}} {{formData.address.receiverName || ''}}
</view>
<view @tap.stop="openAddressBook" style="color: #0b9b73; font-size: 13px; font-weight: normal; margin-left: 10px; display: flex; align-items: center;">
更换地址 <uni-icons type="right" size="13" color="#0b9b73"></uni-icons>
</view>
</view> </view>
</view> </view>
<view class="time-box" v-if="isPaotui"> <view class="time-box" v-if="isPaotui">
@ -195,7 +200,7 @@
<!-- 地址簿弹出层 --> <!-- 地址簿弹出层 -->
<uni-popup ref="bookPopup" background-color="#fff"> <uni-popup ref="bookPopup" background-color="#fff">
<view class="book-popup-content"> <view class="book-popup-content">
<address-list></address-list> <address-list @selectAddress="handleSelectAddress" @syncAddress="handleSyncAddress" @close="closeAddressBook"></address-list>
</view> </view>
</uni-popup> </uni-popup>
<!-- 警告弹出层 --> <!-- 警告弹出层 -->
@ -222,7 +227,7 @@
isPaotui: true, isPaotui: true,
menuButtonInfo: {}, menuButtonInfo: {},
formData:{ formData:{
address:'', address:null,
isImmediately:true, isImmediately:true,
deliveryTime:'', deliveryTime:'',
peisongyuan:'' peisongyuan:''
@ -240,8 +245,36 @@
}, },
onShow() { onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
this.initAddress()
}, },
methods: { methods: {
initAddress() {
let cachedAddress = uni.getStorageSync('selectedAddress');
if (cachedAddress) {
this.formData.address = cachedAddress;
} else {
let that = this;
that.tui.request("/app/userAddress/list", "GET", {userId:uni.getStorageSync('id')}, false, true).then((res) => {
if (res.code == 200 && res.result && res.result.length > 0) {
// Find default address or use the first one
let target = res.result.find(item => item.isDefault == 1) || res.result[0];
that.formData.address = target;
uni.setStorageSync('selectedAddress', target);
}
}).catch(() => {});
}
},
handleSelectAddress(address) {
this.formData.address = address;
uni.setStorageSync('selectedAddress', address);
this.$refs.bookPopup.close();
},
handleSyncAddress(address) {
this.formData.address = address;
},
closeAddressBook() {
this.$refs.bookPopup.close();
},
submitPay(){ submitPay(){
this.$refs.warnPopup.open() this.$refs.warnPopup.open()
}, },

1
package1/group/groupBuyList.vue
View File

@ -319,6 +319,7 @@
} }
} }
console.log(that.shopArea) console.log(that.shopArea)
console.log(that.shopArea)
} }
} else { } else {
that.tui.toast(res.message) that.tui.toast(res.message)

14
package1/group/groupBuySingle.vue
View File

@ -143,7 +143,7 @@
</view> </view>
<view class="bottom-price">￥{{cartTotalPrice}}</view> <view class="bottom-price">￥{{cartTotalPrice}}</view>
</view> </view>
<view class="bottom-right"> <view class="bottom-right" @tap="submitCartCheckout">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d93d893296ed46ea99cfd0e8e2835eaa.png" alt="" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d93d893296ed46ea99cfd0e8e2835eaa.png" alt="" />
</view> </view>
</view> </view>
@ -210,6 +210,12 @@
</view> </view>
</uni-popup> </uni-popup>
<!-- 警告弹出层 -->
<uni-popup ref="warnPopup" background-color="#fff">
<view class="warnImg">
<img @tap="$refs.warnPopup.close()" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4996043b3987401794b974d359429b8e.png" alt="购物车是空的" style="width:300px;height:370px;" />
</view>
</uni-popup>
<!-- 拼团和选规格弹窗 --> <!-- 拼团和选规格弹窗 -->
<uni-popup ref="pintuanPopup" background-color="#fff"> <uni-popup ref="pintuanPopup" background-color="#fff">
<view class="car-content"> <view class="car-content">
@ -611,7 +617,7 @@
// Directly navigate to checkout // Directly navigate to checkout
uni.navigateTo({ uni.navigateTo({
// Update this url to actual checkout path // Update this url to actual checkout path
url: '/package1/goods/confirmPintuanOrder?item=' + encodeURIComponent(JSON.stringify(goData)) url: '/package1/buyFood/buyFood?item=' + encodeURIComponent(JSON.stringify(goData))
}); });
this.$refs.pintuanPopup.close(); this.$refs.pintuanPopup.close();
}, },
@ -661,12 +667,12 @@
}, },
submitCartCheckout() { submitCartCheckout() {
if(this.cartItems.length === 0) { if(this.cartItems.length === 0) {
uni.showToast({ title: '购物车为空', icon: 'none' }); this.$refs.warnPopup.open()
return; return;
} }
// 类似普通订单结算逻辑 // 类似普通订单结算逻辑
uni.navigateTo({ uni.navigateTo({
url: '/package1/goods/confirmOrder?cart=' + encodeURIComponent(JSON.stringify(this.cartItems)) url: '/package1/buyFood/buyFood?cart=' + encodeURIComponent(JSON.stringify(this.cartItems))
}); });
}, },
goDetail(type) { goDetail(type) {

Write Preview
Loading…
Cancel
Save