Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jamesyang1999
ShopXO
提交
a823fbcd
ShopXO
项目概览
jamesyang1999
/
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,发现更多精彩内容 >>
提交
a823fbcd
编写于
10月 19, 2019
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序优化
上级
8128dd0d
变更
16
显示空白变更内容
内联
并排
Showing
16 changed file
with
57 addition
and
64 deletion
+57
-64
public/appmini/old/alipay/app.acss
public/appmini/old/alipay/app.acss
+1
-0
public/appmini/old/alipay/node_modules/mini-antui/es/popup/index.acss
...ni/old/alipay/node_modules/mini-antui/es/popup/index.acss
+2
-0
public/appmini/old/alipay/node_modules/mini-antui/es/popup/index.axml
...ni/old/alipay/node_modules/mini-antui/es/popup/index.axml
+0
-0
public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
...c/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+1
-1
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
...c/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+1
-1
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+1
-1
public/appmini/old/alipay/pages/user-coupon/user-coupon.acss
public/appmini/old/alipay/pages/user-coupon/user-coupon.acss
+2
-6
public/appmini/old/alipay/pages/user-coupon/user-coupon.axml
public/appmini/old/alipay/pages/user-coupon/user-coupon.axml
+15
-15
public/appmini/old/baidu/app.css
public/appmini/old/baidu/app.css
+1
-0
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
+1
-1
public/appmini/old/baidu/pages/user-coupon/user-coupon.css
public/appmini/old/baidu/pages/user-coupon/user-coupon.css
+2
-6
public/appmini/old/baidu/pages/user-coupon/user-coupon.swan
public/appmini/old/baidu/pages/user-coupon/user-coupon.swan
+15
-15
public/appmini/old/weixin/app.wxss
public/appmini/old/weixin/app.wxss
+1
-0
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+1
-1
public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml
public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml
+11
-11
public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss
public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss
+2
-6
未找到文件。
public/appmini/old/alipay/app.acss
浏览文件 @
a823fbcd
...
...
@@ -407,6 +407,7 @@ textarea {
border-radius: 50%;
width: 90rpx;
height: 90rpx;
z-index: 1;
}
.common-quick-nav image {
width: 60rpx;
...
...
public/appmini/old/alipay/node_modules/mini-antui/es/popup/index.acss
100755 → 100644
浏览文件 @
a823fbcd
.am-popup-content {
position: fixed;
z-index: 101;
}
.am-popup-mask {
...
...
@@ -11,6 +12,7 @@
background-color: rgba(0, 0, 0, 0.75);
opacity: 0;
pointer-events: none;
z-index: 100;
}
.am-popup-left {
...
...
public/appmini/old/alipay/node_modules/mini-antui/es/popup/index.axml
100755 → 100644
浏览文件 @
a823fbcd
文件模式从 100755 更改为 100644
public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
浏览文件 @
a823fbcd
...
...
@@ -312,5 +312,5 @@
.quick-nav-cart .badge-icon {
position: absolute;
top: -5px;
left: calc(50% +
23
rpx);
left: calc(50% +
10
rpx);
}
\ No newline at end of file
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
浏览文件 @
a823fbcd
...
...
@@ -189,7 +189,7 @@
<!-- 购物车 -->
<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
<view class="common-quick-nav quick-nav-cart">
<view class="badge-icon">
<view
a:if="{{quick_nav_cart_count > 0}}"
class="badge-icon">
<badge text="{{quick_nav_cart_count}}" dot="{{false}}"></badge>
</view>
<image src="/images/default-cart-icon.png" class="dis-block"></image>
...
...
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
浏览文件 @
a823fbcd
...
...
@@ -312,7 +312,7 @@ Page({
success
:
(
res
)
=>
{
my
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
this
.
setData
({
quick_nav_cart_count
:
this
.
data
.
quick_nav_cart_count
+
this
.
data
.
temp_buy_number
});
this
.
setData
({
quick_nav_cart_count
:
res
.
data
.
data
});
this
.
popup_close_event
();
app
.
showToast
(
res
.
data
.
msg
,
'
success
'
);
}
else
{
...
...
public/appmini/old/alipay/pages/user-coupon/user-coupon.acss
浏览文件 @
a823fbcd
...
...
@@ -4,11 +4,7 @@
.nav-tabs {
overflow: hidden;
background: #eee;
position: fixed;
left: 0;
top: 0;
width: 100%;
z-index: 1;
}
.nav-tabs .nav-item {
text-align: center;
...
...
@@ -25,8 +21,8 @@
/*
* 数据列表
*/
.
coupon-container
{
margin-top: 100rpx
;
.
scroll-box
{
height: calc(100vh - 80rpx)
;
}
.coupon-container .item,
.coupon-container .v-right,
...
...
public/appmini/old/alipay/pages/user-coupon/user-coupon.axml
浏览文件 @
a823fbcd
<view a:if="{{data_list != null}}">
<!-- 导航 -->
<view class="nav-tabs">
<!-- 导航 -->
<view class="nav-tabs">
<block a:for="{{nav_tabs_list}}">
<view class="nav-item cr-666 fl {{item.value == nav_tabs_value ? 'nav-item-active' : ''}}" data-index="{{index}}" data-value="{{item.value}}" onTap="nav_tabs_event">{{item.name}}</view>
</block>
</view>
</view>
<scroll-view scroll-y="{{true}}" class="scroll-box" lower-threshold="30">
<!-- 优惠劵列表 -->
<view class="coupon-container">
<view
a:if="{{data_list != null}}"
class="coupon-container">
<!-- 未使用 -->
<view a:if="{{(data_list.not_use || null) != null && data_list.not_use.length > 0 && nav_tabs_value == 'not_use'}}">
<block a:for="{{data_list.not_use}}">
...
...
@@ -76,12 +76,12 @@
</block>
</view>
</view>
</view>
<view a:if="{{data_list_loding_status != 3}}">
<view a:if="{{data_list_loding_status != 3}}">
<import src="/pages/common/nodata.axml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.axml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
\ No newline at end of file
<import src="/pages/common/bottom_line.axml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</scroll-view>
\ No newline at end of file
public/appmini/old/baidu/app.css
浏览文件 @
a823fbcd
...
...
@@ -475,6 +475,7 @@ button[disabled].bg-primary {
border-radius
:
50%
;
width
:
90
rpx
;
height
:
90
rpx
;
z-index
:
1
;
}
.common-quick-nav
image
{
width
:
60
rpx
;
...
...
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
浏览文件 @
a823fbcd
...
...
@@ -290,7 +290,7 @@ Page({
success
:
res
=>
{
swan
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
this
.
setData
({
quick_nav_cart_count
:
this
.
data
.
quick_nav_cart_count
+
this
.
data
.
temp_buy_number
});
this
.
setData
({
quick_nav_cart_count
:
res
.
data
.
data
});
this
.
popup_close_event
();
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
...
...
public/appmini/old/baidu/pages/user-coupon/user-coupon.css
浏览文件 @
a823fbcd
...
...
@@ -4,11 +4,7 @@
.nav-tabs
{
overflow
:
hidden
;
background
:
#eee
;
position
:
fixed
;
left
:
0
;
top
:
0
;
width
:
100%
;
z-index
:
1
;
}
.nav-tabs
.nav-item
{
text-align
:
center
;
...
...
@@ -25,8 +21,8 @@
/*
* 数据列表
*/
.
coupon-container
{
margin-top
:
100
rpx
;
.
scroll-box
{
height
:
calc
(
100vh
-
80
rpx
)
;
}
.coupon-container
.item
,
.coupon-container
.v-right
,
...
...
public/appmini/old/baidu/pages/user-coupon/user-coupon.swan
浏览文件 @
a823fbcd
<view s-if="data_list != null">
<!-- 导航 -->
<view class="nav-tabs">
<!-- 导航 -->
<view class="nav-tabs">
<block s-for="item, index in nav_tabs_list" s-key="item">
<view class="nav-item cr-666 fl {{item.value == nav_tabs_value ? 'nav-item-active' : ''}}" data-index="{{index}}" data-value="{{item.value}}" bindtap="nav_tabs_event">{{item.name}}</view>
</block>
</view>
</view>
<scroll-view scroll-y="{{true}}" class="scroll-box" lower-threshold="30">
<!-- 优惠劵列表 -->
<view class="coupon-container">
<view
s-if="data_list != null"
class="coupon-container">
<!-- 未使用 -->
<view s-if="(data_list.not_use || null) != null && data_list.not_use.length > 0 && nav_tabs_value == 'not_use'">
<block s-for="item, index in data_list.not_use" s-key="item">
...
...
@@ -76,12 +76,12 @@
</block>
</view>
</view>
</view>
<view s-if="data_list_loding_status != 3">
<view s-if="data_list_loding_status != 3">
<import src="/pages/common/nodata.swan" />
<template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.swan" />
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
\ No newline at end of file
<import src="/pages/common/bottom_line.swan" />
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
</scroll-view>
\ No newline at end of file
public/appmini/old/weixin/app.wxss
浏览文件 @
a823fbcd
...
...
@@ -316,6 +316,7 @@ button[disabled].bg-primary {
border-radius: 50%;
width: 90rpx;
height: 90rpx;
z-index: 1;
}
.common-quick-nav image {
width: 60rpx;
...
...
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
浏览文件 @
a823fbcd
...
...
@@ -331,7 +331,7 @@ Page({
success
:
(
res
)
=>
{
wx
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
this
.
setData
({
quick_nav_cart_count
:
this
.
data
.
quick_nav_cart_count
+
this
.
data
.
temp_buy_number
});
this
.
setData
({
quick_nav_cart_count
:
res
.
data
.
data
});
this
.
popup_close_event
();
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
...
...
public/appmini/old/weixin/pages/user-coupon/user-coupon.wxml
浏览文件 @
a823fbcd
<view wx:if="{{data_list != null}}">
<!-- 导航 -->
<view class="nav-tabs">
<!-- 导航 -->
<view class="nav-tabs">
<block wx:for="{{nav_tabs_list}}" wx:key="item">
<view class="nav-item cr-666 fl {{item.value == nav_tabs_value ? 'nav-item-active' : ''}}" data-index="{{index}}" data-value="{{item.value}}" bindtap="nav_tabs_event">{{item.name}}</view>
</block>
</view>
</view>
<scroll-view scroll-y="{{true}}" class="scroll-box" lower-threshold="30">
<!-- 优惠劵列表 -->
<view class="coupon-container">
<view
wx:if="{{data_list != null}}"
class="coupon-container">
<!-- 未使用 -->
<view wx:if="{{(data_list.not_use || null) != null && data_list.not_use.length > 0 && nav_tabs_value == 'not_use'}}">
<block wx:for="{{data_list.not_use}}" wx:key="item">
...
...
@@ -76,12 +76,12 @@
</block>
</view>
</view>
</view>
<view wx:if="{{data_list_loding_status != 3}}">
<view wx:if="{{data_list_loding_status != 3}}">
<import src="/pages/common/nodata.wxml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</scroll-view>
\ No newline at end of file
public/appmini/old/weixin/pages/user-coupon/user-coupon.wxss
浏览文件 @
a823fbcd
...
...
@@ -4,11 +4,7 @@
.nav-tabs {
overflow: hidden;
background: #eee;
position: fixed;
left: 0;
top: 0;
width: 100%;
z-index: 1;
}
.nav-tabs .nav-item {
text-align: center;
...
...
@@ -25,8 +21,8 @@
/*
* 数据列表
*/
.
coupon-container
{
margin-top: 100rpx
;
.
scroll-box
{
height: calc(100vh - 80rpx)
;
}
.coupon-container .item,
.coupon-container .v-right,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录