diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index f3ee1f5467f16f98c182c5500f01188a156c8fea..9e1e0367514c1d2e9a95c22279bbfde0d44bd29c 100755
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -24,6 +24,13 @@ App({
// 错误圆形提示图片
default_round_error_icon: "/images/default-round-error-icon.png",
+ // tabbar页面
+ tabbar_pages: [
+ "index",
+ "goods-category",
+ "cart",
+ "user",
+ ],
// 页面标题
common_pages_title: {
@@ -50,7 +57,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
- //request_url: "http://test.shopxo.net/",
+ request_url: "https://test.shopxo.net/",
//request_url: 'http://tp5-dev.com/',
// 基础信息
@@ -427,6 +434,33 @@ App({
return s_x;
},
+ /**
+ * 当前地址是否存在tabbar中
+ */
+ is_tabbar_pages(url) {
+ if (url.indexOf("?") == -1)
+ {
+ var all = url.split("/");
+ } else {
+ var temp_str = url.split("?");
+ var all = temp_str[0].split("/");
+ }
+ if (all.length <= 0)
+ {
+ return false;
+ }
+
+ var temp_tabbar_pages = this.data.tabbar_pages;
+ for (var i in temp_tabbar_pages)
+ {
+ if (temp_tabbar_pages[i] == all[all.length-1])
+ {
+ return true;
+ }
+ }
+ return false;
+ },
+
/**
* 事件操作
*/
@@ -443,7 +477,12 @@ App({
// 内部页面
case 1 :
- my.navigateTo({url: value});
+ if (this.is_tabbar_pages(value))
+ {
+ my.switchTab({ url: value });
+ } else {
+ my.navigateTo({ url: value });
+ }
break;
// 跳转到外部小程序
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
index e2915e59ed903a4a92f1ed7e4b0625be7f33b1e8..ad2d6e4c891e5eea1b73215f0e5a579e34b7567d 100755
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
@@ -166,8 +166,10 @@
.goods-base {
padding: 15rpx 10rpx;
}
-.goods-base .goods-price .fr {
- line-height: 50rpx;
+.goods-base .goods-price .sales {
+ position: absolute;
+ top: 0;
+ right: 0;
}
.goods-base .goods-title {
width: calc(100% - 100rpx);
@@ -187,6 +189,9 @@
}
.goods-base .goods-price {
margin-top: 10rpx;
+ padding-right: 160rpx;
+ position: relative;
+ max-height: 68rpx;
}
.page {
padding-bottom: 100rpx;
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
index df37bb78a7d3f8644ec55a45b946d6464ae1dfbf..56bc906df323946b05932b4b5bba113472bdb1fd 100755
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
@@ -20,16 +20,16 @@
{{goods.title}}
-
-
+
¥{{goods.price}}
¥{{goods.original_price}}
-
+
销量 {{goods.sales_count}}
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
index 97104282405b2f319a65584870ac2f82e85ea2e5..bbf42c5cdd31ca2f3048ef68196e4122813e41d9 100755
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -616,9 +616,14 @@ Page({
// 商品相册图片查看
goods_photo_view_event(e) {
var index = e.currentTarget.dataset.index;
+ var all = [];
+ for (var i in this.data.goods_photo)
+ {
+ all.push(this.data.goods_photo[i]['images']);
+ }
my.previewImage({
current: index,
- urls: this.data.goods_photo
+ urls: all
});
},
diff --git a/public/appmini/old/wechat/app.js b/public/appmini/old/wechat/app.js
index 7a53054c8e780bb60d3f63f57da0446833add52c..e9cf07f3823cff3a967ea46e7b8e9fd2b9e9d1ac 100755
--- a/public/appmini/old/wechat/app.js
+++ b/public/appmini/old/wechat/app.js
@@ -27,6 +27,13 @@ App({
// 错误圆形提示图片
default_round_error_icon: "/images/default-round-error-icon.png",
+ // tabbar页面
+ tabbar_pages: [
+ "index",
+ "goods-category",
+ "cart",
+ "user",
+ ],
// 页面标题
common_pages_title: {
@@ -52,8 +59,7 @@ App({
},
// 请求地址
- //request_url: "{{request_url}}",
- //request_url: "http://test.shopxo.net/",
+ request_url: "{{request_url}}",
request_url: 'https://test.shopxo.net/',
// 基础信息
@@ -397,6 +403,33 @@ App({
return s_x;
},
+ /**
+ * 当前地址是否存在tabbar中
+ */
+ is_tabbar_pages(url) {
+ if (url.indexOf("?") == -1)
+ {
+ var all = url.split("/");
+ } else {
+ var temp_str = url.split("?");
+ var all = temp_str[0].split("/");
+ }
+ if (all.length <= 0)
+ {
+ return false;
+ }
+
+ var temp_tabbar_pages = this.data.tabbar_pages;
+ for (var i in temp_tabbar_pages)
+ {
+ if (temp_tabbar_pages[i] == all[all.length-1])
+ {
+ return true;
+ }
+ }
+ return false;
+ },
+
/**
* 事件操作
*/
@@ -412,7 +445,12 @@ App({
// 内部页面
case 1:
- wx.navigateTo({ url: value });
+ if (this.is_tabbar_pages(value))
+ {
+ wx.switchTab({ url: value });
+ } else {
+ wx.navigateTo({ url: value });
+ }
break;
// 跳转到外部小程序
@@ -438,7 +476,7 @@ App({
// 拨打电话
case 4:
- wx.makePhoneCall({ number: value });
+ wx.makePhoneCall({ phoneNumber: value });
break;
}
}
diff --git a/public/appmini/old/wechat/app.json b/public/appmini/old/wechat/app.json
index 7d378e65cb00c4b672c3780ed0ee11b16ab55655..f22cf359e2415c0a037e9180c77e02e570cfb2bf 100755
--- a/public/appmini/old/wechat/app.json
+++ b/public/appmini/old/wechat/app.json
@@ -1,9 +1,9 @@
{
- "pages": ["pages/user/user",
+ "pages": [
"pages/index/index",
"pages/goods-category/goods-category",
"pages/cart/cart",
-
+ "pages/user/user",
"pages/web-view/web-view",
"pages/login/login",
"pages/paytips/paytips",
diff --git a/public/appmini/old/wechat/components/badge/badge.wxss b/public/appmini/old/wechat/components/badge/badge.wxss
index ce1d3d2ac298ff146657e3e07fd4175a4085592a..7dfb7aef027576848b5a8aa1ec768232f75dfd1f 100644
--- a/public/appmini/old/wechat/components/badge/badge.wxss
+++ b/public/appmini/old/wechat/components/badge/badge.wxss
@@ -19,8 +19,8 @@
border-radius: 16px;
color: #fff;
font-size: 10px;
- padding: 2px 2px;
+ padding: 1px 1px;
}
.am-badge-text-max {
- padding:2px 3px;
+ padding: 1px 2px;
}
\ No newline at end of file
diff --git a/public/appmini/old/wechat/pages/answer-form/answer-form.wxss b/public/appmini/old/wechat/pages/answer-form/answer-form.wxss
index abfc9244415d2ea6d2f53c22d2c1360066247ed9..c6d4f6d3e6a514fa25495c2f61a974892ba566c2 100755
--- a/public/appmini/old/wechat/pages/answer-form/answer-form.wxss
+++ b/public/appmini/old/wechat/pages/answer-form/answer-form.wxss
@@ -11,7 +11,7 @@
}
.form-input {
- padding: 20rpx 0;
+ padding: 20rpx 10rpx;
}
.form-input input, .form-input textarea {
font-size: 30rpx;
diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
index 7cae731994c04be395f0de01c4159452b13e35cf..19d25f7388ed0c10c57283fa9078e67724737cb3 100755
--- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
@@ -164,6 +164,9 @@
.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
+.goods-buy-nav .dis-block {
+ margin-top: -10rpx;
+}
.goods-base {
padding: 15rpx 10rpx;
}
diff --git a/public/appmini/old/wechat/pages/index/index.wxss b/public/appmini/old/wechat/pages/index/index.wxss
index b3127290b6b7979c6b54423678fdb556c697c52c..8519c6e097b943ca4f6ad0d4c293c15321578879 100755
--- a/public/appmini/old/wechat/pages/index/index.wxss
+++ b/public/appmini/old/wechat/pages/index/index.wxss
@@ -42,7 +42,7 @@
}
.floor-left {
width: 40%;
- height: 662rpx;
+ height: 660rpx;
}
.floor-left image {
left: 0;
@@ -107,7 +107,7 @@
.goods-list .goods:nth-child(5),
.goods-list .goods:nth-child(6) {
width: calc(50% - 1rpx);
- height: 480rpx;
+ height: 490rpx;
float: left;
}
.goods-list .goods-base {
diff --git a/public/appmini/old/wechat/pages/login/login.js b/public/appmini/old/wechat/pages/login/login.js
index a4e2dadb33d31e2f5e142917a1cb9b990db9dbcf..a517d842d9973639f6c8a3a179c6e8c0a2cec8ee 100755
--- a/public/appmini/old/wechat/pages/login/login.js
+++ b/public/appmini/old/wechat/pages/login/login.js
@@ -16,14 +16,14 @@ Page({
* 页面加载初始化
*/
onLoad(option) {
- // 标题设置
- wx.setNavigationBarTitle({title: '手机绑定'});
-
// 设置用户信息
this.setData({
params: option,
user: app.get_user_cache_info() || null
});
+
+ // 标题设置
+ wx.setNavigationBarTitle({ title: (this.data.user == null) ? '授权用户信息' : '手机绑定' });
},
/**
diff --git a/public/appmini/old/wechat/pages/user/user.js b/public/appmini/old/wechat/pages/user/user.js
index c7a3e04c4d916e30550caf9ddb325854b07cfd3a..c26eb3dbfde7069adfc44ae73988e6443fd537f9 100755
--- a/public/appmini/old/wechat/pages/user/user.js
+++ b/public/appmini/old/wechat/pages/user/user.js
@@ -136,7 +136,7 @@ Page({
// 清除缓存
clear_storage(e) {
wx.clearStorage()
- app.showToast("清除缓存成功");
+ app.showToast("清除缓存成功", "success");
},
// 客服电话
@@ -145,7 +145,7 @@ Page({
{
app.showToast("客服电话有误");
} else {
- wx.makePhoneCall({ number: this.data.customer_service_tel });
+ wx.makePhoneCall({ phoneNumber: this.data.customer_service_tel });
}
},
diff --git a/public/appmini/old/wechat/pages/user/user.wxss b/public/appmini/old/wechat/pages/user/user.wxss
index d811c34a1c3be36b9c5540aa801dcd577709a39d..fde309e318bc534e82fe3a36915488fce8d9cd37 100755
--- a/public/appmini/old/wechat/pages/user/user.wxss
+++ b/public/appmini/old/wechat/pages/user/user.wxss
@@ -54,15 +54,16 @@
box-sizing: border-box;
padding: 30rpx 20rpx;
}
-.nav-box .nav-item .item-icon{
+.nav-box .nav-item .item-icon {
width: 40rpx;
height: 40rpx;
vertical-align: middle;
}
-.nav-box .nav-item .item-name{
+.nav-box .nav-item .item-name {
margin-left: 20rpx;
+ vertical-align: middle;
}
-.nav-box .nav-item .item-arrow{
+.nav-box .nav-item .item-arrow {
width: 25rpx;
}
@@ -80,8 +81,8 @@
}
.items-list .items .badge-icon {
position: absolute;
- top: 0;
- left: calc(50% + 30rpx);
+ top: -2px;
+ left: calc(50% + 35rpx);
}