Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
纵之格
ShopXO
提交
3321f27d
ShopXO
项目概览
纵之格
/
ShopXO
通知
394
Star
16
Fork
11
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3321f27d
编写于
2月 01, 2020
作者:
D
devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序新增销售+自提
上级
c5e0a096
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
246 addition
and
55 deletion
+246
-55
public/appmini/old/alipay/pages/buy/buy.acss
public/appmini/old/alipay/pages/buy/buy.acss
+11
-0
public/appmini/old/alipay/pages/buy/buy.axml
public/appmini/old/alipay/pages/buy/buy.axml
+9
-2
public/appmini/old/alipay/pages/buy/buy.js
public/appmini/old/alipay/pages/buy/buy.js
+25
-3
public/appmini/old/alipay/pages/user-address-save/user-address-save.js
...i/old/alipay/pages/user-address-save/user-address-save.js
+9
-6
public/appmini/old/baidu/app.js
public/appmini/old/baidu/app.js
+6
-2
public/appmini/old/baidu/pages/buy/buy.css
public/appmini/old/baidu/pages/buy/buy.css
+11
-0
public/appmini/old/baidu/pages/buy/buy.js
public/appmini/old/baidu/pages/buy/buy.js
+26
-4
public/appmini/old/baidu/pages/buy/buy.swan
public/appmini/old/baidu/pages/buy/buy.swan
+9
-2
public/appmini/old/baidu/pages/user-address-save/user-address-save.js
...ni/old/baidu/pages/user-address-save/user-address-save.js
+13
-7
public/appmini/old/qq/pages/buy/buy.js
public/appmini/old/qq/pages/buy/buy.js
+25
-3
public/appmini/old/qq/pages/buy/buy.qml
public/appmini/old/qq/pages/buy/buy.qml
+9
-2
public/appmini/old/qq/pages/buy/buy.qss
public/appmini/old/qq/pages/buy/buy.qss
+11
-0
public/appmini/old/qq/pages/user-address-save/user-address-save.js
...pmini/old/qq/pages/user-address-save/user-address-save.js
+12
-6
public/appmini/old/toutiao/pages/buy/buy.js
public/appmini/old/toutiao/pages/buy/buy.js
+25
-3
public/appmini/old/toutiao/pages/buy/buy.ttml
public/appmini/old/toutiao/pages/buy/buy.ttml
+9
-2
public/appmini/old/toutiao/pages/buy/buy.ttss
public/appmini/old/toutiao/pages/buy/buy.ttss
+11
-0
public/appmini/old/toutiao/pages/user-address-save/user-address-save.js
.../old/toutiao/pages/user-address-save/user-address-save.js
+12
-6
public/appmini/old/weixin/pages/buy/buy.js
public/appmini/old/weixin/pages/buy/buy.js
+1
-1
public/appmini/old/weixin/pages/user-address-save/user-address-save.js
...i/old/weixin/pages/user-address-save/user-address-save.js
+12
-6
未找到文件。
public/appmini/old/alipay/pages/buy/buy.acss
浏览文件 @
3321f27d
...
...
@@ -143,6 +143,17 @@
padding: 8rpx 10rpx;
}
/**
* 销售+自提 模式选择
*/
.buy-header-nav {
background: #e9e9e9;
}
.buy-header-nav .item {
padding: 25rpx 0;
width: 50%;
}
/**
* 插件样式区域
*/
...
...
public/appmini/old/alipay/pages/buy/buy.axml
浏览文件 @
3321f27d
...
...
@@ -4,8 +4,15 @@
</block>
<block a:else>
<view a:if="{{goods_list.length > 0}}" class="page">
<!-- 销售+自提 模式选择 -->
<view a:if="{{common_site_type == 4}}" class="buy-header-nav oh tc">
<block a:for="{{buy_header_nav}}" a:key="key">
<view class="item fl {{site_model == item.value ? 'cr-main' : 'cr-666'}}" data-value="{{item.value}}" onTap="buy_header_nav_event">{{item.name}}</view>
</block>
</view>
<!-- 地址 -->
<block a:if="{{common_site_type == 0 || common_site_type == 2}}">
<block a:if="{{common_site_type == 0 || common_site_type == 2
|| common_site_type == 4
}}">
<view class="address bg-white arrow-right" onTap="address_event">
<view a:if="{{address != null}}">
<view class="address-base oh">
...
...
@@ -19,7 +26,7 @@
</view>
</view>
<view a:if="{{address == null}}" class="no-address cr-888">
请选择地址
{{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}}
</view>
</view>
<view class="address-divider spacing-mb"></view>
...
...
public/appmini/old/alipay/pages/buy/buy.js
浏览文件 @
3321f27d
...
...
@@ -17,6 +17,11 @@ Page({
common_order_is_booking
:
0
,
common_site_type
:
0
,
extraction_address
:
[],
site_model
:
0
,
buy_header_nav
:
[
{
name
:
"
快递邮寄
"
,
value
:
0
},
{
name
:
"
自提点取货
"
,
value
:
2
}
],
// 优惠劵
plugins_coupon_data
:
null
,
...
...
@@ -87,6 +92,7 @@ Page({
data
[
'
address_id
'
]
=
this
.
data
.
address_id
;
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
my
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
...
...
@@ -178,10 +184,11 @@ Page({
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
user_note
'
]
=
this
.
data
.
user_note_value
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
// 数据验证
var
validation
=
[];
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
)
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
||
this
.
data
.
common_site_type
==
4
)
{
validation
.
push
({
fields
:
'
address_id
'
,
msg
:
'
请选择地址
'
,
is_can_zero
:
1
});
}
...
...
@@ -278,12 +285,12 @@ Page({
// 地址选择事件
address_event
(
e
)
{
if
(
this
.
data
.
common_site_type
==
0
)
if
(
this
.
data
.
common_site_type
==
0
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
0
)
)
{
my
.
navigateTo
({
url
:
'
/pages/user-address/user-address?is_back=1
'
});
}
else
if
(
this
.
data
.
common_site_type
==
2
)
}
else
if
(
this
.
data
.
common_site_type
==
2
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
2
)
)
{
my
.
navigateTo
({
url
:
'
/pages/extraction-address/extraction-address?is_back=1
'
...
...
@@ -293,4 +300,19 @@ Page({
}
},
// 销售+自提 模式选择事件
buy_header_nav_event
(
e
)
{
// 数据设置
this
.
setData
({
address
:
null
,
address_id
:
null
,
site_model
:
e
.
currentTarget
.
dataset
.
value
||
0
,
});
// 删除地址缓存
my
.
removeStorageSync
({
key
:
app
.
data
.
cache_buy_user_address_select_key
});
// 数据初始化
this
.
init
();
},
});
public/appmini/old/alipay/pages/user-address-save/user-address-save.js
浏览文件 @
3321f27d
...
...
@@ -4,14 +4,19 @@ Page({
data
:
{
data_list_loding_status
:
1
,
data_list_loding_msg
:
'
处理错误
'
,
params
:
null
,
name
:
''
,
tel
:
''
,
address
:
''
,
is_default
:
0
,
province_id
:
null
,
city_id
:
null
,
county_id
:
null
,
province_list
:
[],
city_list
:
[],
county_list
:
[],
province_id
:
null
,
city_id
:
null
,
county_id
:
null
,
is_default
:
0
,
default_province
:
"
请选择省
"
,
default_city
:
"
请选择市
"
,
...
...
@@ -20,8 +25,6 @@ Page({
province_value
:
null
,
city_value
:
null
,
county_value
:
null
,
params
:
null
,
},
onLoad
(
params
)
{
...
...
public/appmini/old/baidu/app.js
浏览文件 @
3321f27d
...
...
@@ -621,8 +621,12 @@ App({
}
},
// 登录校验
is_login_check
(
res
)
{
/**
* 登录校验
* object 回调操作对象
* method 回调操作对象的函数
*/
is_login_check
(
res
,
object
,
method
)
{
if
(
res
.
code
==
-
400
)
{
swan
.
clearStorage
();
...
...
public/appmini/old/baidu/pages/buy/buy.css
浏览文件 @
3321f27d
...
...
@@ -142,6 +142,17 @@
padding
:
10
rpx
;
}
/**
* 销售+自提 模式选择
*/
.buy-header-nav
{
background
:
#e9e9e9
;
}
.buy-header-nav
.item
{
padding
:
25
rpx
0
;
width
:
50%
;
}
/**
* 插件样式区域
*/
...
...
public/appmini/old/baidu/pages/buy/buy.js
浏览文件 @
3321f27d
...
...
@@ -17,6 +17,11 @@ Page({
common_order_is_booking
:
0
,
common_site_type
:
0
,
extraction_address
:
[],
site_model
:
0
,
buy_header_nav
:
[
{
name
:
"
快递邮寄
"
,
value
:
0
},
{
name
:
"
自提点取货
"
,
value
:
2
}
],
// 优惠劵
plugins_coupon_data
:
null
,
...
...
@@ -72,6 +77,7 @@ Page({
data
[
'
address_id
'
]
=
this
.
data
.
address_id
;
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
swan
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
...
...
@@ -160,10 +166,11 @@ Page({
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
user_note
'
]
=
this
.
data
.
user_note_value
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
// 数据验证
var
validation
=
[];
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
)
{
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
||
this
.
data
.
common_site_type
==
4
)
{
validation
.
push
({
fields
:
'
address_id
'
,
msg
:
'
请选择地址
'
,
is_can_zero
:
1
});
}
if
(
this
.
data
.
common_order_is_booking
!=
1
)
{
...
...
@@ -257,17 +264,32 @@ Page({
// 地址选择事件
address_event
(
e
)
{
if
(
this
.
data
.
common_site_type
==
0
)
{
if
(
this
.
data
.
common_site_type
==
0
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
0
)
)
{
swan
.
navigateTo
({
url
:
'
/pages/user-address/user-address?is_back=1
'
});
}
else
if
(
this
.
data
.
common_site_type
==
2
)
{
}
else
if
(
this
.
data
.
common_site_type
==
2
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
2
)
)
{
swan
.
navigateTo
({
url
:
'
/pages/extraction-address/extraction-address?is_back=1
'
});
}
else
{
app
.
showToast
(
'
当前模式不允许使用地址
'
);
}
}
},
// 销售+自提 模式选择事件
buy_header_nav_event
(
e
)
{
// 数据设置
this
.
setData
({
address
:
null
,
address_id
:
null
,
site_model
:
e
.
currentTarget
.
dataset
.
value
||
0
,
});
// 删除地址缓存
swan
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
// 数据初始化
this
.
init
();
},
});
\ No newline at end of file
public/appmini/old/baidu/pages/buy/buy.swan
浏览文件 @
3321f27d
...
...
@@ -4,8 +4,15 @@
</block>
<block s-else>
<view s-if="goods_list.length > 0" class="page">
<!-- 销售+自提 模式选择 -->
<view s-if="common_site_type == 4" class="buy-header-nav oh tc">
<block s-for="{{buy_header_nav}}" s-key="key">
<view class="item fl {{site_model == item.value ? 'cr-main' : 'cr-666'}}" data-value="{{item.value}}" bindtap="buy_header_nav_event">{{item.name}}</view>
</block>
</view>
<!-- 地址 -->
<block s-if="common_site_type == 0 || common_site_type == 2">
<block s-if="common_site_type == 0 || common_site_type == 2
|| common_site_type == 4
">
<view class="address bg-white arrow-right" bindtap="address_event">
<view s-if="address != null">
<view class="address-base oh">
...
...
@@ -19,7 +26,7 @@
</view>
</view>
<view s-if="address == null" class="no-address cr-888">
请选择地址
{{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}}
</view>
</view>
<view class="address-divider spacing-mb"></view>
...
...
public/appmini/old/baidu/pages/user-address-save/user-address-save.js
浏览文件 @
3321f27d
...
...
@@ -2,13 +2,21 @@ const app = getApp();
Page
({
data
:
{
province_list
:
[],
city_list
:
[],
county_list
:
[],
data_list_loding_status
:
1
,
data_list_loding_msg
:
'
处理错误
'
,
params
:
null
,
name
:
''
,
tel
:
''
,
address
:
''
,
is_default
:
0
,
province_id
:
null
,
city_id
:
null
,
county_id
:
null
,
is_default
:
0
,
province_list
:
[],
city_list
:
[],
county_list
:
[],
default_province
:
"
请选择省
"
,
default_city
:
"
请选择市
"
,
...
...
@@ -16,9 +24,7 @@ Page({
province_value
:
null
,
city_value
:
null
,
county_value
:
null
,
params
:
null
county_value
:
null
},
onLoad
(
params
)
{
...
...
public/appmini/old/qq/pages/buy/buy.js
浏览文件 @
3321f27d
...
...
@@ -17,6 +17,11 @@ Page({
common_order_is_booking
:
0
,
common_site_type
:
0
,
extraction_address
:
[],
site_model
:
0
,
buy_header_nav
:
[
{
name
:
"
快递邮寄
"
,
value
:
0
},
{
name
:
"
自提点取货
"
,
value
:
2
}
],
// 优惠劵
plugins_coupon_data
:
null
,
...
...
@@ -75,6 +80,7 @@ Page({
data
[
'
address_id
'
]
=
this
.
data
.
address_id
;
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
qq
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
...
...
@@ -166,10 +172,11 @@ Page({
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
user_note
'
]
=
this
.
data
.
user_note_value
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
// 数据验证
var
validation
=
[];
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
)
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
||
this
.
data
.
common_site_type
==
4
)
{
validation
.
push
({
fields
:
'
address_id
'
,
msg
:
'
请选择地址
'
,
is_can_zero
:
1
});
}
...
...
@@ -264,12 +271,12 @@ Page({
// 地址选择事件
address_event
(
e
)
{
if
(
this
.
data
.
common_site_type
==
0
)
if
(
this
.
data
.
common_site_type
==
0
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
0
)
)
{
qq
.
navigateTo
({
url
:
'
/pages/user-address/user-address?is_back=1
'
});
}
else
if
(
this
.
data
.
common_site_type
==
2
)
}
else
if
(
this
.
data
.
common_site_type
==
2
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
2
)
)
{
qq
.
navigateTo
({
url
:
'
/pages/extraction-address/extraction-address?is_back=1
'
...
...
@@ -279,4 +286,19 @@ Page({
}
},
// 销售+自提 模式选择事件
buy_header_nav_event
(
e
)
{
// 数据设置
this
.
setData
({
address
:
null
,
address_id
:
null
,
site_model
:
e
.
currentTarget
.
dataset
.
value
||
0
,
});
// 删除地址缓存
qq
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
// 数据初始化
this
.
init
();
},
});
public/appmini/old/qq/pages/buy/buy.qml
浏览文件 @
3321f27d
...
...
@@ -4,8 +4,15 @@
<
/block
>
<
block
qq
:
else
>
<
view
qq
:
if
=
"
{{goods_list.length > 0}}
"
class
=
"
page
"
>
<!--
销售
+
自提
模式选择
-->
<
view
qq
:
if
=
"
{{common_site_type == 4}}
"
class
=
"
buy-header-nav oh tc
"
>
<
block
qq
:
for
=
"
{{buy_header_nav}}
"
qq
:
key
=
"
key
"
>
<
view
class
=
"
item fl {{site_model == item.value ? 'cr-main' : 'cr-666'}}
"
data
-
value
=
"
{{item.value}}
"
bindtap
=
"
buy_header_nav_event
"
>
{{
item
.
name
}}
<
/view
>
<
/block
>
<
/view
>
<!--
地址
-->
<
block
qq
:
if
=
"
{{common_site_type == 0 || common_site_type == 2}}
"
>
<
block
qq
:
if
=
"
{{common_site_type == 0 || common_site_type == 2
|| common_site_type == 4
}}
"
>
<
view
class
=
"
address bg-white arrow-right
"
bindtap
=
"
address_event
"
>
<
view
qq
:
if
=
"
{{address != null}}
"
>
<
view
class
=
"
address-base oh
"
>
...
...
@@ -19,7 +26,7 @@
<
/view
>
<
/view
>
<
view
qq
:
if
=
"
{{address == null}}
"
class
=
"
no-address cr-888
"
>
请选择地址
{{(
common_site_type
==
0
||
(
common_site_type
==
4
&&
site_model
==
0
))
?
'
请选择收货地址
'
:
'
请选择取货地址
'
}}
<
/view
>
<
/view
>
<
view
class
=
"
address-divider spacing-mb
"
><
/view
>
...
...
public/appmini/old/qq/pages/buy/buy.qss
浏览文件 @
3321f27d
...
...
@@ -141,6 +141,17 @@
padding: 12rpx;
}
/**
* 销售+自提 模式选择
*/
.buy-header-nav {
background: #e9e9e9;
}
.buy-header-nav .item {
padding: 25rpx 0;
width: 50%;
}
/**
* 插件样式区域
*/
...
...
public/appmini/old/qq/pages/user-address-save/user-address-save.js
浏览文件 @
3321f27d
...
...
@@ -2,13 +2,21 @@ const app = getApp();
Page
({
data
:
{
province_list
:
[],
city_list
:
[],
county_list
:
[],
data_list_loding_status
:
1
,
data_list_loding_msg
:
'
处理错误
'
,
params
:
null
,
name
:
''
,
tel
:
''
,
address
:
''
,
is_default
:
0
,
province_id
:
null
,
city_id
:
null
,
county_id
:
null
,
is_default
:
0
,
province_list
:
[],
city_list
:
[],
county_list
:
[],
default_province
:
"
请选择省
"
,
default_city
:
"
请选择市
"
,
...
...
@@ -17,8 +25,6 @@ Page({
province_value
:
null
,
city_value
:
null
,
county_value
:
null
,
params
:
null
,
},
onLoad
(
params
)
{
...
...
public/appmini/old/toutiao/pages/buy/buy.js
浏览文件 @
3321f27d
...
...
@@ -17,6 +17,11 @@ Page({
common_order_is_booking
:
0
,
common_site_type
:
0
,
extraction_address
:
[],
site_model
:
0
,
buy_header_nav
:
[
{
name
:
"
快递邮寄
"
,
value
:
0
},
{
name
:
"
自提点取货
"
,
value
:
2
}
],
// 优惠劵
plugins_coupon_data
:
null
,
...
...
@@ -75,6 +80,7 @@ Page({
data
[
'
address_id
'
]
=
this
.
data
.
address_id
;
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
tt
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
...
...
@@ -166,10 +172,11 @@ Page({
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
user_note
'
]
=
this
.
data
.
user_note_value
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
// 数据验证
var
validation
=
[];
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
)
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
||
this
.
data
.
common_site_type
==
4
)
{
validation
.
push
({
fields
:
'
address_id
'
,
msg
:
'
请选择地址
'
,
is_can_zero
:
1
});
}
...
...
@@ -264,12 +271,12 @@ Page({
// 地址选择事件
address_event
(
e
)
{
if
(
this
.
data
.
common_site_type
==
0
)
if
(
this
.
data
.
common_site_type
==
0
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
0
)
)
{
tt
.
navigateTo
({
url
:
'
/pages/user-address/user-address?is_back=1
'
});
}
else
if
(
this
.
data
.
common_site_type
==
2
)
}
else
if
(
this
.
data
.
common_site_type
==
2
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
2
)
)
{
tt
.
navigateTo
({
url
:
'
/pages/extraction-address/extraction-address?is_back=1
'
...
...
@@ -279,4 +286,19 @@ Page({
}
},
// 销售+自提 模式选择事件
buy_header_nav_event
(
e
)
{
// 数据设置
this
.
setData
({
address
:
null
,
address_id
:
null
,
site_model
:
e
.
currentTarget
.
dataset
.
value
||
0
,
});
// 删除地址缓存
tt
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
// 数据初始化
this
.
init
();
},
});
public/appmini/old/toutiao/pages/buy/buy.ttml
浏览文件 @
3321f27d
...
...
@@ -4,8 +4,15 @@
</block>
<block tt:else>
<view tt:if="{{goods_list.length > 0}}" class="page">
<!-- 销售+自提 模式选择 -->
<view tt:if="{{common_site_type == 4}}" class="buy-header-nav oh tc">
<block tt:for="{{buy_header_nav}}" tt:key="key">
<view class="item fl {{site_model == item.value ? 'cr-main' : 'cr-666'}}" data-value="{{item.value}}" bindtap="buy_header_nav_event">{{item.name}}</view>
</block>
</view>
<!-- 地址 -->
<block tt:if="{{common_site_type == 0 || common_site_type == 2}}">
<block tt:if="{{common_site_type == 0 || common_site_type == 2
|| common_site_type == 4
}}">
<view class="address bg-white arrow-right" bindtap="address_event">
<view tt:if="{{address != null}}">
<view class="address-base oh">
...
...
@@ -19,7 +26,7 @@
</view>
</view>
<view tt:if="{{address == null}}" class="no-address cr-888">
请选择地址
{{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}}
</view>
</view>
<view class="address-divider spacing-mb"></view>
...
...
public/appmini/old/toutiao/pages/buy/buy.ttss
浏览文件 @
3321f27d
...
...
@@ -141,6 +141,17 @@
padding: 12rpx;
}
/**
* 销售+自提 模式选择
*/
.buy-header-nav {
background: #e9e9e9;
}
.buy-header-nav .item {
padding: 25rpx 0;
width: 50%;
}
/**
* 插件样式区域
*/
...
...
public/appmini/old/toutiao/pages/user-address-save/user-address-save.js
浏览文件 @
3321f27d
...
...
@@ -2,13 +2,21 @@ const app = getApp();
Page
({
data
:
{
province_list
:
[],
city_list
:
[],
county_list
:
[],
data_list_loding_status
:
1
,
data_list_loding_msg
:
'
处理错误
'
,
params
:
null
,
name
:
''
,
tel
:
''
,
address
:
''
,
is_default
:
0
,
province_id
:
null
,
city_id
:
null
,
county_id
:
null
,
is_default
:
0
,
province_list
:
[],
city_list
:
[],
county_list
:
[],
default_province
:
"
请选择省
"
,
default_city
:
"
请选择市
"
,
...
...
@@ -17,8 +25,6 @@ Page({
province_value
:
null
,
city_value
:
null
,
county_value
:
null
,
params
:
null
,
},
onLoad
(
params
)
{
...
...
public/appmini/old/weixin/pages/buy/buy.js
浏览文件 @
3321f27d
...
...
@@ -176,7 +176,7 @@ Page({
// 数据验证
var
validation
=
[];
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
)
if
(
this
.
data
.
common_site_type
==
0
||
this
.
data
.
common_site_type
==
2
||
this
.
data
.
common_site_type
==
4
)
{
validation
.
push
({
fields
:
'
address_id
'
,
msg
:
'
请选择地址
'
,
is_can_zero
:
1
});
}
...
...
public/appmini/old/weixin/pages/user-address-save/user-address-save.js
浏览文件 @
3321f27d
...
...
@@ -2,13 +2,21 @@ const app = getApp();
Page
({
data
:
{
province_list
:
[],
city_list
:
[],
county_list
:
[],
data_list_loding_status
:
1
,
data_list_loding_msg
:
'
处理错误
'
,
params
:
null
,
name
:
''
,
tel
:
''
,
address
:
''
,
is_default
:
0
,
province_id
:
null
,
city_id
:
null
,
county_id
:
null
,
is_default
:
0
,
province_list
:
[],
city_list
:
[],
county_list
:
[],
default_province
:
"
请选择省
"
,
default_city
:
"
请选择市
"
,
...
...
@@ -17,8 +25,6 @@ Page({
province_value
:
null
,
city_value
:
null
,
county_value
:
null
,
params
:
null
,
},
onLoad
(
params
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录