Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
starsw001
ShopXO
提交
2905ebdb
ShopXO
项目概览
starsw001
/
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 搜索 >>
提交
2905ebdb
编写于
11月 26, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序登录优化
上级
c3d962f7
变更
21
显示空白变更内容
内联
并排
Showing
21 changed file
with
76 addition
and
33 deletion
+76
-33
public/appmini/old/weixin/app.js
public/appmini/old/weixin/app.js
+23
-0
public/appmini/old/weixin/app.wxss
public/appmini/old/weixin/app.wxss
+1
-0
public/appmini/old/weixin/pages/buy/buy.js
public/appmini/old/weixin/pages/buy/buy.js
+3
-1
public/appmini/old/weixin/pages/cart/cart.js
public/appmini/old/weixin/pages/cart/cart.js
+4
-2
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+6
-3
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
...c/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+1
-1
public/appmini/old/weixin/pages/lib/online-service/content.wxml
.../appmini/old/weixin/pages/lib/online-service/content.wxml
+1
-1
public/appmini/old/weixin/pages/user-address/user-address.js
public/appmini/old/weixin/pages/user-address/user-address.js
+3
-2
public/appmini/old/weixin/pages/user-answer-list/user-answer-list.js
...ini/old/weixin/pages/user-answer-list/user-answer-list.js
+3
-2
public/appmini/old/weixin/pages/user-coupon/user-coupon.js
public/appmini/old/weixin/pages/user-coupon/user-coupon.js
+3
-1
public/appmini/old/weixin/pages/user-faovr/user-faovr.js
public/appmini/old/weixin/pages/user-faovr/user-faovr.js
+3
-2
public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js
...i/old/weixin/pages/user-goods-browse/user-goods-browse.js
+3
-2
public/appmini/old/weixin/pages/user-integral/user-integral.js
...c/appmini/old/weixin/pages/user-integral/user-integral.js
+3
-2
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml
...old/weixin/pages/user-order-detail/user-order-detail.wxml
+2
-2
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss
...old/weixin/pages/user-order-detail/user-order-detail.wxss
+2
-2
public/appmini/old/weixin/pages/user-order/user-order.js
public/appmini/old/weixin/pages/user-order/user-order.js
+3
-2
public/appmini/old/weixin/pages/user-order/user-order.wxml
public/appmini/old/weixin/pages/user-order/user-order.wxml
+1
-1
public/appmini/old/weixin/pages/user-order/user-order.wxss
public/appmini/old/weixin/pages/user-order/user-order.wxss
+2
-2
public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
...d/weixin/pages/user-orderaftersale/user-orderaftersale.js
+3
-2
public/appmini/old/weixin/pages/user/user.js
public/appmini/old/weixin/pages/user/user.js
+5
-2
public/appmini/old/weixin/pages/user/user.wxml
public/appmini/old/weixin/pages/user/user.wxml
+1
-1
未找到文件。
public/appmini/old/weixin/app.js
浏览文件 @
2905ebdb
...
...
@@ -524,4 +524,27 @@ App({
}
},
// 登录校验
is_login_check
(
res
)
{
if
(
res
.
code
==
-
400
)
{
wx
.
clearStorage
();
wx
.
showModal
({
title
:
'
温馨提示
'
,
content
:
'
授权用户信息
'
,
confirmText
:
'
确认
'
,
cancelText
:
'
暂不
'
,
success
:
(
result
)
=>
{
if
(
result
.
confirm
)
{
wx
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
}
},
});
return
false
;
}
return
true
;
},
});
\ No newline at end of file
public/appmini/old/weixin/app.wxss
浏览文件 @
2905ebdb
...
...
@@ -78,6 +78,7 @@ textarea {
.br-r { border-right: solid 1px #efefef; }
/* 虚线边框 */
.br-dashed { border: dashed 1px #efefef; }
.br-b-dashed { border-bottom: dashed 1px #efefef; }
.br-t-dashed { border-top: dashed 1px #efefef; }
.br-l-dashed { border-left: dashed 1px #efefef; }
...
...
public/appmini/old/weixin/pages/buy/buy.js
浏览文件 @
2905ebdb
...
...
@@ -131,8 +131,10 @@ Page({
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
stopPullDownRefresh
();
...
...
public/appmini/old/weixin/pages/cart/cart.js
浏览文件 @
2905ebdb
...
...
@@ -76,7 +76,7 @@ Page({
data_bottom_line_status
:
true
,
data_list_loding_msg
:
'
购物车空空如也
'
,
//
是否展示型
//
站点模式
common_site_type
:
data
.
common_site_type
||
0
,
common_is_exhibition_mode_btn_text
:
data
.
common_is_exhibition_mode_btn_text
||
'
立即咨询
'
,
customer_service_tel
:
data
.
customer_service_tel
||
null
,
...
...
@@ -87,8 +87,10 @@ Page({
data_bottom_line_status
:
false
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
stopPullDownRefresh
();
...
...
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
浏览文件 @
2905ebdb
...
...
@@ -315,8 +315,10 @@ Page({
});
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
@@ -350,8 +352,10 @@ Page({
this
.
popup_close_event
();
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
@@ -866,5 +870,4 @@ Page({
path
:
'
/pages/goods-detail/goods-detail?goods_id=
'
+
this
.
data
.
goods
.
id
+
'
&referrer=
'
+
user_id
};
},
});
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
浏览文件 @
2905ebdb
...
...
@@ -235,7 +235,7 @@
<!-- 在线客服 -->
<view wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/lib/online-service/content.wxml" />
<template is="online_service"></template>
<template is="online_service"
data="{{title: goods.title, path: '/pages/goods-detail/goods-detail?goods_id='+goods.id, img: goods.images, card: true}}"
></template>
</view>
<!-- 购物车 -->
...
...
public/appmini/old/weixin/pages/lib/online-service/content.wxml
浏览文件 @
2905ebdb
<template name="online_service">
<button open-type="contact" class="common-quick-nav common-online-service">
<button open-type="contact" class="common-quick-nav common-online-service"
send-message-title="{{title || ''}}" send-message-path="{{path || ''}}" send-message-img="{{img || ''}}" show-message-card="{{card || false}}"
>
<image src="/pages/lib/online-service/icon.png" class="dis-block"></image>
</button>
</template>
\ No newline at end of file
public/appmini/old/weixin/pages/user-address/user-address.js
浏览文件 @
2905ebdb
...
...
@@ -77,9 +77,10 @@ Page({
this
.
setData
({
data_list_loding_status
:
0
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user-answer-list/user-answer-list.js
浏览文件 @
2905ebdb
...
...
@@ -91,9 +91,10 @@ Page({
this
.
setData
({
data_list_loding_status
:
0
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user-coupon/user-coupon.js
浏览文件 @
2905ebdb
...
...
@@ -66,8 +66,10 @@ Page({
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user-faovr/user-faovr.js
浏览文件 @
2905ebdb
...
...
@@ -89,9 +89,10 @@ Page({
this
.
setData
({
data_list_loding_status
:
0
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js
浏览文件 @
2905ebdb
...
...
@@ -88,9 +88,10 @@ Page({
this
.
setData
({
data_list_loding_status
:
0
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user-integral/user-integral.js
浏览文件 @
2905ebdb
...
...
@@ -91,9 +91,10 @@ Page({
this
.
setData
({
data_list_loding_status
:
0
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml
浏览文件 @
2905ebdb
...
...
@@ -16,7 +16,7 @@
<!-- 商品列表 -->
<view class="goods bg-white spacing-mb">
<view wx:for="{{detail.items}}" wx:key="item" class="goods-item oh">
<view wx:for="{{detail.items}}" wx:key="item" class="goods-item
br-b-dashed
oh">
<navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
<image class="goods-image fl" src="{{item.images}}" mode="aspectFill" />
<view class="goods-base">
...
...
@@ -44,7 +44,7 @@
<view wx:if="{{(site_fictitious.tips || null) != null}}" class="tips-value">
<rich-text nodes="{{site_fictitious.tips}}"></rich-text>
</view>
<view wx:for="{{detail.items}}" wx:key="item" class="item br-b oh">
<view wx:for="{{detail.items}}" wx:key="item" class="item br-b
-dashed
oh">
<image class="left-image br fl" src="{{item.images}}" mode="aspectFill" />
<view class="right-value fr">
<rich-text wx:if="{{(item.fictitious_goods_value || null) != null}}" nodes="{{item.fictitious_goods_value}}"></rich-text>
...
...
public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss
浏览文件 @
2905ebdb
...
...
@@ -28,8 +28,8 @@
min-height: 160rpx;
margin-left: 180rpx;
}
.goods .goods-item:
not(:last-child)
{
border-bottom:
1px dashed #efefef
;
.goods .goods-item:
last-child
{
border-bottom:
0
;
}
.goods-item {
padding: 20rpx 10rpx;
...
...
public/appmini/old/weixin/pages/user-order/user-order.js
浏览文件 @
2905ebdb
...
...
@@ -156,9 +156,10 @@ Page({
data_list_loding_status
:
0
,
load_status
:
1
,
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user-order/user-order.wxml
浏览文件 @
2905ebdb
...
...
@@ -14,7 +14,7 @@
<text class="cr-666">{{item.add_time}}</text>
<text class="fr cr-main">{{item.status_name}}</text>
</view>
<view wx:for="{{item.items}}" wx:key="key" wx:for-item="detail" class="goods-item oh">
<view wx:for="{{item.items}}" wx:key="key" wx:for-item="detail" class="goods-item
br-b-dashed
oh">
<navigator url="/pages/user-order-detail/user-order-detail?id={{item.id}}" hover-class="none">
<image class="goods-image fl" src="{{detail.images}}" mode="aspectFill" />
<view class="goods-base">
...
...
public/appmini/old/weixin/pages/user-order/user-order.wxss
浏览文件 @
2905ebdb
...
...
@@ -24,8 +24,8 @@
.goods-title {
line-height: 36rpx;
}
.list-item .goods-item:
not(:last-child)
{
border-bottom:
1px dashed #efefef
;
.list-item .goods-item:
last-child
{
border-bottom:
0
;
}
.goods-item {
padding: 20rpx 10rpx;
...
...
public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
浏览文件 @
2905ebdb
...
...
@@ -134,9 +134,10 @@ Page({
data_list_loding_status
:
0
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
...
...
public/appmini/old/weixin/pages/user/user.js
浏览文件 @
2905ebdb
...
...
@@ -107,8 +107,11 @@ Page({
common_app_is_head_vice_nav
:
data
.
common_app_is_head_vice_nav
||
0
,
});
}
else
{
if
(
app
.
is_login_check
(
res
.
data
))
{
app
.
showToast
(
res
.
data
.
msg
);
}
}
},
fail
:
()
=>
{
wx
.
stopPullDownRefresh
();
...
...
@@ -119,7 +122,7 @@ Page({
// 清除缓存
clear_storage
(
e
)
{
wx
.
clearStorage
()
wx
.
clearStorage
()
;
app
.
showToast
(
"
清除缓存成功
"
,
"
success
"
);
},
...
...
public/appmini/old/weixin/pages/user/user.wxml
浏览文件 @
2905ebdb
...
...
@@ -57,7 +57,7 @@
<view class="nav-item br-b" bindtap="clear_storage">
<image src="/images/user-nav-cache-icon.png" class="item-icon" mode="widthFix" />
<text class="item-name">
清除缓存
</text>
<text class="item-name">
安全退出
</text>
</view>
<view wx:if="{{customer_service_tel != null}}" class="nav-item" bindtap="call_event">
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录