Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wds12580
ShopXO
提交
1bb757a3
ShopXO
项目概览
wds12580
/
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,发现更多精彩内容 >>
提交
1bb757a3
编写于
1月 05, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序优化
上级
454e1dd6
变更
32
隐藏空白更改
内联
并排
Showing
32 changed file
with
110 addition
and
103 deletion
+110
-103
public/appmini/old/alipay/pages/buy/buy.acss
public/appmini/old/alipay/pages/buy/buy.acss
+2
-1
public/appmini/old/alipay/pages/buy/buy.axml
public/appmini/old/alipay/pages/buy/buy.axml
+2
-1
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss
...old/alipay/pages/user-order-detail/user-order-detail.acss
+1
-1
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml
...old/alipay/pages/user-order-detail/user-order-detail.axml
+1
-1
public/appmini/old/alipay/pages/user-order/user-order.acss
public/appmini/old/alipay/pages/user-order/user-order.acss
+2
-1
public/appmini/old/wechat/app.js
public/appmini/old/wechat/app.js
+25
-35
public/appmini/old/wechat/app.wxss
public/appmini/old/wechat/app.wxss
+3
-2
public/appmini/old/wechat/pages/answer-form/answer-form.js
public/appmini/old/wechat/pages/answer-form/answer-form.js
+1
-1
public/appmini/old/wechat/pages/buy/buy.js
public/appmini/old/wechat/pages/buy/buy.js
+7
-9
public/appmini/old/wechat/pages/buy/buy.wxml
public/appmini/old/wechat/pages/buy/buy.wxml
+5
-5
public/appmini/old/wechat/pages/buy/buy.wxss
public/appmini/old/wechat/pages/buy/buy.wxss
+12
-2
public/appmini/old/wechat/pages/cart/cart.wxss
public/appmini/old/wechat/pages/cart/cart.wxss
+1
-0
public/appmini/old/wechat/pages/goods-detail/goods-detail.js
public/appmini/old/wechat/pages/goods-detail/goods-detail.js
+3
-3
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
...c/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
+1
-1
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
...c/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
+4
-3
public/appmini/old/wechat/pages/goods-search/goods-search.js
public/appmini/old/wechat/pages/goods-search/goods-search.js
+1
-1
public/appmini/old/wechat/pages/goods-search/goods-search.wxml
...c/appmini/old/wechat/pages/goods-search/goods-search.wxml
+1
-1
public/appmini/old/wechat/pages/index/index.wxml
public/appmini/old/wechat/pages/index/index.wxml
+1
-1
public/appmini/old/wechat/pages/login/login.js
public/appmini/old/wechat/pages/login/login.js
+6
-2
public/appmini/old/wechat/pages/message/message.js
public/appmini/old/wechat/pages/message/message.js
+1
-1
public/appmini/old/wechat/pages/user-address-save/user-address-save.js
...i/old/wechat/pages/user-address-save/user-address-save.js
+3
-3
public/appmini/old/wechat/pages/user-address/user-address.js
public/appmini/old/wechat/pages/user-address/user-address.js
+5
-7
public/appmini/old/wechat/pages/user-address/user-address.wxml
...c/appmini/old/wechat/pages/user-address/user-address.wxml
+3
-3
public/appmini/old/wechat/pages/user-answer-list/user-answer-list.js
...ini/old/wechat/pages/user-answer-list/user-answer-list.js
+1
-1
public/appmini/old/wechat/pages/user-faovr/user-faovr.js
public/appmini/old/wechat/pages/user-faovr/user-faovr.js
+2
-2
public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.js
...i/old/wechat/pages/user-goods-browse/user-goods-browse.js
+2
-2
public/appmini/old/wechat/pages/user-integral/user-integral.js
...c/appmini/old/wechat/pages/user-integral/user-integral.js
+1
-1
public/appmini/old/wechat/pages/user-order-detail/user-order-detail.js
...i/old/wechat/pages/user-order-detail/user-order-detail.js
+1
-1
public/appmini/old/wechat/pages/user-order-detail/user-order-detail.wxml
...old/wechat/pages/user-order-detail/user-order-detail.wxml
+1
-1
public/appmini/old/wechat/pages/user-order/user-order.js
public/appmini/old/wechat/pages/user-order/user-order.js
+4
-4
public/appmini/old/wechat/pages/user-order/user-order.wxml
public/appmini/old/wechat/pages/user-order/user-order.wxml
+3
-3
public/appmini/old/wechat/pages/user-order/user-order.wxss
public/appmini/old/wechat/pages/user-order/user-order.wxss
+4
-3
未找到文件。
public/appmini/old/alipay/pages/buy/buy.acss
浏览文件 @
1bb757a3
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
.goods-item {
.goods-item {
padding: 20rpx 10rpx;
padding: 20rpx 10rpx;
}
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
margin-bottom: 10rpx;
}
}
.goods-image {
.goods-image {
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
}
}
.goods-base {
.goods-base {
min-height: 160rpx;
min-height: 160rpx;
margin-left: 180rpx;
}
}
/**
/**
...
...
public/appmini/old/alipay/pages/buy/buy.axml
浏览文件 @
1bb757a3
...
@@ -26,7 +26,8 @@
...
@@ -26,7 +26,8 @@
<view class="goods-base">
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<view class="goods-title multi-text">{{item.title}}</view>
<block a:if="{{item.spec != null}}">
<block a:if="{{item.spec != null}}">
<view class="goods-attribute cr-888" a:for="{{item.spec}}" a:for-item="spec">{{spec.type}}:{{spec.value}}
<view class="goods-spec cr-888" a:for="{{item.spec}}" a:for-item="spec">
{{spec.type}}:{{spec.value}}
</view>
</view>
</block>
</block>
</view>
</view>
...
...
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss
浏览文件 @
1bb757a3
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
.goods-item {
.goods-item {
padding: 20rpx 10rpx;
padding: 20rpx 10rpx;
}
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
margin-bottom: 10rpx;
}
}
.goods-image {
.goods-image {
...
...
public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml
浏览文件 @
1bb757a3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<view class="goods-base">
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<view class="goods-title multi-text">{{item.title}}</view>
<block a:if="{{item.spec != null}}">
<block a:if="{{item.spec != null}}">
<view class="goods-
attribute
cr-888" a:for="{{item.spec}}" a:for-item="spec">
<view class="goods-
spec
cr-888" a:for="{{item.spec}}" a:for-item="spec">
{{spec.type}}:{{spec.value}}
{{spec.type}}:{{spec.value}}
</view>
</view>
</block>
</block>
...
...
public/appmini/old/alipay/pages/user-order/user-order.acss
浏览文件 @
1bb757a3
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
}
}
.goods-base {
.goods-base {
min-height: 160rpx;
min-height: 160rpx;
margin-left: 180rpx;
}
}
.goods-title {
.goods-title {
line-height: 36rpx;
line-height: 36rpx;
...
@@ -28,7 +29,7 @@
...
@@ -28,7 +29,7 @@
.goods-item {
.goods-item {
padding: 20rpx 10rpx;
padding: 20rpx 10rpx;
}
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
margin-bottom: 10rpx;
}
}
.goods-image {
.goods-image {
...
...
public/appmini/old/wechat/app.js
浏览文件 @
1bb757a3
...
@@ -81,60 +81,50 @@ App({
...
@@ -81,60 +81,50 @@ App({
/**
/**
* 启动query参数处理
* 启动query参数处理
*/
*/
startup_query
(
option
s
)
{
startup_query
(
param
s
)
{
// 没有启动参数则返回
// 没有启动参数则返回
if
((
options
.
query
||
null
)
==
null
)
{
if
((
params
||
null
)
==
null
)
{
return
false
;
return
false
;
}
}
// 启动处理类型
// 启动处理类型
var
type
=
options
.
query
.
type
||
null
;
var
type
=
params
.
type
||
null
;
switch
(
type
)
{
switch
(
type
)
{
// type=page
// type=page
case
'
page
'
:
case
"
page
"
:
// 页面
// 页面
var
page
=
options
.
query
.
page
||
null
;
var
page
=
params
.
page
||
null
;
// 参数值
// 参数名
var
value
=
options
.
query
.
value
||
null
;
var
params_field
=
params
.
params_field
||
null
;
// 附带参数值
var
params
=
null
;
// 进入逻辑处理
// 参数值
switch
(
page
)
{
var
params_value
=
params
.
params_value
||
null
;
// 进入店铺 page=shop
case
'
shop
'
:
// 进入项目详情 page=detail
// 页面跳转
case
'
detail
'
:
if
(
page
!=
null
)
{
if
(
value
!=
null
)
{
wx
.
navigateTo
({
params
=
'
id=
'
+
value
;
url
:
"
/pages/
"
+
page
+
"
/
"
+
page
+
"
?
"
+
params_field
+
"
=
"
+
params_value
}
});
break
;
}
break
;
// 店铺买单 page=shoppay
// type=view
case
'
shoppay
'
:
case
"
view
"
:
if
(
value
!=
null
)
{
var
url
=
params
.
url
||
null
;
params
=
'
shop_id=
'
+
value
;
}
break
;
default
:
// 页面跳转
break
;
if
(
url
!=
null
)
{
wx
.
navigateTo
({
url
:
'
/pages/web-view/web-view?url=
'
+
url
});
}
}
break
;
break
;
// 默认
default
:
default
:
break
;
break
;
}
}
// 是否需要进行页面跳转
if
(
params
!=
null
)
{
wx
.
navigateTo
({
url
:
'
/pages/
'
+
page
+
'
/
'
+
page
+
'
?
'
+
params
});
}
},
},
/**
/**
...
...
public/appmini/old/wechat/app.wxss
浏览文件 @
1bb757a3
...
@@ -23,6 +23,7 @@ input[type="digit"],
...
@@ -23,6 +23,7 @@ input[type="digit"],
textarea {
textarea {
-webkit-appearance: none;
-webkit-appearance: none;
border-radius: 5px;
border-radius: 5px;
box-sizing: border-box;
}
}
/* 导航分割 */
/* 导航分割 */
...
@@ -222,8 +223,8 @@ textarea {
...
@@ -222,8 +223,8 @@ textarea {
position: fixed;
position: fixed;
left: 0;
left: 0;
bottom: 0;
bottom: 0;
background: #d2364c;
background: #d2364c
!important
;
color: #fff;
color: #fff
!important
;
border: none;
border: none;
width: 100%;
width: 100%;
}
}
...
...
public/appmini/old/wechat/pages/answer-form/answer-form.js
浏览文件 @
1bb757a3
...
@@ -36,7 +36,7 @@ Page({
...
@@ -36,7 +36,7 @@ Page({
];
];
if
(
app
.
fields_check
(
e
.
detail
.
value
,
validation
))
if
(
app
.
fields_check
(
e
.
detail
.
value
,
validation
))
{
{
wx
.
showLoading
({
content
:
'
提交中...
'
});
wx
.
showLoading
({
title
:
'
提交中...
'
});
this
.
setData
({
form_submit_loading
:
true
});
this
.
setData
({
form_submit_loading
:
true
});
// 网络请求
// 网络请求
...
...
public/appmini/old/wechat/pages/buy/buy.js
浏览文件 @
1bb757a3
...
@@ -31,7 +31,7 @@ Page({
...
@@ -31,7 +31,7 @@ Page({
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)});
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)});
// 删除地址缓存
// 删除地址缓存
wx
.
removeStorageSync
(
{
key
:
app
.
data
.
cache_buy_user_address_select_key
}
);
wx
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
}
}
},
},
...
@@ -46,14 +46,12 @@ Page({
...
@@ -46,14 +46,12 @@ Page({
// 本地缓存地址
// 本地缓存地址
if
(
this
.
data
.
is_first
==
0
)
if
(
this
.
data
.
is_first
==
0
)
{
{
var
cache_address
=
wx
.
getStorageSync
({
var
cache_address
=
wx
.
getStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
key
:
app
.
data
.
cache_buy_user_address_select_key
if
((
cache_address
||
null
)
!=
null
)
});
if
((
cache_address
.
data
||
null
)
!=
null
)
{
{
this
.
setData
({
this
.
setData
({
address
:
cache_address
.
data
,
address
:
cache_address
,
address_id
:
cache_address
.
data
.
id
address_id
:
cache_address
.
id
});
});
}
else
{
}
else
{
this
.
setData
({
this
.
setData
({
...
@@ -64,7 +62,7 @@ Page({
...
@@ -64,7 +62,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
'
加载中...
'
});
wx
.
showLoading
({
title
:
'
加载中...
'
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
@@ -153,7 +151,7 @@ Page({
...
@@ -153,7 +151,7 @@ Page({
}
}
if
(
app
.
fields_check
(
data
,
validation
))
{
if
(
app
.
fields_check
(
data
,
validation
))
{
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
'
提交中...
'
});
wx
.
showLoading
({
title
:
'
提交中...
'
});
this
.
setData
({
buy_submit_disabled_status
:
true
});
this
.
setData
({
buy_submit_disabled_status
:
true
});
wx
.
request
({
wx
.
request
({
...
...
public/appmini/old/wechat/pages/buy/buy.wxml
浏览文件 @
1bb757a3
...
@@ -21,12 +21,12 @@
...
@@ -21,12 +21,12 @@
<!-- 商品 -->
<!-- 商品 -->
<view class="goods bg-white spacing-mb">
<view class="goods bg-white spacing-mb">
<view wx:for="{{goods_list}}" class="goods-item oh">
<view wx:for="{{goods_list}}"
wx:key="key"
class="goods-item oh">
<image class="goods-image fl" src="{{item.images}}" mode="aspectFill" />
<image class="goods-image fl" src="{{item.images}}" mode="aspectFill" />
<view class="goods-base">
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<view class="goods-title multi-text">{{item.title}}</view>
<block wx:if="{{item.spec != null}}">
<block wx:if="{{item.spec != null}}">
<view class="goods-
attribute cr-888" wx:for="{{item.spec}}
" wx:for-item="spec">{{spec.type}}:{{spec.value}}
<view class="goods-
spec cr-888" wx:for="{{item.spec}}" wx:key="key
" wx:for-item="spec">{{spec.type}}:{{spec.value}}
</view>
</view>
</block>
</block>
</view>
</view>
...
@@ -42,11 +42,11 @@
...
@@ -42,11 +42,11 @@
</view>
</view>
<!-- 留言 -->
<!-- 留言 -->
<textarea bindinput="bind_user_note_event" maxlength="60" auto-height placeholder="留言" class="spacing-mb" />
<textarea bindinput="bind_user_note_event" maxlength="60" auto-height placeholder="留言" class="
content-textarea bg-white
spacing-mb" />
<!-- 扩展数据展示 -->
<!-- 扩展数据展示 -->
<view wx:if="{{extension_list.length > 0}}" class="extension-list spacing-mb">
<view wx:if="{{extension_list.length > 0}}" class="extension-list spacing-mb">
<view wx:for="{{extension_list}}" class="item oh">
<view wx:for="{{extension_list}}"
wx:key="key"
class="item oh">
<text class="cr-666">{{item.name}}
<text class="cr-666">{{item.name}}
</text>
</text>
<text class="text-tips fr">{{item.tips}}
<text class="text-tips fr">{{item.tips}}
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
<!-- 支付方式 -->
<!-- 支付方式 -->
<view wx:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
<view wx:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
<view class="item tc fl" wx:for="{{payment_list}}">
<view class="item tc fl" wx:for="{{payment_list}}"
wx:key="key"
>
<view class="item-content br {{(item.selected || '')}}" data-value="{{item.id}}" bindtap="payment_event">
<view class="item-content br {{(item.selected || '')}}" data-value="{{item.id}}" bindtap="payment_event">
<image wx:if="{{(item.logo || null) != null}}" class="icon" src="{{item.logo}}" mode="widthFix" />
<image wx:if="{{(item.logo || null) != null}}" class="icon" src="{{item.logo}}" mode="widthFix" />
<text>{{item.name}}</text>
<text>{{item.name}}</text>
...
...
public/appmini/old/wechat/pages/buy/buy.wxss
浏览文件 @
1bb757a3
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
}
}
.address-divider {
.address-divider {
height: 4px;
height: 4px;
background-image: url("
/images/buy-address-divider.png
");
background-image: url("
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD4AAAAECAYAAADWIIyPAAAAkklEQVR42mP4jwR+7tr1/4OzM1Xwt46O/6SA3Yd//HeLeU0V3DXjE0H7GGCMvw8f/v/o5UUVT39KTPz/78cPoj398Omf/75Jb6ji6ZSyd/9//PxHnMdBjvyUlEQVT4MC7++DB0R7GuTIlPJ3VPE0KPAePvlDlL1gj3/r6qJaEv+5YwdJSbxn5meqJfGdh74TbS8A1dn662xhNdIAAAAASUVORK5CYII=
");
background-repeat-y: no-repeat;
background-repeat-y: no-repeat;
}
}
.address-detail .text, .goods-title {
.address-detail .text, .goods-title {
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
.goods-item {
.goods-item {
padding: 20rpx 10rpx;
padding: 20rpx 10rpx;
}
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
margin-bottom: 10rpx;
}
}
.goods-image {
.goods-image {
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
}
}
.goods-base {
.goods-base {
min-height: 160rpx;
min-height: 160rpx;
margin-left: 180rpx;
}
}
/**
/**
...
@@ -120,4 +121,13 @@
...
@@ -120,4 +121,13 @@
}
}
.extension-list .item .text-tips {
.extension-list .item .text-tips {
color: #ff8f44;
color: #ff8f44;
}
/**
* 留言
*/
.content-textarea {
padding: 10rpx;
min-height: 10vh;
width: 100%;
}
}
\ No newline at end of file
public/appmini/old/wechat/pages/cart/cart.wxss
浏览文件 @
1bb757a3
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
.number-content input {
.number-content input {
width: 30px;
width: 30px;
background: #fff;
background: #fff;
border-radius: 0px;
}
}
.number-content .number-submit,
.number-content .number-submit,
.number-content input
.number-content input
...
...
public/appmini/old/wechat/pages/goods-detail/goods-detail.js
浏览文件 @
1bb757a3
...
@@ -60,7 +60,7 @@ Page({
...
@@ -60,7 +60,7 @@ Page({
var
self
=
this
;
var
self
=
this
;
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
'
加载中...
'
});
wx
.
showLoading
({
title
:
'
加载中...
'
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
@@ -205,7 +205,7 @@ Page({
...
@@ -205,7 +205,7 @@ Page({
});
});
return
false
;
return
false
;
}
else
{
}
else
{
wx
.
showLoading
({
content
:
'
处理中...
'
});
wx
.
showLoading
({
title
:
'
处理中...
'
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
'
favor
'
,
'
goods
'
),
url
:
app
.
get_request_url
(
'
favor
'
,
'
goods
'
),
...
@@ -246,7 +246,7 @@ Page({
...
@@ -246,7 +246,7 @@ Page({
});
});
return
false
;
return
false
;
}
else
{
}
else
{
wx
.
showLoading
({
content
:
'
处理中...
'
});
wx
.
showLoading
({
title
:
'
处理中...
'
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
'
save
'
,
'
cart
'
),
url
:
app
.
get_request_url
(
'
save
'
,
'
cart
'
),
method
:
'
POST
'
,
method
:
'
POST
'
,
...
...
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
浏览文件 @
1bb757a3
...
@@ -105,7 +105,7 @@
...
@@ -105,7 +105,7 @@
<view wx:if="{{goods_specifications_choose.length > 0}}" class="goods-attr-choose">
<view wx:if="{{goods_specifications_choose.length > 0}}" class="goods-attr-choose">
<view wx:for="{{goods_specifications_choose}}" wx:key="key" wx:for-index="key" class="item br-b">
<view wx:for="{{goods_specifications_choose}}" wx:key="key" wx:for-index="key" class="item br-b">
<view class="title">{{item.name}}</view>
<view class="title">{{item.name}}</view>
<view wx:if="{{item.value.length > 0}}" class="
attribute
">
<view wx:if="{{item.value.length > 0}}" class="
spec
">
<block wx:for="{{item.value}}" wx:key="key" wx:for-index="keys" wx:for-item="items">
<block wx:for="{{item.value}}" wx:key="key" wx:for-index="keys" wx:for-item="items">
<button catchtap="goods_specifications_event" data-key="{{key}}" data-keys="{{keys}}" type="default" size="mini" hover-class="none" class="{{items.is_active}} {{items.is_dont}} {{items.is_disabled}}">
<button catchtap="goods_specifications_event" data-key="{{key}}" data-keys="{{keys}}" type="default" size="mini" hover-class="none" class="{{items.is_active}} {{items.is_dont}} {{items.is_disabled}}">
<image wx:if="{{(items.images || null) != null}}" src="{{items.images}}" mode="scaleToFill" />
<image wx:if="{{(items.images || null) != null}}" src="{{items.images}}" mode="scaleToFill" />
...
...
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
浏览文件 @
1bb757a3
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
.goods-popup-content .title {
.goods-popup-content .title {
font-size: 36rpx;
font-size: 36rpx;
}
}
.goods-attr-choose .item .
attribute
button {
.goods-attr-choose .item .
spec
button {
margin-top: 20rpx;
margin-top: 20rpx;
margin-right: 25rpx;
margin-right: 25rpx;
padding: 0 30rpx;
padding: 0 30rpx;
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
height: 27px;
height: 27px;
border: 1px solid #d5d5d5;
border: 1px solid #d5d5d5;
}
}
.goods-attr-choose .item .
attribute
button image {
.goods-attr-choose .item .
spec
button image {
width: 20px;
width: 20px;
height: 20px;
height: 20px;
vertical-align: middle;
vertical-align: middle;
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
.spec-items-disabled image {
.spec-items-disabled image {
opacity: 0.3;
opacity: 0.3;
}
}
.goods-attr-choose .item .
attribute
button,
.goods-attr-choose .item .
spec
button,
.goods-popup-submit
.goods-popup-submit
{
{
border-radius: 50rpx;
border-radius: 50rpx;
...
@@ -123,6 +123,7 @@
...
@@ -123,6 +123,7 @@
.goods-popup .number-content input {
.goods-popup .number-content input {
width: 50px;
width: 50px;
background: #fff;
background: #fff;
border-radius: 0px;
}
}
.goods-popup .number-content .number-submit,
.goods-popup .number-content .number-submit,
.goods-popup .number-content input
.goods-popup .number-content input
...
...
public/appmini/old/wechat/pages/goods-search/goods-search.js
浏览文件 @
1bb757a3
...
@@ -51,7 +51,7 @@ Page({
...
@@ -51,7 +51,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
...
public/appmini/old/wechat/pages/goods-search/goods-search.wxml
浏览文件 @
1bb757a3
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
</scroll-view>
</scroll-view>
<!-- 筛选条件 popup -->
<!-- 筛选条件 popup -->
<component-popup prop-show="{{is_show_popup_form}}" prop-position="right"
prop-
onclose="popup_form_event_close">
<component-popup prop-show="{{is_show_popup_form}}" prop-position="right"
bind
onclose="popup_form_event_close">
<form bindsubmit="form_submit_event" class="popup-form oh bg-white">
<form bindsubmit="form_submit_event" class="popup-form oh bg-white">
<view class="item oh screening-price">
<view class="item oh screening-price">
<view class="title cr-666">价格区间(元)
<view class="title cr-666">价格区间(元)
...
...
public/appmini/old/wechat/pages/index/index.wxml
浏览文件 @
1bb757a3
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<view wx:if="{{load_status == 1 && common_app_is_enable_search == 1}}" class="search wh-auto">
<view wx:if="{{load_status == 1 && common_app_is_enable_search == 1}}" class="search wh-auto">
<view class="search-content bg-white oh">
<view class="search-content bg-white oh">
<icon type="search" size="16" />
<icon type="search" size="16" />
<input type="text" confirm-type="search" placeholder="其实搜索很简单^_^!" class="wh-auto cr-888"
onConfirm="search_input_event
" />
<input type="text" confirm-type="search" placeholder="其实搜索很简单^_^!" class="wh-auto cr-888"
bindconfirm="search_input_event" confirm-type="search
" />
</view>
</view>
</view>
</view>
...
...
public/appmini/old/wechat/pages/login/login.js
浏览文件 @
1bb757a3
...
@@ -62,6 +62,10 @@ Page({
...
@@ -62,6 +62,10 @@ Page({
this
.
setData
({
this
.
setData
({
user
:
app
.
get_user_cache_info
()
||
null
user
:
app
.
get_user_cache_info
()
||
null
});
});
if
((
this
.
data
.
user
.
mobile
||
null
)
!=
null
)
{
wx
.
navigateBack
();
}
},
},
/**
/**
...
@@ -83,7 +87,7 @@ Page({
...
@@ -83,7 +87,7 @@ Page({
{
{
// 网络请求
// 网络请求
var
$this
=
this
;
var
$this
=
this
;
wx
.
showLoading
({
content
:
'
发送中...
'
});
wx
.
showLoading
({
title
:
'
发送中...
'
});
this
.
setData
({
verify_submit_text
:
'
发送中
'
,
verify_loading
:
true
,
verify_disabled
:
true
});
this
.
setData
({
verify_submit_text
:
'
发送中
'
,
verify_loading
:
true
,
verify_disabled
:
true
});
wx
.
request
({
wx
.
request
({
...
@@ -146,7 +150,7 @@ Page({
...
@@ -146,7 +150,7 @@ Page({
e
.
detail
.
value
[
'
app_type
'
]
=
'
weixin
'
;
e
.
detail
.
value
[
'
app_type
'
]
=
'
weixin
'
;
if
(
app
.
fields_check
(
e
.
detail
.
value
,
validation
))
if
(
app
.
fields_check
(
e
.
detail
.
value
,
validation
))
{
{
wx
.
showLoading
({
content
:
'
处理中...
'
});
wx
.
showLoading
({
title
:
'
处理中...
'
});
this
.
setData
({
form_submit_loading
:
true
});
this
.
setData
({
form_submit_loading
:
true
});
// 网络请求
// 网络请求
...
...
public/appmini/old/wechat/pages/message/message.js
浏览文件 @
1bb757a3
...
@@ -38,7 +38,7 @@ Page({
...
@@ -38,7 +38,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
...
public/appmini/old/wechat/pages/user-address-save/user-address-save.js
浏览文件 @
1bb757a3
...
@@ -55,7 +55,7 @@ Page({
...
@@ -55,7 +55,7 @@ Page({
get_user_address
()
{
get_user_address
()
{
var
self
=
this
;
var
self
=
this
;
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
"
detail
"
,
"
useraddress
"
),
url
:
app
.
get_request_url
(
"
detail
"
,
"
useraddress
"
),
...
@@ -257,7 +257,7 @@ Page({
...
@@ -257,7 +257,7 @@ Page({
if
(
app
.
fields_check
(
form_data
,
validation
))
{
if
(
app
.
fields_check
(
form_data
,
validation
))
{
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
处理中...
"
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
"
save
"
,
"
useraddress
"
),
url
:
app
.
get_request_url
(
"
save
"
,
"
useraddress
"
),
...
@@ -268,7 +268,7 @@ Page({
...
@@ -268,7 +268,7 @@ Page({
success
:
res
=>
{
success
:
res
=>
{
wx
.
hideLoading
();
wx
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
if
(
res
.
data
.
code
==
0
)
{
app
.
showToast
(
res
.
data
.
msg
);
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
setTimeout
(
function
()
{
setTimeout
(
function
()
{
wx
.
navigateBack
();
wx
.
navigateBack
();
},
1000
);
},
1000
);
...
...
public/appmini/old/wechat/pages/user-address/user-address.js
浏览文件 @
1bb757a3
...
@@ -35,7 +35,7 @@ Page({
...
@@ -35,7 +35,7 @@ Page({
// 获取数据列表
// 获取数据列表
get_data_list
()
{
get_data_list
()
{
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
@@ -117,7 +117,7 @@ Page({
...
@@ -117,7 +117,7 @@ Page({
success
:
result
=>
{
success
:
result
=>
{
if
(
result
.
confirm
)
{
if
(
result
.
confirm
)
{
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
处理中...
"
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
// 获取数据
// 获取数据
wx
.
request
({
wx
.
request
({
...
@@ -140,13 +140,11 @@ Page({
...
@@ -140,13 +140,11 @@ Page({
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
// 当前删除是否存在缓存中,存在则删除
// 当前删除是否存在缓存中,存在则删除
var
cache_address
=
wx
.
getStorageSync
({
var
cache_address
=
wx
.
getStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
key
:
app
.
data
.
cache_buy_user_address_select_key
});
if
((
cache_address
.
data
||
null
)
!=
null
)
{
if
((
cache_address
.
data
||
null
)
!=
null
)
{
if
(
cache_address
.
data
.
id
==
value
)
{
if
(
cache_address
.
data
.
id
==
value
)
{
// 删除地址缓存
// 删除地址缓存
wx
.
removeStorageSync
(
{
key
:
app
.
data
.
cache_buy_user_address_select_key
}
);
wx
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
}
}
}
}
...
@@ -182,7 +180,7 @@ Page({
...
@@ -182,7 +180,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
处理中...
"
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
// 获取数据
// 获取数据
wx
.
request
({
wx
.
request
({
...
...
public/appmini/old/wechat/pages/user-address/user-address.wxml
浏览文件 @
1bb757a3
<view class="page">
<view class="page">
<view wx:if="{{data_list.length > 0}}">
<view wx:if="{{data_list.length > 0}}">
<view class="item bg-white spacing-mb" wx:for="{{data_list}}">
<view class="item bg-white spacing-mb" wx:for="{{data_list}}"
wx:key="key"
>
<view bindtap="address_conent_event" data-index="{{index}}">
<view bindtap="address_conent_event" data-index="{{index}}">
<view class="base oh">
<view class="base oh">
<text>{{item.name}}</text>
<text>{{item.name}}</text>
...
@@ -17,9 +17,9 @@
...
@@ -17,9 +17,9 @@
<image wx:else class="item-icon" src="/images/default-select-icon.png" mode="widthFix" />
<image wx:else class="item-icon" src="/images/default-select-icon.png" mode="widthFix" />
<text>设为默认地址</text>
<text>设为默认地址</text>
</view>
</view>
<button class="fr cr-666 delete-submit" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
<button class="fr cr-666 delete-submit
br
" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
<navigator url="/pages/user-address-save/user-address-save?id={{item.id}}" open-type="navigate" hover-class="none">
<navigator url="/pages/user-address-save/user-address-save?id={{item.id}}" open-type="navigate" hover-class="none">
<button class="fr cr-666" type="default" size="mini" bindtap="address_edit_event" hover-class="none">编辑</button>
<button class="fr cr-666
br
" type="default" size="mini" bindtap="address_edit_event" hover-class="none">编辑</button>
</navigator>
</navigator>
</view>
</view>
</view>
</view>
...
...
public/appmini/old/wechat/pages/user-answer-list/user-answer-list.js
浏览文件 @
1bb757a3
...
@@ -38,7 +38,7 @@ Page({
...
@@ -38,7 +38,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
...
public/appmini/old/wechat/pages/user-faovr/user-faovr.js
浏览文件 @
1bb757a3
...
@@ -37,7 +37,7 @@ Page({
...
@@ -37,7 +37,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
@@ -132,7 +132,7 @@ Page({
...
@@ -132,7 +132,7 @@ Page({
var
index
=
e
.
currentTarget
.
dataset
.
index
;
var
index
=
e
.
currentTarget
.
dataset
.
index
;
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
处理中...
"
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
"
cancel
"
,
"
usergoodsfavor
"
),
url
:
app
.
get_request_url
(
"
cancel
"
,
"
usergoodsfavor
"
),
...
...
public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.js
浏览文件 @
1bb757a3
...
@@ -37,7 +37,7 @@ Page({
...
@@ -37,7 +37,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
@@ -131,7 +131,7 @@ Page({
...
@@ -131,7 +131,7 @@ Page({
var
index
=
e
.
currentTarget
.
dataset
.
index
;
var
index
=
e
.
currentTarget
.
dataset
.
index
;
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
处理中...
"
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
"
delete
"
,
"
usergoodsbrowse
"
),
url
:
app
.
get_request_url
(
"
delete
"
,
"
usergoodsbrowse
"
),
...
...
public/appmini/old/wechat/pages/user-integral/user-integral.js
浏览文件 @
1bb757a3
...
@@ -38,7 +38,7 @@ Page({
...
@@ -38,7 +38,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
...
public/appmini/old/wechat/pages/user-order-detail/user-order-detail.js
浏览文件 @
1bb757a3
...
@@ -20,7 +20,7 @@ Page({
...
@@ -20,7 +20,7 @@ Page({
init
()
{
init
()
{
var
self
=
this
;
var
self
=
this
;
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
...
public/appmini/old/wechat/pages/user-order-detail/user-order-detail.wxml
浏览文件 @
1bb757a3
...
@@ -49,6 +49,6 @@
...
@@ -49,6 +49,6 @@
<view class="nav-back tc wh-auto">
<view class="nav-back tc wh-auto">
<navigator url="/pages/user-order/user-order" open-type="navigateBack" hover-class="none">
<navigator url="/pages/user-order/user-order" open-type="navigateBack" hover-class="none">
<button type="default" size="mini" class="cr-888" hover-class="none">返回</button>
<button type="default" size="mini" class="cr-888
br
" hover-class="none">返回</button>
</navigator>
</navigator>
</view>
</view>
\ No newline at end of file
public/appmini/old/wechat/pages/user-order/user-order.js
浏览文件 @
1bb757a3
...
@@ -77,7 +77,7 @@ Page({
...
@@ -77,7 +77,7 @@ Page({
}
}
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
加载中...
"
});
wx
.
showLoading
({
title
:
"
加载中...
"
});
this
.
setData
({
this
.
setData
({
data_list_loding_status
:
1
data_list_loding_status
:
1
});
});
...
@@ -211,7 +211,7 @@ Page({
...
@@ -211,7 +211,7 @@ Page({
// 支付方法
// 支付方法
pay_handle
(
order_id
,
index
)
{
pay_handle
(
order_id
,
index
)
{
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
请求中...
"
});
wx
.
showLoading
({
title
:
"
请求中...
"
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
"
pay
"
,
"
order
"
),
url
:
app
.
get_request_url
(
"
pay
"
,
"
order
"
),
...
@@ -283,7 +283,7 @@ Page({
...
@@ -283,7 +283,7 @@ Page({
var
index
=
e
.
currentTarget
.
dataset
.
index
;
var
index
=
e
.
currentTarget
.
dataset
.
index
;
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
处理中...
"
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
"
cancel
"
,
"
order
"
),
url
:
app
.
get_request_url
(
"
cancel
"
,
"
order
"
),
...
@@ -327,7 +327,7 @@ Page({
...
@@ -327,7 +327,7 @@ Page({
var
index
=
e
.
currentTarget
.
dataset
.
index
;
var
index
=
e
.
currentTarget
.
dataset
.
index
;
// 加载loding
// 加载loding
wx
.
showLoading
({
content
:
"
处理中...
"
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
wx
.
request
({
wx
.
request
({
url
:
app
.
get_request_url
(
"
collect
"
,
"
order
"
),
url
:
app
.
get_request_url
(
"
collect
"
,
"
order
"
),
...
...
public/appmini/old/wechat/pages/user-order/user-order.wxml
浏览文件 @
1bb757a3
...
@@ -36,11 +36,11 @@
...
@@ -36,11 +36,11 @@
<view wx:if="{{item.status <= 3}}" class="item-operation tr br-t">
<view wx:if="{{item.status <= 3}}" class="item-operation tr br-t">
<button wx:if="{{item.status <= 1}}" class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消
<button wx:if="{{item.status <= 1}}" class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消
</button>
</button>
<button wx:if="{{item.status == 1}}" class="submit-pay cr-666" type="default" size="mini" bindtap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付
<button wx:if="{{item.status == 1}}" class="submit-pay cr-666
br
" type="default" size="mini" bindtap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付
</button>
</button>
<button wx:if="{{item.status == 2}}" class="submit-rush cr-666" type="default" size="mini" bindtap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催
<button wx:if="{{item.status == 2}}" class="submit-rush cr-666
br
" type="default" size="mini" bindtap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催
</button>
</button>
<button wx:if="{{item.status == 3}}" class="submit-success cr-666" type="default" size="mini" bindtap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">收货
<button wx:if="{{item.status == 3}}" class="submit-success cr-666
br
" type="default" size="mini" bindtap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">收货
</button>
</button>
</view>
</view>
<view wx:if="{{data_list.length == 0}}">
<view wx:if="{{data_list.length == 0}}">
...
...
public/appmini/old/wechat/pages/user-order/user-order.wxss
浏览文件 @
1bb757a3
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
}
}
.goods-base {
.goods-base {
min-height: 160rpx;
min-height: 160rpx;
margin-left: 180rpx;
}
}
.goods-title {
.goods-title {
line-height: 36rpx;
line-height: 36rpx;
...
@@ -28,7 +29,7 @@
...
@@ -28,7 +29,7 @@
.goods-item {
.goods-item {
padding: 20rpx 10rpx;
padding: 20rpx 10rpx;
}
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
margin-bottom: 10rpx;
}
}
.goods-image {
.goods-image {
...
@@ -46,11 +47,11 @@
...
@@ -46,11 +47,11 @@
bottom: 0;
bottom: 0;
}
}
.item-base, .item-describe, .item-operation {
.item-base, .item-describe, .item-operation {
padding: 25rpx 10rpx
2
0rpx 10rpx;
padding: 25rpx 10rpx
1
0rpx 10rpx;
}
}
.submit-cancel {
.submit-cancel {
border: 1px solid #f7c3b3;
border: 1px solid #f7c3b3;
color: #f7c3b3;
color: #f7c3b3
!important
;
}
}
.item-operation button:not(:first-child) {
.item-operation button:not(:first-child) {
margin-left: 20rpx;
margin-left: 20rpx;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录