From 224e4f4772995e199e0ab47f4cd5fa9734e1fce3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 1 Jul 2023 00:05:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=94=B6=E9=93=B6=E5=8F=B0=E3=80=91?= =?UTF-8?q?=201.=20=E4=BB=8E=20crmeb=20php=20=E9=A1=B9=E7=9B=AE=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/numberScroll.vue | 160 ++++++ pages.json | 26 +- pages/goods/cashier/index.vue | 796 +++++++++++++++++++++++++++ pages/index/components/a_seckill.vue | 2 +- pages/users/order_confirm/index.vue | 136 +++-- 5 files changed, 1044 insertions(+), 76 deletions(-) create mode 100644 components/numberScroll.vue create mode 100644 pages/goods/cashier/index.vue diff --git a/components/numberScroll.vue b/components/numberScroll.vue new file mode 100644 index 00000000..2ace75d5 --- /dev/null +++ b/components/numberScroll.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/pages.json b/pages.json index 758b7b39..af32d5ed 100644 --- a/pages.json +++ b/pages.json @@ -269,7 +269,7 @@ "style": { "navigationBarTitleText": "修改密码", "navigationBarBackgroundColor": "#e93323" - // #ifdef MP + // #ifdef MP , "navigationBarTextStyle": "#fff" // #endif @@ -314,7 +314,7 @@ "style": { "navigationBarTitleText": "推广人排行", "navigationBarBackgroundColor": "#e93323" - // #ifdef MP + // #ifdef MP , "navigationBarTextStyle": "#fff" // #endif @@ -475,8 +475,24 @@ "navigationBarTitleText": "精品推荐" } }] - } - ], + }, { + "root": "pages/goods", + "name": "goods", + "pages": [{ + "path": "cashier/index", + "style": { + "navigationBarTitleText": "收银台", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }] + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "crmeb", @@ -526,4 +542,4 @@ "query": "" //启动参数，在页面的onLoad函数里面得到 }] } -} \ No newline at end of file +} diff --git a/pages/goods/cashier/index.vue b/pages/goods/cashier/index.vue new file mode 100644 index 00000000..91079337 --- /dev/null +++ b/pages/goods/cashier/index.vue @@ -0,0 +1,796 @@ + + + + + diff --git a/pages/index/components/a_seckill.vue b/pages/index/components/a_seckill.vue index 1c2e95c0..2c0d6f35 100644 --- a/pages/index/components/a_seckill.vue +++ b/pages/index/components/a_seckill.vue @@ -9,7 +9,7 @@ {{point}} 场 + :datatime="datatime" :is-col="true" :bgColor="bgColor" /> GO diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index da476261..7605508c 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -56,7 +56,7 @@ - + 积分抵扣 @@ -275,16 +275,7 @@ * 获得订单确认信息 */ getloadPreOrder: function() { - OrderApi.settlementOrder({ - items: this.items, - deliveryType: this.deliveryType, - addressId: this.address.addressId > 0 && this.deliveryType === 1 ? this.address.addressId : undefined, - receiverName: this.deliveryType === 2 ? this.contacts : undefined, - receiverMobile: this.deliveryType === 2 ? this.contactsTel : undefined, - couponId: this.couponId > 0 ? this.couponId : undefined, - pointStatus: this.pointStatus, - // TODO 芋艿：秒杀等等 - }).then(res => { + OrderApi.settlementOrder(this.getSettlementReqVO()).then(res => { const orderInfoVo = res.data this.orderInfoVo = orderInfoVo; this.cartInfo = orderInfoVo.items; @@ -303,74 +294,79 @@ }); }) }, - - /** - * 输入 - */ - bindHideKeyboard: function(e) { - this.mark = e.detail.value; - }, - - orderCreate: function(data) { - let that = this; - orderCreate(data).then(res => { - that.getOrderPay(res.data.orderNo, '支付成功'); - - }).catch(err => { - uni.hideLoading(); - return that.$util.Tips({ - title: err - }); - }); - }, - SubOrder: function(e) { + SubOrder: function(e) { // 校验参数 - if (!this.address.addressId && this.deliveryType === 1) { + if (!this.address.addressId && this.deliveryType === 1) { return this.$util.Tips({ title: '请选择收货地址' }); } - if (this.deliveryType === 2) { - if (this.contacts === "" || this.contactsTel === "") { - return this.$util.Tips({ - title: '请填写联系人或联系人电话' - }); - } - if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) { - return this.$util.Tips({ - title: '请填写正确的手机号' - }); - } - if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) { - return this.$util.Tips({ - title: '请填写您的真实姓名' - }); - } - if (this.storeList.length === 0) { + if (this.deliveryType === 2) { + if (this.contacts === "" || this.contactsTel === "") { + return this.$util.Tips({ + title: '请填写联系人或联系人电话' + }); + } + if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) { + return this.$util.Tips({ + title: '请填写正确的手机号' + }); + } + if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) { + return this.$util.Tips({ + title: '请填写您的真实姓名' + }); + } + if (this.storeList.length === 0) { return this.$util.Tips({ title: '暂无门店,请选择其他方式' }); } - } - const data = { - realName: this.contacts, - phone: this.contactsTel, - addressId: this.address.addressId, - couponId: this.couponId, - pointStatus: this.pointStatus, - preOrderNo: this.preOrderNo, - mark: this.mark, - storeId: this.system_store.id > 0 ? this.system_store.id : undefined, - deliveryType: this.deliveryType, - }; - // #ifdef MP - openPaySubscribe().then(() => { - this.orderCreate(data); - }); - // #endif - // #ifndef MP - this.orderCreate(data); - // #endif + } + // #ifdef MP + openPaySubscribe().then(() => { + this.orderCreate(); + }); + // #endif + // #ifndef MP + this.orderCreate(); + // #endif + }, + orderCreate: function() { + OrderApi.createOrder({ + ...this.getSettlementReqVO(), + mark: this.mark, + }).then(res => { + alert(res); + }).catch(err => { + uni.hideLoading(); + return this.$util.Tips({ + title: err + }); + }); + }, + /** + * 获得结算请求 VO + */ + getSettlementReqVO() { + return { + items: this.items, + deliveryType: this.deliveryType, + addressId: this.address.addressId > 0 && this.deliveryType === 1 ? this.address.addressId : undefined, + pickUpStoreId: this.system_store.id > 0 && this.deliveryType === 2 ? this.system_store.id : undefined, + receiverName: this.deliveryType === 2 ? this.contacts : undefined, + receiverMobile: this.deliveryType === 2 ? this.contactsTel : undefined, + couponId: this.couponId > 0 ? this.couponId : undefined, + pointStatus: this.pointStatus, + // TODO 芋艿：秒杀等等 + } + }, + + /** + * 输入备注 + */ + bindHideKeyboard: function(e) { + this.mark = e.detail.value; }, // ========== 积分 ==========