Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞鱼0526
ShopXO
提交
2f9217e9
ShopXO
项目概览
飞鱼0526
/
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,发现更多精彩内容 >>
提交
2f9217e9
编写于
1月 05, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
微信小程序
上级
fd385d41
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
173 addition
and
243 deletion
+173
-243
public/appmini/old/alipay/pages/user-faovr/user-faovr.axml
public/appmini/old/alipay/pages/user-faovr/user-faovr.axml
+1
-1
public/appmini/old/wechat/app.js
public/appmini/old/wechat/app.js
+1
-1
public/appmini/old/wechat/app.wxss
public/appmini/old/wechat/app.wxss
+11
-11
public/appmini/old/wechat/components/popup/popup.js
public/appmini/old/wechat/components/popup/popup.js
+2
-8
public/appmini/old/wechat/pages/answer-form/answer-form.js
public/appmini/old/wechat/pages/answer-form/answer-form.js
+3
-12
public/appmini/old/wechat/pages/cart/cart.wxml
public/appmini/old/wechat/pages/cart/cart.wxml
+2
-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-category/goods-category.js
...appmini/old/wechat/pages/goods-category/goods-category.js
+2
-8
public/appmini/old/wechat/pages/goods-detail/goods-detail.js
public/appmini/old/wechat/pages/goods-detail/goods-detail.js
+116
-161
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
...c/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
+3
-3
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
...c/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
+1
-0
public/appmini/old/wechat/pages/goods-search/goods-search.js
public/appmini/old/wechat/pages/goods-search/goods-search.js
+2
-8
public/appmini/old/wechat/pages/user-faovr/user-faovr.wxml
public/appmini/old/wechat/pages/user-faovr/user-faovr.wxml
+1
-1
public/appmini/old/wechat/pages/user-faovr/user-faovr.wxss
public/appmini/old/wechat/pages/user-faovr/user-faovr.wxss
+1
-1
public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.wxss
...old/wechat/pages/user-goods-browse/user-goods-browse.wxss
+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
+18
-18
public/appmini/old/wechat/pages/user-order/user-order.wxml
public/appmini/old/wechat/pages/user-order/user-order.wxml
+4
-4
public/appmini/old/wechat/pages/user/user.wxml
public/appmini/old/wechat/pages/user/user.wxml
+3
-3
未找到文件。
public/appmini/old/alipay/pages/user-faovr/user-faovr.axml
浏览文件 @
2f9217e9
...
...
@@ -11,7 +11,7 @@
</view>
</view>
</navigator>
<button class="submit-cancel" type="default" size="mini" onTap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
<button class="submit-cancel" type="default" size="mini" onTap="cancel_event" data-value="{{item.
goods_
id}}" data-index="{{index}}" hover-class="none">取消</button>
</view>
</view>
<view a:if="{{data_list.length == 0}}">
...
...
public/appmini/old/wechat/app.js
浏览文件 @
2f9217e9
...
...
@@ -167,7 +167,7 @@ App({
params
=
"
&
"
+
params
;
}
var
user
=
this
.
get_user_cache_info
();
var
app_client_user_id
=
user
==
false
?
""
:
user
.
we
chat
_openid
;
var
app_client_user_id
=
user
==
false
?
""
:
user
.
we
ixin
_openid
;
var
user_id
=
user
==
false
?
0
:
user
.
id
;
return
(
this
.
data
.
request_url
+
...
...
public/appmini/old/wechat/app.wxss
浏览文件 @
2f9217e9
...
...
@@ -78,7 +78,7 @@ textarea {
.nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; }
.tips { background: #ffffeb url('
/images/tips.png
') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 20px; font-size: 26rpx; border-radius: 2px; display: block; }
.tips { background: #ffffeb url('
data:image/png;base64,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
') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 20px; font-size: 26rpx; border-radius: 2px; display: block; }
.data-loding image { width: 60px; height: 60px; background-size: 80% 80% !important; }
...
...
@@ -97,7 +97,7 @@ textarea {
.br-r-dashed { border-right: dashed 1px #efefef; }
/* 箭头符号 */
.arrow-right { background-image: url('data:image/
svg+xml;charset=utf-8,<svg width="16" height="26" viewBox="0 0 16 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="UI-KIT_基础元件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="9.9基础元件" transform="translate(-5809.000000, -8482.000000)" fill="#C7C7CC"><polygon id="Disclosure-Indicator" points="5811 8482 5809 8484 5820.5 8495 5809 8506 5811 8508 5825 8495"></polygon></g></g></svg>'); background-size: 15px 10
px; background-repeat: no-repeat; background-position: center right; }
.arrow-right { background-image: url('data:image/
png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAA+klEQVRYR+3WsWrDMBAG4P/eotCQLlk73UGfq6O3BgLNEsg7JQQPZ7ADfos8gAeBijYTAsnpREJBXmX0f/7RCRNe/NCL81EBtYH/1YCq/gK4iMiu1PSYGlDVloi+AOyZ+bsEwgQYx/FtmqYDgFUphAmQvniOiDFuRaTxNGEGlEZkAWaIFsCHp4lsQEIMw7AIIRw9CBfgGgFgzcw/ljPhBtxoohGR7aOIIoC+799DCCciWsYYnwvwhKeWXA14w12AEuHZgFLhWYCS4WbAPDxn5m+NpukQquqZiD49V+81wgToum6TfkiYef/oRXPvPRPg3mY56xVQG6gN/AEiuagh/yEjYQAAAABJRU5ErkJggg=='); background-size: 18px 18
px; background-repeat: no-repeat; background-position: center right; }
/* 常用样式 */
...
...
@@ -253,17 +253,17 @@ textarea {
font-size: 32rpx;
border-radius: 0;
}
.bg-main.a-button-disabled
{
background-color: #fbe0e5;
color: #f7b6c2;
button[disabled].bg-main
{
background-color: #fbe0e5
!important
;
color: #f7b6c2
!important
;
}
.bg-warning.a-button-disabled
{
background-color: #ffcda6;
color: #fdae70;
button[disabled].bg-warning
{
background-color: #ffcda6
!important
;
color: #fdae70
!important
;
}
.bg-primary.a-button-disabled
{
background-color: #ffd2d7;
color: #ffa0ab;
button[disabled].bg-primary
{
background-color: #ffd2d7
!important
;
color: #ffa0ab
!important
;
}
.nav-back {
...
...
public/appmini/old/wechat/components/popup/popup.js
浏览文件 @
2f9217e9
...
...
@@ -9,8 +9,7 @@ Component({
propPosition
:
String
,
propMask
:
Boolean
,
propAnimation
:
Boolean
,
propDisablescroll
:
Boolean
,
propOnclose
:
String
propDisablescroll
:
Boolean
},
/**
...
...
@@ -25,12 +24,7 @@ Component({
*/
methods
:
{
onMaskTap
:
function
onMaskTap
()
{
var
onClose
=
this
.
propOnclose
;
console
.
log
(
onClose
)
if
(
onClose
)
{
onClose
();
}
this
.
triggerEvent
(
'
onclose
'
,
{},
{});
}
}
})
public/appmini/old/wechat/pages/answer-form/answer-form.js
浏览文件 @
2f9217e9
...
...
@@ -51,10 +51,7 @@ Page({
if
(
res
.
data
.
code
==
0
)
{
wx
.
showToast
({
type
:
'
success
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
setTimeout
(
function
()
{
wx
.
redirectTo
({
...
...
@@ -64,20 +61,14 @@ Page({
}
else
{
this
.
setData
({
form_submit_loading
:
false
});
wx
.
showToast
({
type
:
'
fail
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
);
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
this
.
setData
({
form_submit_loading
:
false
});
wx
.
showToast
({
type
:
'
fail
'
,
content
:
'
服务器请求出错
'
});
app
.
showToast
(
'
服务器请求出错
'
);
}
});
}
...
...
public/appmini/old/wechat/pages/cart/cart.wxml
浏览文件 @
2f9217e9
<view wx:if="{{data_list.length > 0}}" class="page">
<view wx:for="{{data_list}}" class="goods-item oh bg-white">
<view wx:for="{{data_list}}"
wx:key="key"
class="goods-item oh bg-white">
<!-- 选择 -->
<view bindtap="selectedt_event" data-type="node" data-index="{{index}}" class="fl selected">
<image wx:if="{{(item.selected || false)}}" class="icon" src="/images/default-select-active-icon.png" mode="widthFix" />
...
...
@@ -17,7 +17,7 @@
<view class="goods-title multi-text">{{item.title}}
</view>
<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>
<view class="goods-attribute cr-888" wx:for="{{item.spec}}" wx:
key="key" wx:
for-item="spec">{{spec.type}}:{{spec.value}}</view>
</block>
</view>
<!-- 数量 -->
...
...
public/appmini/old/wechat/pages/cart/cart.wxss
浏览文件 @
2f9217e9
...
...
@@ -57,6 +57,7 @@
}
.number-content input {
width: 30px;
background: #fff;
}
.number-content .number-submit,
.number-content input
...
...
public/appmini/old/wechat/pages/goods-category/goods-category.js
浏览文件 @
2f9217e9
...
...
@@ -51,10 +51,7 @@ Page({
data_bottom_line_status
:
true
,
});
wx
.
showToast
({
type
:
"
fail
"
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
);
}
},
fail
:
()
=>
{
...
...
@@ -64,10 +61,7 @@ Page({
data_bottom_line_status
:
true
,
});
wx
.
showToast
({
type
:
"
fail
"
,
content
:
"
服务器请求出错
"
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
...
...
public/appmini/old/wechat/pages/goods-detail/goods-detail.js
浏览文件 @
2f9217e9
...
...
@@ -129,10 +129,7 @@ Page({
data_list_loding_msg
:
'
服务器请求出错
'
,
});
wx
.
showToast
({
type
:
"
fail
"
,
content
:
"
服务器请求出错
"
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
}
...
...
@@ -200,10 +197,9 @@ Page({
// 收藏事件
goods_favor_event
(
e
)
{
var
user
=
app
.
get_user_info
(
this
,
'
goods_favor_event
'
);
if
(
user
!=
false
)
{
var
user
=
app
.
get_user_cache_info
(
this
,
'
goods_favor_event
'
);
// 用户未绑定用户则转到登录页面
if
(
(
user
.
mobile
||
null
)
==
null
)
{
if
(
user
==
false
||
(
user
.
mobile
||
null
)
==
null
)
{
wx
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
...
...
@@ -226,36 +222,25 @@ Page({
goods_favor_text
:
(
status
==
1
)
?
'
已收藏
'
:
'
收藏
'
,
goods_favor_icon
:
'
/images/goods-detail-favor-icon-
'
+
status
+
'
.png
'
});
wx
.
showToast
({
type
:
'
success
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
wx
.
showToast
({
type
:
'
fail
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
);
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
wx
.
showToast
({
type
:
'
fail
'
,
content
:
'
服务器请求出错
'
});
app
.
showToast
(
'
服务器请求出错
'
);
}
});
}
}
},
// 加入购物车事件
goods_cart_event
(
e
,
spec
)
{
var
user
=
app
.
get_user_info
(
this
,
'
goods_cart_event
'
);
if
(
user
!=
false
)
{
var
user
=
app
.
get_user_cache_info
(
this
,
'
goods_cart_event
'
);
// 用户未绑定用户则转到登录页面
if
(
(
user
.
mobile
||
null
)
==
null
)
{
if
(
user
==
false
||
(
user
.
mobile
||
null
)
==
null
)
{
wx
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
...
...
@@ -271,28 +256,18 @@ Page({
wx
.
hideLoading
();
if
(
res
.
data
.
code
==
0
)
{
this
.
popup_close_event
();
wx
.
showToast
({
type
:
'
success
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
,
"
success
"
);
}
else
{
wx
.
showToast
({
type
:
'
fail
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
);
}
},
fail
:
()
=>
{
wx
.
hideLoading
();
wx
.
showToast
({
type
:
'
fail
'
,
content
:
'
服务器请求出错
'
});
app
.
showToast
(
'
服务器请求出错
'
);
}
});
}
}
},
// 规格事件
...
...
@@ -411,17 +386,11 @@ Page({
this
.
setData
({
goods_specifications_choose
:
temp_data
});
}
}
else
{
wx
.
showToast
({
type
:
'
fail
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
);
}
},
fail
:
()
=>
{
wx
.
showToast
({
type
:
'
fail
'
,
content
:
'
服务器请求出错
'
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
...
...
@@ -471,17 +440,11 @@ Page({
goods_spec_base_inventory
:
res
.
data
.
data
.
inventory
,
});
}
else
{
wx
.
showToast
({
type
:
'
fail
'
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
);
}
},
fail
:
()
=>
{
wx
.
showToast
({
type
:
'
fail
'
,
content
:
'
服务器请求出错
'
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
...
...
@@ -517,28 +480,27 @@ Page({
buy_number
=
buy_min_number
;
if
(
buy_min_number
>
1
)
{
wx
.
showToast
({
content
:
'
起购
'
+
buy_min_number
+
inventory_unit
}
);
app
.
showToast
(
'
起购
'
+
buy_min_number
+
inventory_unit
);
}
}
if
(
buy_max_number
>
0
&&
buy_number
>
buy_max_number
)
{
buy_number
=
buy_max_number
;
wx
.
showToast
({
content
:
'
限购
'
+
buy_max_number
+
inventory_unit
}
);
app
.
showToast
(
'
限购
'
+
buy_max_number
+
inventory_unit
);
}
if
(
buy_number
>
inventory
)
{
buy_number
=
inventory
;
wx
.
showToast
({
content
:
'
库存数量
'
+
inventory
+
inventory_unit
}
);
app
.
showToast
(
'
库存数量
'
+
inventory
+
inventory_unit
);
}
this
.
setData
({
temp_buy_number
:
buy_number
});
},
// 确认
goods_buy_confirm_event
(
e
)
{
var
user
=
app
.
get_user_info
(
this
,
'
goods_buy_confirm_event
'
);
if
(
user
!=
false
)
{
var
user
=
app
.
get_user_cache_info
(
this
,
'
goods_buy_confirm_event
'
);
// 用户未绑定用户则转到登录页面
if
(
(
user
.
mobile
||
null
)
==
null
)
{
if
(
user
==
false
||
(
user
.
mobile
||
null
)
==
null
)
{
wx
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
...
...
@@ -564,10 +526,7 @@ Page({
}
if
(
active_count
<
sku_count
)
{
wx
.
showToast
({
type
:
'
fail
'
,
content
:
'
请选择属性
'
});
app
.
showToast
(
'
请选择属性
'
);
return
false
;
}
}
...
...
@@ -593,11 +552,7 @@ Page({
break
;
default
:
wx
.
showToast
({
type
:
"
fail
"
,
content
:
"
操作事件类型有误
"
});
}
app
.
showToast
(
"
操作事件类型有误
"
);
}
}
},
...
...
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
浏览文件 @
2f9217e9
...
...
@@ -77,7 +77,7 @@
</view>
<!-- 弹层 -->
<component-popup prop-show="{{popup_status}}" prop-position="bottom"
prop-
onclose="popup_close_event">
<component-popup prop-show="{{popup_status}}" prop-position="bottom"
bind
onclose="popup_close_event">
<view class="goods-popup bg-white">
<view class="close fr oh">
<view class="fr" catchtap="popup_close_event">
...
...
@@ -103,10 +103,10 @@
<view class="goods-popup-content">
<!-- 商品属性 -->
<view wx:if="{{goods_specifications_choose.length > 0}}" class="goods-attr-choose">
<view wx:for="{{goods_specifications_choose}}" 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 wx:if="{{item.value.length > 0}}" class="attribute">
<block wx:for="{{item.value}}" 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}}">
<image wx:if="{{(items.images || null) != null}}" src="{{items.images}}" mode="scaleToFill" />
{{items.name}}
...
...
public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss
浏览文件 @
2f9217e9
...
...
@@ -122,6 +122,7 @@
}
.goods-popup .number-content input {
width: 50px;
background: #fff;
}
.goods-popup .number-content .number-submit,
.goods-popup .number-content input
...
...
public/appmini/old/wechat/pages/goods-search/goods-search.js
浏览文件 @
2f9217e9
...
...
@@ -114,10 +114,7 @@ Page({
data_list_loding_status
:
0
});
wx
.
showToast
({
type
:
"
fail
"
,
content
:
res
.
data
.
msg
});
app
.
showToast
(
res
.
data
.
msg
);
}
},
fail
:
()
=>
{
...
...
@@ -127,10 +124,7 @@ Page({
this
.
setData
({
data_list_loding_status
:
2
});
wx
.
showToast
({
type
:
"
fail
"
,
content
:
"
服务器请求出错
"
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
...
...
public/appmini/old/wechat/pages/user-faovr/user-faovr.wxml
浏览文件 @
2f9217e9
...
...
@@ -11,7 +11,7 @@
</view>
</view>
</navigator>
<button class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
<button class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.
goods_
id}}" data-index="{{index}}" hover-class="none">取消</button>
</view>
</view>
<view wx:if="{{data_list.length == 0}}">
...
...
public/appmini/old/wechat/pages/user-faovr/user-faovr.wxss
浏览文件 @
2f9217e9
...
...
@@ -22,6 +22,6 @@
right: 10rpx;
bottom: 20rpx;
border: 1px solid #f7c3b3;
color: #f7c3b3;
color: #f7c3b3
!important
;
padding: 0 35rpx;
}
\ No newline at end of file
public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.wxss
浏览文件 @
2f9217e9
...
...
@@ -22,6 +22,6 @@
right: 10rpx;
bottom: 20rpx;
border: 1px solid #f7c3b3;
color: #f7c3b3;
color: #f7c3b3
!important
;
padding: 0 35rpx;
}
\ No newline at end of file
public/appmini/old/wechat/pages/user-order-detail/user-order-detail.js
浏览文件 @
2f9217e9
...
...
@@ -40,24 +40,24 @@ Page({
self
.
setData
({
detail
:
data
,
detail_list
:[
{
name
:
"
订单号
"
,
value
:
data
.
order_no
},
{
name
:
"
状态
"
,
value
:
data
.
status_name
},
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
},
{
name
:
"
单价
"
,
value
:
data
.
price
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
},
{
name
:
"
优惠
"
,
value
:
data
.
preferential_price
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
},
{
name
:
"
快递单号
"
,
value
:
data
.
expres_number
},
{
name
:
"
用户留言
"
,
value
:
data
.
user_note
},
{
name
:
"
创建时间
"
,
value
:
data
.
add_time
},
{
name
:
"
确认时间
"
,
value
:
data
.
confirm_time
},
{
name
:
"
支付时间
"
,
value
:
data
.
pay_time
},
{
name
:
"
发货时间
"
,
value
:
data
.
delivery_time
},
{
name
:
"
收货时间
"
,
value
:
data
.
collect_time
},
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
},
{
name
:
"
订单号
"
,
value
:
data
.
order_no
||
''
},
{
name
:
"
状态
"
,
value
:
data
.
status_name
||
''
},
{
name
:
"
支付状态
"
,
value
:
data
.
pay_status_name
||
''
},
{
name
:
"
单价
"
,
value
:
data
.
price
||
''
},
{
name
:
"
总价
"
,
value
:
data
.
total_price
||
''
},
{
name
:
"
优惠
"
,
value
:
data
.
preferential_price
||
''
},
{
name
:
"
支付金额
"
,
value
:
data
.
pay_price
||
''
},
{
name
:
"
支付方式
"
,
value
:
data
.
payment_name
||
''
},
{
name
:
"
快递公司
"
,
value
:
data
.
express_name
||
''
},
{
name
:
"
快递单号
"
,
value
:
data
.
expres_number
||
''
},
{
name
:
"
用户留言
"
,
value
:
data
.
user_note
||
''
},
{
name
:
"
创建时间
"
,
value
:
data
.
add_time
||
''
},
{
name
:
"
确认时间
"
,
value
:
data
.
confirm_time
||
''
},
{
name
:
"
支付时间
"
,
value
:
data
.
pay_time
||
''
},
{
name
:
"
发货时间
"
,
value
:
data
.
delivery_time
||
''
},
{
name
:
"
收货时间
"
,
value
:
data
.
collect_time
||
''
},
{
name
:
"
取消时间
"
,
value
:
data
.
close_time
||
''
},
{
name
:
"
关闭时间
"
,
value
:
data
.
close_time
||
''
},
],
data_list_loding_status
:
3
,
data_bottom_line_status
:
true
,
...
...
public/appmini/old/wechat/pages/user-order/user-order.wxml
浏览文件 @
2f9217e9
...
...
@@ -9,18 +9,18 @@
<!-- 订单列表 -->
<scroll-view scroll-y="{{true}}" class="scroll-box" bindscrolltolower="scroll_lower" lower-threshold="30">
<view class="list-content">
<view class="list-item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}">
<view class="list-item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}"
wx:key="key"
>
<view class="item-base oh br-b">
<text class="cr-666">{{item.add_time}}</text>
<text class="fr cr-main">{{item.status_name}}</text>
</view>
<view wx:for="{{item.items}}" wx:for-item="detail" class="goods-item oh">
<view wx:for="{{item.items}}" wx:
key="key" wx:
for-item="detail" class="goods-item oh">
<navigator url="/pages/user-order-detail/user-order-detail?id={{item.id}}">
<image class="goods-image fl" src="{{detail.images}}" mode="aspectFill" />
<view class="goods-base">
<view class="goods-title multi-text" >{{detail.title}}</view>
<block wx:if="{{detail.spec != null}}">
<view class="goods-spec cr-888" wx:for="{{detail.spec}}" wx:for-item="spec">
<view class="goods-spec cr-888" wx:for="{{detail.spec}}" wx:
key="key" wx:
for-item="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
@@ -56,7 +56,7 @@
</scroll-view>
<!-- 支付方式 popup -->
<component-popup prop-show="{{is_show_payment_popup}}" prop-position="bottom"
prop-
onclose="payment_popup_event_close">
<component-popup prop-show="{{is_show_payment_popup}}" prop-position="bottom"
bind
onclose="payment_popup_event_close">
<view wx:if="{{payment_list.length > 0}}" class="payment-list oh bg-white">
<view class="item tc fl" wx:for="{{payment_list}}">
<view class="item-content br" data-value="{{item.id}}" bindtap="popup_payment_event">
...
...
public/appmini/old/wechat/pages/user/user.wxml
浏览文件 @
2f9217e9
...
...
@@ -6,7 +6,7 @@
</view>
<view wx:if="{{head_nav_list.length > 0}}" class="head-nav oh wh-auto">
<block wx:for="{{head_nav_list}}">
<block wx:for="{{head_nav_list}}"
wx:key="key"
>
<navigator url="/pages/{{item.url}}/{{item.url}}" hover-class="none">
<view class="head-nav-item tc fl">
<view>{{item.count}}</view>
...
...
@@ -27,7 +27,7 @@
<!-- 导航 -->
<view class="nav-box bg-white">
<block wx:for="{{nav_lists}}">
<block wx:for="{{nav_lists}}"
wx:key="key"
>
<view wx:if="{{item.is_show == 1}}">
<navigator url="/pages/{{item.url}}/{{item.url}}" class="nav-item br-b" hover-class="none">
<view class="arrow-right">
...
...
@@ -37,7 +37,7 @@
</navigator>
</view>
<view wx:if="{{item.url == 'user-order' && user_order_status_list.length > 0}}" class="items-list br-b oh">
<block wx:for="{{user_order_status_list}}" wx:for-item="items">
<block wx:for="{{user_order_status_list}}" wx:
key="key" wx:
for-item="items">
<navigator url="/pages/{{item.url}}/{{item.url}}?status={{items.status}}" hover-class="none">
<view class="items fl tc">
<view class="badge-icon">
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录