+
联系客服
@@ -156,7 +156,7 @@ import {
getGoodsIsCollect,
} from "@/api/members.js";
import config from "@/config/config";
-import storage from "@/utils/storage";
+
import { getGoodsList } from "@/api/goods.js";
import { getAllCoupons } from "@/api/promotions.js";
import { getFloorStoreData } from "@/api/home"; //获取楼层装修接口
@@ -262,6 +262,9 @@ export default {
},
methods: {
+ talk(){
+ this.$options.filters.talkIm(this.storeInfo.storeId)
+ },
back() {
uni.navigateBack();
},
@@ -298,35 +301,6 @@ export default {
// 店铺信息
this.getStoreData();
},
- /**
- * 联系客服
- */
- linkKefuDetail() {
- // 客服
- // #ifdef MP-WEIXIN
-
- const params = {
- // originalPrice: this.goodsDetail.original || this.goodsDetail.price,
- uuid: storage.getUuid(),
- token: storage.getAccessToken(),
- sign: this.storeInfo.yzfSign,
- mpSign: this.storeInfo.yzfMpSign,
- };
- uni.navigateTo({
- url:
- "/pages/product/customerservice/index?params=" +
- encodeURIComponent(JSON.stringify(params)),
- });
- // #endif
- // #ifndef MP-WEIXIN
- const sign = this.storeInfo.yzfSign;
- uni.navigateTo({
- url:
- "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
- sign,
- });
- // #endif
- },
/** 获取店铺分类 */
async getCategoryData() {
diff --git a/pages/tabbar/home/template/tpl_flex_one.vue b/pages/tabbar/home/template/tpl_flex_one.vue
index 67c08cf..7633e4a 100644
--- a/pages/tabbar/home/template/tpl_flex_one.vue
+++ b/pages/tabbar/home/template/tpl_flex_one.vue
@@ -1,8 +1,8 @@
diff --git a/utils/filters.js b/utils/filters.js
index 0fbb778..29c568d 100644
--- a/utils/filters.js
+++ b/utils/filters.js
@@ -120,6 +120,19 @@ export function isLogin(val) {
return storage.getUserInfo();
}
}
+/**
+ * 跳转im
+ */
+export function talkIm(storeId){
+ if(isLogin('auth')){
+ uni.navigateTo({
+ url: `/pages/tabbar/home/web-view?IM=${storeId}`,
+ });
+ }
+ else{
+ tipsToLogin()
+ }
+}
export function tipsToLogin() {
if (!isLogin("auth")) {
From 979a1e6b141484b0e873c125f5dfc9a285eb0181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 26 Dec 2022 16:28:14 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9=E5=95=86?=
=?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F=E4=B8=BA0=E6=97=B6=E5=80=99?=
=?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E6=A5=BC=E5=B1=82=E5=BC=80?=
=?UTF-8?q?=E5=85=B3=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/m-buy/goods.vue | 36 +++++-----
pages/product/shopPage.vue | 137 +++++++++++++++++++++++--------------
2 files changed, 103 insertions(+), 70 deletions(-)
diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index 76410f0..2dba42d 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -71,7 +71,7 @@
数量
-
+
@@ -125,7 +125,7 @@ export default {
buyType: '', //用于存储促销，拼团等活动类型
parentOrder: '', //父级拼团活动的数据 - 如果是团员则有数据
formatList: [],
- currentSelceted: [],
+ currentSelected: [],
skuList: '',
isClose: false //是否可以点击遮罩关闭
};
@@ -182,12 +182,15 @@ export default {
},
watch: {
num(val) {
+
+ val == 0 ? this.num = 1 : ''
if (val) {
+
//超过库存后修改回库存
- if (val > this.goodsDetail.quantity) {
- this.$nextTick(function() {
- this.num = this.goodsDetail.quantity;
- });
+ if (val > this.goodsDetail.quantity) {
+ this.$nextTick(function() {
+ this.num = this.goodsDetail.quantity;
+ });
}
}
},
@@ -223,20 +226,15 @@ export default {
closeMask() {
this.$emit('closeBuy', false);
},
- numChange() {
- if (this.num > this.goodsDetail.quantity) {
- alert(1);
- this.num = this.goodsDetail.quantity;
- }
- },
+
/**点击规格 */
handleClickSpec(val, index, specValue) {
- this.currentSelceted[index] = specValue.value;
+ this.currentSelected[index] = specValue.value;
let selectedSkuId = this.goodsSpec.find(i => {
let matched = true;
let specValues = i.specValues.filter(j => j.specName !== 'images');
for (let n = 0; n < specValues.length; n++) {
- if (specValues[n].specValue !== this.currentSelceted[n]) {
+ if (specValues[n].specValue !== this.currentSelected[n]) {
matched = false;
return;
}
@@ -246,7 +244,7 @@ export default {
}
});
if (selectedSkuId?.skuId) {
- this.$set(this.currentSelceted, index, specValue.value);
+ this.$set(this.currentSelected, index, specValue.value);
this.selectSkuList = {
spec: {
specName: val.name,
@@ -381,7 +379,7 @@ export default {
item.specValues
.filter(i => i.specName !== 'images')
.forEach((value, _index) => {
- this.currentSelceted[_index] = value.specValue;
+ this.currentSelected[_index] = value.specValue;
this.selectName = value.specValue;
@@ -551,4 +549,4 @@ export default {
color: #333;
}
}
-
+
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 8bdecc4..6b37161 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -79,50 +79,79 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{{item.labelName}}
+
+
+
+
+
+
+
{{child.labelName}}
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -147,7 +176,7 @@ import tpl_menu from "@/pages/tabbar/home/template/tpl_menu"; //五列菜单模
import tpl_search from "@/pages/tabbar/home/template/tpl_search"; //搜索栏
import tpl_group from "@/pages/tabbar/home/template/tpl_group"; //
import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //商品分类以及分类中的商品
-
+import goodsTemplate from '@/components/m-goods-list/list'
import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
import {
receiveCoupons,
@@ -192,7 +221,7 @@ export default {
},
goodsParams: {
pageNumber: 1,
- pageSize: 50,
+ pageSize: 10,
storeId: "",
},
};
@@ -214,6 +243,7 @@ export default {
flexOne: tpl_flex_one,
goods: tpl_goods,
group: tpl_group,
+ goodsTemplate
// spike: tpl_spike,
// joinGroup: tpl_join_group,
// integral: tpl_integral,
@@ -345,16 +375,21 @@ export default {
let res = await getStoreBaseInfo(this.storeId);
if (res.data.success) {
this.storeInfo = res.data.result;
-
- // 开启了楼层装修店铺
- this.initPageData();
- // 未开启楼层装修店铺
- // 商品信息
- this.getGoodsData();
// 优惠券信息
this.getCouponsData();
- // 店铺分类
- this.getCategoryData();
+ if(res.data.result.pageShow == '1'){
+ // 开启了楼层装修店铺
+ this.initPageData();
+ this.enablePageData = true;
+ }
+ else{
+ // 商品信息
+ this.getGoodsData();
+ // 店铺分类
+ this.getCategoryData();
+
+ this.basePageData = true;
+ }
} else {
uni.reLaunch({
url: "/",
From f7975389353b04049bd620fb7fc9b37efee51ba4 Mon Sep 17 00:00:00 2001
From: yeliang-king <2244255345@qq.com>
Date: Thu, 29 Dec 2022 12:02:05 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/fillorder.vue | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 2ef494b..86e9913 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -245,9 +245,8 @@