diff --git a/src/constants/app.config.js b/src/constants/app.config.js
index 4546295..8c2f940 100644
--- a/src/constants/app.config.js
+++ b/src/constants/app.config.js
@@ -3,8 +3,8 @@ export default {
appName: "Wagoo",
appShareName: "Wagoo",
appId: "wx00e2dcdc7c02b23a",
- // apiBaseUrl: "https://api.wagoo.me/api/v1", // 服务端测试地址
- apiBaseUrl: "https://api.wagoo.pet/api/v1", // 服务端生产地址
+ apiBaseUrl: "https://api.wagoo.me/api/v1", // 服务端测试地址
+ // apiBaseUrl: "https://api.wagoo.pet/api/v1", // 服务端生产地址
// apiBaseUrl: "http:192.168.30.79", //本地接口
tencentMapKey: "WSBBZ-7OXK4-46QUC-KFB7B-4N3W7-M2BXM",
tencentSecret: "vb7D0PGj7xUvmOLuJz2Jd7ykTMpjiWRJ",
diff --git a/src/pages/client/category/index.vue b/src/pages/client/category/index.vue
index fdb343c..81e8ebd 100644
--- a/src/pages/client/category/index.vue
+++ b/src/pages/client/category/index.vue
@@ -643,7 +643,7 @@ export default {
justify-content: flex-start;
align-items: flex-start;
margin-top: 20rpx;
- padding: 0 20rpx;
+ padding: 0 20rpx 120rpx;
.goods-list-item {
flex: 1;
diff --git a/src/pages/client/order/components/GoodInfo.vue b/src/pages/client/order/components/GoodInfo.vue
index b57d967..72091cc 100644
--- a/src/pages/client/order/components/GoodInfo.vue
+++ b/src/pages/client/order/components/GoodInfo.vue
@@ -1,17 +1,18 @@
-
-
-
- {{ data[0].goods_name || "" }}
- ¥{{ data[0].goods_price || data[0].product_actual_price }}
-
-
-
- {{ data[0].shuxing_name || "" }}{{ data[0].shuxing_name && data[0].price_name ? ";" : "" }}{{ data[0].price_name || "" }}
+
+
+
+
+ 到手价
+ ¥{{ data[0].goods_price || data[0].product_actual_price }}
+ 原价¥{{ data[0].product_original_price }}
- 共{{ data[0].number || 1 }}件
+ 已售{{ data[0].number || 1 }}件
+
+
+ {{ data[0].goods_name || "" }}
@@ -81,71 +82,67 @@
&.good-info {
padding-top: 20rpx;
- align-items: center;
+ align-items: flex-start;
- .good-icon {
- width: 100rpx;
- height: 100rpx;
- border-radius: 8rpx;
- margin-right: 20rpx;
- flex-shrink: 0;
- }
-
- .good-content {
- flex: 1;
- min-width: 0;
- overflow: hidden;
+ .good-wrapper {
+ width: 100%;
display: flex;
flex-direction: column;
- min-height: 100rpx;
+ }
- .goods-row-first {
+ .good-icon {
+ width: 100%;
+ height: 400rpx;
+ border-radius: 16rpx;
+ background: #f5f5f5;
+ }
+
+ .price-section {
+ display: flex;
+ justify-content: space-between;
+ align-items: baseline;
+ margin-top: 20rpx;
+
+ .price-left {
display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 8rpx;
+ align-items: baseline;
- .goods-name {
- flex: 1;
- font-size: 28rpx;
- color: #3D3D3D;
- line-height: 40rpx;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- margin-right: 20rpx;
+ .hand-price-tag {
+ font-size: 24rpx;
+ color: #fff;
+ background: linear-gradient(135deg, #FF19A0, #FF6B35);
+ padding: 4rpx 12rpx;
+ border-radius: 4rpx;
+ margin-right: 12rpx;
}
- .goods-price {
- flex-shrink: 0;
- font-size: 28rpx;
- color: #3D3D3D;
- font-weight: 500;
+ .current-price {
+ font-size: 40rpx;
+ color: #FF19A0;
+ font-weight: bold;
+ }
+
+ .origin-price {
+ font-size: 24rpx;
+ color: #999;
+ text-decoration: line-through;
+ margin-left: 12rpx;
}
}
- .goods-row-second {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .goods-spec {
- flex: 1;
- font-size: 24rpx;
- color: #999;
- margin-right: 20rpx;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .goods-count {
- flex-shrink: 0;
- font-size: 24rpx;
- color: #999;
- }
+ .goods-count {
+ font-size: 24rpx;
+ color: #999;
}
}
+
+ .goods-name {
+ font-size: 32rpx;
+ color: #3D3D3D;
+ line-height: 44rpx;
+ font-weight: bold;
+ margin-top: 16rpx;
+ }
}
.good-info-more {
@@ -177,4 +174,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/src/pages/client/order/create.vue b/src/pages/client/order/create.vue
index ed69e10..51e2f1f 100644
--- a/src/pages/client/order/create.vue
+++ b/src/pages/client/order/create.vue
@@ -1,96 +1,86 @@
-
-
-
-
-
-
-
- {{
- item.item_name || item.product_name
- }}
-
- 到手价
- ¥{{ item.product_price || item.goods_price }}
-
- ¥{{ item.original_price || (item.product_price * 1.5).toFixed(2) }}
-
-
-
- 已售0件
+
+
+
+
+
+
+
+
+ {{
+ item.item_name || item.product_name
+ }}
+
+ 到手价
+ ¥{{ item.product_price || item.goods_price }}
+
+
+ {{ item.goods_name }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 立即支付
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 立即支付
+
+
+
+
+
@@ -193,7 +183,7 @@ export default {
const eventChannel = this.getOpenerEventChannel();
eventChannel.on("createOrder", (data) => {
- // Helper function to extract first image from image_list
+ console.log(data,'--=?')
const extractFirstImage = (imageList) => {
if (!imageList) return "";
try {
@@ -209,10 +199,8 @@ export default {
};
this.orderData = (data?.goodList || []).map((item) => {
- // Check if product_pic is actually an image_list that needs parsing
let processedItem = { ...item };
if (processedItem.product_pic) {
- // If product_pic looks like an array or JSON string, try to parse it
if (
typeof processedItem.product_pic === "string" &&
(processedItem.product_pic.startsWith("[") ||
@@ -262,68 +250,11 @@ export default {
createCartOrder(params)
.then((res) => {
- // Check if tt and requirePlugin are available
if (typeof tt !== "undefined" && tt.requirePlugin) {
try {
const plugin = tt.requirePlugin("lifeServicePlugin");
if (plugin && plugin.createOrder) {
- // 先隐藏之前的loading，让插件显示自己的弹窗
uni.hideLoading();
- // let res1 = {
- // data: {
- // businessLine: 1,
- // skuList: [
- // {
- // quantity: 1,
- // skuId: "1861281775887367",
- // skuType: 1,
- // price: 12000,
- // goodsInfo: {
- // goodsName:
- // "狗狗移动上门赛级洗护｜ 狗狗洗澡｜ 体重【5-10kg】",
- // goodsPhoto:
- // "https://static.wagoo.pet/statics/dog5to10base.png",
- // goodsId: "7625864573682075667",
- // goodsType: 1,
- // },
- // },
- // ],
- // bookInfo: {
- // itemBookInfoList: [
- // {
- // poiId: "7620725019240319028",
- // shopName: "WAGOO·上海市",
- // outShopId: "life_7620725019240319028",
- // goodsId: "7625864573682075667",
- // bookStartTime: 1775613600000,
- // bookEndTime: 1775622600000,
- // },
- // ],
- // },
- // payment: {
- // totalAmount: 12000,
- // },
- // contactInfo: {
- // phoneNumber: "13773726377",
- // contactName: "老王",
- // },
- // storeInfo: {
- // storeName: "WAGOO·上海市",
- // },
- // callbackData: {
- // douyin_product_id: "7625864573682075667",
- // douyin_sku_id: "1861281775887367",
- // goods_id: 183,
- // order_date: "2026-04-08",
- // period_id: 1,
- // test: 999999,
- // },
- // tradeOption: {
- // life_trade_flag: 1,
- // },
- // },
- // };
- // console.log(res.data,'???')
plugin.createOrder({
skuList: res.data.skuList,
bookInfo: res.data.bookInfo,
@@ -332,14 +263,10 @@ export default {
storeInfo: res.data.storeInfo,
tradeOption: res.data.tradeOption,
payment: res.data.payment,
- // callbackData:res.data.callbackData,
- // tradeOption:res.data.tradeOption,
- // goodsList:res.data.goodsList,
success: (res) => {
const { orderId, outOrderNo } = res;
console.log("success res", res);
console.log("orderId", orderId, "outOrderNo", outOrderNo);
- // Update data the Vue way
this.orderId = orderId;
this.outOrderNo = outOrderNo;
uni.navigateTo({
@@ -348,22 +275,6 @@ export default {
},
fail: (res) => {
console.log("fail res", res);
- const { orderId, outOrderNo, errNo, errMsg, errLogId } =
- res;
- if (errLogId) {
- console.log("预下单失败", errNo, errMsg, errLogId);
- }
- if (orderId || outOrderNo) {
- console.log(
- "支付失败",
- errNo,
- errMsg,
- orderId,
- outOrderNo
- );
- }
- console.log(errNo, errMsg);
- // 隐藏抖音的报错信息，显示自定义中文提示
uni.showToast({
title: "支付失败",
icon: "none",
@@ -410,8 +321,12 @@ export default {
\ No newline at end of file