sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

品牌增强

feat/task1-c-wallet
Devil 2021-01-11 22:38:52 +08:00
parent b21d8c116a
commit a5cb32fe95
25 changed files with 275 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/view/default/brand/save_info.html
View File

@ -33,7 +33,7 @@
</div>
<div class="am-form-group am-form-file">
<label class="block">LOGO<span class="am-form-group-label-tips">建议160x62像素</span></label>
<label class="block">LOGO<span class="am-form-group-label-tips">建议150x50像素</span></label>
<ul class="plug-file-upload-view brand-logo-images-view" data-form-name="logo" data-max-number="1" data-dialog-type="images">
{{if !empty($data['logo'])}}
<li>

19
application/index/view/default/search/index.html
View File

@ -136,14 +136,19 @@
<div class="brand-info">
<div class="map-left am-text-center am-fl">品牌</div>
<div class="map-right map-images-text-items am-fr am-nbfc">
{{if empty($search_map_info['brand']['logo'])}}
<p class="info-logo-empty am-fl am-text-center">{{$search_map_info.brand.name}}</p>
{{else /}}
<img src="{{$search_map_info.brand.logo}}" alt="{{$search_map_info.brand.name}}" class="info-logo am-img-thumbnail am-fl" />
{{/if}}
<a {{if empty($search_map_info['brand']['website_url'])}}href="javascript:;"{{else /}}href="{{$search_map_info.brand.website_url}}" target="_blank"{{/if}} title="{{$search_map_info.brand.name}}">
{{if empty($search_map_info['brand']['logo'])}}
<p class="info-logo-empty am-fl am-text-center">{{$search_map_info.brand.name}}</p>
{{else /}}
<img src="{{$search_map_info.brand.logo}}" alt="{{$search_map_info.brand.name}}" class="info-logo am-img-thumbnail am-fl" />
{{/if}}
</a>
<div class="am-fr info-right">
<p class="info-name">{{$search_map_info.brand.name}}</p>
<p class="info-desc am-margin-top-xs am-text-truncate-2">{{$search_map_info.brand.describe}}</p>
<!-- logo为空则不显示名称、无logo会使用名称当做logo展示 -->
{{if !empty($search_map_info['brand']['logo'])}}
<p class="info-name am-margin-bottom-xs">{{$search_map_info.brand.name}}</p>
{{/if}}
<p class="info-desc am-text-truncate-2">{{$search_map_info.brand.describe}}</p>
</div>
</div>
</div>

2
application/service/BrandService.php
View File

@ -79,7 +79,7 @@ class BrandService
// logo
if(isset($v['logo']))
{
$v['logo'] = ResourcesService::AttachmentPathViewHandle($v['logo']);
$v['logo'] = ResourcesService::AttachmentPathViewHandle($v['logo']);
}
// 品牌官方地址

76
application/tags.php
View File

@ -35,11 +35,12 @@ return array (
'plugins_css' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
2 => 'app\\plugins\\share\\Hook',
3 => 'app\\plugins\\membershiplevelvip\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
5 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\coupon\\Hook',
3 => 'app\\plugins\\share\\Hook',
4 => 'app\\plugins\\membershiplevelvip\\Hook',
5 => 'app\\plugins\\exchangerate\\Hook',
6 => 'app\\plugins\\limitedtimediscount\\Hook',
),
'plugins_js' =>
array (
@ -52,58 +53,66 @@ return array (
'plugins_service_navigation_header_handle' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
2 => 'app\\plugins\\membershiplevelvip\\Hook',
3 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\coupon\\Hook',
3 => 'app\\plugins\\membershiplevelvip\\Hook',
4 => 'app\\plugins\\limitedtimediscount\\Hook',
),
'plugins_service_quick_navigation_pc' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\invoice\\Hook',
2 => 'app\\plugins\\signin\\Hook',
3 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\invoice\\Hook',
3 => 'app\\plugins\\signin\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_quick_navigation_h5' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\invoice\\Hook',
2 => 'app\\plugins\\signin\\Hook',
3 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\invoice\\Hook',
3 => 'app\\plugins\\signin\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_quick_navigation_weixin' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\invoice\\Hook',
2 => 'app\\plugins\\signin\\Hook',
3 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\invoice\\Hook',
3 => 'app\\plugins\\signin\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_quick_navigation_alipay' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\invoice\\Hook',
2 => 'app\\plugins\\signin\\Hook',
3 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\invoice\\Hook',
3 => 'app\\plugins\\signin\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_quick_navigation_baidu' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\invoice\\Hook',
2 => 'app\\plugins\\signin\\Hook',
3 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\invoice\\Hook',
3 => 'app\\plugins\\signin\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_quick_navigation_qq' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\invoice\\Hook',
2 => 'app\\plugins\\signin\\Hook',
3 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\invoice\\Hook',
3 => 'app\\plugins\\signin\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_quick_navigation_toutiao' =>
array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\invoice\\Hook',
2 => 'app\\plugins\\signin\\Hook',
3 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\brand\\Hook',
2 => 'app\\plugins\\invoice\\Hook',
3 => 'app\\plugins\\signin\\Hook',
4 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_goods_handle_end' =>
array (
@ -145,6 +154,11 @@ return array (
0 => 'app\\plugins\\points\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
),
'plugins_view_goods_detail_panel_bottom' =>
array (
0 => 'app\\plugins\\brand\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
),
'plugins_service_users_center_left_menu_handle' =>
array (
0 => 'app\\plugins\\invoice\\Hook',
@ -162,10 +176,6 @@ return array (
4 => 'app\\plugins\\signin\\Hook',
5 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_view_goods_detail_panel_bottom' =>
array (
0 => 'app\\plugins\\coupon\\Hook',
),
'plugins_view_buy_group_goods_inside_bottom' =>
array (
0 => 'app\\plugins\\coupon\\Hook',

2
config/shopxo.php
View File

@ -28,7 +28,7 @@ if(substr($cdn_public_host, -1) != DS)
// 配置信息
return [
// 开发模式
'is_develop' => false,
'is_develop' => true,
// 默认编码
'default_charset' => 'utf-8',

1
sourcecode/alipay/default/pages/goods-search/goods-search.js
View File

@ -91,6 +91,7 @@ Page({
var post_data = this.data.post_data;
post_data['page'] = this.data.data_page;
post_data['category_id'] = params['category_id'] || 0;
post_data['brand_id'] = params['brand_id'] || 0;
// 获取数据
my.request({

3
sourcecode/alipay/default/pages/plugins/points/index/index.acss
View File

@ -66,9 +66,6 @@ button.login-submit {
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

3
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.acss
View File

@ -110,9 +110,6 @@
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

1
sourcecode/baidu/default/pages/goods-search/goods-search.js
View File

@ -91,6 +91,7 @@ Page({
var post_data = this.data.post_data;
post_data['page'] = this.data.data_page;
post_data['category_id'] = params['category_id'] || 0;
post_data['brand_id'] = params['brand_id'] || 0;
// 获取数据
swan.request({

3
sourcecode/baidu/default/pages/plugins/points/index/index.css
View File

@ -66,9 +66,6 @@ button.login-submit {
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

3
sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.css
View File

@ -110,9 +110,6 @@
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

1
sourcecode/qq/default/pages/goods-search/goods-search.js
View File

@ -91,6 +91,7 @@ Page({
var post_data = this.data.post_data;
post_data['page'] = this.data.data_page;
post_data['category_id'] = params['category_id'] || 0;
post_data['brand_id'] = params['brand_id'] || 0;
// 获取数据
qq.request({

3
sourcecode/qq/default/pages/plugins/points/index/index.qss
View File

@ -66,9 +66,6 @@ button.login-submit {
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

3
sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qss
View File

@ -110,9 +110,6 @@
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

1
sourcecode/toutiao/default/pages/goods-search/goods-search.js
View File

@ -91,6 +91,7 @@ Page({
var post_data = this.data.post_data;
post_data['page'] = this.data.data_page;
post_data['category_id'] = params['category_id'] || 0;
post_data['brand_id'] = params['brand_id'] || 0;
// 获取数据
tt.request({

3
sourcecode/toutiao/default/pages/plugins/points/index/index.ttss
View File

@ -66,9 +66,6 @@ button.login-submit {
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

3
sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttss
View File

@ -110,9 +110,6 @@
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

3
sourcecode/weixin/default/app.json
View File

@ -79,7 +79,8 @@
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail",
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo",
"pages/plugins/signin/user-coming-list/user-coming-list",
"pages/plugins/points/index/index"
"pages/plugins/points/index/index",
"pages/plugins/brand/index/index"
],
"permission": {
"scope.userLocation": {

1
sourcecode/weixin/default/pages/goods-search/goods-search.js
View File

@ -94,6 +94,7 @@ Page({
var post_data = this.data.post_data;
post_data['page'] = this.data.data_page;
post_data['category_id'] = params['category_id'] || 0;
post_data['brand_id'] = params['brand_id'] || 0;
// 获取数据
wx.request({

129
sourcecode/weixin/default/pages/plugins/brand/index/index.js Normal file
View File

@ -0,0 +1,129 @@
const app = getApp();
Page({
data: {
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
params: null,
data_base: null,
brand_list: [],
brand_category_list: [],
nav_active_value: 0,
},
onLoad(params) {
this.setData({
params: params,
});
},
onShow() {
this.get_data();
// 显示分享菜单
app.show_share_menu();
},
// 获取数据
get_data() {
var self = this;
wx.request({
url: app.get_request_url("index", "index", "brand"),
method: "POST",
data: {},
dataType: "json",
success: res => {
wx.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
self.setData({
data_base: data.base || null,
brand_list: data.brand_list || [],
brand_category_list: data.brand_category_list || [],
data_list_loding_msg: '',
data_list_loding_status: ((data.brand_list || []).length > 0) ? 3 : 0,
data_bottom_line_status: ((data.brand_list || []).length > 0),
});
// 选中处理
self.nav_active_handle();
} else {
self.setData({
data_bottom_line_status: false,
data_list_loding_status: 2,
data_list_loding_msg: res.data.msg,
});
}
},
fail: () => {
wx.stopPullDownRefresh();
self.setData({
data_bottom_line_status: false,
data_list_loding_status: 2,
data_list_loding_msg: '服务器请求出错',
});
app.showToast("服务器请求出错");
}
});
},
// 下拉刷新
onPullDownRefresh() {
this.get_data();
},
// 导航事件
nav_event(e) {
this.setData({
nav_active_value: e.currentTarget.dataset.value || 0,
});
this.nav_active_handle();
},
// 导航选中处理
nav_active_handle() {
var value = this.data.nav_active_value;
var temp_brand_list = this.data.brand_list;
var count = 0;
for(var i in temp_brand_list)
{
if(value == 0)
{
temp_brand_list[i]['is_not_show'] = 0;
count++;
} else {
var is_not_show = (temp_brand_list[i]['brand_category_ids'].indexOf(value) == -1) ? 1 : 0;
temp_brand_list[i]['is_not_show'] = is_not_show;
if(is_not_show == 0)
{
count++;
}
}
}
this.setData({
brand_list: temp_brand_list,
data_list_loding_status: (count > 0) ? 3 : 0,
data_bottom_line_status: (count > 0),
});
},
// 自定义分享
onShareAppMessage() {
var user_id = app.get_user_cache_info('id', 0) || 0;
return {
title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
desc: this.data.data_base.seo_desc || app.data.application_describe,
path: '/pages/plugins/brand/index/index?referrer=' + user_id
};
},
// 分享朋友圈
onShareTimeline() {
var user_id = app.get_user_cache_info('id', 0) || 0;
return {
title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
query: 'referrer=' + user_id,
imageUrl: this.data.data_base.right_images || ''
};
},
});

4
sourcecode/weixin/default/pages/plugins/brand/index/index.json Normal file
View File

@ -0,0 +1,4 @@
{
"enablePullDownRefresh": true,
"navigationBarTitleText": "品牌"
}

32
sourcecode/weixin/default/pages/plugins/brand/index/index.wxml Normal file
View File

@ -0,0 +1,32 @@
<view wx:if="{{(data_base || null) != null}}">
<!-- 分类 -->
<scroll-view wx:if="{{(brand_category_list || null) != null && brand_category_list.length > 0}}" class="nav-list bg-white tc oh" scroll-x="true">
<view class="item cr-888 {{nav_active_value == 0 ? 'active' : ''}}" bindtap="nav_event" data-value="0">全部</view>
<block wx:for="{{brand_category_list}}" wx:key="key">
<view class="item cr-888 {{nav_active_value == item.id ? 'active' : ''}}" bindtap="nav_event" data-value="{{item.id}}">{{item.name}}</view>
</block>
</scroll-view>
<!-- 品牌列表 -->
<view wx:if="{{(brand_list || null) != null && brand_list.length > 0}}" class="data-list oh spacing-mt">
<block wx:for="{{brand_list}}" wx:key="key">
<view wx:if="{{(item.is_not_show || 0) == 0}}" class="items bg-white">
<navigator url="/pages/goods-search/goods-search?brand_id={{item.id}}" hover-class="none">
<image src="{{item.logo}}" mode="aspectFit" />
<view class="base br-t-dashed">
<view class="single-text name tc">{{item.name}}</view>
<view class="multi-text desc">{{item.describe}}</view>
</view>
</navigator>
</view>
</block>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
<view wx:if="{{data_list_loding_status != 3}}">
<import src="/pages/common/nodata.wxml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>

45
sourcecode/weixin/default/pages/plugins/brand/index/index.wxss Normal file
View File

@ -0,0 +1,45 @@
/**
* 分类导航
*/
.nav-list {
width: 100%;
height: 80rpx;
white-space: nowrap;
box-sizing: border-box;
}
.nav-list .item {
padding: 20rpx 30rpx;
border-bottom: 3px solid #f0f0f0;
display: inline-block;
position: relative;
}
.nav-list .active {
border-bottom: 3px solid #d2364c;
color: #d2364c;
}
/**
* 数据列表
*/
.data-list .items {
width: calc(50% - 5rpx);
margin-bottom: 10rpx;
}
.data-list .items:nth-child(2n) {
float: right;
}
.data-list .items:nth-child(2n+1) {
float: left;
}
.data-list .items image {
width: 100%;
height: 160rpx !important;
}
.data-list .items .base {
padding-top: 20rpx;
margin: 20rpx;
}
.data-list .items .desc {
color: #999;
margin-top: 10rpx;
}

3
sourcecode/weixin/default/pages/plugins/points/index/index.wxss
View File

@ -66,9 +66,6 @@ button.login-submit {
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}

3
sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxss
View File

@ -110,9 +110,6 @@
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}