From 454e1dd6f1779c14d982682e3f7a8e7f085cc66f Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 5 Jan 2019 16:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/appmini/old/alipay/app.js | 43 ++++++++++++++++-
.../pages/goods-detail/goods-detail.acss | 9 +++-
.../pages/goods-detail/goods-detail.axml | 6 +--
.../alipay/pages/goods-detail/goods-detail.js | 7 ++-
public/appmini/old/wechat/app.js | 46 +++++++++++++++++--
public/appmini/old/wechat/app.json | 4 +-
.../old/wechat/components/badge/badge.wxss | 4 +-
.../wechat/pages/answer-form/answer-form.wxss | 2 +-
.../pages/goods-detail/goods-detail.wxss | 3 ++
.../appmini/old/wechat/pages/index/index.wxss | 4 +-
.../appmini/old/wechat/pages/login/login.js | 6 +--
public/appmini/old/wechat/pages/user/user.js | 4 +-
.../appmini/old/wechat/pages/user/user.wxss | 11 +++--
13 files changed, 120 insertions(+), 29 deletions(-)
diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index f3ee1f546..9e1e03675 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 e2915e59e..ad2d6e4c8 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 df37bb78a..56bc906df 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 971042824..bbf42c5cd 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 7a53054c8..e9cf07f38 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 7d378e65c..f22cf359e 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 ce1d3d2ac..7dfb7aef0 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 abfc92444..c6d4f6d3e 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 7cae73199..19d25f738 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 b3127290b..8519c6e09 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 a4e2dadb3..a517d842d 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 c7a3e04c4..c26eb3dbf 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 d811c34a1..fde309e31 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);
}
--
GitLab