From 75ac4e967ca29a4b55f30959479ab4548c392059 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 21 May 2024 16:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3=E8=B0=83?=
=?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/js/api.js | 12 +
components/qiyue-category/qiyue-category.vue | 5 +-
framework/0-conf.js | 14 +-
framework/11-api.js | 2 +
pages/group_order/components/groupCoupons.vue | 11 +-
pages/group_order/order_groupdetail.vue | 18 +-
pages/index/components/advertisement.vue | 16 +-
pages/index/components/todaylist.vue | 2 +-
pages/index/drinks.vue | 14 +-
pages/index/freedaily.vue | 8 +-
pages/index/index.vue | 14 +-
pages/member/index.vue | 4 +-
pages/order/order.vue | 18 +-
pages/order/successful.vue | 40 ++-
pages/order_detail/order_detail.vue | 261 ++++++++++++------
pages/order_food/order_food.vue | 53 ++--
pages/product/index.vue | 8 +-
pages/product/placeOrder.vue | 133 +++++++--
pages/user/information.vue | 114 +++++---
pages/user/user.vue | 10 +-
20 files changed, 512 insertions(+), 245 deletions(-)
diff --git a/common/js/api.js b/common/js/api.js
index 614eb8f..cfed27d 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -12,6 +12,10 @@ export default {
getproductorderConfirm(data) {
return uni.api.get("/product/orderConfirm", data);
},
+ // 会员支付
+ accountPay(data) {
+ return uni.api.get("/pay/accountPay", data);
+ },
// 下单
creatGroupOrder(data) {
return uni.api.post("/groupOrderInfo/creatGroupOrder", data);
@@ -63,6 +67,14 @@ export default {
paymodfiyOrderInfo(data) { //查询订单支付状态
return uni.api.post("/pay/modfiyOrderInfo", data);
},
+ // 优惠加倍
+ yhqDouble(data) { //查询订单支付状态
+ return uni.api.post("/order/yhqDouble", data);
+ },
+ // 优惠卷详情
+ getYhqDouble(data) { //通过选中的商品规格查询价格
+ return uni.api.get("/order/getYhqDouble", data);
+ },
productqueryProductSku(data) { //通过选中的商品规格查询价格
return uni.api.get("/product/queryProductSku", data);
},
diff --git a/components/qiyue-category/qiyue-category.vue b/components/qiyue-category/qiyue-category.vue
index e0e8bb3..e5e0f26 100644
--- a/components/qiyue-category/qiyue-category.vue
+++ b/components/qiyue-category/qiyue-category.vue
@@ -69,7 +69,7 @@
},
activeBackgroundColor: {
type: String,
- default: '#fff'
+ default: 'rgba(0,0,0,0)'
},
label: {
type: String,
@@ -169,10 +169,11 @@
.nav-left-item {
padding: 10rpx 0;
- font-size: 14px;
+ font-size: 28rpx;
display: flex;
align-items: center;
justify-content: center;
+ color: #666;
}
.nav-right {
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 485d7f3..e488114 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -4,9 +4,11 @@ const proxyApi = "/api"
// #endif
// #ifdef MP-WEIXIN || APP
// const proxyApi = 'http://192.168.2.133:9889/cashierService' // 王伟
-// const proxyApi = 'http://101.37.12.135:9889/cashierService' // 帆哥
+// const proxyApi = 'http://192.168.2.74:9888/cashierService' // 帆哥
const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试
-const proxyApiwws = 'ws://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+// const proxyApiwws = 'ws://192.168.2.74:9888/cashierService' // 测试
+const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+
// #endif
// #ifdef H5
@@ -14,13 +16,15 @@ const baseUrl = debug ? proxyApi : "https://wxcashiertest.sxczgkj.cn/cashierServ
const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
// #endif
// #ifdef APP || MP-WEIXIN
-const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService'// 线上
-const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/cashierService' // 线上
+// const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService'// 线上
+// const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/cashierService' // 线上
+const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
+const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
// #endif
// import VConsole from "./vConsole.js"
// if (debug) {
-// // new VConsole()
+// new VConsole()
// }
const version = '100'
const autoRemoveCache = {
diff --git a/framework/11-api.js b/framework/11-api.js
index 8d9dbb0..21865c5 100644
--- a/framework/11-api.js
+++ b/framework/11-api.js
@@ -75,6 +75,8 @@ async function request(options) {
token: uni.cache.get('token'),
openId: uni.cache.get('miniAppOpenId'),
id: uni.cache.get('userInfo').id,
+ loginName:"",
+ clientType:''
}
} else {
diff --git a/pages/group_order/components/groupCoupons.vue b/pages/group_order/components/groupCoupons.vue
index c9d9e60..164785d 100644
--- a/pages/group_order/components/groupCoupons.vue
+++ b/pages/group_order/components/groupCoupons.vue
@@ -3,15 +3,15 @@
- 美团券
+ 优惠券
{{info.expDate}}
-
-
+
+
{{item.couponNo}}
\ No newline at end of file
diff --git a/pages/group_order/order_groupdetail.vue b/pages/group_order/order_groupdetail.vue
index 13f836c..ed1e0e3 100644
--- a/pages/group_order/order_groupdetail.vue
+++ b/pages/group_order/order_groupdetail.vue
@@ -32,7 +32,7 @@
-
+
@@ -90,11 +90,11 @@
if (res) {
uni.requestPayment({
provider: 'wxpay', //支付类型-固定值
- partnerid: res.data.payAppId, // 微信支付商户号
- timeStamp: res.data.payTimeStamp, // 时间戳（单位：秒）
- nonceStr: res.data.paynonceStr, // 随机字符串
- package: res.data.payPackage, // 固定值
- signType: res.data.paySignType, //固定值
+ partnerid: res.data.appId, // 微信支付商户号
+ timeStamp: res.data.timeStamp, // 时间戳（单位：秒）
+ nonceStr: res.data.nonceStr, // 随机字符串
+ package: res.data.package, // 固定值
+ signType: res.data.signType, //固定值
paySign: res.data.paySign, //签名
success: (res) => {
uni.showToast({
@@ -115,7 +115,9 @@
}
},
clickEvent() {
- this.qrValue = this.qrEvent()
+ this.qrValue =this.listinfo.coupons[0].couponNo
+ console.log(this.listinfo.coupons[0].couponNo)
+ // this.qrValue = this.qrEvent()
this.isQrimg = !this.isQrimg
},
qrR(e) {
@@ -182,7 +184,7 @@
bottom: 0%;
left: 50%;
transform: translate(-50%);
-
+
.payStyle {
background-color: #fe7620;
diff --git a/pages/index/components/advertisement.vue b/pages/index/components/advertisement.vue
index f9f4fc8..1ebbb44 100644
--- a/pages/index/components/advertisement.vue
+++ b/pages/index/components/advertisement.vue
@@ -2,11 +2,10 @@
现有
- {{bannervo.coupons==null?116:bannervo.coupons}}人
-
+ {{bannervo.coupons==null?116:bannervo.coupons}}人
+
已免单
-
@@ -112,7 +111,7 @@
// newList.push(newList[0])
// newList.splice(0, 1)
// }
- this.$emit('changeValue',newList);
+ this.$emit('changeValue', newList);
this.$forceUpdate();
}
@@ -123,7 +122,7 @@
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 9198f2c..4e82349 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -3,7 +3,7 @@
+ :src="userInfo.headImg" mode="aspectFill">
@@ -42,7 +42,7 @@
userInfo: {},
shopInfo: {},
teblist: [],
- list:[]
+ list: []
};
},
onLoad() {
@@ -55,7 +55,7 @@
}
},
methods: {
- clickinformation(){
+ clickinformation() {
uni.pro.navigateTo('user/information')
},
//退出登录
@@ -118,6 +118,7 @@
} catch (e) {}
},
clickinfo(item, index) {
+ console.log(item, '调试121')
switch (item.jumpType) {
case 'scan': //特殊处理点击
switch (item.value) {
@@ -126,6 +127,9 @@
break;
}
break;
+ case 'scan_applet':
+ uni.navigateToMiniProgram(JSON.parse(item.value))
+ break
case 'relative': //内部页面
uni.pro.navigateTo(item.absUrl)
break;