merge

apis/index.js

@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
+	// apiUrl	: 'https://api.douhuotest.douhuofalv.com/api/', //测试环境
 	timeout	: 60000
 }
 

apis/interfaces/user.js

@@ -142,9 +142,10 @@ const submitTeamName = (data) => {
 	})
 }
 //  获取运营中心记录
-const getTeam = () => {
+const getTeam = (data) => {
 	return request({
 		url		: 'user/team',
+        data:data,
 	})
 }
 

manifest.json

@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.3.2",
+    "versionName" : "1.3.3",
     "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */

pages.json

@@ -225,7 +225,7 @@
 		"auth": true,
 		"name": "YunYing",
 		"style": {
-			"navigationBarTitleText": "运营中心",
+			"navigationBarTitleText": "",
 			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#446EFE",
 			"navigationBarTextStyle": "white"

pages/account/yunying.vue

@@ -1,25 +1,48 @@
 <template>
     <view class="content">
-        <!-- :style="'background-image: url(' + require('@/static/icons/yunying_bg.png') + ');'" -->
+        <view class="list-item">
+            <view class="label-t"><u-icon class="icon" name="level" color="#446EFE" size="40rpx" bold />机构名称</view>
+            <view class='value'>
+                {{team_name || '--'}}{{defaultTitle}}
+                <u-icon @click='yunyingShow = true,yunying_name = team_name' name="edit-pen-fill" class='pen'
+                    color="#454545" size="34rpx" bold />
+            </view>
+        </view>
+        <view class="list-item">
+            <view class="label-t"><u-icon class="icon" name="integral" color="#446EFE" size="40rpx" bold />团队人数</view>
+            <view class='value'>
+                团队人数<span>{{users_count || 0}}</span>人
+            </view>
+        </view>
+        <view class="list-item">
+            <view class="label-t"><u-icon class="icon" name="rmb-circle" color="#446EFE" size="40rpx" bold />总业绩</view>
+            <view class='value'>
+                <span>￥{{all_perf || 0}}</span>
+            </view>
+        </view>
         <!-- 账户余额 -->
-        <view class="total">
+        <!-- <view class="total"> -->
-            <view class="total-item-1">
+         <!--   <view class="total-item-1">
                 <view class="total-left">
                     <view class="total-value nowrap ">
                         {{team_name || '--'}}
                         <u-icon @click='yunyingShow = true,yunying_name = team_name' name="edit-pen-fill" class='pen'
-                            color="#eee" size="34rpx" bold />
+                            color="red" size="34rpx" bold />
                     </view>
-                    <view class="total-text nowrap">运营中心</view>
+                    <view class="total-text nowrap">{{defaultTitle}}</view>
                 </view>
-            </view>
+            </view> -->
-            <view class="total-item-2">
+      <!--      <view class="total-item-2" v-if="teamtype == 'team'">
                 <view> 团队人数 :<span>{{users_count}}</span>人</view>
                 <view> 总业绩 :￥<span>{{all_perf}}</span></view>
-            </view>
+            </view> -->
-        </view>
+        <!-- </view> -->
+        <!-- <view class="total" :style="'background-image: url(' + require('@/static/imgs/cash_back.png') + ');'">
+        	<view class="total-value nowrap">{{users_count}}</view>
+        	<view class="total-text">团队人数</view>
+        </view> -->
         <!-- 账户记录 -->
-        <view class="tabs">
+        <!-- <view class="tabs">
             <u-tabs :list="tabs" :scrollable="false" :activeStyle="{color: '#446EFE', fontWeight: 'bold'}"
                 lineColor="#446EFE" @click="onTabs" />
         </view>
@@ -63,19 +86,19 @@
                 </view>
             </block>
         </view>
-        <u-loadmore v-if="pagesShow" :status="status" />
+        <u-loadmore v-if="pagesShow" :status="status" /> -->
 
         <!-- 弹窗展示输入运营中心姓名 -->
         <u-popup :show="yunyingShow" mode="center" @close="yunyingShow = false" :round="22">
             <view class="yunying">
                 <view class="yunying_title">
-                    <view class="title"> 修改运营中心 </view>
+                    <view class="title">  修改{{defaultTitle}} </view>
                     <image class="yunying_bg" src="/static/icons/yunying_bg.png" mode="widthFix" />
                 </view>
                 <view class="rz-item">
                     <input type="text" maxlength="4" v-model='yunying_name' placeholder-class="inputP"
                         placeholder="请输入名称" />
-                    <view class="btn">运营中心</view>
+                    <view class="btn">{{defaultTitle}}</view>
                 </view>
                 <view class="button" @click="sureYunYing">确认修改名称</view>
             </view>
@@ -97,18 +120,7 @@
         data() {
             return {
                 type: 'edit',
-                tabs: [{
+                tabs:[],
-                        name: '名称修改',
-                        value: 'edit'
-                    }, {
-                        name: '团队人数',
-                        value: 'balance'
-                    },
-                    {
-                        name: '总业绩',
-                        value: 'withdraws'
-                    },
-                ],
                 total: '0.00',
                 sended: '0.00',
                 frozen: '0.00',
@@ -125,20 +137,53 @@
                 team_status: '', // 状态 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
                 users_count: '-',
                 all_perf: '-',
+                teamtype:'', // team 
+                id:'',
+                defaultTitle:'', // 全局名称法务运营中心，大区运营中心
             };
         },
+        onLoad(e) {
+            this.teamtype = e.teamtype
+            this.id = e.id
+            let title =''
+            if(e.teamtype == 'team'){
+                title='法务运营中心'
+                this.tabs = [{
+                        name: '名称修改',
+                        value: 'edit'
+                    }, {
+                        name: '团队人数',
+                        value: 'balance'
+                    },
+                    {
+                        name: '总业绩',
+                        value: 'withdraws'
+                    }
+                ]
+            } else {
+                title='大区运营中心'
+                this.tabs = [{
+                    name: '名称修改',
+                    value: 'edit'
+                }]
+            }
+            this.defaultTitle =title
+            uni.setNavigationBarTitle({
+                title:title
+            })
+        },
         onShow() {
             this.page = {
                 current: 1,
                 has_more: false,
             }
             this.getList()
-            this.getTeam();
+            this.getTeam()
         },
         methods: {
             // 获取运营中心基本信息
             getTeam() {
-                getTeam().then(res => {
+                getTeam({identity_id:this.id}).then(res => {
                     this.team_name = res.name
                     this.users_count = res.users_count
                     this.all_perf = res.all_perf
@@ -150,7 +195,7 @@
             sureYunYing() {
                 if (this.yunying_name == '' || this.yunying_name.length == 0) {
                     uni.showToast({
-                        title: '请输入运营中心名称',
+                        title: '请输入'+this.defaultTitle+'名称',
                         icon: 'none',
                         mask: true,
                         duration: 2000
@@ -159,12 +204,12 @@
                 }
 
                 submitTeamName({
-                    name: this.yunying_name
+                    name: this.yunying_name,identity_id:this.id
                 }).then(res => {
                     this.showBind = false
                     uni.showModal({
                         title: '微信提示',
-                        content: '运营中心姓名修改完成，请耐心等待审核！',
+                        content: this.defaultTitle+'姓名修改完成，请耐心等待审核！',
                         showCancel: false,
                         success: res => {
                             this.yunyingShow = false
@@ -197,7 +242,6 @@
             },
             // 获取账户余额
             getList() {
-                
                 // if (this.type === 'balance') this.getBalance()
                 // if (this.type === 'withdraws') this.getWithdraws()
                 if (this.type == 'edit'){
@@ -233,7 +277,7 @@
             },
             // 获取提现记录
             getTeams() {
-                getTeamLogs({}).then(res => {
+                getTeamLogs({identity_id:this.id}).then(res => {
                     console.log(res)
                     this.list = res
                     this.pagesShow = false
@@ -286,6 +330,44 @@
 </script>
 
 <style lang="scss">
+    .list-item{
+        padding:60rpx 40rpx;
+        border-bottom: solid 1rpx #ddd;
+        display:flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        width: 100%;
+        .label-t{
+            width: 240rpx;
+            // background-color: pink;
+            // font-size: 28rpx;
+            // color: #666;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+            .icon{
+                margin-right: 10rpx;
+            }
+        }
+        .value{
+            flex: 1;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-end;
+            font-size: 34rpx;
+            font-weight: bold;
+            color: #222;
+            box-sizing: border-box;
+            .pen{
+                margin-left:20rpx;
+            }
+        }
+    }
     // tabs
     .tabs {
         border-radius: 20rpx 20rpx 0 0;
@@ -301,9 +383,9 @@
     .total {
         background-size: cover;
         background-position: top center;
-        padding: 50rpx 30rpx 170rpx;
+        // padding: 50rpx 30rpx 170rpx;
-        background-color: #446EFE;
+        // background-color: #446EFE;
-        color: white;
+        color: #446EFE;
 
         .total-item-1 {
             display: flex;
@@ -541,12 +623,12 @@
 
             .btn {
                 height: 60rpx;
-                background: #446EFE;
+                // background: #446EFE;
                 border-radius: 10rpx;
-                font-size: 24rpx;
+                // font-size: 24rpx;
                 font-family: PingFang SC;
                 font-weight: 400;
-                color: #FFFFFF;
+                // color: #FFFFFF;
                 line-height: 60rpx;
                 text-align: center;
                 padding: 0 20rpx;

pages/pay/pay.vue

@@ -75,7 +75,7 @@
 					if(resNumb >= 3){
 						clearInterval(outTime)
 						uni.showToast({
-							title: '查询失败',
+							title: '暂未查询到你的支付订单',
 							icon : 'none'
 						})
 						return
@@ -95,7 +95,6 @@
 							})
 						}
 					}).catch(err => {
-						console.log(err)
 						clearInterval(outTime)
 						uni.showToast({
 							title: err.message,
@@ -288,7 +287,7 @@
 			// 打开微信小程序收银台
 			onMiniWx(){
 				let token   = this.$store.getters.getToken
-				let tradeId = res.trade_id
+				let tradeId = this.trade_id
 				plus.share.getServices(e => {
 					let wxIndex = e.findIndex(val => val.id == 'weixin')
 					let sweixin = null

pages/user/index.vue

@@ -11,7 +11,13 @@
                         <view class="tags-item" v-if="certification">
                             <image class="tags-icon" src="@/static/icons/Identity_icon.png" mode="widthFix"></image>实名认证
                         </view>
+                        <block v-if="identity.id != '5'">
                             <view class="tags-item" >{{identity.name}}</view>
+                            <view class="tags-item" v-if="team_name!=''">隶属：{{team_name}}</view>
+                        </block>
+                        <block v-if="identity.id == '5'">
+                            <view class="tags-item" v-if="team_name!=''">{{team_name}}</view>
+                        </block>
                     </view>
                     <view class="state">
                         <view class="state-tag">
@@ -56,12 +62,19 @@
             </view>
             <u-icon name="arrow-right" color="#cacaca" size="34rpx" bold></u-icon>
         </view>
-        <!-- <view class="nav-flex" @click="onNav('YunYing')" v-if="team_status != 0">
+        <view class="nav-flex" @click="yungying('team',team_id)" v-if="team_status != 0">
             <view class="nav-icon">
-                <image class="nav-icon-src" src="@/static/icons/yunying.png"></image> 运营中心
+                <image class="nav-icon-src" src="@/static/icons/yunying.png"></image> 法务运营中心
             </view>
             <u-icon name="arrow-right" color="#cacaca" size="34rpx" bold></u-icon>
-        </view> -->
+        </view>
+        
+        <view class="nav-flex" @click="yungying('region',region_id)" v-if="region_status != 0">
+            <view class="nav-icon">
+                <image class="nav-icon-src" src="@/static/icons/yunying.png"></image> 大区运营中心
+            </view>
+            <u-icon name="arrow-right" color="#cacaca" size="34rpx" bold></u-icon>
+        </view>
         <view class="nav-flex" @click="onNav('AccountBonus')">
             <view class="nav-icon">
                 <image class="nav-icon-src" src="@/static/icons/user_nav_04.png"></image>奖金账户
@@ -133,12 +146,12 @@
         <u-popup :show="yunyingShow" mode="center" @close="yunyingShow = false" :round="22">
             <view class="yunying">
                 <view class="yunying_title">
-                    <view class="title"> 完善运营中心 </view>
+                    <view class="title">{{team_status == '1'?'完善法务运营中心':'完善大区运营中心'}} </view>
                     <image class="yunying_bg" src="/static/icons/yunying_bg.png" mode="widthFix" />
                 </view>
                 <view class="rz-item"> 
                     <input type="text" maxlength="4" v-model='yunying_name' placeholder-class="inputP" placeholder="请输入名称" />
-                    <view class="btn">运营中心</view>
+                    <view class="btn">{{team_status == '1'?'法务运营中心':'大区运营中心'}}</view>
                 </view>
                 <view class="button" @click="sureYunYing">确认名称</view>
             </view>
@@ -159,6 +172,7 @@
                 isAuth: false,
                 nickname: '',
                 identity: '',
+                team_name:'',
                 avatar: '',
                 certification: '',
                 // 绑定关系
@@ -184,6 +198,9 @@
                 yunyingShow:false, //  运营中心是否展示
                 yunying_name:'', // 运营名称
                 team_status:'', // 状态 0 不展示运营中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
+                team_id:'',
+                region_status:'', // 状态 0 不展示 大区中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
+                region_id:'',
             };
         },
         onShow() {
@@ -202,18 +219,28 @@
                         identity,
                         avatar,
                         certification,
-                        parent,team_status
+                        parent,team_name,teams
                     } = res
                     this.nickname = nickname
                     this.identity = identity
                     this.avatar = avatar
                     this.certification = certification
                     this.parent = parent
-                    this.team_status = team_status
+                    this.team_name = team_name
-                    if(team_status == 1){
-                        this.yunyingShow = true
-                    }
                     uni.hideLoading()
+                    // team_status:'', // 状态 0 不展示运营中心 1可以申请但是没有完善，2申请完，审核中，3已通过，已修改
+                    this.team_status = teams.center.status    //  运营中心状态
+                    this.team_id = teams.center.identity_id   //  运营中心
+                    this.region_status = teams.region.status  //  大区中心状态
+                    this.region_id = teams.region.identity_id //  大区中心id
+                    if(teams.center.status == 1){
+                        this.yunyingShow = true
+                        return
+                    }
+                    if(teams.region.status == 1){
+                        this.yunyingShow = true
+                        return
+                    }
                 }).catch(err => {
                     uni.showToast({
                         title: err.message,
@@ -221,17 +248,43 @@
                     })
                 })
             },
-            // 导航
+            yungying(type,id){
-            onNav(name) {
+                if(type === 'team'){
                     if(this.team_status == 2){
                             uni.showToast({
-                        title:'运营中心名称审核中',
+                                title:'法务运营中心名称审核中',
                                 icon:'none',
                                 mask:true,
                                 duration:3000,
                             })
                             return
                     }
+                    if(this.team_status == 1){
+                        this.yunyingShow = true
+                        return
+                    }
+                }
+                if(type == 'region'){
+                    if(this.region_status == 2){
+                            uni.showToast({
+                                title:'大区运营中心名称审核中',
+                                icon:'none',
+                                mask:true,
+                                duration:3000,
+                            })
+                            return
+                    }
+                    if(this.region_status == 1){
+                        this.yunyingShow = true
+                        return
+                    }
+                }
+                uni.navigateTo({
+                    url:'/pages/account/yunying?id='+id+'&teamtype='+type
+                })
+            },
+            // 导航
+            onNav(name) {
                 this.$Router.push({
                     name
                 })
@@ -337,21 +390,25 @@
             },
             //  运营中心确认按钮处理
             sureYunYing(){
+                console.log(this.team_status,this.region_status)
                  if(this.yunying_name == '' || this.yunying_name.length == 0){
                      uni.showToast({
-                         title:'请完善运营中心名称',
+                         title:this.team_status == 1?'请完善法务运营中心名称':'请完善大区运营中心名称',
                          icon:'none',
                          mask:true,
                          duration:2000,
                      })
                      return
                  }
-                 
+                let pararms = {
-                 submitTeamName({name:this.yunying_name}).then(res => {
+                     name:this.yunying_name,
+                     identity_id:this.team_status ==1 ? this.team_id:this.region_id
+                }
+                 submitTeamName(pararms).then(res => {
                      this.showBind = false
                      uni.showModal({
                          title: '微信提示',
-                         content: '运营中心姓名完善完成，请耐心等待审核！',
+                         content: this.team_status ==1?'法务运营中心姓名完善完成，请耐心等待审核！':'大区运营中心姓名完善完成，请耐心等待审核！',
                          showCancel: false,
                          success: res => {
                              this.getUserInfo()
@@ -429,15 +486,20 @@
                     height: 40rpx;
                     color: #555;
                     font-weight: 400;
-                    margin-left: $margin - 10;
+                    margin-right: $margin - 10;
 
                     &::after{
                         border-radius: 20rpx;
                     }
 
-                    &:first-child {
+                    &:first-child ,&:nth-child(3) {
                         margin-left: 0;
                     }
+                    &:nth-child(3){
+                        margin-top: 10rpx;
+                    //     background: #4674DA;
+                    //     color: #fff;
+                    }
 
                     .tags-icon {
                         width: 32rpx;
@@ -675,12 +737,12 @@
     
             .btn {
                 height: 60rpx;
-                background: #4674DA;
+                // background: #4674DA;
                 border-radius: 10rpx;
-                font-size: 24rpx;
+                // font-size: 24rpx;
                 font-family: PingFang SC;
                 font-weight: 400;
-                color: #FFFFFF;
+                // color: #FFFFFF;
                 line-height: 60rpx;
                 text-align: center;
                 padding: 0 20rpx;