From 356592d6f72caaf6396f98624f73a3faac7b690c Mon Sep 17 00:00:00 2001 From: devil Date: Thu, 16 Jan 2020 15:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=86?= =?UTF-8?q?=E9=94=80=E5=BC=80=E5=8F=91+=E7=BB=86=E8=8A=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Order.php | 2 +- application/admin/controller/Payment.php | 4 + application/admin/controller/Theme.php | 5 + .../admin/view/default/payment/index.html | 4 +- .../admin/view/default/payment/save_info.html | 2 +- .../admin/view/default/pluginsadmin/nav.html | 3 + application/admin/view/default/theme/nav.html | 3 + .../admin/view/default/theme/upload.html | 2 +- application/api/controller/Common.php | 2 +- application/common.php | 40 +++- application/index/controller/Common.php | 4 +- application/service/StoreService.php | 26 +++ application/tags.php | 14 ++ config/shopxo.php | 28 +-- public/appmini/old/alipay/app.json | 10 +- ...ye-icon.png => user-center-index-icon.png} | Bin ...g-icon.png => user-center-poster-icon.png} | Bin ...i-icon.png => user-center-profit-icon.png} | Bin ...on.png => user-center-statistics-icon.png} | Bin ...dui-icon.png => user-center-team-icon.png} | Bin .../membershiplevelvip/poster/poster.acss} | 7 + .../tuiguang.axml => poster/poster.axml} | 7 +- .../tuiguang.js => poster/poster.js} | 22 +- .../tuiguang.json => poster/poster.json} | 0 .../profit-detail.acss} | 0 .../profit-detail.axml} | 2 +- .../profit-detail.js} | 2 +- .../profit-detail.json} | 0 .../shouyi.acss => profit/profit.acss} | 0 .../shouyi.axml => profit/profit.axml} | 6 +- .../{shouyi/shouyi.js => profit/profit.js} | 0 .../shouyi.json => profit/profit.json} | 0 .../statistics.acss} | 0 .../statistics.axml} | 0 .../tongji.js => statistics/statistics.js} | 0 .../statistics.json} | 0 .../{tuandui/tuandui.acss => team/team.acss} | 0 .../{tuandui/tuandui.axml => team/team.axml} | 0 .../{tuandui/tuandui.js => team/team.js} | 0 .../{tuandui/tuandui.json => team/team.json} | 0 .../plugins/membershiplevelvip/user/user.acss | 4 +- .../plugins/membershiplevelvip/user/user.axml | 2 +- .../plugins/membershiplevelvip/user/user.js | 23 +- public/appmini/old/weixin/app.js | 2 +- public/appmini/old/weixin/app.json | 22 +- .../user-center-introduce-icon.png | Bin 0 -> 2369 bytes .../distribution/user-center-order-icon.png | Bin 0 -> 3464 bytes .../distribution/user-center-poster-icon.png | Bin 0 -> 1886 bytes .../distribution/user-center-profit-icon.png | Bin 0 -> 2148 bytes .../user-center-statistics-icon.png} | Bin .../distribution/user-center-team-icon.png | Bin 0 -> 9515 bytes ...ye-icon.png => user-center-index-icon.png} | Bin ...g-icon.png => user-center-poster-icon.png} | Bin ...i-icon.png => user-center-profit-icon.png} | Bin .../user-center-statistics-icon.png | Bin 0 -> 2556 bytes ...dui-icon.png => user-center-team-icon.png} | Bin .../weixin/pages/goods-detail/goods-detail.js | 2 +- .../distribution/introduce/introduce.js | 78 +++++++ .../distribution/introduce/introduce.json | 8 + .../distribution/introduce/introduce.wxml | 47 ++++ .../distribution/introduce/introduce.wxss | 48 +++++ .../distribution/order-detail/order-detail.js | 86 ++++++++ .../order-detail/order-detail.json | 8 + .../order-detail/order-detail.wxml | 31 +++ .../order-detail/order-detail.wxss | 31 +++ .../pages/plugins/distribution/order/order.js | 170 +++++++++++++++ .../plugins/distribution/order/order.json | 8 + .../plugins/distribution/order/order.wxml | 44 ++++ .../plugins/distribution/order/order.wxss | 47 ++++ .../plugins/distribution/poster/poster.js | 132 ++++++++++++ .../plugins/distribution/poster/poster.json | 8 + .../plugins/distribution/poster/poster.wxml | 47 ++++ .../plugins/distribution/poster/poster.wxss | 40 ++++ .../profit-detail/profit-detail.js | 89 ++++++++ .../profit-detail/profit-detail.json | 8 + .../profit-detail/profit-detail.wxml | 24 +++ .../profit-detail/profit-detail.wxss} | 0 .../plugins/distribution/profit/profit.js | 166 +++++++++++++++ .../plugins/distribution/profit/profit.json | 8 + .../plugins/distribution/profit/profit.wxml | 50 +++++ .../plugins/distribution/profit/profit.wxss | 37 ++++ .../distribution/statistics/statistics.js | 201 ++++++++++++++++++ .../distribution/statistics/statistics.json | 11 + .../statistics/statistics.wxml} | 0 .../distribution/statistics/statistics.wxss | 61 ++++++ .../pages/plugins/distribution/team/team.js | 147 +++++++++++++ .../pages/plugins/distribution/team/team.json | 8 + .../pages/plugins/distribution/team/team.wxml | 46 ++++ .../pages/plugins/distribution/team/team.wxss | 39 ++++ .../pages/plugins/distribution/user/user.js | 172 +++++++++++++++ .../pages/plugins/distribution/user/user.json | 8 + .../pages/plugins/distribution/user/user.wxml | 52 +++++ .../pages/plugins/distribution/user/user.wxss | 99 +++++++++ .../tuiguang.js => poster/poster.js} | 0 .../tuiguang.json => poster/poster.json} | 0 .../tuiguang.wxml => poster/poster.wxml} | 4 +- .../membershiplevelvip/poster/poster.wxss} | 4 + .../profit-detail.js} | 2 +- .../profit-detail.json} | 0 .../profit-detail.wxml} | 0 .../profit-detail/profit-detail.wxss | 25 +++ .../{shouyi/shouyi.js => profit/profit.js} | 0 .../shouyi.json => profit/profit.json} | 0 .../shouyi.wxml => profit/profit.wxml} | 6 +- .../shouyi.wxss => profit/profit.wxss} | 0 .../tongji.js => statistics/statistics.js} | 8 +- .../statistics.json} | 0 .../statistics/statistics.wxml | 62 ++++++ .../statistics.wxss} | 0 .../{tuandui/tuandui.js => team/team.js} | 0 .../{tuandui/tuandui.json => team/team.json} | 0 .../{tuandui/tuandui.wxml => team/team.wxml} | 0 .../{tuandui/tuandui.wxss => team/team.wxss} | 0 .../plugins/membershiplevelvip/user/user.js | 24 +-- .../plugins/membershiplevelvip/user/user.wxss | 4 +- 115 files changed, 2350 insertions(+), 98 deletions(-) rename public/appmini/old/alipay/images/plugins/membershiplevelvip/{user-center-shouye-icon.png => user-center-index-icon.png} (100%) rename public/appmini/old/alipay/images/plugins/membershiplevelvip/{user-center-tuiguang-icon.png => user-center-poster-icon.png} (100%) rename public/appmini/old/alipay/images/plugins/membershiplevelvip/{user-center-shouyi-icon.png => user-center-profit-icon.png} (100%) rename public/appmini/old/alipay/images/plugins/membershiplevelvip/{user-center-tongji-icon.png => user-center-statistics-icon.png} (100%) rename public/appmini/old/alipay/images/plugins/membershiplevelvip/{user-center-tuandui-icon.png => user-center-team-icon.png} (100%) rename public/appmini/old/{weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxss => alipay/pages/plugins/membershiplevelvip/poster/poster.acss} (82%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tuiguang/tuiguang.axml => poster/poster.axml} (80%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tuiguang/tuiguang.js => poster/poster.js} (83%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tuiguang/tuiguang.json => poster/poster.json} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi-detail/shouyi-detail.acss => profit-detail/profit-detail.acss} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi-detail/shouyi-detail.axml => profit-detail/profit-detail.axml} (87%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi-detail/shouyi-detail.js => profit-detail/profit-detail.js} (98%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi-detail/shouyi-detail.json => profit-detail/profit-detail.json} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi/shouyi.acss => profit/profit.acss} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi/shouyi.axml => profit/profit.axml} (84%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi/shouyi.js => profit/profit.js} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{shouyi/shouyi.json => profit/profit.json} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tongji/tongji.acss => statistics/statistics.acss} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tongji/tongji.axml => statistics/statistics.axml} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tongji/tongji.js => statistics/statistics.js} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tongji/tongji.json => statistics/statistics.json} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tuandui/tuandui.acss => team/team.acss} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tuandui/tuandui.axml => team/team.axml} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tuandui/tuandui.js => team/team.js} (100%) rename public/appmini/old/alipay/pages/plugins/membershiplevelvip/{tuandui/tuandui.json => team/team.json} (100%) create mode 100644 public/appmini/old/weixin/images/plugins/distribution/user-center-introduce-icon.png create mode 100644 public/appmini/old/weixin/images/plugins/distribution/user-center-order-icon.png create mode 100644 public/appmini/old/weixin/images/plugins/distribution/user-center-poster-icon.png create mode 100644 public/appmini/old/weixin/images/plugins/distribution/user-center-profit-icon.png rename public/appmini/old/weixin/images/plugins/{membershiplevelvip/user-center-tongji-icon.png => distribution/user-center-statistics-icon.png} (100%) create mode 100644 public/appmini/old/weixin/images/plugins/distribution/user-center-team-icon.png rename public/appmini/old/weixin/images/plugins/membershiplevelvip/{user-center-shouye-icon.png => user-center-index-icon.png} (100%) rename public/appmini/old/weixin/images/plugins/membershiplevelvip/{user-center-tuiguang-icon.png => user-center-poster-icon.png} (100%) rename public/appmini/old/weixin/images/plugins/membershiplevelvip/{user-center-shouyi-icon.png => user-center-profit-icon.png} (100%) create mode 100644 public/appmini/old/weixin/images/plugins/membershiplevelvip/user-center-statistics-icon.png rename public/appmini/old/weixin/images/plugins/membershiplevelvip/{user-center-tuandui-icon.png => user-center-team-icon.png} (100%) create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/introduce/introduce.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order-detail/order-detail.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order/order.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order/order.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order/order.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/order/order.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/poster/poster.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/poster/poster.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/poster/poster.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml rename public/appmini/old/weixin/pages/plugins/{membershiplevelvip/shouyi-detail/shouyi-detail.wxss => distribution/profit-detail/profit-detail.wxss} (100%) create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/profit/profit.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/profit/profit.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.json rename public/appmini/old/weixin/pages/plugins/{membershiplevelvip/tongji/tongji.wxml => distribution/statistics/statistics.wxml} (100%) create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/team/team.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/team/team.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/team/team.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/team/team.wxss create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/user/user.js create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/user/user.json create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml create mode 100644 public/appmini/old/weixin/pages/plugins/distribution/user/user.wxss rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tuiguang/tuiguang.js => poster/poster.js} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tuiguang/tuiguang.json => poster/poster.json} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tuiguang/tuiguang.wxml => poster/poster.wxml} (88%) rename public/appmini/old/{alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.acss => weixin/pages/plugins/membershiplevelvip/poster/poster.wxss} (88%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{shouyi-detail/shouyi-detail.js => profit-detail/profit-detail.js} (98%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{shouyi-detail/shouyi-detail.json => profit-detail/profit-detail.json} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{shouyi-detail/shouyi-detail.wxml => profit-detail/profit-detail.wxml} (100%) create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxss rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{shouyi/shouyi.js => profit/profit.js} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{shouyi/shouyi.json => profit/profit.json} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{shouyi/shouyi.wxml => profit/profit.wxml} (84%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{shouyi/shouyi.wxss => profit/profit.wxss} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tongji/tongji.js => statistics/statistics.js} (97%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tongji/tongji.json => statistics/statistics.json} (100%) create mode 100644 public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.wxml rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tongji/tongji.wxss => statistics/statistics.wxss} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tuandui/tuandui.js => team/team.js} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tuandui/tuandui.json => team/team.json} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tuandui/tuandui.wxml => team/team.wxml} (100%) rename public/appmini/old/weixin/pages/plugins/membershiplevelvip/{tuandui/tuandui.wxss => team/team.wxss} (100%) 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/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxss b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.acss similarity index 82% rename from public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxss rename to public/appmini/old/alipay/pages/plugins/membershiplevelvip/poster/poster.acss index b8af8abfe..ddea4324b 100644 --- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/tuiguang/tuiguang.wxss +++ 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 0000000000000000000000000000000000000000..d608ef3037645ac16665adbc1af2c5a820fcce30 GIT binary patch literal 2369 zcmV-H3BLA;P)tdc&|5f4?R7K{+64?r9!5&_yI3Mp#c-9MUL+lsxjJ9lR8 zd^o=Iy62vA&-v}SA9FuOV4hS(KvGp3QyCZ_Df<(|286}x7)1617)ePCE<;)mN@a2( zCH3i4BT^uoDDOafO9|4R0Axp+9PieJmm%!~X@U|N5Kh>~K$g=9;`+Zvx}Zb?geAKS zU?P1P(XU47fubDY3A6srCqLp$5LR^7hdwy^lP6}&{VCC zq1@_7oP&iK5YEW3&l4{cJwQq}UA>XkN7FJ3?vo+s#4hgdPGZvmB~l<#Eo#xPqcIx< zq|;-h1d5h`v44iVUn-M}IszJ2hZm5vK#3TL9FWS1`LMy%QCJ4vK$6T91Edd-q@Wle1AzE|;tXE2yqk*{$i|q5cnum9`jmy`mB-LfA_cOM<{@c; zq6bK^It7sj)(%zD@lw(2)rm7x_kyvi!+Y`=I#aX&>9(~e_oLnJI%iq)X_{B*35b&~8OFLB{1eiPq%9Kq6q|b_`$lX#o@pK?4Zhhz4 zj?_1l%>$%=hdeLU;(;JQI(^EZrR$DT`hv2FfRuNDnM5#XU(R(|Xy8^`Y~Rx1!GdE4S5AVC(_JSLih`xIY5jy=bl zhOXfU0!(^4v`&I}{;jRJ_tDSEpM96rT!2M;0fLWcR;#X#{E65l*X_2-Kniob9W6Ws z!3WhXuazWlO^EwzIe9#&4jtvX$0Rb&PR3-Q5S`5xZoVi1$OU@YtSZY{g+ z-Iqq?Dyq6rET{Q$-)*U)B&bXnAYXZg@5n6SPa@bA)c*Q%1ZWYTna)Y#>+PM_AZ<)R z@IGDsdFlxRq|oFu01kQ@@hL#ywIvH5dhD?L+h zgE3Fo16l!iHcpa2P+PH+JF?AbU*VEffob{^{mt*P@T9+Z9wu3UJ^mbF}Pwph|yY38j8{z zN=zG&LX&?4aC;oyi-nI(AC}+6VJmJM+JNL6d|U)yjM@PbZ{k+Gy}nzPqPCTUer-U; zo4m&Yo`~EDqEXAqXykShGN28}eNFCc1Fyy4$5(4vc{Bz)iI~s^#HoFu!8!!vk$FPA zI+Ve?P9BywBD0aOVy!^#|25y!TEbreY>C1z3QF}OVn?AnEjqOVah%GZ;RE9A#L)Z@ zc&VP1-I~>=PMvlj9ViX{QUssZ<*l<5rQO2rN59Ol`dh2Y+;z zysGM4-%ANp73h!~u)^o1J~|-FmdBgCOMr)cy_zTfMc{k56*a#TKm)`J`3jgh9N$Bm0ISeN3=lUUv)pTK#VgZ?0&PBC)%fMpylqPcWA&_@QYB@8^of+SU`60m z8+hW8toYhiIzG!!SQfqj;2R{))pMOY;FX@vC?)B~lEu^wd#_(XB;f2eY=~fX+fJM< z?~(tlkJV^Yi<{<;-Av*p>en(jbhyl_Yfi%8;Pioj}GQ?zv$&f*PlgSX1 zAtpm~jNa0!1jFN6^H4w>7yv$9&&hw*2i`g7F2K*$UtpsH2v67wAF7Wr zGlau{H4NcMUl1J_xB{y+Jm}W!z(7bi7b1Vk4aRDwoMAzT>FYxi21w_!N@kpPS$S`8 zj99!)366X15e@{zfzfVbugam#{26{*h=*2c8w!Z>HR0Z|iCu!Mid~xUvg;d&9~djf z3k_Bv=-js+4v6jCMxCza$}7TMr##ukGl|Ah1H(&``HU+Ao*Fo zw>~O=3+q>*!LQeH^24Bdx}WExbBJdIg6%=|Xe~#a>+0je@+SiWebdTUlcm)GqpWWP nlrzM{FrEk)Ao0Xm*~}fpj!}J!AFbu=NVDJ?Hgx*&Tu$?5y^A5&sJ!CHd3BzzL2!gK>@owuCDh42;{WMLt zx*EUfxV-~Ja>m4EK}7To0GuM?uN~j(9Vop5L@Muzi8F}k6#(oDAx2r26{c?W7sqjF zh4FuXsso9Lo~CKK>jGq#&-MloR^Wrd;Dt_SFeeBhHf@!%9CHr<9vO)EFiDb8mxQ(* zyElMDQM8MQPc#!h$n$(V%d%73#g)&oP8tjbOz>K6A)-?u#JwhCyUxY*d@lfz=Iv{h zs3M~0X_~e&eWh+s<^mQEth-fQK(|w=Rk>W8cos!kDiRfjTrfWXG=Q>s& z0AYg9SwYMlX_~IMF39HjD2lcb@mbxod7gjjlOt{BQ+;OXfJ9Nm%6yLSJ`}l%7}9I} zS^>y?TeI4g*f!5E9gsMVNioq*&jwKxvDlhB*)RK`*jqsIJYVfHjuA!C7!f(PGWGkY z0g(qbKAq3~k|gPLvuI3hZ)UcQh?;$-(?y#mv}8b3o`J(8N!SOrl;2VT;T5ZNNS^2H z%9wK;`l8ac$Wl;J14yUVP8`SV;-3qCebhRHF^ZyyqAP8Ql;x1iVb~bF%3l5RKCC)BX1&>;LeWjO| zwX}yvg%?Wtm>y-T|VEQ&b2%&hz}K ztv6PV$&pBQw<~kJx`?|p**N@8Z#aY}V~TrM7Rd<vpx|2#&F^d233xTdMDB z7PwvkA}ucVBh^L_>vo+?q^`PHtRsGXh!FN35UEdiXLD>@o8;D1EJ*9^r4VAH4|=1z zj^1%dIXMUM<%~<0ZW-sv%)HQBK%`D#pOa1Ip%ooCPLGJ3`QD2x#kxuN8juRNa5g-f z#d8rpDwUQ4|MRyzfHVkJ9?$I#b8$!5MJBagQz}Zh2ZJ%xIb46 zEO5Ads&HzzH-_zEezjj-Dt5ZNO zh=5-qqIFmmfWAS%J-h%xoBi$r$n35?dk}5_;f4!1%q>8)bLTkodJ(lcx6S~0``a*t z8~DOnR}dXgPJ1ppuniz35!k>u`=oH^?*hyxebpcKe*}`vk=+AU0qS!J7bK_x4fyiV0l-!oU>z4{^WNXqeg=lnsw2t8FZ+ zPIQQs&S0x4r_DB8F(qOgtgNO4V{QQiU6mpLk2=K*hggDfaQi)N`(*DfIiw08pP_OH zMmiBj0MG9nwX0af-)s#?;Rd;dFSG|fqJ!bF{}}h80AWHEn{E({^?F4-93Ew@QjA&y z^7cWrhXAV5N_@ei6EF%QEkI;ViAVz|d`=mj)4euQpcNn&?vSAN;(xIaqQl|wq_aEU ziw4A!Q%1w1^kGw-)fkWqk1bA=ZgZknx8KuRo84ks)G`1mKrxv12(Z)Cifjys&iY`} zb^s!5a@aG0uxKkwH6NX*ZX>!H0aCadZsBXyNt{S*b?NUZiL@*Z`QZS$n$>!n3vt~n zH>?pLTHCy1z0nsADfJ272x^NyH{}v%Kup{bkhs^isOk%c@I21eSN8$2zAkVBE^!7# zt2;a$j%@YFvPD)QnF?=la8h?ZVJ^9IH2KtaJ&g{AXX~r4>ntl)ck=1b4P~nQk-DQ# zI;3K8DRqepZH$1(yMATgr>Rivj{)BQ@&=sz<|h36tN-SISkwi|Fbu!oi#tPv-@gO= zth)O?3*bLP6n}sH0lr*Rb1=RSAKe`MX@KzOe|(^y{15PEbxuD5`sa59e-T3PHEwM` zEF~Zk2(E2w9ST_MEtu7HW-_z_=Cv$%UMJvVeBgxInzG+--M%I9ng6U>aOEq+i7 zNEAiS_;RG{1PiOz};GQhxiyVlmW3lMMKG@VZ^ngT@j+u-nP zYlon(aupVJN^JKHHw5F2(z=eLuEdk=WaM+qEj*{ojWPvD6h)k}P~-E$2q(sI%rf|kStZH60$od{>bT8TZu=Ocx)v3;@p&mtQ!7ub zVbeO7MAwu#f5{x8YTMALA5+`D9J(Fk!ey1yH22i44IMdr^O=2ixSfvVq>RRb`M$ZE7nbSAV?hX8=J6*8kl zRXqu=4GX!M9xF?>_J!q&nn+1k*-fC*r9Sem@Du7&pv&Q~kfzRsIo zZrTzMWrLH7-+r#dw>-ge6pss3swzk~s;jPZRmdIAPCSlIPVG$Tk$r3kBRGpbliPzu zJOGq)nsV<;y~vk-bdJe_W2^4>+D402WyBvv#HuUZ7~VBG-BfOLopPUfhv!oefQVL9 z-4817G}<6il9+nFm!G*j+YnJ`3OQHLSeJm9T1Kb{XZZU@2d9eYvL%4a^qicEvjgk& zo696-Hpp5TGnx(IvVvDOfp_^Jqb`Kt4>gX?$y2tn*^A43BnLTJM0Mj^c#&PE#oT%c z2ERC$&!6#mW>21Y5AD72F`*a+-7&f`X^oV) zk+`75xPxZK1(S4QI=H|kB>_Xrf}sT&2Rg^x`O)@u-n@5b=FOYy^t^|7nElSt{@H~l8YKsWP z<}s`D{k8>e+mps;0F=J|>kLF0SbVY@OVt;B06flWyPboaY{_;R-=HV1qA4ig)0hd;OH895bHpy=@2>Ma!h{ zJkv{`q!*n`RTCgLc!3B#4TfUl_Keiy5DpVhx6T0ckuid;3&K}vWOb+>fOOvAF(O{dqJpk#t!LuNIV1%AlA!5YSd$~j~<`{@vW4MP34Ffo| zbv_zd$>q3mSG6IlGtRfS<_>1uA;OG@I=M}y77-;xum=P71dvUp6Nb3>k%X)b14$0qu!ZE1qAi3W zrZHrCulX4C95na3slAs<{3c!^XsBv5UB&#maC3udsVg4zRfpdMv{OrzcgmTFaf1H^HggR zM6dZJi1vLLk7#ryU#eE-s`m7ISDe+!e&b3o7`Uklc4h%GuvVh31v?R6C+ApasCs)tF_NopBcPl$XlzY4g~)REZ0X;PiDQQ08t%jeCzyEso2{I z5GMZAvxHfxp&K>+-3MR#zHzFfYlg7&`^)G4+IE2G7^jhA1dv8r-{#%|hyY@k1q>5s zTQVfmhaM^%aA4q3Fp)d(;QM7KhbY^) zneIabTaN%SzTKVh?~t6*CD$fBVC@~uj7#f)C=gm$b;%^h=Ed~{2H@GXV0K&=oN55E zJs81=g%bYuelI6S4v=HZ6T`%290Ot?6$sFYYX{D`_6=@IKn5Rv(H+RNERY$E_;UnQ zpk#wP4@dV;I=&^LDFHdYbXpy%Hm>(OgU`;jpLg8SX;MHY769`7Op;qJV&>Rf$9czX zjwS`}APb*8gcQOP|}-kCYrDIYi%kB!@Il4pF@# zyDiWYC+XwW*>dinv$?46O4W~S%8*r!IRp?5t5qAaG^Q>YB7kUEO#pGpAz(zAa_zYN zxfsK=B^RjnsdF7+Yku%R8XbnD`|%6d+lD+0{2EH&R8fVpIi#F-dZ2r)Q(V2?9(F9R z;Em0Wr2;Rk#oCa(I{05wD;Gvj;OpKA*6f0n1FfbN4825W94KwgcnU)HqOrgN%7Wx4P0VDm7 z{J$(MGBC8vNP(0oOM6j8>Th6Wks}3C4&(vfgDSH81=t8!zr@`r15YTBChl$D zn7&LY0AgVb@L*2X{S7SkJus<3yJhXn+Kv5c69tk8#KI=PSHKp5tg{T9Ui-U+;Gj~0 zB#K^SZecobQNZR`KzdL=)&Y?*N46bVVca5CFlh}*fMs1bR@#nr0@=xyAB1TuLo+zwoj<8p|BB~=uskE{q4 zt($(&TMxg%z-19`qD&M>iA)wY1(x{;lC1SoU{3@8MyVZPq(I7nJOdmPF#87>WZ=^X zouf?@NP$!qCIUC*m`pY>En4YFLj{r}l!d*4MLBa-ZyMM)QsX2u1rm_Uf-E|H2*~t$ zHvI$)H1J)L(vijrBn;$L;D8(r4>hnLQr~1V1+w;d<6+?B93`h1xIS6sgbWI#PAuyJ z5JHPeVl~geu?gBXWU4^CY}U=v&dgEq3zN&?$t@b_h` zuGU4C)Pn0|g|ILg2OrH#7wJd7z5#Y>L zEH3p~AlB_%l7U{?VJ^Xl^zN)Bed>|rBhatG1+azo_SLkOCD-E($mYwIralA2cW0&H z-mygCIlwprf3}o_FRbH%_@gbZ15OES#IM&}dQtL-l5J!?mO2)Qj~={IM2=ARE#IY; zDD@sq9S6j^Ltdnfke`hs)SYDD#t6HXm~;#f>&6i>(mtnP0jXY8sTHFQNCVz$QriQu z?v%C5fwLl2{R_Cl(_xdDbxXNA}6KW(n1i4uC|2 zM8!tC1 zx(h_Dz>Wf9VLgA)yli%qfHV2G^kCouLK5D8A8@aMhI>sZcR)t~v2X-1NrK2yF22B4 zj=sCwz>5|6i+0oYKrEaG+!=kv`G!vcj{$QH{853whFo+45Sc-3q;VF(q+yoYFsF)$ zz=jB9GIauwP$YMrHeUl0>m&{If}UEBC<50BKqMMmy0D@2E$&Dn+4M5sfE>iqt5YWc zkr`Oo(k1)wUIP{a?*fZW{PEho22$Gt=`~7L^hFd%MM75PMuAkNWJP`yNJTKE4h)@G(I;E$ zBP;Ii(nnUDPWs47&}p@)PMzo@t9_^6wGD}@^F7^$tTNCq?yHttSr>T>91jV4A2-G|L%0Tu}1o95RF8u asPsRKLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z8dyn0K~#9!?45a-6xG$nf2VqzVRIqkzQkP1&|g%TBHS#7C>601(5#~K#s5FiZl>2{&xT|e$qfn|6NQJ z5C%f}@09*KrvDfHJ69|HJEea|iJ@oU@J^2s@(K z9h?0KaVWy^8nED5W-}j~F<87n=)V(?ZHaL+aCV71p9b#NAgu5-Ecj`~inA{<8sbZGbAmOh(utK)26B@kbPIqR0^T*$WK?#P+OP zF<<}=*I==CK%Ezp;!JFol?BSr5|A*xu$TgL@Lf>@+y;z7kwF>vY&t-)-?t~qc!a?L zHD5}C({T8#EI?wL10X5=W0k0=J9-Wx%4;aL_H>%VH^5~GPkF9yIzZg-;bLG6!dAZe zeMpL<5mwg=MN{HtW zw)C}QHqaNv#*+4sofx(5rZGbP{qO|EQa`I_jur1&tOzQ#pVV`p-s^b zVVdU?hv_KJ#wLkv0221ixTXRGAW?$r61FAAa|nkS9ccp{fu*?_;%tt9cnhoq<|7@#YVR&8~!a8DSrz@D&Ih$*{(AeUOBj2oS$_vXsFGhXZeD zx+N%Njm0^@)_C1yi*4p~OQmjd_D5NRkN5xu=_h`7ez-9)&=D95cyaW}DpVj{w5%t)68 z0g?hLI0?89JXC^d%zcKi2xtrRGEA*CKo#%~G(v~e*JBvf1FNADraxh(qH+T+f#Pix zU~#n3Zoj+(T#RC2!vJyF+~I_oP~^L}QOqI4!+Iw*4!Fj+YOY>Ck~F521BjK|^|?DY zX_S(8*Wp9E=|0Giq8}M%Qpst+?}6iSgDm{A0mWIsv-JnWVl=|_1=G=u)c7-L?!hKb zWp1&56AV@tZ9p}))CPzcYlhXJ)ho#7@fsm|81Yb}li5e`;DGD>wOOOyh$R1V}cFC)H>(BVT3(&lBMUV>|v7 zic@p-v2;h<3?RY{!0x`M)Sx&Q#q_!WauUJ}AJYknzadH%N9scpk+ezWR?L#r34~^%hm-xuh?`bf2BE2U_BtS(q4AV&dVx)5WoZ;A~EZV6Q-vVCo41UF8;5cA)b`2ScWlTfYc=Ws zDz~WC{aj-HdENybKGdqcJ~9^3@m<+xK@U;KGXRT6J=)Bn6Yy@)jwu#7;sC9fOPDT3 zgI~qGwxGZ)i%v=;Z8FhRR#h{XEwz!;u@VIBTK_^jFT#9g)@sRa; zpZrnaW1JGIz@0%OfzgKcjsw31{!w=09sOelIW!g^Nlj~5bx>yx5aE0(_^VM?3Y#ju z)h`BODLE2&+xOYNqIz>Nri)dv95@#EJaE*esqIwjjzswgp`C{dbNwPtSu-O;_V`)j z0+RJXSo(g4^1^^D+7e?XVr+aAi?KPZ=+Z5<0&)~?Xpt#6I$8FWxFJ2qc{si# z9kn(orn>X>4VG?NjhnUEM^qIjY7Q#ezjm3;xieZGysSW=8EIWuCl_K}}LQSJ=sO-JxWL%5dc!UodaJrL#?5gGvVQS>B1 zjZY}%6G)bL2j4M7CI^E+rbk421l z1I6pWDWa;_8kmLf8{^A~z-1+k|Fr&*64O6Kdn#A}?BO#!hmzv%+`XG4AW{B`8!Bts zMQ`G83=Ve5b+q>A$gTBu**vZ>0bzuwDlFg@ge#0Mzt&s2?@MBAmjESyI_f0g$y|3z zj^{ZWhpD;9!p#Mc3=rcgBHZE&y!!^5-eh>cBz+`hsq@1T=KBWe={QUm<#Mxq!NWd+ z&B>JG?Mv2D0r!l>Ux;vpFOY2=X$FyC=4Jy(5(se_QEo*QD4p|hc%at&C!t!X8Ta1* z&H6vIBuH`?HXmdG*;NMx?`%~5SyG%->rNtj;FA(`N|*>yrXfBmUPzH*I1YDuI=eXl zai~BsiV(v+SGZ-}M5c`RvZw|mSptwK?Q~YV-Hkq)hT)EggZ(!5iqcgKSzvUwU!^XDJH2%!QGa+_CcogUw zu;$DHMj`yGi2*qdxE^HNvfde2@u<IK@ZnpO56JtLz$*m0f{(cr&l1 zG!eGIbKEQlkbI(<{A|f~q<1t`5aM3o+yYhLs<1^Urekp*+3=di17t5kT!`xt-92#R zXZRy2Zp9Ix)b`bXR?UaKZ`{r=eI_79e)Ox)bsN z;#TBf6r&LOl-N*iK=CcYQWT32mXqRLgl_@>iRvWFd!aZ8;c$Hjb*B;xQ$`!Z;}O2g z&2Dps#PFtGN|phLyU7_!nA?365(vY|aEsq;5cRtNm64ov7Ni#rah45Cs2p|9lVeu?(x>d6~GAPC%Oh)*+PJo!(#gNY^bAU9h ziEu8^hYY zC_V>1KzNrFvvG*iT9e&Jc0u*KmJR7BA;-oBT4#PDZN*3tq3!MGB5T&>GpdGs^^Fk% z4#4416rBlkE|3y|D#hGL$|Ra)<_0zO4pS72Ma@lyXr_yJqbUNKgj4Zx9I;j9s;>Wx&d zk7FS?4pde`#un0v46Pr!3R$-<3r0^u`siAI>%I$${Sme=!CzGaSCeE?IeCC<2PE6X zeD;P3NF8;%;!W*iSrwqutAKG>930pn_p@aP&*+8sJMB8HDd{Lv1|w}59N7=RF-O7K zS3@EJ@r|uF#^rho+Byz5R#x(@3rLza_g@O}B!t-?VJ>3$ziW%_a?5)Rhg*sAZn-}E zx&i_YJ0M(uaG58AC$;R0+~d)&drA_n$BmG07swPTUc`-^U4igz$yZy{28aSy16{hq zdBY%)g7^k2o|L;CM=kqZ}YT0*JtH(H)AVo%3T5x}XS^sn5U04V?HycjlJb2Q#P$q5lsQqxC_dxMxJx z2M__0Vd&Te`dtC3BqZY?vQ2djUwO92LJbaMR5&_8QZ;s~2Ztd)Rd=D1e^P!VSG8VO zZzaXM1t|b2?n@HYJphnMARryI0e4Y}S%B8*>riBX^#~3Yw;)W@G{W}4R3sq(y2FPE zHzG_cnNYH>fFyuD_k@dXhWJKz=OhBKWldZ?qm&#K@PvsfT6wwk!%R*AJ&1 z{cs4Oh@yyKu?4VAQT62}78noQLWFf5w{NClfEHQ21A z5;JQ-2VjOyT;uP+hp`z+h;M4m@L3-~_SzFJycstBN!1`tlYzGJt9NH3QPi#&FenXgUsG`2a*(ipfSl$?b{0{hAKptDya)-xJ z%s@1y;x90t;BrR|M&|+*rMM3Gi^qcB6o3qw0M+aKfBhM+Dh zND7nfh#G^$faie|0>BuMTQHjekm?!;g&`V&>S}efC33a@nNG$Y8QZem*yt`hz=GLu z&u9?krrOB@(k8b?^g(f%?|5LgPHTWOfI0O6q(8!B+{issR+C~F!qnX2?+^LUTCUj$ z4%g})QLykS&czHjYA!%R5Q#udjlvSfA##m(lAvNy21aA{RJPn6KAZ~=-k9IPc>!_l zDj0zToUDS?DEg3LZe0NBgzzGG0>l9R30y>+_dUBY6Ogpep%dXuqD=KIdh1aP*0c

    _J%oB!+H8SZxdQq2GonvSa?9D$urpN7t$Q*K6DfSN&&QeQxaxM+1)`?BH|4{hcJI`5YAi zc1V=TggMVQqUY+@*sb&sfnmd^nDNb&5Kze@DBmlM9PS2&7VX4l0K~Ff%EZ^^HZ^he ztWx4h9AgP15yrZ8wNP!_6MpA;!f(EU*xw_G8n5fx9i&I;bDZscvu*?_CU{e89Ovo8 z6A3W`XHTV=2L`|9 z9yr&(4+RImJqKzNIg z!6~`F{|9tXupf|c(N3uZmT4b-_L{Y1=tio<0Z9`Or;z}0G?}>5Rxsir*tpgU$VLrF z>i|HiK{@mTHBB3mS$RhLs;F<2XaW}_Yh)SHNyBPvr= zy!ePp*DdfM4nq(!?iwQWC*;f3u9yG?wnI5iqG1TP`93?BBoCMMUO@8|77YbN0TLng z`>U~c-XEO09R&7mMkYFVc)T?3fuuJ)*M-91IJBNP*yYR$bDo5N*;h$5EFW^rE6^;^KzL?7CHy2ABTZP3eAK=4*TSWC{AKXLh=Ia>7LXjg|r6arh z0Mp3FSvd$-0(aD}7mCcxx&V@b)X+O|+HM7z2Fwt^QA}2f^Nf#HDTl7$eXX9VXhZ1R zPib}UNY`Lg0czb1AThVp3xQ)r_2zQi*w(x&)_ohmyMc`?oqXnTEY2{l|2Hf2r{7 zA{;8JidhI|gzwuZPQXlAS8T+3r2`i8$cATT7ppjf8YKZtD}s~SmpWp-8mh0j4ZHo$ zNPI(ss~~__>QzKcU(Q^y=!O~Zt`usE4ut-15f%6TDcB$CzR7x#7hJ9uRmHm8A%AxS z24|70T`mG9ddNeEK7lz?>LcMI14D{zpMQi*r{9pQ8iEQ(5j#Vph^UbuW-6;Sf;t}G zAz7zQdm>9-BKFX|?zb>E>em`x$ICBR$_iF1aM>DUMP@yi0+qv2yi z%@f3Qv^@l##U307r^Bv97Cc48l!<;8E8h~~woiqh<`F_{vb!dK* z1F{~{M;uF{_k~EZrojt&5xH30onu(97~=wWrB(ZEZ} za_<3Lfg20_H1HssN=gB;7E&jiN}|`rSU-Hxn5xR7{{==X)M28SkH|d)omf^5c8A@l zc=0Zxvz{g}Xv)_XQA*Jwn~$^r(gH|}v;fiqNQ<-p@*g7qKLG#SwDha%ab-*v{t3?x^LzlGw%o4A2Yi%vpbLN z>z%(|cJ4Xn-tXs~d+*HLxkFG#TPZ+oRU1_qC?GBRC$MsZGj-Cw%D_hn@<$m2}noVE0MQQa#bQ5Ewk zZ=3QdfWJ_6>bQ1VT()on{Vz%g1tf}EK4n*~WbvWn@+bip)|_T>hf$!PMG2vRL{ZD9 ztd%QG*GSv%=Y{|~V`7X zFzyL*Ly~XK6!l+(4WodBRVoOG>HZeLCj#9t9ySWv(y(C^kg!Vmlv~%sQ>2tf>bhY3 z$tY-7gbkyBgjLFKx|?(6f@pIi7fkYoY(DjDqjKJP1tg40LETl(-3-Fq%G0zL;F;yW z5#hU;y!MSSp%joXD*1I+3wfeU$yY&`SaF)r1IF6Q-{=)1FRl&~N&yL@QiSeG*TrPV zk;kh|2=1pcR{F(8;S`WY3I)%u)&W>pahiFDQP5}GrhF0LYpYCG8kY9$M&T5YMhXQ2 zk$(XA<5fWJHVXQdzMOkM6CSJ@TlN{2xUNw+1*DNeKIe<3Gn+t9RGoTTl*A>A*3*fi z!IzRIU#m8i(w&woroHQyz(WCv0mL?)mjS9Aq#0X`f_C?)JKN`ik$@E$OIxFW#1K8m zq|bB=1{G`0GY@rFWk9|K;DM@c>lwomvlNgP0`bib@NW!D|73X>yPK~8%a^J{r=+-i zL6Ke!s*>umBESmD4gzQWo}t^Odl##O^Ll18d%`^AA={VRssq z_b(g(Bb%@$ItREC66udIyS z?Jfty@5*|$VQJqC>#k_HZnO<-US5FEk4JhNNLAAR`L*ner6|U*#(};rm8j`}$bGP(ZvJfTnx_;DBe{{G?&& zw~iHzvmS_TI*$SLW&du99ybc&&as4X)&d!RCy>A6cS~eMlrH0kD zu8@9-VQG)N7ckB$Aj7vp_yK@#3KCm_v$>eBGq(!hxS#f}?dEgRESE571;8H&5{|+1 zvzGp7tAvf~XIuj*n2sSpO8``^Ff3P#aRT5TqoDsJu86I)8<#-robx4+SW^93KK_ORrg!V%ju>*%jzQQ6TL8|QPU)8XDA ziKm0aEoJ{Sfz@E}E*9GA+**2mEbAIIRy`okHtK^%gE7Nf(Y;*=@jFMB4o|uuefX|k z@}4QQZ=-b5n3<4}H&-G?S1ku6ZP9FN(nvcn`F((3~)s<{#e{;U(%oosZ^Xe$!{(S2ieN!{_RY00hZ|?nkB?NmbQAQVH zpM<1OZ}~y|dt(Yn6F}xHcUKWn<>r^ny;~pDd>2xO38jF9Q7NE|0@8$dNth}iNvPU{ zPX(k2@scoAK$1|k37-l`6XGRds(>V+Y7;&ckS4@S!c+lCLe(aGo)JL2_qqwGEA%vW zE_jGeHqqWlrbXk_MI<_Igpdb~eEMJ{p{(nHtveYa~&9Xw}i@MvZ?)Iv?z4cN>Wr)gg@M{3q?00RbGCKq!s;Tc;Vg>K#U>3>%VvWmtNJ)-_|ux`jMZ zrlt3ZxH$my0N2O;erKSQ7@eRYy8$9P#mu2P)UZtmDCcQ0yj=&wVZs0b?{))C`mSsK zw-ny@j}#59XTD&N2QC@J+hqom1B@L2TSZAMtKKS6y{Dcetr)%)kQkyRY4U$PbxN@6 SQ!s}B0000 { + 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/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.acss b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxss similarity index 88% rename from public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.acss rename to public/appmini/old/weixin/pages/plugins/membershiplevelvip/poster/poster.wxss index b8af8abfe..d10785efd 100644 --- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/tuiguang/tuiguang.acss +++ 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; -- GitLab