diff --git a/.idea/ApifoxUploaderProjectSetting.xml b/.idea/ApifoxUploaderProjectSetting.xml
new file mode 100644
index 0000000..868ecc4
--- /dev/null
+++ b/.idea/ApifoxUploaderProjectSetting.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index c06f7eb..0090167 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -30,6 +30,9 @@
+
+
+
-
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index f3439dd..65d3203 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -15,6 +15,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 98f644b..65bc734 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,12 @@
-
-
-
-
-
+
+
+
+
+
+
UPDATE
@@ -213,7 +214,6 @@
-
diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml
new file mode 100644
index 0000000..3dfd21f
--- /dev/null
+++ b/.idea/qaplug_profiles.xml
@@ -0,0 +1,465 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceAclApplication.xml b/.idea/runConfigurations/ServiceAclApplication.xml
index 5e65474..932eb2c 100644
--- a/.idea/runConfigurations/ServiceAclApplication.xml
+++ b/.idea/runConfigurations/ServiceAclApplication.xml
@@ -3,9 +3,8 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceActivityApplication.xml b/.idea/runConfigurations/ServiceActivityApplication.xml
index 3920e96..13a429c 100644
--- a/.idea/runConfigurations/ServiceActivityApplication.xml
+++ b/.idea/runConfigurations/ServiceActivityApplication.xml
@@ -3,9 +3,8 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceGatewayApplication.xml b/.idea/runConfigurations/ServiceGatewayApplication.xml
index 05660d2..c08d71c 100644
--- a/.idea/runConfigurations/ServiceGatewayApplication.xml
+++ b/.idea/runConfigurations/ServiceGatewayApplication.xml
@@ -2,9 +2,8 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServicePaymentApplication.xml b/.idea/runConfigurations/ServicePaymentApplication.xml
index a709dfe..15da9b9 100644
--- a/.idea/runConfigurations/ServicePaymentApplication.xml
+++ b/.idea/runConfigurations/ServicePaymentApplication.xml
@@ -3,9 +3,8 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/ServiceUserApplication.xml b/.idea/runConfigurations/ServiceUserApplication.xml
index c8b5958..50b7277 100644
--- a/.idea/runConfigurations/ServiceUserApplication.xml
+++ b/.idea/runConfigurations/ServiceUserApplication.xml
@@ -3,9 +3,8 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/xlcs-user/.hbuilderx/launch.json b/xlcs-user/.hbuilderx/launch.json
index cac109a..be9dee9 100644
--- a/xlcs-user/.hbuilderx/launch.json
+++ b/xlcs-user/.hbuilderx/launch.json
@@ -4,16 +4,19 @@
"version": "0.0",
"configurations": [
{
- "default": {
- "launchtype": "local"
- },
- "h5": {
- "launchtype": "local"
- },
- "mp-weixin": {
- "launchtype": "local"
- },
- "type": "uniCloud"
+ "app-plus": {
+ "launchtype": "local"
+ },
+ "default": {
+ "launchtype": "local"
+ },
+ "h5": {
+ "launchtype": "local"
+ },
+ "mp-weixin": {
+ "launchtype": "local"
+ },
+ "type": "uniCloud"
}
]
}
diff --git a/xlcs-user/common/http.api.js b/xlcs-user/common/http.api.js
index a2457b7..d4c3b71 100644
--- a/xlcs-user/common/http.api.js
+++ b/xlcs-user/common/http.api.js
@@ -27,10 +27,10 @@ const post_update_user = '/user/weixin/auth/updateUser' // 更新用户信息
const get_find_user_order = '/order/auth/findUserOrderPage' // 获取用户订单信息
const get_weixin_payment = '/payment/weixin/createJsapi' // 获取微信支付信息
const get_order_status = '/payment/weixin/queryPayStatus' // 获取订单状态
-
-// 后续需求
const get_account_login = '/user/h5/login' // 用户登陆
const post_register = '/user/h5/register' // 用户注册
+
+// 后续需求
const post_h5_update_user = '/user/h5/auth/updateUser' // 更新用户信息
const get_alipay_payment = '/payment/alipay/createJsapi' // 获取支付宝支付信息
const get_order_alipay_status = '/payment/alipay/queryPayStatus' // 获取订单状态
@@ -42,7 +42,7 @@ const install = (Vue, vm) => {
// 获取首页数据
const getHomeIndex = () => vm.$u.get(get_home_index);
/*---------------------------------------------------------
- 提货点模块
+ 提货点模块
---------------------------------------------------------*/
// 根据经纬度获取地址信息
const getBaiduMapAddress = (o) => vm.$u.get(get_baidu_map_address + `${o.latitude},${o.longitude}`)
@@ -60,7 +60,7 @@ const install = (Vue, vm) => {
showLoading: false
})
/*---------------------------------------------------------
- 商品模块
+ 商品模块
---------------------------------------------------------*/
// 获取分类
const getCategories = () => vm.$u.get(get_categories, {
@@ -75,14 +75,14 @@ const install = (Vue, vm) => {
// 商品详情
const getHomeItem = (o) => vm.$u.get(get_home_item + `/${o.skuId}`);
/*---------------------------------------------------------
- 秒杀模块
+ 秒杀模块
---------------------------------------------------------*/
// 从缓存中查询时间段列表
const getFindAllSeckillTimeList = () => vm.$u.get(get_find_all_sec_kill_time_list);
// 从缓存中读取秒杀sku
const getFindSeckillSkuList = (o) => vm.$u.get(get_find_sec_kill_sku_list + `/${o.timeName}`);
/*---------------------------------------------------------
- 购物车模块
+ 购物车模块
---------------------------------------------------------*/
// 加入购物车
const getAddToCart = (o) => vm.$u.get(get_add_to_cart + `/${o.skuId}/${o.skuNum}`, {
@@ -118,12 +118,14 @@ const install = (Vue, vm) => {
const getOrderInfo = (o) => vm.$u.get(get_order_info + `/${o.orderId}`)
// 获取微信支付信息
const getWxPayment = (o) => vm.$u.get(get_weixin_payment + `/${o.orderNo}`)
+ // 获取支付宝支付信息
+ const getAliPayment = (o) => vm.$u.get(get_alipay_payment + `/${o.orderNo}`)
// 获取订单状态信息
const getOrderStatus = (o) => vm.$u.get(get_order_status + `/${o.orderNo}`)
/*---------------------------------------------------------
- 用户登陆
+ 用户登陆
---------------------------------------------------------*/
// 微信用户登陆
const getWxLogin = (o) => vm.$u.get(get_wx_login + `/${o.code}`, {
@@ -131,10 +133,8 @@ const install = (Vue, vm) => {
})
// 账号密码登登录
const getAccountLogin = (o) => vm.$u.post(get_account_login, o)
-
-
+ // 用户注册
const postRegister = (o) => vm.$u.post(post_register, o)
- // '/user/h5/register' // 用户注册
// 更新用户信息
const postUpdateUser = (o) => vm.$u.post(post_update_user, {
...o,
@@ -168,6 +168,7 @@ const install = (Vue, vm) => {
postSubmitOrder,
getOrderInfo,
getWxPayment,
+ getAliPayment,
getWxLogin,
getAccountLogin,
postRegister,
diff --git a/xlcs-user/common/http.interceptor.js b/xlcs-user/common/http.interceptor.js
index 1bb22c7..4530a9e 100644
--- a/xlcs-user/common/http.interceptor.js
+++ b/xlcs-user/common/http.interceptor.js
@@ -21,7 +21,7 @@ const install = (Vue, vm) => {
} else if (res.code == 208) {
// 未登陆，token过期
uni.reLaunch({
- url: '/pages/login/login'
+ url: '/pages/loginh5/loginh5'
})
return false;
} else {
diff --git a/xlcs-user/pages/cart/cart.vue b/xlcs-user/pages/cart/cart.vue
index 8bb9387..e41ba19 100644
--- a/xlcs-user/pages/cart/cart.vue
+++ b/xlcs-user/pages/cart/cart.vue
@@ -14,36 +14,22 @@
-
+
{{ cartInfoListItem.activityRule.ruleDesc }}
-
-
-
+
+
+
{{ cartInfoItem.skuName }}
@@ -51,7 +37,8 @@
￥
{{ cartInfoItem.cartPrice }}
-
+
+
@@ -79,7 +66,9 @@
优惠券优惠:￥{{ getCartPriceInfo.couponReduceAmount }}
原价:
- ￥{{ getCartPriceInfo.originalTotalAmount }}
+ ￥{{ getCartPriceInfo.originalTotalAmount }}
+
@@ -95,8 +84,8 @@
-
+
+
@@ -122,7 +111,9 @@ export default {
])
},
methods: {
- ...mapActions('cartModule', ['getActivityCartListAction', 'changeCheckCartAction', 'changeMultiCheckedCartAction', 'changeAllCheckCartAction']),
+ ...mapActions('cartModule', ['getActivityCartListAction', 'changeCheckCartAction',
+ 'changeMultiCheckedCartAction', 'changeAllCheckCartAction'
+ ]),
...mapActions('cartModule', ['getCartListAction']),
// 到分类页购买商品
gotoCategory() {
@@ -133,20 +124,31 @@ export default {
// 修改单个商品选中状态
changeChecked(detail) {
let isChecked = 1;
- const {name: skuId, value} = detail;
+ const {
+ name: skuId,
+ value
+ } = detail;
if (!value) isChecked = 0;
- this.changeCheckCartAction({skuId, isChecked});
+ this.changeCheckCartAction({
+ skuId,
+ isChecked
+ });
},
// 修改多个商品的选中状态
changeMultiChecked(detail) {
let skuIdList = [];
skuIdList = detail.name.split(',');
const isChecked = detail.value === true ? 1 : 0;
- this.changeMultiCheckedCartAction({skuIdList, isChecked});
+ this.changeMultiCheckedCartAction({
+ skuIdList,
+ isChecked
+ });
},
// 全部选中/返选
changeAllSelected(detail) {
- this.changeAllCheckCartAction({isChecked: detail.value === true ? 1 : 0});
+ this.changeAllCheckCartAction({
+ isChecked: detail.value === true ? 1 : 0
+ });
},
// 跳转至确认订单
gotoConfirmOrder() {
@@ -156,7 +158,9 @@ export default {
// 思考：为什么需要将请求放置于onShow钩子函数中，
// 主要考虑tabs切换后需要进行实时数据的获取
onShow() {
- this.getActivityCartListAction({showLoading: true});
+ this.getActivityCartListAction({
+ showLoading: true
+ });
},
mounted() {
// 需要获取购物车数据列表，将最新获取的数据渲染到页面
diff --git a/xlcs-user/pages/login/login.vue b/xlcs-user/pages/login/login.vue
index c0330ec..4763038 100644
--- a/xlcs-user/pages/login/login.vue
+++ b/xlcs-user/pages/login/login.vue
@@ -22,6 +22,8 @@
+
+
diff --git a/xlcs-user/pages/loginh5/loginh5.vue b/xlcs-user/pages/loginh5/loginh5.vue
new file mode 100644
index 0000000..23915dd
--- /dev/null
+++ b/xlcs-user/pages/loginh5/loginh5.vue
@@ -0,0 +1,166 @@
+
+
+
+ 欢迎登录小鹿超市
+
+
+
+
+
+
+
+
+
+
+ 登录代表同意
+ 小鹿超市用户协议、隐私政策，
+ 并授权使用您的小鹿超市账号信息（如昵称、头像、收获地址）以便您统一管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xlcs-user/pages/my/my.vue b/xlcs-user/pages/my/my.vue
index a770de3..63035f0 100644
--- a/xlcs-user/pages/my/my.vue
+++ b/xlcs-user/pages/my/my.vue
@@ -107,12 +107,12 @@
提货码
-
+
+
+
+ 退出登录
+
+
@@ -204,11 +204,12 @@ export default {
gotoOrderList(index) {
this.$u.route('/pagesOrder/orderList/orderList?current=' + index);
},
- // gotoMyPickUpLocation() {
- // uni.navigateTo({
- // url: '/pagesLocation/myPickUpLocation/myPickUpLocation'
- // });
- // }
+ logout() {
+ uni.removeStorageSync('token');
+ uni.navigateTo({
+ url: '/pages/loginh5/loginh5'
+ });
+ }
},
async mounted() {
this.userInfo = uni.getStorageSync('userInfo');
diff --git a/xlcs-user/pages/register/register.vue b/xlcs-user/pages/register/register.vue
new file mode 100644
index 0000000..3ebea2f
--- /dev/null
+++ b/xlcs-user/pages/register/register.vue
@@ -0,0 +1,151 @@
+
+
+
+ 欢迎注册小鹿超市
+
+
+
+
+
+
+
+
+
+
+ 注册代表同意
+ 小鹿超市用户协议、隐私政策，
+ 并授权使用您的小鹿超市账号信息（如昵称、头像、收获地址）以便您统一管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue b/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue
index 4d187c3..9c35569 100644
--- a/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue
+++ b/xlcs-user/pagesOrder/confirmOrder/confirmOrder.vue
@@ -14,10 +14,10 @@
-->
- 提货人联系方式
+ 联系方式
-
-
+
+
@@ -32,15 +32,10 @@
-
+
{{ cartInfoItem.skuName }}
购买数量：{{ cartInfoItem.skuNum }}
@@ -61,25 +56,25 @@
-
+
￥
{{ couponInfoItem.amount }}
- {{ couponInfoItem.couponType === 'FULL_REDUCTION' ? '满减券' : '现金券' }}
+
+ {{ couponInfoItem.couponType === 'FULL_REDUCTION' ? '满减券' : '现金券' }}
+
{{ getRangeType(couponInfoItem.rangeType) }}
{{ couponInfoItem.couponName }}
{{ couponInfoItem.rangeDesc }}
- 过期时间：{{ dayjs(couponInfoItem.expireTime).format('YYYY-MM-DD') }}
+
+ 过期时间：{{ dayjs(couponInfoItem.expireTime).format('YYYY-MM-DD') }}
+
@@ -111,7 +106,9 @@
优惠券优惠:￥{{ getCartPriceInfo.couponReduceAmount }}
原价:
- ￥{{ getCartPriceInfo.originalTotalAmount }}
+ ￥{{ getCartPriceInfo.originalTotalAmount }}
+
@@ -144,7 +141,9 @@ export default {
},
computed: {
...mapState('orderModule', ['order']),
- ...mapGetters('orderModule', ['getCartInfoList', 'getSelectedCount', 'getCartPriceInfo', 'getLeaderAddressVo', 'showMultiCheckbox', 'getCartCouponInfoList']),
+ ...mapGetters('orderModule', ['getCartInfoList', 'getSelectedCount', 'getCartPriceInfo', 'getLeaderAddressVo',
+ 'showMultiCheckbox', 'getCartCouponInfoList'
+ ]),
getRangeType() {
return function (rangeType) {
switch (rangeType) {
diff --git a/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue b/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue
index 940e394..9278e9f 100644
--- a/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue
+++ b/xlcs-user/pagesOrder/getOrderInfo/getOrderInfo.vue
@@ -9,11 +9,11 @@
- 提货人联系方式
+ 联系方式
- 收货人员：{{ order.receiverName }}
+ 姓名：{{ order.receiverName }}
联系方式：{{ order.receiverPhone }}
- 提货地点：{{ order.receiverAddress }}
+ 地点：{{ order.receiverAddress }}
@@ -28,8 +28,11 @@
{{ orderItem.skuName }}
单价：￥{{ orderItem.skuPrice }}
数量：{{ orderItem.skuNum }}
- 活动金额:￥{{ orderItem.splitActivityAmount }}
- 优惠券额:￥{{ orderItem.splitCouponAmount }}
+
+ 活动金额:￥{{ orderItem.splitActivityAmount }}
+
+ 优惠券额:￥{{ orderItem.splitCouponAmount }}
+
小计：
￥{{ orderItem.splitTotalAmount }}
@@ -69,7 +72,8 @@
- 支付订单
+ 微信支付订单
+ 支付宝支付订单
@@ -91,7 +95,9 @@ export default {
},
methods: {
async getOrderInfoById(orderId) {
- const result = await this.$u.api.getOrderInfo({orderId});
+ const result = await this.$u.api.getOrderInfo({
+ orderId
+ });
this.order = result;
},
copyOrderNo() {
@@ -106,8 +112,10 @@ export default {
}
});
},
- async payOrder() {
- const result = await this.$u.api.getWxPayment({orderNo: this.order.orderNo});
+ async payWxOrder() {
+ const result = await this.$u.api.getWxPayment({
+ orderNo: this.order.orderNo
+ });
wx.requestPayment({
timeStamp: result.timeStamp,
nonceStr: result.nonceStr,
@@ -115,7 +123,9 @@ export default {
signType: 'MD5',
paySign: result.paySign,
success: res => {
- this.$u.api.getOrderStatus({orderNo: this.order.orderNo});
+ this.$u.api.getOrderStatus({
+ orderNo: this.order.orderNo
+ });
uni.showToast({
title: '支付成功',
icon: 'none'
@@ -131,7 +141,46 @@ export default {
});
}
});
+ },
+ async payAliOrder() {
+ try {
+ const result = await this.$u.api.getAliPayment({
+ orderNo: this.order.orderNo
+ });
+
+ my.tradePay({
+ tradeNO: result.tradeNO,
+ success: res => {
+ if (res.resultCode === '9000') {
+ this.$u.api.getOrderStatus({
+ orderNo: this.order.orderNo
+ });
+ uni.showToast({
+ title: '支付成功',
+ icon: 'none'
+ });
+ uni.switchTab({
+ url: '/pages/index/index'
+ });
+ } else {
+ throw new Error('支付失败');
+ }
+ },
+ fail: err => {
+ uni.showToast({
+ icon: 'none',
+ title: err.errorMessage || '支付失败'
+ });
+ }
+ });
+ } catch (error) {
+ uni.showToast({
+ icon: 'none',
+ title: error.message || '支付失败'
+ });
+ }
}
+
},
mounted() {
this.getOrderInfoById(this.orderId);
diff --git a/xlcs-user/pagesOrder/orderList/orderList.vue b/xlcs-user/pagesOrder/orderList/orderList.vue
index 19560d4..5ce6f81 100644
--- a/xlcs-user/pagesOrder/orderList/orderList.vue
+++ b/xlcs-user/pagesOrder/orderList/orderList.vue
@@ -36,7 +36,9 @@
- 现价：￥{{ res.totalAmount }} 原价：￥{{ res.originalTotalAmount }}
+ 现价：￥{{ res.totalAmount }}
+ 原价：￥{{ res.originalTotalAmount }}
+
@@ -45,6 +47,7 @@
查看物流
卖了换钱
+
评价
@@ -63,14 +66,19 @@ export default {
data() {
return {
// 订单列表
- orderList: [[], [], [], [], []],
+ orderList: [
+ [],
+ [],
+ [],
+ [],
+ []
+ ],
// 订单类型、状态与数量
- list: [
- {
- name: '待付款',
- orderStatus: 'UNPAID',
- count: 0
- },
+ list: [{
+ name: '待付款',
+ orderStatus: 'UNPAID',
+ count: 0
+ },
{
name: '待发货',
orderStatus: 'WAITING_DELEVER',
@@ -159,6 +167,9 @@ export default {
this.loadStatus.splice(idx, 1, 'nomore');
}
},
+ async getOrderInfo(id) {
+ this.$u.route(`/pagesOrder/getOrderInfo/getOrderInfo?orderId=${id}`);
+ },
// tab栏切换
change(index) {
this.swiperCurrent = index;