diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
old mode 100755
new mode 100644
index f2dbae81b03d6b134ab8dacba2288b14d694bcae..49bbef57dd2cc51789101479512ec7f3108f4782
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -57,7 +57,6 @@ App({
// 请求地址
request_url: "{{request_url}}",
- //request_url: "https://test.shopxo.net/",
//request_url: 'http://tp5-dev.com/',
// 基础信息
diff --git a/public/appmini/old/alipay/pages/common/copyright.axml b/public/appmini/old/alipay/pages/common/copyright.axml
old mode 100755
new mode 100644
index fded65f14a382bd7e71454822d027f8df9904ec9..703c49b58cd14ddb25a25d15f4267634cf680fe4
--- a/public/appmini/old/alipay/pages/common/copyright.axml
+++ b/public/appmini/old/alipay/pages/common/copyright.axml
@@ -1,5 +1,5 @@
- Powered by ShopXO v1.5.0
+ Powered by ShopXO v1.6.0
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/index/index.acss b/public/appmini/old/alipay/pages/index/index.acss
old mode 100755
new mode 100644
index b3127290b6b7979c6b54423678fdb556c697c52c..b1051a2df5d1758f5b69163fabfb8cbe55d3f946
--- a/public/appmini/old/alipay/pages/index/index.acss
+++ b/public/appmini/old/alipay/pages/index/index.acss
@@ -26,97 +26,64 @@
line-height: 70rpx;
}
- /**
+/**
* 楼层数据
*/
-.floor-list, .floor-left {
- overflow: hidden;
- position: relative;
-}
-.floor .vice-name {
- color: #fff;
- margin-top: 20rpx;
- padding: 0 10rpx;
- font-size: 34rpx;
- line-height: 48rpx;
-}
-.floor-left {
- width: 40%;
- height: 662rpx;
-}
-.floor-left image {
- left: 0;
- bottom: 0;
- width: 100%;
-}
-.goods-list,
-.goods-list .goods {
- overflow: hidden;
-}
-.floor-left image,
-.goods-list .goods:nth-child(1),
-.goods-list .goods:nth-child(2),
-.goods-list .goods:nth-child(1) .goods-base,
-.goods-list .goods:nth-child(2) .goods-base {
- position: absolute;
-}
-
-.goods-list .goods image {
- width: 100%;
- height: 380rpx;
-}
-.goods-list .goods:nth-child(1),
-.goods-list .goods:nth-child(2) {
- width: 60%;
- height: 330rpx;
-}
-.goods-list .goods:nth-child(1) .goods-base,
-.goods-list .goods:nth-child(2) .goods-base {
- padding-left: 10rpx;
- width: calc(40% - 10rpx);
- bottom: 20rpx;
+.floor-list {
+ overflow: hidden;
+ position: relative;
}
-.goods-list .goods:nth-child(1) image,
-.goods-list .goods:nth-child(2) image {
- width: 60%;
- height: 330rpx;
- float: right;
+.floor-list .word {
+ padding: 20rpx 20rpx 0 20rpx;
+}
+.floor-list .word .vice-name {
+ color: #fff;
+ max-width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ text-align: center;
+ padding: 20rpx;
}
-.goods-list .goods:nth-child(1) {
- top: 0;
- right: 0;
+.floor-list .word .word-icon {
+ margin: 10rpx;
+ width: calc(33% - 24rpx);
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ color: #fff;
+ background-color: rgba(0, 0, 0, 0.03);
+ border-radius: 6rpx;
+ display: inline-block;
+ border: 1px solid #fff;
+ text-decoration: none;
+ overflow: hidden;
}
-.goods-list .goods:nth-child(2) {
- top: 330rpx;
- right: 0;
+.floor-list .word image {
+ max-width: 100%;
}
-
-.goods-list .goods:nth-child(2),
-.goods-list .goods:nth-child(3),
-.goods-list .goods:nth-child(4),
-.goods-list .goods:nth-child(5),
-.goods-list .goods:nth-child(6) {
- border-top: 1px solid #eee;
+.floor-list .goods-list .goods {
+ width: calc(50% - 2rpx);
+ float: left;
+ border-bottom: 1px solid #eee;
+ padding-bottom: 10rpx;
}
-.goods-list .goods:nth-child(4),
-.goods-list .goods:nth-child(6) {
- border-left: 1px solid #eee;
+.floor-list .goods-list .goods:nth-of-type(2n + 1) {
+ border-right: 1px solid #eee;
}
-.goods-list .goods:nth-child(3),
-.goods-list .goods:nth-child(4),
-.goods-list .goods:nth-child(5),
-.goods-list .goods:nth-child(6) {
- width: calc(50% - 1rpx);
- height: 480rpx;
- float: left;
+.floor-list .goods-list .goods image {
+ width: 100%;
+ height: 380rpx;
}
-.goods-list .goods-base {
- padding: 0 10rpx;
+.floor-list .goods-list .goods-base {
+ padding: 0 10rpx;
}
-.goods-base .goods-title {
- line-height: 52rpx;
- font-size: 32rpx;
+.floor-list .goods-list .goods-base .goods-title {
+ line-height: 52rpx;
+ font-size: 32rpx;
}
-.goods-base .sales-price {
- font-size: 30rpx;
+.floor-list .goods-list .goods-base .sales-price {
+ font-size: 30rpx;
}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/index/index.axml b/public/appmini/old/alipay/pages/index/index.axml
old mode 100755
new mode 100644
index de3df72e6f3df16da4075c777ad396d057e677be..3b16da71308f7c3cabf860742053982f0294852b
--- a/public/appmini/old/alipay/pages/index/index.axml
+++ b/public/appmini/old/alipay/pages/index/index.axml
@@ -28,13 +28,20 @@
{{floor.name}}
-
-
-
- {{floor.describe}}
-
+
+
+
+
+
+ {{icv.name}}
+
+
-
+ {{floor.describe}}
+
+
+
+
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 65656c01865fce505a2c63abbd3209a49080bb21..77a13def1f17c141612e12c7b4e6636b1323e975 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -59,8 +59,9 @@ App({
},
// 请求地址
- request_url: "{{request_url}}",
- //request_url: 'https://test.shopxo.net/',
+ // request_url: "{{request_url}}",
+ // request_url: 'http://tp5-dev.com/',
+ request_url: 'https://test.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index f22cf359e2415c0a037e9180c77e02e570cfb2bf..b0990e91839f7f0a3bb3154fe2974e8c153f0eb2 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,5 +1,5 @@
{
- "pages": [
+ "pages": ["pages/goods-detail/goods-detail",
"pages/index/index",
"pages/goods-category/goods-category",
"pages/cart/cart",
@@ -8,7 +8,7 @@
"pages/login/login",
"pages/paytips/paytips",
"pages/goods-search/goods-search",
- "pages/goods-detail/goods-detail",
+
"pages/goods-attribute/goods-attribute",
"pages/buy/buy",
"pages/user-address/user-address",
diff --git a/public/appmini/old/weixin/pages/common/copyright.wxml b/public/appmini/old/weixin/pages/common/copyright.wxml
index fded65f14a382bd7e71454822d027f8df9904ec9..703c49b58cd14ddb25a25d15f4267634cf680fe4 100755
--- a/public/appmini/old/weixin/pages/common/copyright.wxml
+++ b/public/appmini/old/weixin/pages/common/copyright.wxml
@@ -1,5 +1,5 @@
- Powered by ShopXO v1.5.0
+ Powered by ShopXO v1.6.0
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index 4ce27beb0ff937ea4fc9d745fc88a021f830f564..25b7e5612e57c1b05d6a8ba4333377ab42003f58 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -30,10 +30,12 @@ Page({
goods_spec_base_images: '',
show_field_price_text: null,
+
+ goods_video_is_autoplay: false,
},
onLoad(params) {
- //params['goods_id']=12;
+ params['goods_id']=2;
this.setData({params: params});
this.init();
},
@@ -592,6 +594,16 @@ Page({
});
},
+ // 视频播放
+ goods_video_play_event(e) {
+ this.setData({ goods_video_is_autoplay: true});
+ },
+
+ // 视频关闭
+ goods_video_close_event(e) {
+ this.setData({ goods_video_is_autoplay: false });
+ },
+
// 自定义分享
onShareAppMessage() {
return {
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
index 5ec853ec0f72f6add03e58206e27d6e4a61c63e2..b5aab7daa65e47114b8b2807bcbe49bd82e5e49e 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -15,6 +15,15 @@
+
+
+
+
+
+ 视频
+ 关闭
+
+
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
index 23f0bc42e7e4b56385f5c8058123283e1bc272da..ed6e5a136cee10c9700f4663ccdb37bbdc0196fc 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -213,4 +213,42 @@
padding:2px 5px;
line-height:20px;
border-radius:1px;
-}
\ No newline at end of file
+}
+
+/**
+ * 视频
+ */
+.goods-video {
+ width: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ text-align: center;
+ z-index:1;
+}
+.goods-video video {
+ width: 100%;
+ height: 65vh;
+}
+.goods-video-submit {
+ position: absolute;
+ left: 30rpx;
+ top: calc(65vh - 80rpx);
+ z-index: 2;
+}
+.goods-video-submit text {
+ height: 56rpx;
+ line-height: 56rpx !important;
+ font-size: 24rpx;
+ padding: 5rpx 20rpx;
+ border-radius: 6rpx;
+ background: #fff;
+}
+.goods-video-play {
+ border: 1px solid #10a54a;
+ color: #10a54a;
+}
+.goods-video-close {
+ border: 1px solid #eee;
+ color: #cb5757;
+}
diff --git a/public/appmini/old/weixin/pages/index/index.wxml b/public/appmini/old/weixin/pages/index/index.wxml
index 595cffa11fa8dfb1b8573343ff6d0fb7a01c911f..40b4bc94c29840a8a60df0df2799dde5b39f9a96 100755
--- a/public/appmini/old/weixin/pages/index/index.wxml
+++ b/public/appmini/old/weixin/pages/index/index.wxml
@@ -24,13 +24,20 @@
{{floor.name}}
-
-
-
- {{floor.describe}}
-
+
+
+
+
+
+ {{icv.name}}
+
+
-
+ {{floor.describe}}
+
+
+
+
diff --git a/public/appmini/old/weixin/pages/index/index.wxss b/public/appmini/old/weixin/pages/index/index.wxss
index 8519c6e097b943ca4f6ad0d4c293c15321578879..b1051a2df5d1758f5b69163fabfb8cbe55d3f946 100755
--- a/public/appmini/old/weixin/pages/index/index.wxss
+++ b/public/appmini/old/weixin/pages/index/index.wxss
@@ -26,97 +26,64 @@
line-height: 70rpx;
}
- /**
+/**
* 楼层数据
*/
-.floor-list, .floor-left {
- overflow: hidden;
- position: relative;
-}
-.floor .vice-name {
- color: #fff;
- margin-top: 20rpx;
- padding: 0 10rpx;
- font-size: 34rpx;
- line-height: 48rpx;
-}
-.floor-left {
- width: 40%;
- height: 660rpx;
-}
-.floor-left image {
- left: 0;
- bottom: 0;
- width: 100%;
-}
-.goods-list,
-.goods-list .goods {
- overflow: hidden;
-}
-.floor-left image,
-.goods-list .goods:nth-child(1),
-.goods-list .goods:nth-child(2),
-.goods-list .goods:nth-child(1) .goods-base,
-.goods-list .goods:nth-child(2) .goods-base {
- position: absolute;
-}
-
-.goods-list .goods image {
- width: 100%;
- height: 380rpx;
-}
-.goods-list .goods:nth-child(1),
-.goods-list .goods:nth-child(2) {
- width: 60%;
- height: 330rpx;
-}
-.goods-list .goods:nth-child(1) .goods-base,
-.goods-list .goods:nth-child(2) .goods-base {
- padding-left: 10rpx;
- width: calc(40% - 10rpx);
- bottom: 20rpx;
+.floor-list {
+ overflow: hidden;
+ position: relative;
}
-.goods-list .goods:nth-child(1) image,
-.goods-list .goods:nth-child(2) image {
- width: 60%;
- height: 330rpx;
- float: right;
+.floor-list .word {
+ padding: 20rpx 20rpx 0 20rpx;
+}
+.floor-list .word .vice-name {
+ color: #fff;
+ max-width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ text-align: center;
+ padding: 20rpx;
}
-.goods-list .goods:nth-child(1) {
- top: 0;
- right: 0;
+.floor-list .word .word-icon {
+ margin: 10rpx;
+ width: calc(33% - 24rpx);
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ color: #fff;
+ background-color: rgba(0, 0, 0, 0.03);
+ border-radius: 6rpx;
+ display: inline-block;
+ border: 1px solid #fff;
+ text-decoration: none;
+ overflow: hidden;
}
-.goods-list .goods:nth-child(2) {
- top: 330rpx;
- right: 0;
+.floor-list .word image {
+ max-width: 100%;
}
-
-.goods-list .goods:nth-child(2),
-.goods-list .goods:nth-child(3),
-.goods-list .goods:nth-child(4),
-.goods-list .goods:nth-child(5),
-.goods-list .goods:nth-child(6) {
- border-top: 1px solid #eee;
+.floor-list .goods-list .goods {
+ width: calc(50% - 2rpx);
+ float: left;
+ border-bottom: 1px solid #eee;
+ padding-bottom: 10rpx;
}
-.goods-list .goods:nth-child(4),
-.goods-list .goods:nth-child(6) {
- border-left: 1px solid #eee;
+.floor-list .goods-list .goods:nth-of-type(2n + 1) {
+ border-right: 1px solid #eee;
}
-.goods-list .goods:nth-child(3),
-.goods-list .goods:nth-child(4),
-.goods-list .goods:nth-child(5),
-.goods-list .goods:nth-child(6) {
- width: calc(50% - 1rpx);
- height: 490rpx;
- float: left;
+.floor-list .goods-list .goods image {
+ width: 100%;
+ height: 380rpx;
}
-.goods-list .goods-base {
- padding: 0 10rpx;
+.floor-list .goods-list .goods-base {
+ padding: 0 10rpx;
}
-.goods-base .goods-title {
- line-height: 52rpx;
- font-size: 32rpx;
+.floor-list .goods-list .goods-base .goods-title {
+ line-height: 52rpx;
+ font-size: 32rpx;
}
-.goods-base .sales-price {
- font-size: 30rpx;
+.floor-list .goods-list .goods-base .sales-price {
+ font-size: 30rpx;
}
\ No newline at end of file