Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
starsw001
ShopXO
提交
c4b433fe
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,发现更多精彩内容 >>
提交
c4b433fe
编写于
1月 19, 2020
作者:
D
devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
微信小程序开发
上级
552e6abb
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
110 addition
and
41 deletion
+110
-41
public/appmini/old/alipay/app.acss
public/appmini/old/alipay/app.acss
+1
-0
public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js
.../old/alipay/pages/plugins/membershiplevelvip/user/user.js
+2
-2
public/appmini/old/baidu/app.css
public/appmini/old/baidu/app.css
+1
-0
public/appmini/old/qq/app.qss
public/appmini/old/qq/app.qss
+1
-0
public/appmini/old/toutiao/app.ttss
public/appmini/old/toutiao/app.ttss
+1
-0
public/appmini/old/weixin/app.json
public/appmini/old/weixin/app.json
+5
-5
public/appmini/old/weixin/app.wxss
public/appmini/old/weixin/app.wxss
+1
-0
public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
...plugins/distribution/extraction-order/extraction-order.js
+29
-0
public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
...ugins/distribution/extraction-order/extraction-order.wxml
+47
-27
public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
...ugins/distribution/extraction-order/extraction-order.wxss
+14
-0
public/appmini/old/weixin/pages/plugins/distribution/user/user.js
...ppmini/old/weixin/pages/plugins/distribution/user/user.js
+5
-4
public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml
...mini/old/weixin/pages/plugins/distribution/user/user.wxml
+1
-1
public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js
.../old/weixin/pages/plugins/membershiplevelvip/user/user.js
+2
-2
未找到文件。
public/appmini/old/alipay/app.acss
浏览文件 @
c4b433fe
...
...
@@ -86,6 +86,7 @@ textarea {
.fr { float: right; }
.bg-white { background-color: #fff; }
.wh-auto { width: 100%; }
.ht-auto { height: 100%; }
.tc { text-align: center; }
.tl { text-align: left; }
.tr { text-align: right; }
...
...
public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js
浏览文件 @
c4b433fe
...
...
@@ -40,14 +40,14 @@ Page({
});
}
self
.
setData
({
avatar
:
user
.
avatar
||
app
.
data
.
default_user_head_src
,
avatar
:
((
self
.
data
.
avatar
||
null
)
==
null
)
?
(
user
.
avatar
||
app
.
data
.
default_user_head_src
)
:
self
.
data
.
avatar
,
nickname
:
user
.
nickname
||
'
用户名
'
,
});
},
});
}
else
{
self
.
setData
({
avatar
:
user
.
avatar
||
app
.
data
.
default_user_head_src
,
avatar
:
((
self
.
data
.
avatar
||
null
)
==
null
)
?
(
user
.
avatar
||
app
.
data
.
default_user_head_src
)
:
self
.
data
.
avatar
,
nickname
:
user
.
nickname
||
'
用户名
'
,
});
...
...
public/appmini/old/baidu/app.css
浏览文件 @
c4b433fe
...
...
@@ -93,6 +93,7 @@ textarea {
.fr
{
float
:
right
;
}
.bg-white
{
background-color
:
#fff
;
}
.wh-auto
{
width
:
100%
;
}
.ht-auto
{
height
:
100%
;
}
.tc
{
text-align
:
center
;
}
.tl
{
text-align
:
left
;
}
.tr
{
text-align
:
right
;
}
...
...
public/appmini/old/qq/app.qss
浏览文件 @
c4b433fe
...
...
@@ -93,6 +93,7 @@ textarea {
.fr { float: right; }
.bg-white { background-color: #fff; }
.wh-auto { width: 100%; }
.ht-auto { height: 100%; }
.tc { text-align: center; }
.tl { text-align: left; }
.tr { text-align: right; }
...
...
public/appmini/old/toutiao/app.ttss
浏览文件 @
c4b433fe
...
...
@@ -94,6 +94,7 @@ textarea {
.fr { float: right; }
.bg-white { background-color: #fff; }
.wh-auto { width: 100%; }
.ht-auto { height: 100%; }
.tc { text-align: center; }
.tl { text-align: left; }
.tr { text-align: right; }
...
...
public/appmini/old/weixin/app.json
浏览文件 @
c4b433fe
{
"pages"
:
[
"pages/plugins/distribution/extraction/extraction"
,
"pages/plugins/distribution/extraction-apply/extraction-apply"
,
"pages/plugins/distribution/extraction-order/extraction-order"
,
"pages/plugins/distribution/user/user"
,
"pages/index/index"
,
"pages/goods-category/goods-category"
,
...
...
@@ -31,6 +28,7 @@
"pages/user-orderaftersale/user-orderaftersale"
,
"pages/user-orderaftersale-detail/user-orderaftersale-detail"
,
"pages/extraction-address/extraction-address"
,
"pages/common/open-setting-location/open-setting-location"
,
"pages/plugins/coupon/index/index"
,
"pages/plugins/coupon/user/user"
,
"pages/plugins/membershiplevelvip/index/index"
,
...
...
@@ -50,8 +48,10 @@
"pages/plugins/distribution/statistics/statistics"
,
"pages/plugins/distribution/poster/poster"
,
"pages/plugins/distribution/team/team"
,
"pages/plugins/distribution/introduce/introduce"
,
"pages/common/open-setting-location/open-setting-location"
"pages/plugins/distribution/extraction/extraction"
,
"pages/plugins/distribution/extraction-apply/extraction-apply"
,
"pages/plugins/distribution/extraction-order/extraction-order"
,
"pages/plugins/distribution/introduce/introduce"
],
"permission"
:
{
"scope.userLocation"
:
{
...
...
public/appmini/old/weixin/app.wxss
浏览文件 @
c4b433fe
...
...
@@ -93,6 +93,7 @@ textarea {
.fr { float: right; }
.bg-white { background-color: #fff; }
.wh-auto { width: 100%; }
.ht-auto { height: 100%; }
.tc { text-align: center; }
.tl { text-align: left; }
.tr { text-align: right; }
...
...
public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
浏览文件 @
c4b433fe
...
...
@@ -19,6 +19,9 @@ Page({
extraction_value
:
null
,
extraction_code
:
''
,
form_submit_disabled_status
:
false
,
is_show_search_popup
:
false
,
search_keywords_value
:
''
,
},
onLoad
(
params
)
{
...
...
@@ -89,6 +92,7 @@ Page({
data
:
{
page
:
this
.
data
.
data_page
,
status
:
status
||
0
,
keywords
:
this
.
data
.
search_keywords_value
||
''
,
},
dataType
:
"
json
"
,
success
:
res
=>
{
...
...
@@ -213,6 +217,7 @@ Page({
extraction_code
:
self
.
data
.
extraction_code
,
};
self
.
setData
({
form_submit_disabled_status
:
true
});
wx
.
showLoading
({
title
:
"
处理中...
"
});
wx
.
request
({
url
:
app
.
get_request_url
(
"
take
"
,
"
extraction
"
,
"
distribution
"
),
method
:
"
POST
"
,
...
...
@@ -242,4 +247,28 @@ Page({
}
});
},
// 搜索弹层-开启
drag_event
(
e
)
{
this
.
setData
({
is_show_search_popup
:
true
});
},
// 搜索弹层-关闭
search_popup_event_close
()
{
this
.
setData
({
is_show_search_popup
:
false
});
},
// 搜索关键字输入事件
search_input_keywords_event
(
e
)
{
this
.
setData
({
search_keywords_value
:
e
.
detail
.
value
||
''
});
},
// 搜索确认事件
search_submit_event
(
e
)
{
this
.
setData
({
is_show_search_popup
:
false
,
data_page
:
1
,
});
this
.
get_data_list
(
1
);
},
});
\ No newline at end of file
public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
浏览文件 @
c4b433fe
...
...
@@ -5,41 +5,48 @@
</block>
</view>
<!-- 列表 -->
<scroll-view scroll-y="{{true}}" class="scroll-box" bindscrolltolower="scroll_lower" lower-threshold="30">
<view class="data-list">
<view class="item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}" wx:key="key">
<view class="base oh br-b">
<text class="fl cr-666">{{item.add_time}}</text>
<text class="fr nickname cr-888">{{item.status_name}}</text>
</view>
<view class="content">
<view class="multi-text">
<text class="title cr-666">订单号</text>
<text class="value">{{item.order_no}}</text>
<movable-area class="wh-auto ht-auto">
<!-- 列表 -->
<scroll-view scroll-y="{{true}}" class="scroll-box" bindscrolltolower="scroll_lower" lower-threshold="30">
<view class="data-list">
<view class="item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}" wx:key="key">
<view class="base oh br-b">
<text class="fl cr-666">{{item.add_time}}</text>
<text class="fr nickname cr-888">{{item.status_name}}</text>
</view>
<view class="content">
<view class="multi-text">
<text class="title cr-666">订单号</text>
<text class="value">{{item.order_no}}</text>
</view>
<view class="multi-text">
<text class="title cr-666">支付金额</text>
<text class="value">{{item.pay_price}}</text>
<text class="unit cr-888">元</text>
</view>
</view>
<view class="multi-text">
<text class="title cr-666">支付金额</text>
<text class="value">{{item.pay_price}}</text>
<text class="unit cr-888">元</text>
<view wx:if="{{item.status == 0}}" class="operation tr br-t-dashed">
<button class="cr-888 br" type="default" size="mini" hover-class="none" class="br" data-index="{{index}}" data-oid="{{item.order_id}}" data-uid="{{item.order_user_id}}" bindtap="list_submit_take_event">取货</button>
</view>
</view>
<view wx:if="{{item.status == 0}}" class="operation tr br-t-dashed">
<button class="cr-888 br" type="default" size="mini" hover-class="none" class="br" data-index="{{index}}" data-oid="{{item.order_id}}" data-uid="{{item.order_user_id}}" bindtap="list_submit_take_event">取货</button>
<view wx:if="{{data_list.length == 0}}">
<import src="/pages/common/nodata.wxml" />
<template is="nodata" data="{{status: data_list_loding_status}}">
</template>
</view>
</view>
<view wx:if="{{data_list.length == 0}}">
<import src="/pages/common/nodata.wxml" />
<template is="nodata" data="{{status: data_list_loding_status}}">
</template>
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
</scroll-view>
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
</scroll-view>
<!-- 拖拽按钮 -->
<movable-view class="search-drag tc" direction="all" bindtap="drag_event">
<icon type="search" size="30"/>
</movable-view>
</movable-area>
<!-- 取货 popup -->
<component-popup prop-show="{{is_show_take_popup}}" prop-position="bottom" bindonclose="take_popup_event_close">
...
...
@@ -52,4 +59,17 @@
<button class="submit-bottom" type="default" hover-class="none" disabled="{{form_submit_disabled_status}}" bindtap="form_submit_take_event">确认</button>
</view>
</view>
</component-popup>
<!-- 搜索 popup -->
<component-popup prop-show="{{is_show_search_popup}}" prop-position="bottom" bindonclose="search_popup_event_close">
<view class="form-container spacing-mt">
<view class="form-gorup tc">
<view class="form-gorup-title">搜索条件</view>
<input type="number" value="{{search_keywords_value}}" placeholder-class="cr-ccc" class="cr-666 br-b spacing-mt" placeholder="订单号/取货码" bindinput="search_input_keywords_event" />
</view>
<view class="form-gorup">
<button class="submit-bottom" type="default" hover-class="none" disabled="{{form_submit_disabled_status}}" bindtap="search_submit_event">搜索</button>
</view>
</view>
</component-popup>
\ No newline at end of file
public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
浏览文件 @
c4b433fe
...
...
@@ -62,4 +62,18 @@
.submit-bottom {
background-color: #ff6a80 !important;
color: #fff !important;
}
/*
* 搜索
*/
.search-drag {
width: 30px;
height: 30px;
padding: 10px;
background: hsla(0, 0%, 0%, 0.1);
border-radius: 50%;
margin-top: calc(100vh - 120px);
margin-left: calc(50% - 25px);
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.3);
}
\ No newline at end of file
public/appmini/old/weixin/pages/plugins/distribution/user/user.js
浏览文件 @
c4b433fe
...
...
@@ -15,10 +15,11 @@ Page({
nav_list
:
[],
},
onLoad
(
params
)
{},
onLoad
(
params
)
{
this
.
setData
({
nav_list
:
this
.
nav_list_data
()
});
},
onShow
()
{
this
.
setData
({
nav_list
:
this
.
nav_list_data
()});
this
.
init
();
},
...
...
@@ -41,14 +42,14 @@ Page({
});
}
self
.
setData
({
avatar
:
user
.
avatar
||
app
.
data
.
default_user_head_src
,
avatar
:
((
self
.
data
.
avatar
||
null
)
==
null
)
?
(
user
.
avatar
||
app
.
data
.
default_user_head_src
)
:
self
.
data
.
avatar
,
nickname
:
user
.
nickname
||
'
用户名
'
,
});
},
});
}
else
{
self
.
setData
({
avatar
:
user
.
avatar
||
app
.
data
.
default_user_head_src
,
avatar
:
((
self
.
data
.
avatar
||
null
)
==
null
)
?
(
user
.
avatar
||
app
.
data
.
default_user_head_src
)
:
self
.
data
.
avatar
,
nickname
:
user
.
nickname
||
'
用户名
'
,
});
...
...
public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml
浏览文件 @
c4b433fe
...
...
@@ -10,7 +10,7 @@
<view wx:if="{{(user_level || null) != null && (user_level.name || null) != null}}" class="single-text level-name spacing-mt">{{user_level.name}}</view>
<block wx:if="{{(data_base || null) != null && (data_base.is_enable_self_extraction || 0) == 1}}">
<navigator url="/pages/plugins/distribution/extraction/extraction" hover-class="none">
<button size="mini" type="default" hover-class="none" class="head-base-submit">{{(extraction
_data
|| null) == null ? '申请' : ''}}取货点</button>
<button size="mini" type="default" hover-class="none" class="head-base-submit">{{(extraction || null) == null ? '申请' : ''}}取货点</button>
</navigator>
</block>
</view>
...
...
public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js
浏览文件 @
c4b433fe
...
...
@@ -39,14 +39,14 @@ Page({
});
}
self
.
setData
({
avatar
:
user
.
avatar
||
app
.
data
.
default_user_head_src
,
avatar
:
((
self
.
data
.
avatar
||
null
)
==
null
)
?
(
user
.
avatar
||
app
.
data
.
default_user_head_src
)
:
self
.
data
.
avatar
,
nickname
:
user
.
nickname
||
'
用户名
'
,
});
},
});
}
else
{
self
.
setData
({
avatar
:
user
.
avatar
||
app
.
data
.
default_user_head_src
,
avatar
:
((
self
.
data
.
avatar
||
null
)
==
null
)
?
(
user
.
avatar
||
app
.
data
.
default_user_head_src
)
:
self
.
data
.
avatar
,
nickname
:
user
.
nickname
||
'
用户名
'
,
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录