diff --git a/App.vue b/App.vue
index 6e716d8d..5b3bb3bf 100644
--- a/App.vue
+++ b/App.vue
@@ -45,7 +45,7 @@
"/pages/user/user"
],
// 请求地址
- request_url: 'https://d1.shopxo.vip/',
+ request_url: 'http://shopxo.com/',
// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
static_url: 'https://d1.shopxo.vip/',
// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
diff --git a/common/css/page.css b/common/css/page.css
index 396865af..ff05aa06 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -785,4 +785,43 @@ button[disabled].bg-gray {
*/
.last-next-data navigator {
width: calc(100% - 120rpx);
+}
+
+/**
+ * 商品列表 - 列表
+ */
+.goods-data-list .goods-img {
+ width: 190rpx !important;
+ height: 190rpx !important;
+}
+.goods-data-list .base {
+ width: calc(100% - 220rpx);
+}
+/*
+ * 商品列表 - 滚动
+ */
+.goods-data-rolling-list swiper {
+ height: 390rpx !important;
+}
+.goods-data-rolling-list .item .goods-img {
+ height: 240rpx !important;
+}
+/**
+ * 商品列表 - 九方格
+ */
+.goods-data-grid-list .item {
+ width: calc(50% - 10rpx);
+ float: left;
+ padding-bottom: 10rpx;
+ margin-bottom: 20rpx;
+}
+.goods-data-grid-list .item:nth-of-type(2n + 1) {
+ margin-right: 10rpx;
+}
+.goods-data-grid-list .item:nth-of-type(2n) {
+ margin-left: 10rpx;
+}
+.goods-data-grid-list .item .goods-img {
+ width: 100%;
+ height: 380rpx !important;
}
\ No newline at end of file
diff --git a/common/css/plugins.css b/common/css/plugins.css
index 575bb6eb..58e2e3f5 100644
--- a/common/css/plugins.css
+++ b/common/css/plugins.css
@@ -126,14 +126,17 @@
.plugins-label-bottom-right {
right: 0;
}
-.plugins-activity-rolling-list .plugins-label-bottom-left,
-.plugins-activity-rolling-list .plugins-label-bottom-center,
-.plugins-activity-rolling-list .plugins-label-bottom-right {
- bottom: calc(100% - 240rpx);
+/**
+ * 商品列表标签处理
+ */
+.goods-data-rolling-list .plugins-label-bottom-left,
+.goods-data-rolling-list .plugins-label-bottom-center,
+.goods-data-rolling-list .plugins-label-bottom-right {
+ bottom: calc(100% - 240rpx) !;
}
-.plugins-activity-list .plugins-label-bottom-left,
-.plugins-activity-list .plugins-label-bottom-center,
-.plugins-activity-list .plugins-label-bottom-right {
+.goods-data-list .plugins-label-bottom-left,
+.goods-data-list .plugins-label-bottom-center,
+.goods-data-list .plugins-label-bottom-right {
bottom: 0;
}
@@ -192,45 +195,6 @@
height: 230rpx !important;
}
-/**
- * 活动配置 - 列表
- */
-.plugins-activity-list .activity-img {
- width: 190rpx !important;
- height: 190rpx !important;
-}
-.plugins-activity-list .base {
- width: calc(100% - 220rpx);
-}
-/*
- * 活动配置 - 滚动
- */
-.plugins-activity-rolling-list swiper {
- height: 390rpx !important;
-}
-.plugins-activity-rolling-list .item .activity-img {
- height: 240rpx !important;
-}
-/**
- * 活动配置 - 九方格
- */
-.plugins-activity-grid-list .item {
- width: calc(50% - 10rpx);
- float: left;
- padding-bottom: 10rpx;
- margin-bottom: 20rpx;
-}
-.plugins-activity-grid-list .item:nth-of-type(2n + 1) {
- margin-right: 10rpx;
-}
-.plugins-activity-grid-list .item:nth-of-type(2n) {
- margin-left: 10rpx;
-}
-.plugins-activity-grid-list .item .activity-img {
- width: 100%;
- height: 380rpx !important;
-}
-
/**
* 门店 - 数据列表
*/
diff --git a/components/activity-list/activity-list.vue b/components/activity-list/activity-list.vue
index c6c15eed..71c9993d 100644
--- a/components/activity-list/activity-list.vue
+++ b/components/activity-list/activity-list.vue
@@ -3,113 +3,23 @@
-
- {{floor.title}}
- {{floor.vice_title}}
- 更多
-
-
-
-
-
- {{kv}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
- {{item.simple_desc}}
- {{propCurrencySymbol}}{{item.min_price}}
-
-
-
-
-
-
- {{lv.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
- {{propCurrencySymbol}}{{item.min_price}}
-
-
-
-
-
-
- {{lv.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
- {{propCurrencySymbol}}{{item.min_price}}
-
-
-
-
-
-
- {{lv.name}}
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 35797ab9..f5749bb1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,14 +61,13 @@
"desc" : "你的位置将用于小程序中相应业务位置服务使用"
}
},
- "plugins" : {
- // // 直播（需要开通权限 https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/liveplayer/live-player-plugin.html）
- // "live-player-plugin" : {
- // "version" : "1.3.0",
- // "provider" : "wx2b03c6e691cd7370"
- // }
- }
+ "plugins" : {}
},
+ // // 直播（需要开通权限 https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/liveplayer/live-player-plugin.html）
+ // "live-player-plugin" : {
+ // "version" : "1.3.0",
+ // "provider" : "wx2b03c6e691cd7370"
+ // }
"mp-alipay" : {
"usingComponents" : true,
"appid" : "2021001173639600"
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index bb40fca6..c4102074 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -1,11 +1,11 @@
-
+
-
+
@@ -102,35 +102,17 @@
-
-
- 全部
-
-
- {{item.name}}
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
- {{currency_symbol}}{{item.min_price}}
-
-
-
-
-
-
-
-
-
@@ -148,7 +130,9 @@
const app = getApp();
import componentLayout from "../../../../components/layout/layout";
import componentNoData from "../../../../components/no-data/no-data";
- import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+ import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+ import componentBanner from "../../../../components/slider/slider";
+ import componentGoodsList from "../../../../components/goods-list/goods-list";
var common_static_url = app.globalData.get_static_url('common');
export default {
@@ -166,12 +150,11 @@
shop_favor_user: [],
shop_navigation: [],
shop_goods_category: [],
- data: null,
- goods_list: [],
+ slider: [],
+ data: [],
search_keywords_value: '',
header_service_status: false,
nav_category_status: false,
- shop_category_tab_value: 0,
shop_favor_info: {
"text": "收藏",
"status": 0,
@@ -185,7 +168,9 @@
components: {
componentLayout,
componentNoData,
- componentBottomLine
+ componentBottomLine,
+ componentBanner,
+ componentGoodsList
},
props: {},
@@ -235,23 +220,18 @@
var data = res.data.data;
this.setData({
data_base: data.base || null,
- shop: ((data.shop || null) == null) ? null : data.shop,
+ shop: data.shop || null,
shop_favor_user: data.shop_favor_user || [],
shop_navigation: data.shop_navigation || [],
shop_goods_category: data.shop_goods_category || [],
- data: data.data || null,
- goods_list: (data.data || null) != null && (data.data.goods || null) != null && data.data.goods.length > 0 ? data.data.goods : [],
+ data: data.data || [],
+ slider: data.slider || [],
data_list_loding_msg: '',
data_list_loding_status: 0,
data_bottom_line_status: true
});
if ((this.shop || null) != null) {
- // 自动模式数据、商品列表切换处理
- if ((this.shop.data_model || 0) == 0) {
- this.shop_category_tab_handle();
- }
-
// 收藏信息
var status = this.shop_favor_user.indexOf(this.shop.id) != -1 ? 1 : 0;
this.setData({
@@ -401,32 +381,6 @@
app.globalData.image_show_event(e);
},
- // 分类切换事件
- shop_category_tab_event(e) {
- this.setData({
- shop_category_tab_value: e.currentTarget.dataset.value || 0
- });
- this.shop_category_tab_handle();
- },
-
- // 分类切换处理
- shop_category_tab_handle() {
- var value = this.shop_category_tab_value || 0;
- var temp = this.data;
- var goods = [];
- if (temp.goods.length > 0) {
- for (var i in temp.goods) {
- if (temp.goods[i]['shop_category_id'] == value || value == 0) {
- goods.push(temp.goods[i]);
- }
- }
- }
- this.setData({
- goods_list: goods,
- data_bottom_line_status: goods.length > 0
- });
- },
-
// 进入客服系统
chat_event() {
app.globalData.chat_entry_handle(this.shop.chat_info.chat_url);