diff --git a/components/shopro-auth-modal/shopro-auth-modal.vue b/components/shopro-auth-modal/shopro-auth-modal.vue
index b064ef4..ab5e86d 100644
--- a/components/shopro-auth-modal/shopro-auth-modal.vue
+++ b/components/shopro-auth-modal/shopro-auth-modal.vue
@@ -1,7 +1,7 @@
-
-
+ {}">
+
+
-
+
{{ goodsInfo.title }}
@@ -163,12 +163,26 @@
});
that.$emit('getSkuText', str);
return str;
+ },
+ skuPreviewImage() {
+ return (this.currentSkuPrice.image || this.goodsInfo.image || '').trim();
}
},
methods: {
...mapActions(['addCartGoods', 'getCartList']),
+ previewSkuImage() {
+ const url = this.skuPreviewImage;
+ if (!url) {
+ return;
+ }
+ this.$tools.previewImage([url], url);
+ },
jump(path, parmas) {
+ if (path === '/pages/order/confirm') {
+ this.$tools.toOrderConfirm(parmas || {});
+ return;
+ }
this.$Router.push({
path: path,
query: parmas
@@ -336,7 +350,7 @@
from: 'goods',
orderType: that.goodsType,
grouponBuyType: that.grouponBuyType,
- grouponId: that.grouponId
+ grouponId: Number(that.grouponId) || 0
});
}
},
diff --git a/components/shopro-tabbar/shopro-tabbar.vue b/components/shopro-tabbar/shopro-tabbar.vue
index a9c48bd..f69580e 100644
--- a/components/shopro-tabbar/shopro-tabbar.vue
+++ b/components/shopro-tabbar/shopro-tabbar.vue
@@ -4,8 +4,8 @@
-
+
{{ cartNum }}
{}
- });
- // #endif
- },
refreshTabbar() {
this.updateCurrentPath();
- this.hideNativeTabBar();
},
handleTabTap(index) {
const tab = this.tabbarList[index];
@@ -158,30 +205,33 @@ export default {
justify-content: center;
padding: 8rpx 0 6rpx;
box-sizing: border-box;
+ overflow: visible;
.img-box {
position: relative;
width: 50rpx;
height: 50rpx;
flex-shrink: 0;
+ overflow: visible;
.badge {
position: absolute;
display: inline-flex;
justify-content: center;
align-items: center;
- line-height: 24rpx;
- padding: 4rpx 10rpx;
+ min-width: 28rpx;
+ height: 28rpx;
+ line-height: 1;
+ padding: 0 8rpx;
border-radius: 100rpx;
color: #fff;
- font-size: 24rpx;
+ font-size: 20rpx;
z-index: 9;
background-color: #fa3534;
- transform: scale(0.8);
- transform-origin: center center;
- top: -6rpx;
- right: -16rpx;
+ top: -10rpx;
+ right: -18rpx;
white-space: nowrap;
+ box-sizing: border-box;
}
}
diff --git a/custom-tab-bar/index.vue b/custom-tab-bar/index.vue
new file mode 100644
index 0000000..0ae0be2
--- /dev/null
+++ b/custom-tab-bar/index.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/manifest.json b/manifest.json
index a72fcd9..3a97677 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
- "name" : "小众厨房设备1",
+ "name" : "初始商城",
"appid" : "__UNI__C77F3FE",
- "description" : "小众厨房设备1",
+ "description" : "初始商城",
"versionName" : "1.3.9",
"versionCode" : 137,
"transformPx" : false,
@@ -97,7 +97,7 @@
"payment" : {
"weixin" : {
"__platform__" : [ "ios", "android" ],
- "appid" : "wx8dab4aa7e442592a",
+ "appid" : "",
"UniversalLinks" : "https://m.*****.top/uni-universallinks/__*****"
},
"alipay" : {
@@ -115,13 +115,13 @@
"oauth" : {
"apple" : {},
"weixin" : {
- "appid" : "wx8dab4aa7e442592a",
+ "appid" : "",
"UniversalLinks" : "https://m.*****.top/uni-universallinks/__*****"
}
},
"share" : {
"weixin" : {
- "appid" : "wx8dab4aa7e442592a",
+ "appid" : "",
"UniversalLinks" : "https://m.*****.top/uni-universallinks/__*****"
}
},
@@ -164,12 +164,12 @@
}
},
"kernel" : {
- "ios" : "WKWebview" //或者 "WKWebview"
+ "ios" : "WKWebview" //或者 "WKWebview"
}
},
"quickapp" : {},
"mp-weixin" : {
- "appid" : "wxc99af35376585e88",
+ "appid" : "wxbf3e451cf462301a",
"setting" : {
"urlCheck" : false,
"es6" : true, //消除大多数样式警告
diff --git a/pages.json b/pages.json
index dd4d116..b7edf6d 100644
--- a/pages.json
+++ b/pages.json
@@ -94,20 +94,6 @@
"group": "商城"
}
},
- {
- "path": "pages/live/list",
- "name": "video",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": true
- },
- "meta": {
- "auth": false,
- "async": true,
- "title": "直播",
- "group": "直播"
- }
- },
{
"path": "pages/index/money",
"name": "money",
@@ -928,23 +914,6 @@
"group": "用户"
}
},
- {
- "path": "live",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "titleNView": false,
- "scrollIndicator": "none"
- }
- },
- "meta": {
- "auth": true,
- "async": true,
- "title": "开启直播",
- "group": "直播"
- }
- },
{
"path": "set",
"style": {
@@ -1118,6 +1087,7 @@
"backgroundColor": "#FFFFFF"
},
"tabBar": {
+ "custom": true,
"color": "#333",
"selectedColor": "#4C7AF3",
"backgroundColor": "#ffffff",
diff --git a/pages/activity/discounts/list.vue b/pages/activity/discounts/list.vue
index b2d2163..9c81626 100644
--- a/pages/activity/discounts/list.vue
+++ b/pages/activity/discounts/list.vue
@@ -178,10 +178,15 @@ export default {
getGoodsList() {
let that = this;
that.loadStatus = 'loading';
- that.$http('goods.lists', {
- goods_ids: that.activityInfo.goods_ids,
- page: that.currentPage
- }).then(res => {
+ let goodsIds = that.activityInfo.goods_ids;
+ if (goodsIds === undefined || goodsIds === null || goodsIds === 'undefined') {
+ goodsIds = '';
+ }
+ const params = { page: that.currentPage };
+ if (goodsIds) {
+ params.goods_ids = goodsIds;
+ }
+ that.$http('goods.lists', params).then(res => {
if (res.code === 1) {
that.goodsList = [...that.goodsList, ...res.data.data];
that.isEmpty = !that.goodsList.length;
diff --git a/pages/activity/groupon/my-groupon.vue b/pages/activity/groupon/my-groupon.vue
index 83af6ff..588a588 100644
--- a/pages/activity/groupon/my-groupon.vue
+++ b/pages/activity/groupon/my-groupon.vue
@@ -14,7 +14,7 @@
-
+
{
+ (this.detail || []).forEach(item => {
+ if (!item || !item.type) {
+ return;
+ }
obj[item.type] = item;
- obj[item.type].num = item.goods_ids.split(',').length;
+ const goodsIds = item.goods_ids;
+ if (goodsIds === null || goodsIds === undefined || goodsIds === '') {
+ obj[item.type].num = 0;
+ } else {
+ obj[item.type].num = String(goodsIds).split(',').filter(Boolean).length;
+ }
});
return obj;
}
diff --git a/pages/goods/components/sh-groupon.vue b/pages/goods/components/sh-groupon.vue
index c85f56a..c47e8c5 100644
--- a/pages/goods/components/sh-groupon.vue
+++ b/pages/goods/components/sh-groupon.vue
@@ -19,7 +19,7 @@
剩余时间{{ g.time.h }}:{{ g.time.m }}:{{ g.time.s }}
-
+
@@ -44,7 +44,7 @@
剩余时间{{ g.time.h }}:{{ g.time.m }}:{{ g.time.s }}
-
+
@@ -100,12 +100,9 @@ export default {
query: parmas
});
},
- joinTeam(path, parmas) {
+ handleJoin(grouponId) {
this.showModal = false;
- this.$Router.push({
- path: path,
- query: parmas
- });
+ this.$emit('join', grouponId);
},
onMoreGrouponTeam() {
this.showModal = true;
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 5daaff4..3e2645e 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -44,13 +44,19 @@
-
-
-
+
+
+
-
+
+
+
+ style="width: 100%;height: 100%;position: relative;">
+ v-if="goodsInfo.activity && goodsInfo.activity.type === 'groupon' && detailType !== 'score'"
+ :grouponData="goodsInfo" @join="onJoinGroupon">
+ @tap="payGroupon(joinGrouponId ? 'join' : 'groupon')">
¥{{ goodsInfo.groupon_price }}
- 我要开团
+ {{ joinGrouponId ? '立即参团' : '我要开团' }}
@@ -311,7 +317,8 @@
@@ -377,6 +384,7 @@
buyType: 'sku',
is_play: 'stop',
grouponBuyType: 'alone', //拼团购买方式。
+ joinGrouponId: 0, // 参团ID,0表示开团
showEmpty: false,
showEmptyText: '',
showServe: false,
@@ -582,8 +590,30 @@
},
// 轮播图预览
- onGoodsSwiper(e) {
- this.$tools.previewImage(this.goodsInfo.images, e);
+ onGoodsSwiper(index) {
+ const images = this.goodsInfo.images || [];
+ let urls = [];
+ let currentUrl = '';
+
+ if (this.detailType === 'score') {
+ urls = images.map((img) => this.$tools.formatImageUrl(img));
+ currentUrl = urls[index];
+ } else {
+ const current = images[index];
+ if (!current || Number(current.type) !== 0) {
+ return;
+ }
+ urls = images
+ .filter((img) => Number(img.type) === 0)
+ .map((img) => this.$tools.formatImageUrl(img.src));
+ currentUrl = this.$tools.formatImageUrl(current.src);
+ }
+
+ if (!urls.length || !currentUrl) {
+ return;
+ }
+
+ this.$tools.previewImage(urls, currentUrl);
},
getActivityRules(e) {
if (e) {
@@ -742,8 +772,12 @@
if (this.isLogin) {
if (type === 'groupon') {
this.grouponBuyType = 'groupon';
+ this.joinGrouponId = 0;
+ } else if (type === 'join') {
+ this.grouponBuyType = 'groupon';
} else {
this.grouponBuyType = 'alone';
+ this.joinGrouponId = 0;
}
this.buyType = 'buy';
this.showSku = true;
@@ -751,6 +785,12 @@
this.$store.dispatch('showAuthModal');
}
},
+ onJoinGroupon(grouponId) {
+ this.joinGrouponId = Number(grouponId) || 0;
+ this.grouponBuyType = 'groupon';
+ this.buyType = 'buy';
+ this.showSku = true;
+ },
// 预约抢购
handleRobOrder() {
if (!this.isLogin) {
@@ -859,6 +899,18 @@
font-weight: bold;
}
+ .goods-swiper-item {
+ width: 100%;
+ height: 100%;
+ }
+
+ .goods-swiper-image {
+ width: 100%;
+ height: 100%;
+ display: block;
+ pointer-events: none;
+ }
+
// 标题栏
.nav-box {
position: fixed;
@@ -866,6 +918,14 @@
min-height: 140rpx;
z-index: 888;
top: 0;
+ pointer-events: none;
+
+ .back-box,
+ .back-hover,
+ .tool-button,
+ .nav-item {
+ pointer-events: auto;
+ }
.back-box {
background-color: rgba(#000, 0.18);
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index cb2d344..478d4f4 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -184,7 +184,7 @@
this.$u.toast('活动商品只能单独购买');
return false;
}
- that.jump('/pages/order/confirm', {
+ that.$tools.toOrderConfirm({
goodsList: confirmcartList,
from: 'cart'
});
diff --git a/pages/index/category/one-catgory.vue b/pages/index/category/one-catgory.vue
index ed43d81..6c4aac2 100644
--- a/pages/index/category/one-catgory.vue
+++ b/pages/index/category/one-catgory.vue
@@ -1,12 +1,12 @@
-
-
-
+
+
- {{ item.name }}
+ {{ item.name }}
@@ -189,10 +189,14 @@
background: #fff;
}
+ .left-scroll-box {
+ flex: none;
+ width: 220rpx;
+ }
+
.left {
- width: 200upx;
+ width: 220rpx;
height: 100%;
- flex: 1;
.list-active {
background: #fff;
@@ -205,22 +209,37 @@
}
.type-list {
- height: 110upx;
+ flex-shrink: 0;
+ min-height: 88rpx;
position: relative;
- width: 200rpx;
- padding-left: 16rpx;
- line-height: 110rpx;
+ width: 220rpx;
+ padding: 16rpx 12rpx 16rpx 16rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
font-size: 28upx;
font-weight: 400;
color: rgba(102, 102, 102, 1);
+ .type-name {
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
+ word-break: break-all;
+ white-space: normal;
+ line-height: 1.4;
+ width: 100%;
+ }
+
.line {
width: 10upx;
height: 40rpx;
position: absolute;
left: 0;
border-radius: 5rpx;
- top:35rpx;
+ top: 50%;
+ transform: translateY(-50%);
}
}
}
diff --git a/pages/index/category/takeout-catgory.vue b/pages/index/category/takeout-catgory.vue
index 23f0b78..e962267 100644
--- a/pages/index/category/takeout-catgory.vue
+++ b/pages/index/category/takeout-catgory.vue
@@ -2,9 +2,9 @@
-