diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 2f5d607c6..a0351b4db 100755 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -97,7 +97,7 @@ class Order extends Common // 发起支付 - 支付方式 $pay_where = [ - 'where' => ['is_enable'=>1, 'is_open_user'=>1, 'payment'=>config('shopxo.under_line_list')], + 'where' => ['is_enable'=>1, 'payment'=>config('shopxo.under_line_list')], ]; $this->assign('buy_payment_list', PaymentService::BuyPaymentList($pay_where)); diff --git a/application/admin/controller/Payment.php b/application/admin/controller/Payment.php index 3d0b23db7..438720d81 100755 --- a/application/admin/controller/Payment.php +++ b/application/admin/controller/Payment.php @@ -11,6 +11,7 @@ namespace app\admin\controller; use app\service\PaymentService; +use app\service\StoreService; /** * 支付方式管理 @@ -58,6 +59,9 @@ class Payment extends Common // 适用平台 $this->assign('common_platform_type', lang('common_platform_type')); + // 应用商店 + $this->assign('store_payment_url', StoreService::StorePaymentUrl()); + return $this->fetch(); } diff --git a/application/admin/controller/Theme.php b/application/admin/controller/Theme.php index 8e36df1d7..650b95bb0 100755 --- a/application/admin/controller/Theme.php +++ b/application/admin/controller/Theme.php @@ -12,6 +12,7 @@ namespace app\admin\controller; use app\service\ThemeService; use app\service\ConfigService; +use app\service\StoreService; /** * 主题管理 @@ -64,6 +65,10 @@ class Theme extends Common // 默认主题 $theme = MyC('common_default_theme', 'default', true); $this->assign('theme', empty($theme) ? 'default' : $theme); + + // 应用商店 + $this->assign('store_theme_url', StoreService::StoreThemeUrl()); + return $this->fetch('index'); } else { return $this->fetch('upload'); diff --git a/application/admin/view/default/payment/index.html b/application/admin/view/default/payment/index.html index c9f125889..b4433a1cc 100755 --- a/application/admin/view/default/payment/index.html +++ b/application/admin/view/default/payment/index.html @@ -6,7 +6,7 @@
上传 - 更多支付插件下载 + 更多支付插件下载
@@ -21,7 +21,7 @@ 作者 描述 启用 - 开放使用 + 用户开放 操作 diff --git a/application/admin/view/default/payment/save_info.html b/application/admin/view/default/payment/save_info.html index 247d87f66..16eb33447 100755 --- a/application/admin/view/default/payment/save_info.html +++ b/application/admin/view/default/payment/save_info.html @@ -149,7 +149,7 @@
- +
diff --git a/application/admin/view/default/pluginsadmin/nav.html b/application/admin/view/default/pluginsadmin/nav.html index fa1a03538..950895516 100755 --- a/application/admin/view/default/pluginsadmin/nav.html +++ b/application/admin/view/default/pluginsadmin/nav.html @@ -5,4 +5,7 @@
  • 上传应用
    • +
  • + 更多支付插件下载 +
    • \ No newline at end of file diff --git a/application/admin/view/default/theme/nav.html b/application/admin/view/default/theme/nav.html index 6e1a5ae48..33fc32003 100755 --- a/application/admin/view/default/theme/nav.html +++ b/application/admin/view/default/theme/nav.html @@ -5,4 +5,7 @@
  • 主题安装
    • +
  • + 更多支付插件下载 +
    • \ No newline at end of file diff --git a/application/admin/view/default/theme/upload.html b/application/admin/view/default/theme/upload.html index f7a894f12..7b334ef72 100755 --- a/application/admin/view/default/theme/upload.html +++ b/application/admin/view/default/theme/upload.html @@ -8,7 +8,7 @@ -
    +
    diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index a7528d181..10b601b08 100755 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -108,7 +108,7 @@ class Common extends Controller { if(MyC('home_site_state') != 1) { - die(json_encode(DataReturn(MyC('home_site_close_reason', '网站维护中...'), -10000))); + exit(json_encode(DataReturn(MyC('home_site_close_reason', '网站维护中...'), -10000))); } } diff --git a/application/common.php b/application/common.php index 3ac15eccb..99016ea3b 100755 --- a/application/common.php +++ b/application/common.php @@ -1101,20 +1101,38 @@ function IsJson($jsonstr) * @blog http://gong.gg/ * @version 0.0.1 * @datetime 2016-12-03T21:58:54+0800 - * @param [string] $url [请求地址] - * @param [array] $post [发送的post数据] + * @param [string] $url [请求地址] + * @param [array] $post [发送的post数据] + * @param [boolean] $is_json [是否使用 json 数据发送] + * @return [mixed] [请求返回的数据] */ -function CurlPost($url, $post) +function CurlPost($url, $post, $is_json = false) { - $options = array( - CURLOPT_RETURNTRANSFER => true, - CURLOPT_HEADER => false, - CURLOPT_POST => true, - CURLOPT_POSTFIELDS => http_build_query($post), - ); + $ch = curl_init(); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_HEADER, false); + curl_setopt($ch, CURLOPT_URL, $url); + + // 是否 json + if($is_json) + { + $data_string = json_encode($post); + curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string); + curl_setopt($ch, CURLOPT_HTTPHEADER, array( + "Content-Type: application/json; charset=utf-8", + "Content-Length: " . strlen($data_string) + ) + ); + } else { + curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post)); + curl_setopt($ch, CURLOPT_HTTPHEADER, array( + "Content-Type: application/x-www-form-urlencoded", + "cache-control: no-cache" + ) + ); + } - $ch = curl_init($url); - curl_setopt_array($ch, $options); $result = curl_exec($ch); curl_close($ch); return $result; diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 47a9c416b..95b26d3b6 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -363,9 +363,9 @@ class Common extends Controller // 是否ajax请求 if(IS_AJAX) { - die(json_encode(DataReturn(MyC('home_site_close_reason', '网站维护中...'), -10000))); + exit(json_encode(DataReturn(MyC('home_site_close_reason', '网站维护中...'), -10000))); } else { - die('
    '.MyC('home_site_close_reason', '网站维护中...', true).'
    '); + exit('
    '.MyC('home_site_close_reason', '网站维护中...', true).'
    '); } } } diff --git a/application/service/StoreService.php b/application/service/StoreService.php index 2760bf3cc..190f5c36d 100644 --- a/application/service/StoreService.php +++ b/application/service/StoreService.php @@ -31,5 +31,31 @@ class StoreService { return config('shopxo.store_url').'?ver='.APPLICATION_VERSION.'&url='.urlencode(__MY_URL__); } + + /** + * 应用商店支付插件地址 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-06-16T00:33:28+0800 + * @param [array] $params [输入参数] + */ + public static function StorePaymentUrl($params = []) + { + return config('shopxo.store_payment_url').'?ver='.APPLICATION_VERSION.'&url='.urlencode(__MY_URL__); + } + + /** + * 应用商店主题地址 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-06-16T00:33:28+0800 + * @param [array] $params [输入参数] + */ + public static function StoreThemeUrl($params = []) + { + return config('shopxo.store_theme_url').'?ver='.APPLICATION_VERSION.'&url='.urlencode(__MY_URL__); + } } ?> \ No newline at end of file diff --git a/application/tags.php b/application/tags.php index 326660071..adb292902 100755 --- a/application/tags.php +++ b/application/tags.php @@ -37,19 +37,23 @@ return array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', 1 => 'app\\plugins\\coupon\\Hook', 2 => 'app\\plugins\\distribution\\Hook', + 3 => 'app\\plugins\\limitedtimediscount\\Hook', ), 'plugins_service_navigation_header_handle' => array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', 1 => 'app\\plugins\\coupon\\Hook', + 2 => 'app\\plugins\\limitedtimediscount\\Hook', ), 'plugins_service_goods_handle_end' => array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\limitedtimediscount\\Hook', ), 'plugins_service_goods_spec_base' => array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\limitedtimediscount\\Hook', ), 'plugins_service_buy_handle' => array ( @@ -110,6 +114,7 @@ return array ( 'plugins_js' => array ( 0 => 'app\\plugins\\coupon\\Hook', + 1 => 'app\\plugins\\limitedtimediscount\\Hook', ), 'plugins_view_goods_detail_panel_bottom' => array ( @@ -131,6 +136,7 @@ return array ( array ( 0 => 'app\\plugins\\coupon\\Hook', 1 => 'app\\plugins\\distribution\\Hook', + 2 => 'app\\plugins\\fictitioussecretkey\\Hook', ), 'plugins_service_user_register_end' => array ( @@ -160,5 +166,13 @@ return array ( array ( 0 => 'app\\plugins\\distribution\\Hook', ), + 'plugins_view_goods_detail_base_top' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_view_home_floor_top' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), ); ?> \ No newline at end of file diff --git a/config/shopxo.php b/config/shopxo.php index c7111a6b0..8c611ab0e 100755 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -22,40 +22,42 @@ return [ // 缓存key列表 // 公共系统配置信息key - 'cache_common_my_config_key' => 'cache_common_my_config_data', + 'cache_common_my_config_key' => 'cache_common_my_config_data', // 前台顶部导航，后端菜单更新则删除缓存 - 'cache_common_home_nav_header_key' => 'cache_common_home_nav_header_data', + 'cache_common_home_nav_header_key' => 'cache_common_home_nav_header_data', // 前台顶部导航 - 'cache_common_home_nav_footer_key' => 'cache_common_home_nav_footer_data', + 'cache_common_home_nav_footer_key' => 'cache_common_home_nav_footer_data', // 商品大分类缓存 - 'cache_goods_category_key' => 'cache_goods_category_key_data', + 'cache_goods_category_key' => 'cache_goods_category_key_data', // 应用数据缓存 - 'cache_plugins_data_key' => 'cache_plugins_data_key_data_', + 'cache_plugins_data_key' => 'cache_plugins_data_key_data_', // 用户登录左侧数据 - 'cache_user_login_left_key' => 'cache_user_login_left_data', + 'cache_user_login_left_key' => 'cache_user_login_left_data', // 用户密码找回左侧数据 - 'cache_user_forgetpwd_left_key' => 'cache_user_forgetpwd_left_data', + 'cache_user_forgetpwd_left_key' => 'cache_user_forgetpwd_left_data', // 配置信息一条缓存 拼接唯一标记 [ only_tag ] - 'cache_config_row_key' => 'cache_config_row_data_', + 'cache_config_row_key' => 'cache_config_row_data_', // 用户缓存信息 - 'cache_user_info' => 'cache_user_info_', + 'cache_user_info' => 'cache_user_info_', // 附件host, 数据库图片地址以/static/...开头 - 'attachment_host' => defined('__MY_PUBLIC_URL__') ? substr(__MY_PUBLIC_URL__, 0, -1) : '', + 'attachment_host' => defined('__MY_PUBLIC_URL__') ? substr(__MY_PUBLIC_URL__, 0, -1) : '', // 应用商店地址 - 'store_url' => 'https://store.shopxo.net/', + 'store_url' => 'https://store.shopxo.net/', + 'store_payment_url' => 'https://store.shopxo.net/payment.html', + 'store_theme_url' => 'https://store.shopxo.net/theme.html', // 开启U带域名 - 'url_domain_deploy' => true, + 'url_domain_deploy' => true, // 支付业务类型,支付插件根据业务类型自动生成支付入口文件 'payment_business_type_all' => [ @@ -72,6 +74,6 @@ return [ 'under_line_list' => ['CashPayment', 'DeliveryPayment'], // 小程序平台 - 'mini_app_type_list' => ['weixin', 'alipay', 'baidu', 'toutiao', 'qq'], + 'mini_app_type_list' => ['weixin', 'alipay', 'baidu', 'toutiao', 'qq'], ]; ?> \ No newline at end of file diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json index 447d17be8..16e31df8a 100644 --- a/public/appmini/old/alipay/app.json +++ b/public/appmini/old/alipay/app.json @@ -34,11 +34,11 @@ "pages/plugins/membershiplevelvip/user/user", "pages/plugins/membershiplevelvip/order/order", "pages/plugins/membershiplevelvip/order-detail/order-detail", - "pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail", - "pages/plugins/membershiplevelvip/shouyi/shouyi", - "pages/plugins/membershiplevelvip/tongji/tongji", - "pages/plugins/membershiplevelvip/tuiguang/tuiguang", - "pages/plugins/membershiplevelvip/tuandui/tuandui" + "pages/plugins/membershiplevelvip/profit-detail/profit-detail", + "pages/plugins/membershiplevelvip/profit/profit", + "pages/plugins/membershiplevelvip/statistics/statistics", + "pages/plugins/membershiplevelvip/poster/poster", + "pages/plugins/membershiplevelvip/team/team" ], "window": { "defaultTitle": "shopxo", diff --git a/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-shouye-icon.png b/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-index-icon.png similarity index 100% rename from public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-shouye-icon.png rename to public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-index-icon.png diff --git a/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png b/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-poster-icon.png similarity index 100% rename from public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png rename to public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-poster-icon.png diff --git a/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-shouyi-icon.png b/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-profit-icon.png similarity index 100% rename from public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-shouyi-icon.png rename to public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-profit-icon.png diff --git a/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-tongji-icon.png b/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-statistics-icon.png similarity index 100% rename from public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-tongji-icon.png rename to public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-statistics-icon.png diff --git a/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-tuandui-icon.png b/public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-team-icon.png similarity index 100% rename from public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-tuandui-icon.png rename to public/appmini/old/alipay/images/plugins/membershiplevelvip/user-center-team-icon.png diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.acss b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.acss similarity index 82% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.acss rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.acss index b8af8abfe..ddea4324b 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.acss +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.acss @@ -23,6 +23,13 @@ margin: 20rpx 0; padding: 0 20rpx; } +.share button { + height: 70rpx; + line-height: 70rpx; +} +.submit-double button { + width: 48%; +} /* * 链接 diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.axml b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.axml similarity index 80% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.axml rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.axml index ca129fbbd..360c119ea 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.axml +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.axml @@ -7,8 +7,9 @@ - - + + + @@ -19,7 +20,7 @@ {{user_share_url}} - + diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.js similarity index 83% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.js rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.js index 6ab85a891..1cd629e8c 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.js +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.js @@ -76,8 +76,8 @@ Page({ this.init(); }, - // 二维码事件 - qrcode_event(e) { + // 二维码查看事件 + qrcode_show_event(e) { if ((this.data.user_share_qrode || null) != null) { my.previewImage({ current: 0, @@ -88,6 +88,24 @@ Page({ } }, + // 二维码保存事件 + qrcode_save_event(e) { + if ((this.data.user_share_qrode || null) != null) { + my.saveImage({ + url: this.data.user_share_qrode, + showActionSheet: true, + success: () => { + app.showToast('保存成功', 'success'); + }, + fail: (res) => { + app.showToast('保存失败'); + }, + }); + } else { + app.showToast('二维码地址有误'); + } + }, + // url事件 url_event(e) { if ((this.data.user_share_url || null) != null) { diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.json b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.json similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.json rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.json diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.acss b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.acss similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.acss rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.acss diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.axml b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml similarity index 87% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.axml rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml index 71dd0ffa5..d560f5181 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.axml +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml @@ -17,7 +17,7 @@ - + diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.js similarity index 98% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.js index 06a1dc9ef..a3eaf6866 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.js @@ -11,7 +11,7 @@ Page({ }, onLoad(params) { - params['id'] = 1; + //params['id'] = 1; this.setData({ params: params }); this.init(); }, diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.json b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.json similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.json rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.json diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.acss b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.acss similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.acss rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.acss diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.axml b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.axml similarity index 84% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.axml rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.axml index 1d7c13704..1cbdd3c0f 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.axml +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.axml @@ -13,7 +13,7 @@ {{item.add_time_time}} {{item.status_name}} - + 订单金额 @@ -29,10 +29,6 @@ 当前级别 {{item.level_name}} - - 返佣规则 - {{item.commission_rules}} - diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.js similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.js rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.js diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.json b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.json similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/shouyi/shouyi.json rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/profit/profit.json diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.acss b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.acss similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.acss rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.acss diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.axml b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.axml similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.axml rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.axml diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.js similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.js rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.js diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.json b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.json similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tongji/tongji.json rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.json diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.acss b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.acss similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.acss rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.acss diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.axml b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.axml similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.axml rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.axml diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.js similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.js rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.js diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.json b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.json similarity index 100% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuandui/tuandui.json rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/team/team.json diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.acss b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.acss index 607761535..e553154dc 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.acss +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.acss @@ -12,8 +12,8 @@ } .head-item .avatar { padding: 10rpx; - background: #1d1611; - border: 1px solid #3d3c3c; + background: #3c3835; + border: 1px solid #3c3835; } .head-item .avatar image { width: 140rpx; diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.axml b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.axml index ec72716f7..258a0e3d5 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.axml +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.axml @@ -2,7 +2,7 @@ - + {{nickname}} diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js index 078f3e561..d275b9779 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js +++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js @@ -14,12 +14,11 @@ Page({ nav_list: [], }, - onLoad(params) { - this.init(); - }, + onLoad(params) {}, onShow() { app.set_nav_bg_color_main('#1d1611'); + this.init(); }, init(e) { @@ -98,33 +97,33 @@ Page({ if ((data_base.is_commission || 0) == 1) { nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-shouyi-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-profit-icon.png", title: "收益明细", - url: "/pages/plugins/membershiplevelvip/shouyi/shouyi", + url: "/pages/plugins/membershiplevelvip/profit/profit", }); } // 开启推广 if ((data_base.is_propaganda || 0) == 1) { nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-tuandui-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-team-icon.png", title: "我的团队", - url: "/pages/plugins/membershiplevelvip/tuandui/tuandui", + url: "/pages/plugins/membershiplevelvip/team/team", }); nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-poster-icon.png", title: "推广返利", - url: "/pages/plugins/membershiplevelvip/tuiguang/tuiguang", + url: "/pages/plugins/membershiplevelvip/poster/poster", }); nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-tongji-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-statistics-icon.png", title: "数据统计", - url: "/pages/plugins/membershiplevelvip/tongji/tongji", + url: "/pages/plugins/membershiplevelvip/statistics/statistics", }); } nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-shouye-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-index-icon.png", title: "会员首页", url: "/pages/plugins/membershiplevelvip/index/index", }); diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 1d06e91d3..ef3ecaa91 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -68,7 +68,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - request_url: 'https://dev.shopxo.net/', + // request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index cadf3dec9..983ae2839 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -1,5 +1,5 @@ { - "pages": [ + "pages": [ "pages/plugins/distribution/user/user", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -34,11 +34,21 @@ "pages/plugins/membershiplevelvip/user/user", "pages/plugins/membershiplevelvip/order/order", "pages/plugins/membershiplevelvip/order-detail/order-detail", - "pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail", - "pages/plugins/membershiplevelvip/shouyi/shouyi", - "pages/plugins/membershiplevelvip/tongji/tongji", - "pages/plugins/membershiplevelvip/tuiguang/tuiguang", - "pages/plugins/membershiplevelvip/tuandui/tuandui" + "pages/plugins/membershiplevelvip/profit/profit", + "pages/plugins/membershiplevelvip/profit-detail/profit-detail", + "pages/plugins/membershiplevelvip/statistics/statistics", + "pages/plugins/membershiplevelvip/poster/poster", + "pages/plugins/membershiplevelvip/team/team", + + + "pages/plugins/distribution/order/order", + "pages/plugins/distribution/order-detail/order-detail", + "pages/plugins/distribution/profit/profit", + "pages/plugins/distribution/profit-detail/profit-detail", + "pages/plugins/distribution/statistics/statistics", + "pages/plugins/distribution/poster/poster", + "pages/plugins/distribution/team/team", + "pages/plugins/distribution/introduce/introduce" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/public/appmini/old/weixin/images/plugins/distribution/user-center-introduce-icon.png b/public/appmini/old/weixin/images/plugins/distribution/user-center-introduce-icon.png new file mode 100644 index 000000000..d608ef303 Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/distribution/user-center-introduce-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/distribution/user-center-order-icon.png b/public/appmini/old/weixin/images/plugins/distribution/user-center-order-icon.png new file mode 100644 index 000000000..77267b63d Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/distribution/user-center-order-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/distribution/user-center-poster-icon.png b/public/appmini/old/weixin/images/plugins/distribution/user-center-poster-icon.png new file mode 100644 index 000000000..cb053cf42 Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/distribution/user-center-poster-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/distribution/user-center-profit-icon.png b/public/appmini/old/weixin/images/plugins/distribution/user-center-profit-icon.png new file mode 100644 index 000000000..8809c50a5 Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/distribution/user-center-profit-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png b/public/appmini/old/weixin/images/plugins/distribution/user-center-statistics-icon.png similarity index 100% rename from public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tongji-icon.png rename to public/appmini/old/weixin/images/plugins/distribution/user-center-statistics-icon.png diff --git a/public/appmini/old/weixin/images/plugins/distribution/user-center-team-icon.png b/public/appmini/old/weixin/images/plugins/distribution/user-center-team-icon.png new file mode 100644 index 000000000..80aed19cb Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/distribution/user-center-team-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouye-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-index-icon.png similarity index 100% rename from public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouye-icon.png rename to public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-index-icon.png diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-poster-icon.png similarity index 100% rename from public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png rename to public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-poster-icon.png diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouyi-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-profit-icon.png similarity index 100% rename from public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-shouyi-icon.png rename to public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-profit-icon.png diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-statistics-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-statistics-icon.png new file mode 100644 index 000000000..dd44721f0 Binary files /dev/null and b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-statistics-icon.png differ diff --git a/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuandui-icon.png b/public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-team-icon.png similarity index 100% rename from public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-tuandui-icon.png rename to public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-team-icon.png diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index 054f10611..e307a8742 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -800,7 +800,7 @@ Page({ } else { wx.showLoading({ title: '生成中...' }); wx.request({ - url: app.get_request_url('poster', 'user', 'distribution'), + url: app.get_request_url('goodsposter', 'distribution', 'distribution'), method: 'POST', data: { "goods_id": this.data.goods.id }, dataType: 'json', diff --git a/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.js b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.js new file mode 100644 index 000000000..feb65a362 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.js @@ -0,0 +1,78 @@ +const app = getApp(); +Page({ + data: { + params: null, + data_list_loding_status: 1, + data_list_loding_msg: '', + data_bottom_line_status: false, + + data_base: null, + level_list: [], + }, + + onLoad(params) { + this.setData({ params: params }); + this.init(); + }, + + onShow() { }, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("index", "introduce", "distribution"), + method: "POST", + data: { + id: this.data.params.id + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + var data_base = data.base || null; + var level_list = ((data.level_list || null) != null && data.level_list.length > 0) ? data.level_list : []; + self.setData({ + data_base: data_base, + level_list: level_list, + data_list_loding_status: (data_base == null || level_list.length <= 0) ? 0 : 3, + data_bottom_line_status: true, + data_list_loding_msg: '', + }); + } else { + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: '服务器请求出错', + }); + + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.init(); + }, + +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.json b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.json new file mode 100644 index 000000000..8171087c9 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "等级介绍" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxml b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxml new file mode 100644 index 000000000..685d15e83 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxml @@ -0,0 +1,47 @@ + + + + + {{item.name}} + + + 等级证书 + + + + + + 返佣比例 + + 一级 {{item.level_rate_one}}% + 二级 {{item.level_rate_two}}% + 三级 {{item.level_rate_three}}% + + + + 消费金额 + {{item.rules_msg}} + + + + + + + + + + {{item}} + + + + + + + + + + + + + + diff --git a/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxss b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxss new file mode 100644 index 000000000..fddc3730b --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxss @@ -0,0 +1,48 @@ +/* + * 等级信息 + */ +.panel-item .panel-title { + background: #fff; + font-weight: bold; + padding: 15rpx; + border-bottom: 2px solid #eee; + font-size: 34rpx; +} +.panel-item .panel-content .item { + padding: 20rpx 0; +} +.panel-item .panel-content .item:last-child { + border: 0; +} +.panel-item .panel-content .item .title { + width: 25%; + padding-left: 20rpx; +} +.panel-item .panel-content .item .content { + width: calc(75% - 50rpx); + padding-left: 20rpx; + min-height: 46rpx; +} +.panel-item .panel-content .item view { + line-height: 46rpx; +} +.panel-item .panel-content .item .images image { + width: 60rpx; + height: 60rpx; +} + + +/* + * 等级介绍 + */ +.user-center-level-desc { + padding: 0 10rpx; +} +.user-center-level-desc .tips-desc { + background: #def2fd; + border: 1px solid #cfeeff; + color: #1490d2; + padding: 10rpx; + font-size: 26rpx; + border-radius: 2px; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.js b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.js new file mode 100644 index 000000000..06e4dd02a --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.js @@ -0,0 +1,86 @@ +const app = getApp(); +Page({ + data: { + params: null, + data_list_loding_status: 1, + data_list_loding_msg: '', + data_bottom_line_status: false, + + detail: null, + detail_list: [], + }, + + onLoad(params) { + //params['id'] = 1; + this.setData({ params: params }); + this.init(); + }, + + onShow() {}, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("detail", "order", "distribution"), + method: "POST", + data: { + id: this.data.params.id + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + detail: data.data, + detail_list: [ + { name: "用户昵称", value: data.data.user_name_view || '' }, + { name: "订单金额", value: data.data.total_price + ' 元' || '' }, + { name: "退款金额", value: data.data.refund_price + ' 元' || '' }, + { name: "订单状态", value: data.data.order_status_name || '' }, + { name: "支付状态", value: data.data.order_pay_status_name || '' }, + { name: "来源终端", value: data.data.order_client_type_name || '' }, + { name: "下单时间", value: data.data.add_time_time || '' }, + ], + + data_list_loding_status: 3, + data_bottom_line_status: true, + data_list_loding_msg: '', + }); + } else { + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: '服务器请求出错', + }); + + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.init(); + }, + +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.json b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.json new file mode 100644 index 000000000..000479ff8 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "订单详情" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxml b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxml new file mode 100644 index 000000000..1934ead93 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxml @@ -0,0 +1,31 @@ + + + + + 用户头像 + + + + + + + {{item.name}} + {{item.value}} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxss b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxss new file mode 100644 index 000000000..c6df7dd98 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxss @@ -0,0 +1,31 @@ +.panel-item .panel-title { + background: #fff; + font-weight: bold; + padding: 15rpx; + border-bottom: 2px solid #eee; + font-size: 34rpx; +} +.panel-item .panel-content .item { + padding: 20rpx 0; +} +.panel-item .panel-content .item:last-child { + border: 0; +} +.panel-item .panel-content .item .title { + width: 25%; + padding-left: 20rpx; +} +.panel-item .panel-content .item .content { + width: calc(75% - 50rpx); + padding-left: 20rpx; + min-height: 46rpx; +} +.panel-item .panel-content .item view { + line-height: 46rpx; +} + +.panel-item .panel-content .item .content .avatar { + width: 60rpx; + height: 60rpx; + border-radius: 50%; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order/order.js b/public/appmini/old/weixin/pages/plugins/distribution/order/order.js new file mode 100644 index 000000000..c52a2e65b --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order/order.js @@ -0,0 +1,170 @@ +const app = getApp(); +Page({ + data: { + data_list: [], + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + params: null, + + nav_status_list: [ + { name: "全部", value: "-1" }, + { name: "待支付", value: "1" }, + { name: "已支付", value: "2" }, + { name: "待收货", value: "3" }, + { name: "已完成", value: "4" }, + ], + nav_status_index: 0, + }, + + onLoad(params) { + // 是否指定状态 + var nav_status_index = 0; + if ((params.status || null) != null) { + for (var i in this.data.nav_status_list) { + if (this.data.nav_status_list[i]['value'] == params.status) { + nav_status_index = i; + break; + } + } + } + + this.setData({ + params: params, + nav_status_index: nav_status_index, + }); + this.init(); + }, + + onShow() {}, + + init() { + var user = app.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.redirectTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + + // 获取数据 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data.data_bottom_line_status == true) { + return false; + } + } + + // 加载loding + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + // 参数 + var order_status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value']; + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "order", "distribution"), + method: "POST", + data: { + page: this.data.data_page, + status: order_status, + uid: this.data.params.uid || 0, + is_more: 1, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + if (res.data.data.data.length > 0) { + if (this.data.data_page <= 1) { + var temp_data_list = res.data.data.data; + } else { + var temp_data_list = this.data.data_list; + var temp_data = res.data.data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: res.data.data.total, + data_page_total: res.data.data.page_total, + data_list_loding_status: 3, + data_page: this.data.data_page + 1, + payment_list: res.data.data.payment_list || [], + }); + + // 是否还有数据 + if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) { + this.setData({ data_bottom_line_status: true }); + } else { + this.setData({ data_bottom_line_status: false }); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_list: [], + data_bottom_line_status: false, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + }); + if (app.is_login_check(res.data, this, 'get_data_list')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + + this.setData({ + data_list_loding_status: 2, + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.setData({ + data_page: 1 + }); + this.get_data_list(1); + }, + + // 滚动加载 + scroll_lower(e) { + this.get_data_list(); + }, + + // 导航事件 + nav_event(e) { + this.setData({ + nav_status_index: e.currentTarget.dataset.index || 0, + data_page: 1, + }); + this.get_data_list(1); + }, +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order/order.json b/public/appmini/old/weixin/pages/plugins/distribution/order/order.json new file mode 100644 index 000000000..8d82bfa04 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order/order.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "分销订单" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order/order.wxml b/public/appmini/old/weixin/pages/plugins/distribution/order/order.wxml new file mode 100644 index 000000000..ea6ed5eef --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order/order.wxml @@ -0,0 +1,44 @@ + + + + {{item.name}} + + + + + + + + + + {{item.user_name_view || ''}} + + + + + 订单金额 + {{item.total_price}} + 元 + + + 订单状态 + {{item.order_status_name}} + + + 来源终端 + {{item.order_client_type_name}} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/order/order.wxss b/public/appmini/old/weixin/pages/plugins/distribution/order/order.wxss new file mode 100644 index 000000000..87867d4b7 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/order/order.wxss @@ -0,0 +1,47 @@ +/* + * 导航 + */ +.nav { + background: #eee; + height: 80rpx; + line-height: 80rpx; +} +.nav .item { + width: 20%; +} +.nav .active { + color: #ff6a80; +} + +/* + * 列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list .item .base { + padding: 15rpx 10rpx; +} +.data-list .item .base .avatar { + width: 60rpx; + height: 60rpx; + border-radius: 50%; +} +.data-list .item .base .nickname { + margin-top: 10rpx; +} +.data-list .item .content { + padding: 20rpx 10rpx; +} +.data-list .item .content .multi-text { + line-height: 50rpx; +} +.data-list .item .content .multi-text .title { + margin-right: 30rpx; +} +.data-list .item .content .multi-text .value { + font-weight: 500; +} +.data-list .item .content .multi-text .unit { + margin-left: 10rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.js b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.js new file mode 100644 index 000000000..c56926e85 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.js @@ -0,0 +1,132 @@ +const app = getApp(); +Page({ + data: { + data_list_loding_status: 1, + data_list_loding_msg: '加载中...', + data_bottom_line_status: false, + user_share_poster: null, + user_share_qrode: null, + user_share_url: null, + }, + + onShow() { + this.init(); + }, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("index", "poster", "distribution"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + user_share_poster: data.user_share_poster || null, + user_share_qrode: data.user_share_qrode || null, + user_share_url: data.user_share_url || null, + data_list_loding_status: 3, + data_bottom_line_status: true, + data_list_loding_msg: '', + }); + + // 是否全部没数据 + if (self.data.user_share_poster == null && self.data.user_share_qrode == null && self.data.user_share_url == null) + { + self.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + } else { + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: '服务器请求出错', + }); + + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.init(); + }, + + // 刷新海报 + poster_refresh_event(e) { + wx.showLoading({ title: "处理中..." }); + wx.request({ + url: app.get_request_url("refresh", "poster", "distribution"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + wx.hideLoading(); + if (res.data.code == 0) { + this.setData({ user_share_poster: res.data.data}); + app.showToast(res.data.msg, "success"); + } else { + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); + } + }); + }, + + // 图片查看事件 + images_show_event(e) { + var value = e.currentTarget.dataset.value || null; + if (value != null) { + wx.previewImage({ + current: value, + urls: [value] + }); + } else { + app.showToast('宣传图片地址有误'); + } + }, + + // url事件 + url_event(e) { + if ((this.data.user_share_url || null) != null) { + wx.setClipboardData({ + data: this.data.user_share_url, + success(res) { + app.showToast('复制成功', 'success'); + } + }) + } else { + app.showToast('链接地址有误'); + } + }, +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.json b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.json new file mode 100644 index 000000000..4e77032d5 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "推广返利" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxml b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxml new file mode 100644 index 000000000..789cc3e6c --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxss b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxss new file mode 100644 index 000000000..53f15eed1 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxss @@ -0,0 +1,40 @@ +/* + * 公共 + */ +.share { + padding: 20rpx 10rpx; +} +.share .title { + border-left: 3px solid #ff6a80; + margin-left: 10rpx; + padding-left: 20rpx; + font-size: 32rpx; + font-weight: 500; +} +.share .desc { + font-size: 32rpx; + padding: 0 10rpx 20rpx 10rpx; + margin-top: 20rpx; +} +.share .content { + padding: 20rpx; +} +.share .submit { + margin: 20rpx 0; + padding: 0 20rpx; +} +.share button { + height: 70rpx; + line-height: 70rpx; +} +.submit-double button { + width: 48%; +} + +/* + * 链接 + */ +.url .content { + font-size: 32rpx; + color: #ff6a80; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.js b/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.js new file mode 100644 index 000000000..c140ad41d --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.js @@ -0,0 +1,89 @@ +const app = getApp(); +Page({ + data: { + params: null, + data_list_loding_status: 1, + data_list_loding_msg: '', + data_bottom_line_status: false, + + detail: null, + detail_list: [], + }, + + onLoad(params) { + //params['id'] = 1; + this.setData({ params: params }); + this.init(); + }, + + onShow() {}, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("detail", "profit", "distribution"), + method: "POST", + data: { + id: this.data.params.id + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + detail: data.data, + detail_list: [ + { name: "订单金额", value: data.data.total_price + '元' || '' }, + { name: "退款金额", value: data.data.refund_price + '元' || '' }, + { name: "收益金额", value: data.data.profit_price + '元' || '' }, + { name: "当前级别", value: data.data.level_name || '' }, + { name: "结算状态", value: data.data.status_name || '' }, + { name: "订单状态", value: data.data.order_status_name || '' }, + { name: "订单支付状态", value: data.data.order_pay_status_name || '' }, + { name: "来源终端", value: data.data.order_client_type_name || '' }, + { name: "添加时间", value: data.data.add_time_time || '' }, + { name: "更新时间", value: data.data.upd_time_text || '' }, + ], + + data_list_loding_status: 3, + data_bottom_line_status: true, + data_list_loding_msg: '', + }); + } else { + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: '服务器请求出错', + }); + + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.init(); + }, + +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.json b/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.json new file mode 100644 index 000000000..1b6b15a62 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "收益详情" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml b/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml new file mode 100644 index 000000000..51a861695 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml @@ -0,0 +1,24 @@ + + + + + {{item.name}} + {{item.value}} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxss b/public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxss similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxss rename to public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxss diff --git a/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.js b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.js new file mode 100644 index 000000000..331dba779 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.js @@ -0,0 +1,166 @@ +const app = getApp(); +Page({ + data: { + data_list: [], + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + params: null, + nav_status_list: [ + { name: "全部", value: "-1" }, + { name: "待结算", value: "0" }, + { name: "已结算", value: "1" }, + { name: "已失效", value: "2" }, + ], + nav_status_index: 0, + }, + + onLoad(params) { + // 是否指定状态 + var nav_status_index = 0; + if ((params.status || null) != null) { + for (var i in this.data.nav_status_list) { + if (this.data.nav_status_list[i]['value'] == params.status) { + nav_status_index = i; + break; + } + } + } + + this.setData({ + params: params, + nav_status_index: nav_status_index, + }); + this.init(); + }, + + onShow() {}, + + init() { + var user = app.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.redirectTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + + // 获取数据 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data.data_bottom_line_status == true) { + return false; + } + } + + // 加载loding + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + // 参数 + var status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value']; + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "profit", "distribution"), + method: "POST", + data: { + page: this.data.data_page, + status: status, + is_more: 1, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + if (res.data.data.data.length > 0) { + if (this.data.data_page <= 1) { + var temp_data_list = res.data.data.data; + } else { + var temp_data_list = this.data.data_list; + var temp_data = res.data.data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: res.data.data.total, + data_page_total: res.data.data.page_total, + data_list_loding_status: 3, + data_page: this.data.data_page + 1, + }); + + // 是否还有数据 + if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) { + this.setData({ data_bottom_line_status: true }); + } else { + this.setData({ data_bottom_line_status: false }); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_list: [], + data_bottom_line_status: false, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + }); + if (app.is_login_check(res.data, this, 'get_data_list')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + + this.setData({ + data_list_loding_status: 2, + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.setData({ + data_page: 1 + }); + this.get_data_list(1); + }, + + // 滚动加载 + scroll_lower(e) { + this.get_data_list(); + }, + + // 导航事件 + nav_event(e) { + this.setData({ + nav_status_index: e.currentTarget.dataset.index || 0, + data_page: 1, + }); + this.get_data_list(1); + }, +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.json b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.json new file mode 100644 index 000000000..a5de911e4 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "收益明细" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxml b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxml new file mode 100644 index 000000000..18cedd223 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxml @@ -0,0 +1,50 @@ + + + + {{item.name}} + + + + + + + + + {{item.add_time_time}} + {{item.status_name}} + + + + + 订单金额 + {{item.total_price}} + 元 + + + 退款金额 + {{item.refund_price}} + 元 + + + 收益金额 + {{item.profit_price}} + 元 + + + 当前级别 + {{item.level_name}} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxss b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxss new file mode 100644 index 000000000..85bc57b71 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxss @@ -0,0 +1,37 @@ +/* + * 导航 + */ +.nav { + background: #eee; + height: 80rpx; + line-height: 80rpx; +} +.nav .item { + width: 25%; +} +.nav .active { + color: #ff6a80; +} + +/* + * 列表 + */ +.scroll-box { + height: calc(100vh - 80rpx); +} +.data-list .item .base, +.data-list .item .content { + padding: 20rpx 10rpx; +} +.data-list .item .content .multi-text { + line-height: 50rpx; +} +.data-list .item .content .multi-text .title { + margin-right: 30rpx; +} +.data-list .item .content .multi-text .value { + font-weight: 500; +} +.data-list .item .content .multi-text .unit { + margin-left: 10rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.js b/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.js new file mode 100644 index 000000000..a4b517256 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.js @@ -0,0 +1,201 @@ +import * as echarts from '../../../../components/ec-canvas/echarts'; +const app = getApp(); + +// 近15日收益走势 +let profit_chart_obj = null; +function init_profit_chart(canvas, width, height) { + profit_chart_obj = echarts.init(canvas, null, { + width: width, + height: height + }); + canvas.setChart(profit_chart_obj); + return profit_chart_obj; +}; + +// 近15日推广用户数 +let user_chart_obj = null; +function init_user_chart(canvas, width, height) { + user_chart_obj = echarts.init(canvas, null, { + width: width, + height: height + }); + canvas.setChart(user_chart_obj); + return user_chart_obj; +}; + +Page({ + data: { + data_list_loding_status: 1, + data_list_loding_msg: '加载中...', + data_bottom_line_status: false, + + user_total: null, + user_profit_already_price: 0.00, + user_profit_stay_price: 0.00, + user_profit_total_price: 0.00, + user_data: null, + profit_data: null, + + // 图表 + profit_chart: { + onInit: init_profit_chart, + }, + user_chart: { + onInit: init_user_chart, + }, + }, + + onShow() { + this.init(); + }, + + init() { + var self = this; + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + wx.request({ + url: app.get_request_url("index", "statistics", "distribution"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + self.setData({ + user_total: data.user_total || null, + user_profit_already_price: data.user_profit_already_price || 0.00, + user_profit_stay_price: data.user_profit_stay_price || 0.00, + user_profit_total_price: data.user_profit_total_price || 0.00, + user_data: data.user_chart || null, + profit_data: data.profit_chart || null, + + data_list_loding_status: 3, + data_bottom_line_status: true, + data_list_loding_msg: '', + }); + + // 图表 + setTimeout(function() + { + // 近15日收益走势 + self.set_profit_chart(data.profit_chart); + + // 近15日推广用户数 + self.set_profit_user(data.user_chart); + }, 200); + } else { + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'init')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_list_loding_status: 2, + data_bottom_line_status: false, + data_list_loding_msg: '服务器请求出错', + }); + + app.showToast("服务器请求出错"); + } + }); + }, + + // 近15日推广用户数 + set_profit_user(data) { + if ((data || null) != null) { + var option = { + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross', + label: { + backgroundColor: '#6a7985' + } + } + }, + grid: { + top: '10%', + left: '5%', + right: '5%', + bottom: '15%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: data.name_arr + }, + yAxis: { + type: 'value' + }, + series: [{ + data: data.data, + type: 'bar', + areaStyle: {} + }] + }; + if (typeof (user_chart_obj) == 'object') { + user_chart_obj.setOption(option); + } + } + }, + + // 近15日收益走势图表 + set_profit_chart(data) { + if ((data || null) != null) + { + var option = { + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross', + label: { + backgroundColor: '#6a7985' + } + } + }, + grid: { + top: '10%', + left: '5%', + right: '5%', + bottom: '15%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: data.name_arr + }, + yAxis: { + type: 'value' + }, + series: [{ + data: data.data, + type: 'line' + }] + }; + if (typeof (profit_chart_obj) == 'object') { + profit_chart_obj.setOption(option); + } + } + }, + + // 下拉刷新 + onPullDownRefresh() { + this.init(); + }, + +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.json b/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.json new file mode 100644 index 000000000..841f918ec --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.json @@ -0,0 +1,11 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "数据统计", + "usingComponents": { + "component-ec-canvas": "/components/ec-canvas/ec-canvas" + } +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.wxml b/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxml similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.wxml rename to public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxml diff --git a/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxss b/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxss new file mode 100644 index 000000000..a00c4c64c --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxss @@ -0,0 +1,61 @@ +/* + * 公共 + */ +.container { + padding: 20rpx 10rpx; +} +.container .title { + border-left: 3px solid #ff6a80; + padding-left: 20rpx; + font-size: 32rpx; + font-weight: 500; +} +.container .base-content { + padding: 30rpx 10rpx; +} +.container .base-content .name { + margin-bottom: 10rpx; +} +.container .base-content .value .golden, +.container .base-content .value .yellow, +.container .base-content .value .green { + font-weight: 500; + margin-right: 10rpx; +} +.container .base-content .value .golden { + color: #ff6a80; +} +.container .base-content .value .yellow { + color: #f37b1d; +} +.container .base-content .value .green { + color: #5eb95e; +} + +/* + * 用户 + */ +.user-container .item { + width: 50%; +} + +/* + * 返利 + */ +.profit-container .item { + width: 33.33%; +} + +/* + * 图表 + */ +.chart-container { + width: 100%; + height: 520rpx; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} +.chart-container .chart-not-data { + margin-top: 230rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/team/team.js b/public/appmini/old/weixin/pages/plugins/distribution/team/team.js new file mode 100644 index 000000000..b5ecd8002 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/team/team.js @@ -0,0 +1,147 @@ +const app = getApp(); +Page({ + data: { + data_list: [], + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + params: null, + }, + + onLoad(params) { + this.setData({ + params: params, + }); + this.init(); + }, + + onShow() { }, + + init() { + var user = app.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.redirectTo({ + url: "/pages/login/login?event_callback=init" + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + + // 获取数据 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data.data_bottom_line_status == true) { + return false; + } + } + + // 加载loding + wx.showLoading({ title: "加载中..." }); + this.setData({ + data_list_loding_status: 1 + }); + + // 获取数据 + wx.request({ + url: app.get_request_url("index", "team", "distribution"), + method: "POST", + data: { + page: this.data.data_page, + }, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + if (res.data.data.data.length > 0) { + if (this.data.data_page <= 1) { + var temp_data_list = res.data.data.data; + } else { + var temp_data_list = this.data.data_list; + var temp_data = res.data.data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: res.data.data.total, + data_page_total: res.data.data.page_total, + data_list_loding_status: 3, + data_page: this.data.data_page + 1, + }); + + // 是否还有数据 + if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) { + this.setData({ data_bottom_line_status: true }); + } else { + this.setData({ data_bottom_line_status: false }); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_list: [], + data_bottom_line_status: false, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + }); + if (app.is_login_check(res.data, this, 'get_data_list')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + + this.setData({ + data_list_loding_status: 2, + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.setData({ + data_page: 1 + }); + this.get_data_list(1); + }, + + // 滚动加载 + scroll_lower(e) { + this.get_data_list(); + }, + + // 头像查看 + avatar_event(e) { + var value = e.currentTarget.dataset.value || null; + if (value != null) + { + wx.previewImage({ + current: value, + urls: [value] + }); + } else { + app.showToast('头像地址有误'); + } + }, +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/team/team.json b/public/appmini/old/weixin/pages/plugins/distribution/team/team.json new file mode 100644 index 000000000..500a5b0d8 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/team/team.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "我的团队" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/team/team.wxml b/public/appmini/old/weixin/pages/plugins/distribution/team/team.wxml new file mode 100644 index 000000000..bda88ecf2 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/team/team.wxml @@ -0,0 +1,46 @@ + + + + + + {{item.user_name_view || ''}} + + + + 消费金额 + {{item.order_total}} + 元 + + + 下级消费 + {{item.find_order_total}} + 元 + + + 下级用户 + {{item.referrer_count}} + 人 + + + 加入时间 + {{item.add_time_time}} + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/team/team.wxss b/public/appmini/old/weixin/pages/plugins/distribution/team/team.wxss new file mode 100644 index 000000000..862d31664 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/team/team.wxss @@ -0,0 +1,39 @@ +.scroll-box { + height: 100vh; +} +.data-list .item .base { + padding: 15rpx 10rpx; +} +.data-list .item .base .avatar { + width: 60rpx; + height: 60rpx; + border-radius: 50%; +} +.data-list .item .base .nickname { + margin-top: 10rpx; +} +.data-list .item .content { + padding: 20rpx 10rpx; +} +.data-list .item .content .multi-text { + line-height: 50rpx; +} +.data-list .item .content .multi-text .title { + margin-right: 30rpx; +} +.data-list .item .content .multi-text .value { + font-weight: 500; +} +.data-list .item .content .multi-text .unit { + margin-left: 10rpx; +} +.data-list .item .operation { + padding: 20rpx 10rpx; +} +.data-list .item .submit-order { + border: 1px solid #e5e5e5; + color: #888 !important; +} +.data-list .item .operation button:not(:first-child) { + margin-left: 30rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/user/user.js b/public/appmini/old/weixin/pages/plugins/distribution/user/user.js new file mode 100644 index 000000000..c6ef3ae62 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/user/user.js @@ -0,0 +1,172 @@ +const app = getApp(); +Page({ + data: { + data_bottom_line_status: false, + data_list_loding_status: 1, + data_list_loding_msg: '', + data_base: null, + user_level: null, + extraction: null, + avatar: app.data.default_user_head_src, + nickname: "用户名", + submit_disabled_status: false, + + // 导航 + nav_list: [], + }, + + onLoad(params) {}, + + onShow() { + this.setData({ nav_list: this.nav_list_data()}); + this.init(); + }, + + init(e) { + var user = app.get_user_info(this, "init"), + self = this; + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.user_is_need_login(user)) { + wx.showModal({ + title: '温馨提示', + content: '绑定手机号码', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + wx.stopPullDownRefresh(); + if (result.confirm) { + wx.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.nickname || '用户名', + }); + }, + }); + } else { + self.setData({ + avatar: user.avatar || app.data.default_user_head_src, + nickname: user.nickname || '用户名', + }); + + self.get_data(); + } + } + }, + + // 导航数据 + nav_list_data() { + return [ + { + icon: "/images/plugins/distribution/user-center-order-icon.png", + title: "分销订单", + url: "/pages/plugins/distribution/order/order", + }, + { + icon: "/images/plugins/distribution/user-center-profit-icon.png", + title: "收益明细", + url: "/pages/plugins/distribution/profit/profit", + }, + { + icon: "/images/plugins/distribution/user-center-team-icon.png", + title: "我的团队", + url: "/pages/plugins/distribution/team/team", + }, + { + icon: "/images/plugins/distribution/user-center-poster-icon.png", + title: "推广返利", + url: "/pages/plugins/distribution/poster/poster", + }, + { + icon: "/images/plugins/distribution/user-center-statistics-icon.png", + title: "数据统计", + url: "/pages/plugins/distribution/statistics/statistics", + } + ]; + }, + + // 获取数据 + get_data() { + var self = this; + wx.request({ + url: app.get_request_url("index", "user", "distribution"), + method: "POST", + data: {}, + dataType: "json", + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + var data_base = data.base || null; + var user_level = data.user_level || null; + self.setData({ + data_base: data_base, + user_level: user_level, + extraction: data.extraction || null, + avatar: (user_level == null || (user_level.images_url || null) == null) ? self.data.avatar : user_level.images_url, + data_list_loding_msg: '', + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + + // 导航 + var temp_data_list = self.nav_list_data(); + if (data_base != null && (data_base.is_show_introduce || 0) == 1) + { + // 等级介绍 + temp_data_list.push({ + icon: "/images/plugins/distribution/user-center-introduce-icon.png", + title: "等级介绍", + url: "/pages/plugins/distribution/introduce/introduce", + }); + } + self.setData({ nav_list: temp_data_list }); + } else { + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: res.data.msg, + }); + if (app.is_login_check(res.data, self, 'get_data')) { + app.showToast(res.data.msg); + } + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + self.setData({ + data_bottom_line_status: false, + data_list_loding_status: 2, + data_list_loding_msg: '服务器请求出错', + }); + app.showToast("服务器请求出错"); + } + }); + }, + + // 下拉刷新 + onPullDownRefresh() { + this.get_data(); + }, + + // 头像查看 + preview_event() { + if (app.data.default_user_head_src != this.data.avatar) { + wx.previewImage({ + current: this.data.avatar, + urls: [this.data.avatar] + }); + } + }, + + // 头像加载错误 + user_avatar_error(e) { + this.setData({ avatar: app.data.default_user_head_src }); + }, + +}); \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/user/user.json b/public/appmini/old/weixin/pages/plugins/distribution/user/user.json new file mode 100644 index 000000000..4db72e07a --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/user/user.json @@ -0,0 +1,8 @@ +{ + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#ff6a80", + "backgroundColorTop": "#ff6a80", + "backgroundColorBottom": "#f5f5f5", + "backgroundTextStyle": "light", + "navigationBarTitleText": "我的分销" +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml b/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml new file mode 100644 index 000000000..4059d1922 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml @@ -0,0 +1,52 @@ + + + + + + + {{nickname}} + + + {{user_level.name}} + + + + + + + + + + + + + + + {{item.title}} + + + + + + + + + + + + + {{item}} + + + + + + + + + + {{item}} + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxss b/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxss new file mode 100644 index 000000000..9ced811d9 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxss @@ -0,0 +1,99 @@ +/* + * 头部 + */ +.head-box{ + padding-top: 20rpx; + font-size: 24rpx; + background-color: #ff6a80; + position: relative; +} +.head-item { + padding-bottom: 30rpx; +} +.head-item .avatar { + padding: 10rpx; + background: #fbbec7; + border: 1px solid #fbbec7; +} +.head-item .avatar image { + width: 140rpx; + height: 140rpx; +} +.head-item .avatar, +.head-item .avatar image { + border-radius: 50%; +} +.head-item .item-name{ + font-size: 30rpx; + margin-top: 10rpx; +} +.head-item .item-icon { + width: 30rpx; + margin-right: 20rpx; +} +.head-item { + margin-left: 30rpx; +} +.head-base { + margin-left: 60rpx; + width: calc(100% - 280rpx); +} +.head-base .level-name { + font-size: 42rpx; + font-weight: 500; + margin-bottom: 30rpx; + color: #fffbe0; +} +.head-base .head-base-submit { + font-size: 26rpx; + height: 55rpx; + line-height: 55rpx; + border: 1px solid #ffe2e5; + background-color: #ffe2e5; + color: #f77076; + position: absolute; + right: 30rpx; + bottom: 35rpx; + padding: 0 20rpx; +} + +/* + * 导航 + */ +.nav { + border-top: 1px solid #eee; +} +.nav .item { + padding: 30rpx 0; + width: calc(50% - 1px); + border-bottom: 1px solid #eee; +} +.nav .item:nth-child(odd) { + border-right: 1px solid #eee; +} +.nav .item image { + width: 100rpx; + height: 100rpx; + margin: 0 auto; +} +.nav .item .title { + margin-top: 20rpx; +} + +/* + * 提示信息 + */ +.tips-container .tips-item { + padding: 0 10rpx; +} +.tips-container .tips-item .tips .item { + line-height: 38rpx; +} +.tips-container .not-opening-vip-desc { + background: #def2fd; + border: 1px solid #cfeeff; + color: #1490d2; + padding: 10rpx; + font-size: 26rpx; + border-radius: 2px; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.js similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.js diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.json similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.json diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxml similarity index 88% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxml index 7f665877d..eda5492b2 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxml @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ {{user_share_url}} - + diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxss similarity index 88% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxss index b8af8abfe..d10785efd 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxss +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxss @@ -23,6 +23,10 @@ margin: 20rpx 0; padding: 0 20rpx; } +.share button { + height: 70rpx; + line-height: 70rpx; +} /* * 链接 diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.js similarity index 98% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.js index 1c93a1fce..51e082888 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.js @@ -11,7 +11,7 @@ Page({ }, onLoad(params) { - params['id'] = 1; + //params['id'] = 1; this.setData({ params: params }); this.init(); }, diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.json similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.json diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxml similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi-detail/shouyi-detail.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxml diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxss new file mode 100644 index 000000000..3db968d61 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxss @@ -0,0 +1,25 @@ +.panel-item .panel-title { + background: #fff; + font-weight: bold; + padding: 15rpx; + border-bottom: 2px solid #eee; + font-size: 34rpx; +} +.panel-item .panel-content .item { + padding: 20rpx 0; +} +.panel-item .panel-content .item:last-child { + border: 0; +} +.panel-item .panel-content .item .title { + width: 25%; + padding-left: 20rpx; +} +.panel-item .panel-content .item .content { + width: calc(75% - 50rpx); + padding-left: 20rpx; + min-height: 46rpx; +} +.panel-item .panel-content .item view { + line-height: 46rpx; +} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.js similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.js diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.json similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.json diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.wxml similarity index 84% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.wxml index 7cc18f8d3..9e020b7e3 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxml +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.wxml @@ -13,7 +13,7 @@ {{item.add_time_time}} {{item.status_name}} - + 订单金额 @@ -29,10 +29,6 @@ 当前级别 {{item.level_name}} - - 返佣规则 - {{item.commission_rules}} - diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.wxss similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/shouyi/shouyi.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit/profit.wxss diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.js similarity index 97% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.js index 039cc0e60..6cc65b466 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.js @@ -127,10 +127,10 @@ Page({ } }, grid: { - top: '5%', + top: '10%', left: '5%', right: '5%', - bottom: '8%', + bottom: '15%', containLabel: true }, xAxis: { @@ -168,10 +168,10 @@ Page({ } }, grid: { - top: '5%', + top: '10%', left: '5%', right: '5%', - bottom: '8%', + bottom: '15%', containLabel: true }, xAxis: { diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.json similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.json diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.wxml new file mode 100644 index 000000000..1e0b16fa2 --- /dev/null +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.wxml @@ -0,0 +1,62 @@ + + + 推广客户 + + + 已推广用户总数 + + {{user_total.user_count || 0}} + 人 + + + + 已推广用户总数 + + {{user_total.valid_user_count || 0}} + 人 + + + + + + + + 返利概况 + + + 返佣总金额 + + ￥{{user_profit_total_price || '0.00'}} + + + + 待结算金额 + + ￥{{user_profit_stay_price || '0.00'}} + + + + 已结算金额 + + ￥{{user_profit_already_price || '0.00'}} + + + + + + + + 近15日收益走势 + + {{data_list_loding_msg || '暂无数据'}} + + + + + 近15日推广用户数 + + {{data_list_loding_msg || '暂无数据'}} + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.wxss similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tongji/tongji.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.wxss diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.js similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.js rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.js diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.json b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.json similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.json rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.json diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxml b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.wxml similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxml rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.wxml diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.wxss similarity index 100% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuandui/tuandui.wxss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/team/team.wxss diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js index b3587e55e..12879df16 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js @@ -14,12 +14,12 @@ Page({ nav_list: [], }, - onLoad(params) { + onLoad(params) {}, + + onShow() { this.init(); }, - onShow() {}, - init(e) { var user = app.get_user_info(this, "init"), self = this; @@ -96,33 +96,33 @@ Page({ if ((data_base.is_commission || 0) == 1) { nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-shouyi-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-profit-icon.png", title: "收益明细", - url: "/pages/plugins/membershiplevelvip/shouyi/shouyi", + url: "/pages/plugins/membershiplevelvip/profit/profit", }); } // 开启推广 if ((data_base.is_propaganda || 0) == 1) { nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-tuandui-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-team-icon.png", title: "我的团队", - url: "/pages/plugins/membershiplevelvip/tuandui/tuandui", + url: "/pages/plugins/membershiplevelvip/team/team", }); nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-tuiguang-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-poster-icon.png", title: "推广返利", - url: "/pages/plugins/membershiplevelvip/tuiguang/tuiguang", + url: "/pages/plugins/membershiplevelvip/poster/poster", }); nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-tongji-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-statistics-icon.png", title: "数据统计", - url: "/pages/plugins/membershiplevelvip/tongji/tongji", + url: "/pages/plugins/membershiplevelvip/statistics/statistics", }); } nav_list.push({ - icon: "/images/plugins/membershiplevelvip/user-center-shouye-icon.png", + icon: "/images/plugins/membershiplevelvip/user-center-index-icon.png", title: "会员首页", url: "/pages/plugins/membershiplevelvip/index/index", }); diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss index 607761535..e553154dc 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss +++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.wxss @@ -12,8 +12,8 @@ } .head-item .avatar { padding: 10rpx; - background: #1d1611; - border: 1px solid #3d3c3c; + background: #3c3835; + border: 1px solid #3c3835; } .head-item .avatar image { width: 140rpx;