细节优化

application/tags.php

@@ -32,12 +32,32 @@ return array (
   'log_write' => 
   array (
   ),
+  'plugins_service_users_center_left_menu_handle' => 
+  array (
+    0 => 'app\\plugins\\wallet\\Hook',
+    1 => 'app\\plugins\\membershiplevelvip\\Hook',
+    2 => 'app\\plugins\\coupon\\Hook',
+    3 => 'app\\plugins\\distribution\\Hook',
+  ),
+  'plugins_service_header_navigation_top_right_handle' => 
+  array (
+    0 => 'app\\plugins\\wallet\\Hook',
+    1 => 'app\\plugins\\membershiplevelvip\\Hook',
+    2 => 'app\\plugins\\coupon\\Hook',
+    3 => 'app\\plugins\\distribution\\Hook',
+  ),
+  'plugins_service_user_register_end' => 
+  array (
+    0 => 'app\\plugins\\wallet\\Hook',
+    1 => 'app\\plugins\\coupon\\Hook',
+  ),
   'plugins_css' => 
   array (
     0 => 'app\\plugins\\membershiplevelvip\\Hook',
     1 => 'app\\plugins\\coupon\\Hook',
     2 => 'app\\plugins\\distribution\\Hook',
     3 => 'app\\plugins\\limitedtimediscount\\Hook',
+    4 => 'app\\plugins\\multilingual\\Hook',
   ),
   'plugins_service_navigation_header_handle' => 
   array (
@@ -99,22 +119,11 @@ return array (
   array (
     0 => 'app\\plugins\\membershiplevelvip\\Hook',
   ),
-  'plugins_service_users_center_left_menu_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-    1 => 'app\\plugins\\coupon\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
-  ),
-  'plugins_service_header_navigation_top_right_handle' => 
-  array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
-    1 => 'app\\plugins\\coupon\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
-  ),
   'plugins_js' => 
   array (
     0 => 'app\\plugins\\coupon\\Hook',
     1 => 'app\\plugins\\limitedtimediscount\\Hook',
+    2 => 'app\\plugins\\multilingual\\Hook',
   ),
   'plugins_view_goods_detail_panel_bottom' => 
   array (
@@ -138,10 +147,6 @@ return array (
     1 => 'app\\plugins\\distribution\\Hook',
     2 => 'app\\plugins\\fictitioussecretkey\\Hook',
   ),
-  'plugins_service_user_register_end' => 
-  array (
-    0 => 'app\\plugins\\coupon\\Hook',
-  ),
   'plugins_service_order_aftersale_audit_handle_end' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
@@ -174,5 +179,9 @@ return array (
   array (
     0 => 'app\\plugins\\limitedtimediscount\\Hook',
   ),
+  'plugins_view_header_navigation_top_left' => 
+  array (
+    0 => 'app\\plugins\\multilingual\\Hook',
+  ),
 );
 ?>

public/appmini/old/alipay/pages/plugins/membershiplevelvip/statistics/statistics.axml

@@ -10,7 +10,7 @@
       </view>
     </view>
     <view class="item fl">
-      <view class="name cr-666">已推广用户总数</view>
+      <view class="name cr-666">已消费用户总数</view>
       <view class="value single-text">
         <text class="green">{{user_total.valid_user_count || 0}}</text>
         <text class="cr-888">人</text>

public/appmini/old/weixin/app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    "pages/plugins/distribution/user/user",
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
@@ -41,6 +40,7 @@
     "pages/plugins/membershiplevelvip/statistics/statistics",
     "pages/plugins/membershiplevelvip/poster/poster",
     "pages/plugins/membershiplevelvip/team/team",
+    "pages/plugins/distribution/user/user",
     "pages/plugins/distribution/order/order",
     "pages/plugins/distribution/order-detail/order-detail",
     "pages/plugins/distribution/profit/profit",

public/appmini/old/weixin/pages/index/index.json

@@ -3,6 +3,7 @@
     "navigationBarBackgroundColor": "#d2364c",
     "backgroundColorTop": "#d2364c",
     "backgroundColorBottom": "#f5f5f5",
+    "backgroundTextStyle": "light",
     "usingComponents": {
         "component-icon-nav": "/components/icon-nav/icon-nav",
         "component-banner": "/components/slider/slider"

public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.js

@@ -329,7 +329,7 @@ Page({
     // 地理位置
     if ((self.data.user_location || null) != null)
     {
-      form_data["lng"] = self.data.user_location.lat || 0;
+      form_data["lng"] = self.data.user_location.lng || 0;
       form_data["lat"] = self.data.user_location.lat || 0;
     }
 

public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss

@@ -73,7 +73,7 @@
   padding: 10px;
   background: hsla(0, 0%, 0%, 0.1);
   border-radius: 50%;
-  margin-top: calc(100vh - 120px);
+  margin-top: calc(100vh - 160px);
   margin-left: calc(50% - 25px);
   box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.3);
 }

public/appmini/old/weixin/pages/plugins/distribution/order/order.js

@@ -14,6 +14,7 @@ Page({
       { name: "已支付", value: "2" },
       { name: "待收货", value: "3" },
       { name: "已完成", value: "4" },
+      { name: "已失效", value: "5,6" },
     ],
     nav_status_index: 0,
   },

public/appmini/old/weixin/pages/plugins/distribution/order/order.wxss

@@ -7,7 +7,7 @@
   line-height: 80rpx;
 }
 .nav .item {
-  width: 20%;
+  width: 16.66%;
 }
 .nav .active {
   color: #ff6a80;

public/appmini/old/weixin/pages/plugins/distribution/profit/profit.js

@@ -9,9 +9,10 @@ Page({
     params: null,
     nav_status_list: [
       { name: "全部", value: "-1" },
-      { name: "待结算", value: "0" },
+      { name: "待生效", value: "0" },
-      { name: "已结算", value: "1" },
+      { name: "待结算", value: "1" },
-      { name: "已失效", value: "2" },
+      { name: "已结算", value: "2" },
+      { name: "已失效", value: "3" },
     ],
     nav_status_index: 0,
   },

public/appmini/old/weixin/pages/plugins/distribution/profit/profit.wxss

@@ -7,7 +7,7 @@
   line-height: 80rpx;
 }
 .nav .item {
-  width: 25%;
+  width: 20%;
 }
 .nav .active {
   color: #ff6a80;

public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.js

@@ -30,8 +30,9 @@ Page({
     data_bottom_line_status: false,
 
     user_total: null,
-    user_profit_already_price: 0.00,
     user_profit_stay_price: 0.00,
+    user_profit_vaild_price: 0.00,
+    user_profit_already_price: 0.00,
     user_profit_total_price: 0.00,
     user_data: null,
     profit_data: null,
@@ -68,8 +69,9 @@ Page({
           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_vaild_price: data.user_profit_vaild_price || 0.00,
+            user_profit_already_price: data.user_profit_already_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,

public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxml

@@ -10,7 +10,7 @@
       </view>
     </view>
     <view class="item fl">
-      <view class="name cr-666">已推广用户总数</view>
+      <view class="name cr-666">已消费用户总数</view>
       <view class="value single-text">
         <text class="green">{{user_total.valid_user_count || 0}}</text>
         <text class="cr-888">人</text>
@@ -24,19 +24,25 @@
   <view class="title">返利概况</view>
   <view class="base-content oh tc">
     <view class="item fl">
-      <view class="name cr-666">返佣总金额</view>
+      <view class="name cr-666">返佣总额</view>
       <view class="value single-text">
         <text class="golden">￥{{user_profit_total_price || '0.00'}}</text>
       </view>
     </view>
     <view class="item fl">
-      <view class="name cr-666">待结算金额</view>
+      <view class="name cr-666">待生效</view>
       <view class="value single-text">
         <text class="yellow">￥{{user_profit_stay_price || '0.00'}}</text>
       </view>
     </view>
     <view class="item fl">
-      <view class="name cr-666">已结算金额</view>
+      <view class="name cr-666">待结算</view>
+      <view class="value single-text">
+        <text class="blue">￥{{user_profit_vaild_price || '0.00'}}</text>
+      </view>
+    </view>
+    <view class="item fl">
+      <view class="name cr-666">已结算</view>
       <view class="value single-text">
         <text class="green">￥{{user_profit_already_price || '0.00'}}</text>
       </view>

public/appmini/old/weixin/pages/plugins/distribution/statistics/statistics.wxss

@@ -1,9 +1,17 @@
 /*
  * 公共
  */
-.container {
+.container,
+.user-container .item,
+.profit-container .item {
   padding: 20rpx 10rpx;
 }
+.container .item {
+  width: 50%;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
 .container .title {
   border-left: 3px solid #ff6a80;
   padding-left: 20rpx;
@@ -20,7 +28,6 @@
 .container .base-content .value .yellow,
 .container .base-content .value .green {
   font-weight: 500;
-  margin-right: 10rpx;
 }
 .container .base-content .value .golden {
   color: #ff6a80;
@@ -28,22 +35,23 @@
 .container .base-content .value .yellow {
   color: #f37b1d;
 }
+.container .base-content .value .blue {
+  color: #3bb4f2;
+}
 .container .base-content .value .green {
   color: #5eb95e;
 }
 
 /*
- * 用户
+ * 用户、返利
  */
-.user-container .item {
+.user-container .base-content .value .golden,
-  width: 50%;
+.user-container .base-content .value .green {
+  margin-right: 10rpx;
 }
-
+.user-container .base-content, 
-/*
+.profit-container .base-content {
- * 返利
+  padding: 10rpx;
- */
-.profit-container .item {
-  width: 33.33%;
 }
 
 /*

public/appmini/old/weixin/pages/plugins/membershiplevelvip/statistics/statistics.wxml

@@ -10,7 +10,7 @@
       </view>
     </view>
     <view class="item fl">
-      <view class="name cr-666">已推广用户总数</view>
+      <view class="name cr-666">已消费用户总数</view>
       <view class="value single-text">
         <text class="green">{{user_total.valid_user_count || 0}}</text>
         <text class="cr-888">人</text>

public/appmini/old/weixin/pages/user/user.json

@@ -3,6 +3,7 @@
   "navigationBarBackgroundColor": "#d2364c",
   "backgroundColorTop": "#d2364c",
   "backgroundColorBottom": "#f5f5f5",
+  "backgroundTextStyle": "light",
   "usingComponents": {
     "component-badge": "/components/badge/badge"
   }