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

小程序开发

feat/task1-c-wallet
gongfuxiang 2019-07-04 00:59:07 +08:00
parent 55ff3b8d59
commit 7a5985ccfd
21 changed files with 85 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/admin/view/default/appconfig/app.html
View File

@ -69,6 +69,15 @@
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_app_is_online_service.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_online_service.describe}}</span></label>
<select name="{{$data.common_app_is_online_service.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_online_service.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_online_service']['value']) and $data['common_app_is_online_service']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group am-form-group-refreshing">
<input type="hidden" name="nav_type" value="{{$nav_type}}" />
<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>

7
application/api/controller/Goods.php
View File

@ -105,9 +105,10 @@ class Goods extends Common
// 数据返回
$result = [
'goods' => $ret['data'][0],
'common_order_is_booking' => (int) MyC('common_order_is_booking', 0),
'is_use_mobile_detail' => $is_use_mobile_detail,
'goods' => $ret['data'][0],
'common_order_is_booking' => (int) MyC('common_order_is_booking', 0),
'common_app_is_use_mobile_detail' => $is_use_mobile_detail,
'common_app_is_online_service' => (int) MyC('common_app_is_online_service', 0),
];
return DataReturn('success', 0, $result);
}

1
application/api/controller/Index.php
View File

@ -53,6 +53,7 @@ class Index extends Common
'common_app_is_enable_search' => (int) MyC('common_app_is_enable_search', 1),
'common_app_is_enable_answer' => (int) MyC('common_app_is_enable_answer', 1),
'common_app_is_header_nav_fixed' => (int) MyC('common_app_is_header_nav_fixed', 0),
'common_app_is_online_service' => (int) MyC('common_app_is_online_service', 0),
];
// 返回数据

1
application/api/controller/User.php
View File

@ -284,6 +284,7 @@ class User extends Common
'user_goods_browse_count' => $user_goods_browse_count,
'common_message_total' => $common_message_total,
'navigation' => AppCenterNavService::AppCenterNav(),
'common_app_is_online_service' => (int) MyC('common_app_is_online_service', 0),
);
// 返回数据

18
config/shopxo.sql
View File

File diff suppressed because one or more lines are too long

BIN
public/appmini/old/alipay/images/customer-service.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

4
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
View File

@ -50,11 +50,11 @@
<text class="text-wrapper">详情</text>
</view>
<!-- web详情 -->
<view a:if="{{is_use_mobile_detail == 0}}" class="bg-white">
<view a:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
<!-- 手机独立详情 -->
<block a:if="{{is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<block a:if="{{common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<view a:for="{{goods_content_app}}" class="goods-detail-app bg-white">
<image a:if="{{(item.images || null) != null}}" onTap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view a:if="{{(item.content || null) != null}}" class="content-items">

4
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
View File

@ -31,7 +31,7 @@ Page({
goods_spec_base_images: '',
show_field_price_text: null,
is_use_mobile_detail: 1,
common_app_is_use_mobile_detail: 1,
},
onLoad(params) {
@ -101,7 +101,7 @@ Page({
goods_spec_base_images: data.goods.images,
show_field_price_text: (data.goods.show_field_price_text == '销售价') ? null : (data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null),
is_use_mobile_detail: data.is_use_mobile_detail || 0,
common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
});
// 标题

6
public/appmini/old/alipay/pages/user/user.acss
View File

@ -49,12 +49,12 @@
}
/* 导航列表 */
.nav-box .nav-item{
.nav-box .nav-item {
height: 100rpx;
box-sizing: border-box;
padding: 30rpx 20rpx;
}
.nav-box .nav-item .item-icon{
.nav-box .nav-item .item-icon {
width: 40rpx;
height: 40rpx;
vertical-align: middle;
@ -89,5 +89,5 @@
left: calc(50% + 30rpx);
}
/* 通知 */
.user-notice { margin-top: 20rpx; padding: 0 10rpx 20rpx 10rpx; }

18
public/appmini/old/weixin/app.wxss
View File

@ -316,4 +316,22 @@ button[disabled].bg-primary {
.share-popup-content .share-items .single-text {
width: calc(100% - 100rpx);
line-height: 85rpx;
}
/*
在线客服
*/
.common-online-service {
border: 0;
padding: 15rpx;
background: rgba(0, 0, 0, 0.6);
position: fixed;
right: 10rpx;
bottom: 35%;
line-height: 30rpx;
border-radius: 50%;
}
.common-online-service image {
width: 60rpx;
height: 60rpx;
}

BIN
public/appmini/old/weixin/images/customer-service.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
public/appmini/old/weixin/images/default-online-service-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

4
public/appmini/old/weixin/pages/common/customer_service.wxml
View File

@ -1,4 +0,0 @@
<button open-type="contact" class="common-customer-service">
<image src="/images/user-nav-customer-service-icon.png"></image>
<text>在线客服</text>
</button>

5
public/appmini/old/weixin/pages/common/online_service.wxml Normal file
View File

@ -0,0 +1,5 @@
<template name="online_service">
<button open-type="contact" class="common-online-service">
<image src="/images/default-online-service-icon.png"></image>
</button>
</template>

7
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
View File

@ -32,9 +32,11 @@ Page({
show_field_price_text: null,
goods_video_is_autoplay: false,
is_use_mobile_detail: 1,
common_app_is_use_mobile_detail: 1,
popup_share_status: false,
common_app_is_online_service: 0,
},
onLoad(params) {
@ -103,7 +105,8 @@ Page({
goods_spec_base_images: data.goods.images,
show_field_price_text: (data.goods.show_field_price_text == '销售价') ? null : (data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null),
is_use_mobile_detail: data.is_use_mobile_detail || 0,
common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
common_app_is_online_service: data.common_app_is_online_service || 0,
});
// 标题

10
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
View File

@ -59,11 +59,11 @@
<text class="text-wrapper">详情</text>
</view>
<!-- web详情 -->
<view wx:if="{{is_use_mobile_detail == 0}}" class="bg-white">
<view wx:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
<!-- 手机独立详情 -->
<block wx:if="{{is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<block wx:if="{{common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<view wx:for="{{goods_content_app}}" wx:key="key" class="goods-detail-app bg-white">
<image wx:if="{{(item.images || null) != null}}" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view wx:if="{{(item.content || null) != null}}" class="content-items">
@ -178,4 +178,10 @@
<view wx:if="{{goods == null}}">
<import src="/pages/common/nodata.wxml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>
<!-- 在线客服 -->
<view wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/common/online_service.wxml" />
<template is="online_service"></template>
</view>

2
public/appmini/old/weixin/pages/index/index.js
View File

@ -10,6 +10,7 @@ Page({
common_app_is_enable_search: 1,
common_app_is_enable_answer: 1,
common_app_is_header_nav_fixed: 0,
common_app_is_online_service: 0,
load_status: 0,
},
@ -47,6 +48,7 @@ Page({
common_app_is_enable_answer: data.common_app_is_enable_answer,
common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
common_app_is_online_service: data.common_app_is_online_service || 0,
data_bottom_line_status: true,
});
} else {

6
public/appmini/old/weixin/pages/index/index.wxml
View File

@ -69,6 +69,12 @@
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
<!-- 在线客服 -->
<view wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/common/online_service.wxml" />
<template is="online_service"></template>
</view>
<!-- 版权 -->
<view wx:if="{{load_status == 1}}">
<import src="/pages/common/copyright.wxml" />

3
public/appmini/old/weixin/pages/user/user.js
View File

@ -28,6 +28,8 @@ Page({
// 远程自定义导航
navigation: [],
common_app_is_online_service: 0,
},
onShow() {
@ -106,6 +108,7 @@ Page({
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
common_app_is_online_service: data.common_app_is_online_service || 0,
});
} else {
app.showToast(res.data.msg);

6
public/appmini/old/weixin/pages/user/user.wxml
View File

@ -77,6 +77,12 @@
<view class="tips">{{common_user_center_notice}}</view>
</view>
<!-- 在线客服 -->
<view wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/common/online_service.wxml" />
<template is="online_service"></template>
</view>
<!-- 版权 -->
<import src="/pages/common/copyright.wxml" />
<template is="copyright"></template>

4
public/appmini/old/weixin/pages/user/user.wxss
View File

@ -49,7 +49,7 @@
}
/* 导航列表 */
.nav-box .nav-item{
.nav-box .nav-item {
height: 100rpx;
box-sizing: border-box;
padding: 30rpx 20rpx;
@ -90,5 +90,5 @@
left: calc(50% + 35rpx);
}
/* 通知 */
.user-notice { margin-top: 20rpx; padding: 0 10rpx 20rpx 10rpx; }