1
This commit is contained in:
@ -196,7 +196,7 @@ export const ADD_SERVICE_FEE = "/app/chongwu_order/order_fuwufei";
|
|||||||
// 商品分类
|
// 商品分类
|
||||||
export const GET_GOODS_CATEGORY = "/product/type/list";
|
export const GET_GOODS_CATEGORY = "/product/type/list";
|
||||||
// 商品列表
|
// 商品列表
|
||||||
export const GET_GOODS_LIST = "/product/list";
|
export const GET_GOODS_LIST = "/douyin/goods/product/online/query";
|
||||||
// 商品详情
|
// 商品详情
|
||||||
export const GET_GOODS_DETAIL = "/product/detail";
|
export const GET_GOODS_DETAIL = "/product/detail";
|
||||||
|
|
||||||
|
|||||||
@ -178,6 +178,8 @@ export default {
|
|||||||
if (this.pendingPhoneNumber) {
|
if (this.pendingPhoneNumber) {
|
||||||
this.doMakePhoneCall(this.pendingPhoneNumber)
|
this.doMakePhoneCall(this.pendingPhoneNumber)
|
||||||
this.pendingPhoneNumber = null
|
this.pendingPhoneNumber = null
|
||||||
|
// 拨号后关闭选择弹窗
|
||||||
|
this.$emit('close')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -282,12 +284,12 @@ export default {
|
|||||||
this.checkPrivacyAuthorization(phoneNumber, (authorized) => {
|
this.checkPrivacyAuthorization(phoneNumber, (authorized) => {
|
||||||
if (authorized) {
|
if (authorized) {
|
||||||
this.doMakePhoneCall(phoneNumber)
|
this.doMakePhoneCall(phoneNumber)
|
||||||
|
// 已授权拨号后，关闭选择弹窗
|
||||||
|
this.$emit('close')
|
||||||
}
|
}
|
||||||
// 未授权时，checkPrivacyAuthorization 已经显示了隐私弹窗
|
// 未授权时，checkPrivacyAuthorization 已经显示了隐私弹窗
|
||||||
|
// 此时不关闭选择弹窗，让隐私弹窗能够正常显示
|
||||||
})
|
})
|
||||||
|
|
||||||
// 关闭选择弹窗
|
|
||||||
this.$emit('close')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,13 +45,13 @@
|
|||||||
// text: "立即预约",
|
// text: "立即预约",
|
||||||
// isSpecial: true, // 特殊样式标记（中间突出的按钮）
|
// isSpecial: true, // 特殊样式标记（中间突出的按钮）
|
||||||
// },
|
// },
|
||||||
// {
|
{
|
||||||
// pageId: "shopPage",
|
pageId: "shopPage",
|
||||||
// iconPath: `${imgPrefix}tabBar-mall.png`,
|
iconPath: `${imgPrefix}tabBar-mall.png`,
|
||||||
// selectedIconPath: `${imgPrefix}tabBar-selectdMall.png`,
|
selectedIconPath: `${imgPrefix}tabBar-selectdMall.png`,
|
||||||
// text: "分类",
|
text: "分类",
|
||||||
// isSpecial: false,
|
isSpecial: false,
|
||||||
// },
|
},
|
||||||
{
|
{
|
||||||
pageId: "minePage",
|
pageId: "minePage",
|
||||||
iconPath: `${imgPrefix}tabBar-mine.png`,
|
iconPath: `${imgPrefix}tabBar-mine.png`,
|
||||||
|
|||||||
@ -78,31 +78,31 @@
|
|||||||
"mp-baidu" : {
|
"mp-baidu" : {
|
||||||
"usingComponents" : true
|
"usingComponents" : true
|
||||||
},
|
},
|
||||||
"mp-toutiao" : {
|
"mp-toutiao": {
|
||||||
"usingComponents" : true,
|
"usingComponents": true,
|
||||||
"appid" : "tte57093cd7a7fbf2401",
|
"appid": "tte57093cd7a7fbf2401",
|
||||||
"libVersion" : "2.0.0",
|
"libVersion": "2.0.0",
|
||||||
"setting" : {
|
"setting": {
|
||||||
"urlCheck" : false,
|
"urlCheck": false,
|
||||||
"minified" : true,
|
"minified": true,
|
||||||
"postcss" : true,
|
"postcss": true,
|
||||||
"es6" : true,
|
"es6": true,
|
||||||
"minifyJS" : true,
|
"minifyJS": true,
|
||||||
"minifyWXML" : true,
|
"minifyWXML": true,
|
||||||
"minifyWXSS" : true
|
"minifyWXSS": true
|
||||||
},
|
},
|
||||||
"privacy": {
|
"privacy": {
|
||||||
"usePrivacyCheck": true,
|
"usePrivacyCheck": true,
|
||||||
"requiredPrivateInfos": ["makePhoneCall"]
|
"requiredPrivateInfos": ["makePhoneCall"]
|
||||||
},
|
}
|
||||||
|
},
|
||||||
"plugins" : {
|
"plugins": {
|
||||||
"myTradePlugin" : {
|
"lifeServicePlugin": {
|
||||||
"version" : "*",
|
"version": "*",
|
||||||
"provider" : "tta5a3d31e3aecfb9b11"
|
"provider": "tta5a3d31e3aecfb9b11"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
|
||||||
"mp-qq" : {
|
"mp-qq" : {
|
||||||
"usingComponents" : true
|
"usingComponents" : true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -183,9 +183,9 @@ export default {
|
|||||||
}
|
}
|
||||||
getGoodsListData(params)
|
getGoodsListData(params)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
const list = res?.data || [];
|
const list = res?.data.data.products || [];
|
||||||
this.goodsList =
|
this.goodsList = list;
|
||||||
this.goodPage === 1 ? list : [...this.goodsList, ...list];
|
console.log(this.goodsList,'???')
|
||||||
this.goodsTotal = res?.count || 0;
|
this.goodsTotal = res?.count || 0;
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
@ -328,13 +328,13 @@ export default {
|
|||||||
res.eventChannel.emit("createOrder", {
|
res.eventChannel.emit("createOrder", {
|
||||||
goodList: [{
|
goodList: [{
|
||||||
...this.goodsData,
|
...this.goodsData,
|
||||||
goods_id:goodsData.product_id,
|
goods_id:goodsData.product.out_id,
|
||||||
price_id:goodsData.prices[0].price_id,
|
// price_id:goodsData.prices[0].price_id,
|
||||||
number:1,
|
number:1,
|
||||||
goods_name: goodsData.product_name,
|
goods_name: goodsData.product.product_name,
|
||||||
price_name: goodsData?.product_name,
|
price_name: goodsData?.product.product_name,
|
||||||
goods_price: goodsData.prices[0].actual_price,
|
goods_price: goodsData.product.product_type,
|
||||||
product_pic:goodsData.product_pic
|
product_pic:goodsData.product.product_type
|
||||||
}, ],
|
}, ],
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@ -219,7 +219,7 @@ export default {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
const params = {
|
const params = {
|
||||||
id: this.orderData[0].goods_id,
|
id: Number(this.orderData[0].goods_id),
|
||||||
};
|
};
|
||||||
|
|
||||||
// console.log(this.orderData,'???')
|
// console.log(this.orderData,'???')
|
||||||
@ -232,12 +232,9 @@ export default {
|
|||||||
quantity: 10, // 购买数量 必填
|
quantity: 10, // 购买数量 必填
|
||||||
price: 1, // 商品价格 必填
|
price: 1, // 商品价格 必填
|
||||||
goodsName: "测试商品", // 商品名称 必填
|
goodsName: "测试商品", // 商品名称 必填
|
||||||
goodsPhoto:
|
goodsPhoto:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic.ibaotu.com%2Fgif%2F19%2F48%2F47%2F76Z888piCd6W.gif%21fwpaa50%2Ffw%2F700&refer=http%3A%2F%2Fpic.ibaotu.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1644654365&t=5fc9b5fdad0a16264a9a9c09c14b3af9", // 商品图片链接 必填
|
||||||
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic.ibaotu.com%2Fgif%2F19%2F48%2F47%2F76Z888piCd6W.gif%21fwpaa50%2Ffw%2F700&refer=http%3A%2F%2Fpic.ibaotu.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1644654365&t=5fc9b5fdad0a16264a9a9c09c14b3af9", // 商品图片链接 必填
|
|
||||||
goodsId: "123", // 商品ID 必填（请务必使用小程序商品）
|
goodsId: "123", // 商品ID 必填（请务必使用小程序商品）
|
||||||
goodsType: 2, // 商品类型 必填
|
goodsType: 2, // 商品类型 必填
|
||||||
goodsLabels: ["不可退"], // 商品标签 非必填
|
|
||||||
dateRule: "", // 使用规则 非必填
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
payment: {
|
payment: {
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<view class="goods-item" >
|
<view class="goods-item" >
|
||||||
<image class="goods-img" :src="data.product_pic" mode="aspectFill" />
|
<image class="goods-img" :src="data.product_pic" mode="aspectFill" />
|
||||||
<view class=" fs-24 app-fc-main goods-name">
|
<view class=" fs-24 app-fc-main goods-name">
|
||||||
{{ data.product_name || "" }}
|
{{ data.product.product_name || "" }}
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="flex-row-start label">
|
<!-- <view class="flex-row-start label">
|
||||||
<image class="hot-icon" :src="`${imgPrefix}mall-hot.png`"></image>
|
<image class="hot-icon" :src="`${imgPrefix}mall-hot.png`"></image>
|
||||||
@ -13,7 +13,7 @@
|
|||||||
<text class="fs-28" style="color: #3D3D3D;">
|
<text class="fs-28" style="color: #3D3D3D;">
|
||||||
¥
|
¥
|
||||||
<text class="fs-28">{{
|
<text class="fs-28">{{
|
||||||
data.prices[0].actual_price || 0
|
data.product.product_type || 0
|
||||||
}}</text>
|
}}</text>
|
||||||
</text>
|
</text>
|
||||||
<!-- <text class="fs-24 origin-price">
|
<!-- <text class="fs-24 origin-price">
|
||||||
@ -92,13 +92,13 @@
|
|||||||
|
|
||||||
.goods-name {
|
.goods-name {
|
||||||
margin: 20rpx 0;
|
margin: 20rpx 0;
|
||||||
overflow: hidden;
|
// overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
// text-overflow: ellipsis;
|
||||||
display: -webkit-box;
|
// display: -webkit-box;
|
||||||
-webkit-line-clamp: 1;
|
// -webkit-line-clamp: 1;
|
||||||
-webkit-box-orient: vertical;
|
// -webkit-box-orient: vertical;
|
||||||
word-wrap: break-word;
|
// word-wrap: break-word;
|
||||||
word-break: break-all;
|
// word-break: break-all;
|
||||||
}
|
}
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user