-
没有分类数据
+
没有子分类数据
查看分类下商品 >>
diff --git a/public/static/index/default/css/category.css b/public/static/index/default/css/category.css
index 20e9fa280..e4e4f7c46 100755
--- a/public/static/index/default/css/category.css
+++ b/public/static/index/default/css/category.css
@@ -37,18 +37,16 @@
.category-list-container .category-content .category-item:not(:last-child) {
margin-bottom: 15px;
}
+.category-list-container .category-content .one-cetegory a:hover {
+ text-decoration: none;
+}
.category-list-container .category-content ul {
border-top: 1px dotted #e5e5e5;
}
.category-list-container ul.category-nav li,
-.category-list-container .category-content .title,
.category-list-container .category-content ul {
overflow: hidden;
}
-.category-list-container .category-content .title a {
- font-weight: 500;
- color: #888;
-}
.category-list-container .category-content ul li:not(:last-child) {
margin-right: 20px;
}
@@ -57,6 +55,9 @@
font-size: 12px;
line-height: 22px;
}
+.category-list-container .table-no {
+ padding: 50px 0;
+}
@media only screen and (min-width:640px) {
.category-list-container {
margin-top: 10px;
diff --git a/sourcecode/alipay/app.acss b/sourcecode/alipay/app.acss
index 1a584bf08..c702343ad 100644
--- a/sourcecode/alipay/app.acss
+++ b/sourcecode/alipay/app.acss
@@ -163,7 +163,7 @@ textarea {
width: 33.3%;
}
.data-bottom-line .left, .data-bottom-line .right{
- margin-top: 5px;
+ margin-top: 8px;
border-bottom: 1px solid #e1e1e1;
}
.data-bottom-line .msg{
diff --git a/sourcecode/alipay/pages/goods-category/goods-category.acss b/sourcecode/alipay/pages/goods-category/goods-category.acss
index 6b9bb2497..5f7b6b686 100755
--- a/sourcecode/alipay/pages/goods-category/goods-category.acss
+++ b/sourcecode/alipay/pages/goods-category/goods-category.acss
@@ -17,6 +17,7 @@
color: #666;
border-left: 3px solid #ececec;
border-right: 3px solid #ececec;
+ overflow: hidden;
}
.left-nav .items:not(:last-child) {
border-bottom: 1px solid #e6e6e6;
diff --git a/sourcecode/baidu/app.css b/sourcecode/baidu/app.css
index b9f04b32f..adbd095d3 100755
--- a/sourcecode/baidu/app.css
+++ b/sourcecode/baidu/app.css
@@ -170,7 +170,7 @@ textarea {
width: 33.3%;
}
.data-bottom-line .left, .data-bottom-line .right{
- margin-top: 5px;
+ margin-top: 8px;
border-bottom: 1px solid #e1e1e1;
}
.data-bottom-line .msg{
diff --git a/sourcecode/baidu/pages/goods-category/goods-category.css b/sourcecode/baidu/pages/goods-category/goods-category.css
index 6b9bb2497..5f7b6b686 100755
--- a/sourcecode/baidu/pages/goods-category/goods-category.css
+++ b/sourcecode/baidu/pages/goods-category/goods-category.css
@@ -17,6 +17,7 @@
color: #666;
border-left: 3px solid #ececec;
border-right: 3px solid #ececec;
+ overflow: hidden;
}
.left-nav .items:not(:last-child) {
border-bottom: 1px solid #e6e6e6;
diff --git a/sourcecode/qq/app.qss b/sourcecode/qq/app.qss
index f4ccf325d..ff4dea1a4 100755
--- a/sourcecode/qq/app.qss
+++ b/sourcecode/qq/app.qss
@@ -170,7 +170,7 @@ textarea {
width: 33.3%;
}
.data-bottom-line .left, .data-bottom-line .right{
- margin-top: 5px;
+ margin-top: 8px;
border-bottom: 1px solid #e1e1e1;
}
.data-bottom-line .msg{
diff --git a/sourcecode/qq/pages/goods-category/goods-category.qss b/sourcecode/qq/pages/goods-category/goods-category.qss
index 6b9bb2497..5f7b6b686 100755
--- a/sourcecode/qq/pages/goods-category/goods-category.qss
+++ b/sourcecode/qq/pages/goods-category/goods-category.qss
@@ -17,6 +17,7 @@
color: #666;
border-left: 3px solid #ececec;
border-right: 3px solid #ececec;
+ overflow: hidden;
}
.left-nav .items:not(:last-child) {
border-bottom: 1px solid #e6e6e6;
diff --git a/sourcecode/toutiao/app.ttss b/sourcecode/toutiao/app.ttss
index 3f60ccf3f..9944d6797 100755
--- a/sourcecode/toutiao/app.ttss
+++ b/sourcecode/toutiao/app.ttss
@@ -171,7 +171,7 @@ textarea {
width: 33.3%;
}
.data-bottom-line .left, .data-bottom-line .right{
- margin-top: 5px;
+ margin-top: 8px;
border-bottom: 1px solid #e1e1e1;
}
.data-bottom-line .msg{
diff --git a/sourcecode/toutiao/pages/goods-category/goods-category.ttss b/sourcecode/toutiao/pages/goods-category/goods-category.ttss
index 6b9bb2497..5f7b6b686 100755
--- a/sourcecode/toutiao/pages/goods-category/goods-category.ttss
+++ b/sourcecode/toutiao/pages/goods-category/goods-category.ttss
@@ -17,6 +17,7 @@
color: #666;
border-left: 3px solid #ececec;
border-right: 3px solid #ececec;
+ overflow: hidden;
}
.left-nav .items:not(:last-child) {
border-bottom: 1px solid #e6e6e6;
diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js
index 949d3408a..5bf04cf5d 100755
--- a/sourcecode/weixin/app.js
+++ b/sourcecode/weixin/app.js
@@ -68,7 +68,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://shopxo.com/',
- // request_url: 'https://dev.shopxo.net/',
+ request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",
@@ -698,4 +698,12 @@ App({
}
},
+ // 显示分享菜单
+ show_share_menu() {
+ wx.showShareMenu({
+ withShareTicket: true,
+ menus: ['shareAppMessage', 'shareTimeline']
+ });
+ },
+
});
\ No newline at end of file
diff --git a/sourcecode/weixin/app.wxss b/sourcecode/weixin/app.wxss
index f4ccf325d..ff4dea1a4 100755
--- a/sourcecode/weixin/app.wxss
+++ b/sourcecode/weixin/app.wxss
@@ -170,7 +170,7 @@ textarea {
width: 33.3%;
}
.data-bottom-line .left, .data-bottom-line .right{
- margin-top: 5px;
+ margin-top: 8px;
border-bottom: 1px solid #e1e1e1;
}
.data-bottom-line .msg{
diff --git a/sourcecode/weixin/pages/buy/buy.wxss b/sourcecode/weixin/pages/buy/buy.wxss
index 7b351393e..99657b11f 100755
--- a/sourcecode/weixin/pages/buy/buy.wxss
+++ b/sourcecode/weixin/pages/buy/buy.wxss
@@ -74,7 +74,7 @@
margin-bottom: 5rpx;
}
.goods-item {
- padding: 5rpx 0;
+ padding: 10rpx 0;
}
.goods-image {
width: 160rpx;
@@ -163,6 +163,7 @@
.content-textarea-view,
.content-textarea-view textarea {
height: 180rpx;
+ padding: 5rpx;
}
.content-textarea-view view {
padding: 12rpx;
diff --git a/sourcecode/weixin/pages/goods-category/goods-category.js b/sourcecode/weixin/pages/goods-category/goods-category.js
index 9e1f446f0..a9f217762 100755
--- a/sourcecode/weixin/pages/goods-category/goods-category.js
+++ b/sourcecode/weixin/pages/goods-category/goods-category.js
@@ -1,18 +1,18 @@
const app = getApp();
Page({
data: {
- tab_active: 0,
- tab_active_text_color: '#d2364c',
- tab_active_line_color: '#d2364c',
data_list_loding_status: 1,
- data_bottom_line_status: false,
+ nav_active_index: 0,
data_list: [],
- data_content: [],
+ data_content: null,
},
onShow() {
wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_category});
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
// 获取数据
@@ -34,10 +34,11 @@ Page({
if (res.data.code == 0) {
var data = res.data.data;
var data_content = [];
+ var index = this.data.nav_active_index || 0;
if (data.length > 0)
{
- data[0]['active'] = 'nav-active';
- data_content = data[0]['items'];
+ data[index]['active'] = 'nav-active';
+ data_content = data[index];
}
this.setData({
data_list: data,
@@ -80,7 +81,8 @@ Page({
}
this.setData({
data_list: temp_data,
- data_content: temp_data[index]['items'],
+ data_content: temp_data[index],
+ nav_active_index: index,
});
},
diff --git a/sourcecode/weixin/pages/goods-category/goods-category.wxml b/sourcecode/weixin/pages/goods-category/goods-category.wxml
index e982c592e..cdf59e8c8 100755
--- a/sourcecode/weixin/pages/goods-category/goods-category.wxml
+++ b/sourcecode/weixin/pages/goods-category/goods-category.wxml
@@ -1,23 +1,44 @@
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
- {{v.name}}
+
+
+
+
+ {{item.name}}
-
+
+
+
+
+
+ {{data_content.vice_name}}
+ {{data_content.describe}}
+
+
+
+
+
+ {{v.name}}
+
+
+
+
+
+ {{vs.name}}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
\ No newline at end of file
diff --git a/sourcecode/weixin/pages/goods-category/goods-category.wxss b/sourcecode/weixin/pages/goods-category/goods-category.wxss
index 6b9bb2497..adaeda606 100755
--- a/sourcecode/weixin/pages/goods-category/goods-category.wxss
+++ b/sourcecode/weixin/pages/goods-category/goods-category.wxss
@@ -1,10 +1,10 @@
/**
- 左侧导航
-*/
+ * 左侧导航
+ */
.left-nav {
height: 100vh;
- background: #ececec;
- width: 230rpx;
+ background: #fff;
+ width: 210rpx;
overflow-x: hidden;
overflow-y: auto;
}
@@ -15,43 +15,62 @@
padding: 0 10rpx;
text-align: center;
color: #666;
- border-left: 3px solid #ececec;
- border-right: 3px solid #ececec;
+ border-left: 3px solid #fff;
+ border-right: 3px solid #fff;
+ overflow: hidden;
}
.left-nav .items:not(:last-child) {
- border-bottom: 1px solid #e6e6e6;
+ border-bottom: 1px solid #f1f1f1;
}
.nav-active {
+ background: #f5f5f5;
border-left: 3px solid #e23f36 !important;
- border-right: 3px solid #fff !important;
+ border-right: 3px solid #f5f5f5 !important;
color: #e23f36;
- background: #fff;
}
/**
- 右侧内容
-*/
-.right-content {
+ * 右侧内容
+ */
+.right-container {
height: 100vh;
- width: calc( 100% - 230rpx );
+ width: calc( 100% - 210rpx );
overflow-x: hidden;
overflow-y: auto;
position: absolute;
top: 0;
right: 0;
+ background: #f5f5f5;
}
-.content-items {
+.right-content, .one-content {
+ padding: 20rpx;
+}
+.one-vice-name {
+ font-size: 30rpx;
+ font-weight: 500;
+}
+.one-desc {
+ color: #999;
+ margin-top: 10rpx;
+}
+.two-name {
+ font-weight: bold;
+ font-size: 32rpx;
+ background: #f5f5f5;
+ padding: 20rpx 10rpx;
+}
+.content-three {
float: left;
width: calc(33.33% - 20rpx);
- padding: 20rpx 10rpx;
+ padding: 25rpx 10rpx;
text-align: center;
}
-.content-items .text {
+.content-three .text {
font-size: 28rpx;
line-height: 46rpx;
}
-.content-items .icon {
+.content-three .icon {
width: 100%;
height: 120rpx;
-}
\ No newline at end of file
+}
diff --git a/sourcecode/weixin/pages/goods-detail/goods-detail.js b/sourcecode/weixin/pages/goods-detail/goods-detail.js
index 6528ac21e..0805fa8f4 100755
--- a/sourcecode/weixin/pages/goods-detail/goods-detail.js
+++ b/sourcecode/weixin/pages/goods-detail/goods-detail.js
@@ -87,6 +87,9 @@ Page({
//params['goods_id']=2;
this.setData({params: params});
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
onShow() {
diff --git a/sourcecode/weixin/pages/goods-search/goods-search.js b/sourcecode/weixin/pages/goods-search/goods-search.js
index b6d62f234..23ed80b2f 100755
--- a/sourcecode/weixin/pages/goods-search/goods-search.js
+++ b/sourcecode/weixin/pages/goods-search/goods-search.js
@@ -21,6 +21,9 @@ Page({
onLoad(params) {
this.setData({params: params, post_data: params});
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
onShow() {
diff --git a/sourcecode/weixin/pages/index/index.js b/sourcecode/weixin/pages/index/index.js
index d6b79d32e..bd7cb0120 100755
--- a/sourcecode/weixin/pages/index/index.js
+++ b/sourcecode/weixin/pages/index/index.js
@@ -24,6 +24,9 @@ Page({
onShow() {
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
// 获取数据列表
diff --git a/sourcecode/weixin/pages/plugins/coupon/index/index.js b/sourcecode/weixin/pages/plugins/coupon/index/index.js
index 570242515..fb8d50225 100644
--- a/sourcecode/weixin/pages/plugins/coupon/index/index.js
+++ b/sourcecode/weixin/pages/plugins/coupon/index/index.js
@@ -15,6 +15,9 @@ Page({
onLoad(params) {
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
onShow() {
diff --git a/sourcecode/weixin/pages/plugins/membershiplevelvip/index/index.js b/sourcecode/weixin/pages/plugins/membershiplevelvip/index/index.js
index c0df886d1..fd5f8c364 100644
--- a/sourcecode/weixin/pages/plugins/membershiplevelvip/index/index.js
+++ b/sourcecode/weixin/pages/plugins/membershiplevelvip/index/index.js
@@ -10,6 +10,9 @@ Page({
onLoad(params) {
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
onShow() {},
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js
index d966a1946..2fc6be061 100644
--- a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js
@@ -15,6 +15,9 @@ Page({
//params['id'] = 1;
this.setData({ params: params });
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
onShow() {},
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js
index 19be20074..c0306e1f0 100644
--- a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js
@@ -12,6 +12,9 @@ Page({
onShow() {
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
init() {
diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js
index a82c8986d..8124f323d 100644
--- a/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js
+++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/search/search.js
@@ -37,6 +37,9 @@ Page({
nav_status_index: nav_status_index,
});
this.init();
+
+ // 显示分享菜单
+ app.show_share_menu();
},
onShow() {},
diff --git a/sourcecode/weixin/pages/user-order-detail/user-order-detail.js b/sourcecode/weixin/pages/user-order-detail/user-order-detail.js
index e4ff2be91..3e7b663b5 100755
--- a/sourcecode/weixin/pages/user-order-detail/user-order-detail.js
+++ b/sourcecode/weixin/pages/user-order-detail/user-order-detail.js
@@ -45,12 +45,13 @@ Page({
self.setData({
detail: data.data,
detail_list:[
- {name: "订单号", value: data.data.order_no || ''},
+ {name: "出货仓库", value: data.data.warehouse_name || ''},
{name: "订单模式", value: data.data.order_model_name || '' },
- {name: "状态", value: data.data.status_name || ''},
+ {name: "订单编号", value: data.data.order_no || ''},
+ {name: "订单状态", value: data.data.status_name || ''},
{name: "支付状态", value: data.data.pay_status_name || ''},
- {name: "单价", value: data.data.price || ''},
- {name: "总价", value: data.data.total_price || ''},
+ {name: "订单单价", value: data.data.price || ''},
+ {name: "订单总价", value: data.data.total_price || ''},
{name: "优惠金额", value: data.data.preferential_price || ''},
{name: "增加金额", value: data.data.increase_price || '' },
{name: "支付金额", value: data.data.pay_price || ''},