Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jcy2004x
ShopXO
提交
454e1dd6
ShopXO
项目概览
jcy2004x
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
454e1dd6
编写于
1月 05, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序优化
上级
2f9217e9
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
120 addition
and
29 deletion
+120
-29
public/appmini/old/alipay/app.js
public/appmini/old/alipay/app.js
+41
-2
public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
...c/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+7
-2
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
...c/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+3
-3
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+6
-1
public/appmini/old/wechat/app.js
public/appmini/old/wechat/app.js
+42
-4
public/appmini/old/wechat/app.json
public/appmini/old/wechat/app.json
+2
-2
public/appmini/old/wechat/components/badge/badge.wxss
public/appmini/old/wechat/components/badge/badge.wxss
+2
-2
public/appmini/old/wechat/pages/answer-form/answer-form.wxss
public/appmini/old/wechat/pages/answer-form/answer-form.wxss
+1
-1
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
...c/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
+3
-0
public/appmini/old/wechat/pages/index/index.wxss
public/appmini/old/wechat/pages/index/index.wxss
+2
-2
public/appmini/old/wechat/pages/login/login.js
public/appmini/old/wechat/pages/login/login.js
+3
-3
public/appmini/old/wechat/pages/user/user.js
public/appmini/old/wechat/pages/user/user.js
+2
-2
public/appmini/old/wechat/pages/user/user.wxss
public/appmini/old/wechat/pages/user/user.wxss
+6
-5
未找到文件。
public/appmini/old/alipay/app.js
浏览文件 @
454e1dd6
...
...
@@ -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
;
// 跳转到外部小程序
...
...
public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
浏览文件 @
454e1dd6
...
...
@@ -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;
...
...
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
浏览文件 @
454e1dd6
...
...
@@ -20,16 +20,16 @@
<view class="oh">
<view class="goods-title fl multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
<view class="goods-share fr tc">
<button type="default" size="mini" open-type="share" hover-class="none"
onTap="defaultTap"
>
<button type="default" size="mini" open-type="share" hover-class="none">
<image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
<text class="dis-block cr-888">分享</text>
</button>
</view>
</view>
<view class="goods-price">
<view class="goods-price
single-text
">
<text class="sales-price">¥{{goods.price}}</text>
<text a:if="{{(goods.original_price || null) != null}}" class="original-price">¥{{goods.original_price}}</text>
<view class="
fr cr-ccc
">
<view class="
cr-ccc sales
">
<text>销量 {{goods.sales_count}}</text>
</view>
</view>
...
...
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
浏览文件 @
454e1dd6
...
...
@@ -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
});
},
...
...
public/appmini/old/wechat/app.js
浏览文件 @
454e1dd6
...
...
@@ -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
({
n
umber
:
value
});
wx
.
makePhoneCall
({
phoneN
umber
:
value
});
break
;
}
}
...
...
public/appmini/old/wechat/app.json
浏览文件 @
454e1dd6
{
"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"
,
...
...
public/appmini/old/wechat/components/badge/badge.wxss
浏览文件 @
454e1dd6
...
...
@@ -19,8 +19,8 @@
border-radius: 16px;
color: #fff;
font-size: 10px;
padding:
2px 2
px;
padding:
1px 1
px;
}
.am-badge-text-max {
padding:
2px 3
px;
padding:
1px 2
px;
}
\ No newline at end of file
public/appmini/old/wechat/pages/answer-form/answer-form.wxss
浏览文件 @
454e1dd6
...
...
@@ -11,7 +11,7 @@
}
.form-input {
padding: 20rpx
0
;
padding: 20rpx
10rpx
;
}
.form-input input, .form-input textarea {
font-size: 30rpx;
...
...
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
浏览文件 @
454e1dd6
...
...
@@ -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;
}
...
...
public/appmini/old/wechat/pages/index/index.wxss
浏览文件 @
454e1dd6
...
...
@@ -42,7 +42,7 @@
}
.floor-left {
width: 40%;
height: 66
2
rpx;
height: 66
0
rpx;
}
.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: 4
8
0rpx;
height: 4
9
0rpx;
float: left;
}
.goods-list .goods-base {
...
...
public/appmini/old/wechat/pages/login/login.js
浏览文件 @
454e1dd6
...
...
@@ -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
)
?
'
授权用户信息
'
:
'
手机绑定
'
});
},
/**
...
...
public/appmini/old/wechat/pages/user/user.js
浏览文件 @
454e1dd6
...
...
@@ -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
({
n
umber
:
this
.
data
.
customer_service_tel
});
wx
.
makePhoneCall
({
phoneN
umber
:
this
.
data
.
customer_service_tel
});
}
},
...
...
public/appmini/old/wechat/pages/user/user.wxss
浏览文件 @
454e1dd6
...
...
@@ -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% + 3
0
rpx);
top:
-2px
;
left: calc(50% + 3
5
rpx);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录