修改 我的推广 为 我的盈利

view/xcx/pages/commission_rank/index.js

@@ -13,7 +13,7 @@ Page({
         parameter: {
             'navbar': '1',
             'return': '1',
-            'title': '佣金排行',
+            'title': '盈利排行',
             'color': true,
             'class': '0'
         },
@@ -74,7 +74,7 @@ Page({
             });
         })
     },
-    
+
     /**
      * 生命周期函数--监听页面加载
      */

view/xcx/pages/index/index.wxss

@@ -789,6 +789,14 @@ page {
     margin-top: 20rpx;
 }
 
+.picture_plugin {
+    height: 44rpx;
+    border-radius: 12rpx 0 16rpx 0;
+    line-height: 44rpx;
+    text-align: center;
+    font-size: 26rpx;
+}
+
 .indexs .classifyList .item .text .money {
     font-size: 24rpx;
     font-weight: bold;

view/xcx/pages/user/user.wxml

@@ -1,118 +1,113 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class='user'>
-   <view class='header bg-color acea-row row-between-wrapper'>
-      <view class='picTxt acea-row row-between-wrapper'>
-         <view class='pictrue' data-url='/pages/user_info/index' bindtap='goPages'>
-            <image src='{{userInfo.avatar}}'></image>
-         </view>
-         <view class='text'>
-            <view class='acea-row row-middle'>
-               <view class='name line1' data-url='/pages/user_info/index' bindtap='goPages'>{{userInfo.uid ?
-                  userInfo.nickname : '请点击授权'}}</view>
-               <view data-url='/pages/user_vip/index' class='member acea-row row-middle' wx:if="{{userInfo.vip}}"
-                  bindtap='goPages'>
-                  <image src='{{userInfo.vip_icon}}'></image>{{userInfo.vip_name}}
-               </view>
+    <view class='header bg-color acea-row row-between-wrapper'>
+        <view class='picTxt acea-row row-between-wrapper'>
+            <view class='pictrue' data-url='/pages/user_info/index' bindtap='goPages'>
+                <image src='{{userInfo.avatar}}'></image>
             </view>
-            <view class='id' data-url='/pages/user_info/index' bindtap='goPages' wx:if='{{userInfo.phone}}'>
-               ID：{{userInfo.uid || 0}}<text class='iconfont icon-bianji1'></text></view>
-            <view wx:else data-url='/pages/user_phone/index' bindtap='goPages'><text class="binding">绑定手机号</text></view>
-         </view>
-      </view>
-      <text class='iconfont icon-shezhi' bindtap='Setting'></text>
-   </view>
-   <view class='wrapper'>
-      <view class='nav acea-row row-middle'>
-         <view class='item' data-url='/pages/user_money/index' bindtap='goPages'>
-            <view>我的余额</view>
-            <view class='num'>{{userInfo.now_money || 0}}</view>
-         </view>
-         <view class='item' wx:if="{{userInfo.is_promoter || userInfo.statu==2}}"
-            data-url='/pages/user_spread_user/index' bindtap='goPages'>
-            <view>当前佣金</view>
-            <view class='num'>{{userInfo.brokerage_price || 0}}</view>
-         </view>
-         <view class='item' wx:else data-url='/pages/user_integral/index' bindtap='goPages'>
-            <view>当前积分</view>
-            <view class='num'>{{userInfo.integral || 0}}</view>
-         </view>
-         <view class='item' data-url='/pages/user_coupon/index' bindtap='goPages'>
-            <view>优惠券</view>
-            <view class='num'>{{userInfo.couponCount || 0}}</view>
-         </view>
-      </view>
-      <view class='myOrder'>
-         <view class='title acea-row row-between-wrapper'>
-            <view>我的订单</view>
-            <view class='allOrder' data-url='/pages/order_list/index' bindtap='goPages'>全部订单<text
-                  class='iconfont icon-jiantou'></text></view>
-         </view>
-         <view class='orderState acea-row row-middle'>
-            <view class='item' data-url='/pages/order_list/index?status=0' bindtap='goPages'>
-               <view class='pictrue'>
-                  <image src='/images/dfk.png'></image>
-                  <text class="order-status-num" wx:if="{{orderStatusNum.unpaid_count > 0}}">{{
-                     orderStatusNum.unpaid_count }}</text>
-               </view>
-               <view>待付款</view>
+            <view class='text'>
+                <view class='acea-row row-middle'>
+                    <view class='name line1' data-url='/pages/user_info/index' bindtap='goPages'>{{userInfo.uid ?
+                        userInfo.nickname : '请点击授权'}}</view>
+                    <view data-url='/pages/user_vip/index' class='member acea-row row-middle' wx:if="{{userInfo.vip}}" bindtap='goPages'>
+                        <image src='{{userInfo.vip_icon}}'></image>{{userInfo.vip_name}}
+                    </view>
+                </view>
+                <view class='id' data-url='/pages/user_info/index' bindtap='goPages' wx:if='{{userInfo.phone}}'>
+                    ID：{{userInfo.uid || 0}}<text class='iconfont icon-bianji1'></text></view>
+                <view wx:else data-url='/pages/user_phone/index' bindtap='goPages'><text class="binding">绑定手机号</text></view>
             </view>
-            <view class='item' data-url='/pages/order_list/index?status=1' bindtap='goPages'>
-               <view class='pictrue'>
-                  <image src='/images/dfh.png'></image>
-                  <text class="order-status-num" wx:if="{{orderStatusNum.unshipped_count > 0}}">{{
-                     orderStatusNum.unshipped_count }}</text>
-               </view>
-               <view>待发货</view>
+        </view>
+        <text class='iconfont icon-shezhi' bindtap='Setting'></text>
+    </view>
+    <view class='wrapper'>
+        <view class='nav acea-row row-middle'>
+            <view class='item' data-url='/pages/user_money/index' bindtap='goPages'>
+                <view>我的余额</view>
+                <view class='num'>{{userInfo.now_money || 0}}</view>
             </view>
-            <view class='item' data-url='/pages/order_list/index?status=2' bindtap='goPages'>
-               <view class='pictrue'>
-                  <image src='/images/dsh.png'></image>
-                  <text class="order-status-num" wx:if="{{orderStatusNum.received_count > 0}}">{{
-                     orderStatusNum.received_count }}</text>
-               </view>
-               <view>待收货</view>
+            <view class='item' wx:if="{{userInfo.is_promoter || userInfo.statu==2}}" data-url='/pages/user_spread_user/index' bindtap='goPages'>
+                <view>当前盈利</view>
+                <view class='num'>{{userInfo.brokerage_price || 0}}</view>
             </view>
-            <view class='item' data-url='/pages/order_list/index?status=3' bindtap='goPages'>
-               <view class='pictrue'>
-                  <image src='/images/dpj.png'></image>
-                  <text class="order-status-num" wx:if="{{orderStatusNum.evaluated_count > 0}}">{{
-                     orderStatusNum.evaluated_count }}</text>
-               </view>
-               <view>待评价</view>
+            <view class='item' wx:else data-url='/pages/user_integral/index' bindtap='goPages'>
+                <view>当前积分</view>
+                <view class='num'>{{userInfo.integral || 0}}</view>
             </view>
-            <view class='item' data-url='/pages/user_return_list/index' bindtap='goPages'>
-               <view class='pictrue'>
-                  <image src='/images/sh.png'></image>
-                  <text class="order-status-num" wx:if="{{orderStatusNum.refund_count > 0}}">{{
-                     orderStatusNum.refund_count }}</text>
-               </view>
-               <view>售后/退款</view>
+            <view class='item' data-url='/pages/user_coupon/index' bindtap='goPages'>
+                <view>优惠券</view>
+                <view class='num'>{{userInfo.couponCount || 0}}</view>
             </view>
-         </view>
-      </view>
-      <view class='myService'>
-         <view class='title acea-row row-middle'>我的服务</view>
-         <view class='serviceList acea-row row-middle'>
-            <view class='item' wx:for="{{MyMenus}}" wx:key='index' bindtap='goPages' data-url='{{item.url}}'
-               wx:if="{{item.url!='#' && item.url!='/pages/admin/index' && item.url!='/pages/service/index'}}">
-               <view class='pictrue'>
-                  <image src='{{item.pic}}'></image>
-               </view>
-               <view>{{item.name}}</view>
+        </view>
+        <view class='myOrder'>
+            <view class='title acea-row row-between-wrapper'>
+                <view>我的订单</view>
+                <view class='allOrder' data-url='/pages/order_list/index' bindtap='goPages'>全部订单<text class='iconfont icon-jiantou'></text></view>
             </view>
-            <button class='item' open-type='contact' hover-class='none'>
-               <view class='pictrue'>
-                  <image src='/images/customer.png'></image>
-               </view>
-               <view>联系客服</view>
-            </button>
-         </view>
-      </view>
-   </view>
-   <!-- <image src='/images/support.png' class='support'></image> -->
+            <view class='orderState acea-row row-middle'>
+                <view class='item' data-url='/pages/order_list/index?status=0' bindtap='goPages'>
+                    <view class='pictrue'>
+                        <image src='/images/dfk.png'></image>
+                        <text class="order-status-num" wx:if="{{orderStatusNum.unpaid_count > 0}}">{{
+                            orderStatusNum.unpaid_count }}</text>
+                    </view>
+                    <view>待付款</view>
+                </view>
+                <view class='item' data-url='/pages/order_list/index?status=1' bindtap='goPages'>
+                    <view class='pictrue'>
+                        <image src='/images/dfh.png'></image>
+                        <text class="order-status-num" wx:if="{{orderStatusNum.unshipped_count > 0}}">{{
+                            orderStatusNum.unshipped_count }}</text>
+                    </view>
+                    <view>待发货</view>
+                </view>
+                <view class='item' data-url='/pages/order_list/index?status=2' bindtap='goPages'>
+                    <view class='pictrue'>
+                        <image src='/images/dsh.png'></image>
+                        <text class="order-status-num" wx:if="{{orderStatusNum.received_count > 0}}">{{
+                            orderStatusNum.received_count }}</text>
+                    </view>
+                    <view>待收货</view>
+                </view>
+                <view class='item' data-url='/pages/order_list/index?status=3' bindtap='goPages'>
+                    <view class='pictrue'>
+                        <image src='/images/dpj.png'></image>
+                        <text class="order-status-num" wx:if="{{orderStatusNum.evaluated_count > 0}}">{{
+                            orderStatusNum.evaluated_count }}</text>
+                    </view>
+                    <view>待评价</view>
+                </view>
+                <view class='item' data-url='/pages/user_return_list/index' bindtap='goPages'>
+                    <view class='pictrue'>
+                        <image src='/images/sh.png'></image>
+                        <text class="order-status-num" wx:if="{{orderStatusNum.refund_count > 0}}">{{
+                            orderStatusNum.refund_count }}</text>
+                    </view>
+                    <view>售后/退款</view>
+                </view>
+            </view>
+        </view>
+        <view class='myService'>
+            <view class='title acea-row row-middle'>我的服务</view>
+            <view class='serviceList acea-row row-middle'>
+                <view class='item' wx:for="{{MyMenus}}" wx:key='index' bindtap='goPages' data-url='{{item.url}}' wx:if="{{item.url!='#' && item.url!='/pages/admin/index' && item.url!='/pages/service/index'}}">
+                    <view class='pictrue'>
+                        <image src='{{item.pic}}'></image>
+                    </view>
+                    <view>{{item.name}}</view>
+                </view>
+                <button class='item' open-type='contact' hover-class='none'>
+                    <view class='pictrue'>
+                        <image src='/images/customer.png'></image>
+                    </view>
+                    <view>联系客服</view>
+                </button>
+            </view>
+        </view>
+    </view>
+    <!-- <image src='/images/support.png' class='support'></image> -->
 </view>
 
 <authorize bind:onLoadFun='onLoadFun' isGoIndex='{{isGoIndex}}' iShidden="{{iShidden}}" isAuto="{{isAuto}}"></authorize>
 
-<generalWindow generalActive='{{generalActive}}' generalContent='{{generalContent}}' bind:generalWindow='generalWindow'
-   wx:if='{{generalContent}}'></generalWindow>
+<generalWindow generalActive='{{generalActive}}' generalContent='{{generalContent}}' bind:generalWindow='generalWindow' wx:if='{{generalContent}}'></generalWindow>

view/xcx/pages/user_payment/index.js

@@ -133,7 +133,7 @@ Page({
             app.setUnread(res.data.notice)
         })
     },
-    
+
     /*
      * 用户充值
      */
@@ -146,7 +146,7 @@ Page({
                 title: '请输入金额'
             });
             if (Number(value) > Number(commissionCount)) return app.Tips({
-                title: '转佣金额不能大于' + commissionCount
+                title: '转入金额不能大于' + commissionCount
             });
             wx.showModal({
                 title: '转入余额',

view/xcx/pages/user_payment/index.wxml

@@ -6,37 +6,26 @@
     </view>
     <view class="payment">
         <view class="nav acea-row row-around row-middle">
-            <view class="item {{active==index?'on':''}}" wx:key='index' data-id="{{index}}" wx:for='{{navRecharge}}'
-                bindtap="navRecharge">{{item}}</view>
+            <view class="item {{active==index?'on':''}}" wx:key='index' data-id="{{index}}" wx:for='{{navRecharge}}' bindtap="navRecharge">{{item}}</view>
         </view>
         <view wx:if='{{active}}'>
             <view class='input acea-row row-betweent row-bottom'>
-                <text>￥</text><input placeholder='{{placeholder}}' focus="{{focus}}" bindfocus='setPlaceholder'
-                    type='digit' bindblur="setPlaceholderStatus" placeholder-class='placeholder' name='number'
-                    value='{{number}}'></input>
+                <text>￥</text><input placeholder='{{placeholder}}' focus="{{focus}}" bindfocus='setPlaceholder' type='digit' bindblur="setPlaceholderStatus" placeholder-class='placeholder' name='number' value='{{number}}'></input>
             </view>
             <view class="acea-row row-column">
                     <text class="tip">提示：</text>
-                <view class="tip-samll">当前可转入佣金：
+                <view class="tip-samll">当前可转入盈利：
                     <text class="font-color">￥{{userinfo.commissionCount || 0}}</text>
                 </view>
             </view>
         </view>
         <view class="picList acea-row row-between mt-20" wx:if='{{!active}}'>
-            <view
-                class="pic-box pic-box-color acea-row row-center-wrapper row-column {{activePic==index?'pic-box-color-active':''}}"
-                wx:for='{{picList}}' wx:key='index' bindtap="picCharge" data-index="{{index}}" data-id="{{item.id}}"
-                data-pic="{{item.give_money}}" data-quota="{{item.price}}">
+            <view class="pic-box pic-box-color acea-row row-center-wrapper row-column {{activePic==index?'pic-box-color-active':''}}" wx:for='{{picList}}' wx:key='index' bindtap="picCharge" data-index="{{index}}" data-id="{{item.id}}" data-pic="{{item.give_money}}" data-quota="{{item.price}}">
                 <view class="pic-number"><text class="pic-number-pic">{{item.price}}</text>元</view>
                 <view class="pic-number">赠送：{{item.give_money}}元</view>
             </view>
-            <view
-                class="pic-box pic-box-color acea-row row-center-wrapper {{activePic==picList.length?'pic-box-color-active':''}}"
-                bindtap="picCharge" data-id="0" data-index="{{picList.length}}">
-                <input class="pic-number-pic" placeholder='{{placeholderOther}}' bindfocus='setOtherPlaceholder'
-                    bindblur="setOtherPlaceholderStatus" focus="{{focus}}" type='digit'
-                    placeholder-class="{{activePic==picList.length?'pic-box-color-active':''}}" name='number'
-                    value='{{number}}'></input>
+            <view class="pic-box pic-box-color acea-row row-center-wrapper {{activePic==picList.length?'pic-box-color-active':''}}" bindtap="picCharge" data-id="0" data-index="{{picList.length}}">
+                <input class="pic-number-pic" placeholder='{{placeholderOther}}' bindfocus='setOtherPlaceholder' bindblur="setOtherPlaceholderStatus" focus="{{focus}}" type='digit' placeholder-class="{{activePic==picList.length?'pic-box-color-active':''}}" name='number' value='{{number}}'></input>
             </view>
         </view>
 

view/xcx/pages/user_spread_money/index.js

@@ -13,7 +13,7 @@ Page({
         parameter: {
             'navbar': '1',
             'return': '1',
-            'title': '佣金记录',
+            'title': '盈利记录',
             'color': true,
             'class': '0'
         },
@@ -56,8 +56,8 @@ Page({
             });
         } else if (type == 2) {
             this.setData({
-                'parameter.title': '佣金记录',
-                name: '佣金记录',
+                'parameter.title': '盈利记录',
+                name: '盈利记录',
                 recordType: 3
             });
         } else {

view/xcx/pages/user_spread_user/index.js

@@ -17,7 +17,7 @@ Page({
         parameter: {
             'navbar': '1',
             'return': '1',
-            'title': '我的推广',
+            'title': '我的盈利',
             'color': true,
             'class': '0'
         },
@@ -81,7 +81,7 @@ Page({
             app.setUnread(res.data.notice)
         });
     },
-    
+
     /**
      * 生命周期函数--监听页面隐藏
      */

view/xcx/pages/user_spread_user/index.wxml

@@ -3,8 +3,7 @@
     <view class="header">
         <view class='name acea-row row-center-wrapper'>
             <view>当前佣金</view>
-            <navigator url='/pages/user_spread_money/index?type=1' hover-class="none" class='record'>提现记录<text
-                    class='iconfont icon-xiangyou'></text></navigator>
+            <navigator url='/pages/user_spread_money/index?type=1' hover-class="none" class='record'>提现记录<text class='iconfont icon-xiangyou'></text></navigator>
         </view>
         <view class='num'>{{userInfo.brokerage_price}}</view>
         <view class='profit acea-row row-between-wrapper'>
@@ -20,35 +19,29 @@
     </view>
     <view hover-class='none' data-url='/pages/user_cash/index' bindtap="openSubscribe" class='bnt bg-color'>立即提现</view>
     <view class='list acea-row row-between-wrapper'>
-        <navigator url='/pages/user_spread_code/index' hover-class="none"
-            class='item acea-row row-center-wrapper row-column'>
+        <navigator url='/pages/user_spread_code/index' hover-class="none" class='item acea-row row-center-wrapper row-column'>
             <text class='iconfont icon-erweima'></text>
             <view>推广海报</view>
         </navigator>
-        <navigator url='/pages/promoter-list/index' hover-class="none"
-            class='item acea-row row-center-wrapper row-column'>
+        <navigator url='/pages/promoter-list/index' hover-class="none" class='item acea-row row-center-wrapper row-column'>
             <text class='iconfont icon-tongji'></text>
             <view>推广人统计</view>
         </navigator>
-        <navigator url='/pages/user_spread_money/index?type=2' hover-class="none"
-            class='item acea-row row-center-wrapper row-column'>
+        <navigator url='/pages/user_spread_money/index?type=2' hover-class="none" class='item acea-row row-center-wrapper row-column'>
             <text class='iconfont icon-qiandai'></text>
-            <view>佣金记录</view>
+            <view>盈利记录</view>
         </navigator>
-        <navigator url='/pages/promoter-order/index' hover-class="none"
-            class='item acea-row row-center-wrapper row-column'>
+        <navigator url='/pages/promoter-order/index' hover-class="none" class='item acea-row row-center-wrapper row-column'>
             <text class='iconfont icon-dingdan'></text>
             <view>推广人订单</view>
         </navigator>
-        <navigator url='/pages/promoter_rank/index' hover-class="none"
-            class='item acea-row row-center-wrapper row-column'>
+        <navigator url='/pages/promoter_rank/index' hover-class="none" class='item acea-row row-center-wrapper row-column'>
             <text class='iconfont icon-paihang1'></text>
             <view>推广人排行</view>
         </navigator>
-        <navigator url='/pages/commission_rank/index' hover-class="none"
-            class='item acea-row row-center-wrapper row-column'>
+        <navigator url='/pages/commission_rank/index' hover-class="none" class='item acea-row row-center-wrapper row-column'>
             <text class='iconfont icon-paihang'></text>
-            <view>佣金排行</view>
+            <view>盈利排行</view>
         </navigator>
     </view>
 </view>