添加im标识

src/components/order/cashOut.vue

@@ -47,6 +47,7 @@
     <el-table-column prop="username" label="用户" width="100"> </el-table-column>
     <el-table-column prop="money" label="提现金额" width="100"> </el-table-column>
     <el-table-column prop="apply_reason" label="提现理由"> </el-table-column>
+    <el-table-column prop="real_name" label="姓名"> </el-table-column>
     <el-table-column prop="alipay_account" label="支付宝账号"> </el-table-column>
     <el-table-column prop="cash_no" label="账单号"> </el-table-column>
     <el-table-column prop="alipay_no" label="支付宝转帐订单号"> </el-table-column>
@@ -87,6 +88,9 @@
       <el-form-item label="提现理由" :label-width="formLabelWidth">
         <el-input disabled v-model="form.apply_reason" autocomplete="off"></el-input>
       </el-form-item>
+      <el-form-item label="姓名" :label-width="formLabelWidth">
+        <el-input disabled v-model="form.real_name" autocomplete="off"></el-input>
+      </el-form-item>
       <el-form-item label="支付宝账号" :label-width="formLabelWidth">
         <el-input disabled v-model="form.alipay_account" autocomplete="off"></el-input>
       </el-form-item>

src/components/product/account.vue

@@ -121,6 +121,14 @@
           <span v-else class="red">已退款</span>
         </template>
       </el-table-column>
+      <el-table-column prop="im" label="腾讯限制" width="150px">
+        <template slot-scope="scope">
+          <span style="color:green;" 
+            v-if="scope.row.im==1"
+          >已解除</span>
+          <span v-else >未解除</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="140px">
         <template slot-scope="scope">
           <span class="handel cursor edit" @click="selectUser(scope.row)">归属</span>
@@ -130,6 +138,8 @@
           <span v-if="scope.row.ProductId == 28" class="handel cursor edit" @click="openLimitjt(scope.row)">解除限制</span>
           <span v-if="scope.row.ProductId == 18" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
           <span v-if="scope.row.ProductId == 29" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
+          <span v-if="scope.row.ProductId == 3" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
+          <span v-if="scope.row.ProductId == 26" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
         </template>
       </el-table-column>
     </el-table>
@@ -161,6 +171,11 @@
       <el-table-column prop="LoginTime" label="登录时间"></el-table-column>
       <el-table-column prop="OnlineTime" label="在线时间"></el-table-column>
       <el-table-column prop="ServerIP" label="服务器Ip"></el-table-column>
+      <el-table-column prop="LoginIP" label="登录Ip">
+        <template slot-scope="scope">
+          <span class="handel cursor edit" @click="findaddr(scope.row)">{{scope.row.LoginIP}}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="UpStream" label="上行" ></el-table-column>
       <el-table-column prop="DownStream" label="下行"></el-table-column>
       <el-table-column label="操作" width="140px">
@@ -384,11 +399,10 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(_ => {
-        this.$api
+        this.$api.post(this.$api.phpURL + 'manager/account/delete',  {'id':item.Id}).then(res => {
-          .post('course/v1/productaccount/Delete?id=' + item.Id)
+           this.$message.success('删除成功')
-          .then(res => {
+          that.get()
-            that.get()
+        })
-          })
       })
     },
     dels () {
@@ -468,17 +482,21 @@ export default {
     openLimit(item) {
       this.$api.post(this.$api.phpURL + 'jinyou/jinyoudt/openTxLimit', {
         account: item.Account,
+        productId:item.ProductId,
       }).then(res => {
         this.$message.success('设置成功')
+        this.get()
       })
     },
     
     openLimitjt(item) {
       this.$api.post(this.$api.phpURL + 'jinyou/jinyoujt/openTxLimit', {
         account: item.Account,
+        productId:item.ProductId,
         PackageName:item.PackageName
       }).then(res => {
         this.$message.success('设置成功')
+        this.get()
       })
     },
 
@@ -488,6 +506,7 @@ export default {
         productId:item.ProductId
       }).then(res => {
         this.$message.success('设置成功')
+        this.get()
       })
     },
     killout (item) {
@@ -504,6 +523,11 @@ export default {
           this.online(item.info)
         })
     },
+    findaddr (item) {
+      this.$api.get(this.$api.phpURL + 'api/index/getIpAddress?ip='+item.LoginIP).then(res => {
+        alert(res.data);
+      })
+    },
     dataExport () {
       if (this.dateRange && this.dateRange.length === 2) {
         this.searchModel.Btime = this.dateRange[0]

src/components/product/accountSearch.vue

@@ -63,6 +63,14 @@
           <span v-else class="red">已退款</span>
         </template>
       </el-table-column>
+      <el-table-column prop="im" label="腾讯限制" width="150px">
+        <template slot-scope="scope">
+          <span style="color:green;" 
+            v-if="scope.row.im==1"
+          >已解除</span>
+          <span v-else >未解除</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="140px">
         <template slot-scope="scope">
           <span class="handel cursor edit" @click="selectUser(scope.row)">归属</span>
@@ -72,6 +80,8 @@
           <span v-if="scope.row.ProductId == 28" class="handel cursor edit" @click="openLimitjt(scope.row)">解除限制</span>
           <span v-if="scope.row.ProductId == 18" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
           <span v-if="scope.row.ProductId == 29" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
+          <span v-if="scope.row.ProductId == 3" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
+          <span v-if="scope.row.ProductId == 26" class="handel cursor edit" @click="openLimitother(scope.row)">解除限制</span>
         </template>
       </el-table-column>
     </el-table>
@@ -98,7 +108,10 @@
       <el-table-column prop="LoginTime" label="登录时间"></el-table-column>
       <el-table-column prop="OnlineTime" label="在线时间"></el-table-column>     
       <el-table-column prop="ServerIP" label="服务器Ip"></el-table-column>
-      <el-table-column prop="LoginIP" label="登录ip"></el-table-column>
+      <el-table-column prop="LoginIP" label="登录ip">
+        <template slot-scope="scope">
+          <span class="handel cursor edit" @click="findaddr(scope.row)">{{scope.row.LoginIP}}</span>
+        </template></el-table-column>
       <el-table-column prop="UpStream" label="上行" ></el-table-column>
       <el-table-column prop="DownStream" label="下行"></el-table-column>
       <el-table-column label="操作" width="140px">
@@ -216,11 +229,10 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(_ => {
-        this.$api
+        this.$api.post(this.$api.phpURL + 'manager/account/delete',  {'id':item.Id}).then(res => {
-          .post("course/v1/productaccount/Delete?id=" + item.Id)
+           this.$message.success('删除成功')
-          .then(res => {
+          that.get()
-            that.get();
+        })
-          });
       });
     },
     goAdd() {
@@ -277,17 +289,21 @@ export default {
     openLimit(item) {
       this.$api.post(this.$api.phpURL + 'jinyou/jinyoudt/openTxLimit', {
         account: item.Account,
+        productId:item.ProductId
       }).then(res => {
         this.$message.success('设置成功')
+        this.get()
       })
     },
     
     openLimitjt(item) {
       this.$api.post(this.$api.phpURL + 'jinyou/jinyoujt/openTxLimit', {
         account: item.Account,
+        productId:item.ProductId,
         PackageName:item.PackageName
       }).then(res => {
         this.$message.success('设置成功')
+        this.get()
       })
     },
 
@@ -297,6 +313,12 @@ export default {
         productId:item.ProductId
       }).then(res => {
         this.$message.success('设置成功')
+        this.get()
+      })
+    },
+    findaddr (item) {
+      this.$api.get(this.$api.phpURL + 'api/index/getIpAddress?ip='+item.LoginIP).then(res => {
+        alert(res.data);
       })
     },
     killout(item){

src/components/user/statistics.vue

@@ -26,15 +26,15 @@
       </router-link>
       <el-button type="primary" size="small" @click="click_phone()" plain>号码拨号</el-button>
       
-      <div  v-if="$local.isRoot()">
+      <!-- <div  v-if="$local.isRoot()">
         {{sell_detail.cost_mogu}}<span style="color:red">|| </span>{{sell_detail.cost_not_mogu}}
-      </div>
+      </div> -->
       <div> 
         <p>主动销售：</p>
-        <p>{{sell_detail.other_order_active}}<span style="color:red">|| </span>{{sell_detail.mogu_order_active}}<span style="color:red">|| </span>{{sell_detail.recharge_active}}<span style="color:red">|| </span>{{sell_detail.http_active}}<span style="color:red">|| </span>{{sell_detail.ros_active}}<span style="color:red">|| </span>{{sell_detail.jinqiao_active}}</p>
+        <p>{{sell_detail.other_order_active}}<span style="color:red">|| </span>{{sell_detail.self_order_active}}<span style="color:red"> || </span>{{sell_detail.recharge_active}}<span style="color:red">|| </span>{{sell_detail.http_active}}<span style="color:red">|| </span>{{sell_detail.ros_active}}<span style="color:red">|| </span>{{sell_detail.jinqiao_active}}</p>
       
         <p>被动销售：</p>
-        <p>{{sell_detail.other_order_not_active}}<span style="color:red">|| </span>{{sell_detail.mogu_order_not_active}}<span style="color:red">|| </span>{{sell_detail.recharge_not_active}}<span style="color:red">|| </span>{{sell_detail.http_not_active}}<span style="color:red">|| </span>{{sell_detail.ros_not_active}}<span style="color:red">|| </span>{{sell_detail.jinqiao_not_active}}</p>
+        <p>{{sell_detail.other_order_not_active}}<span style="color:red">|| </span>{{sell_detail.self_order_not_active}}<span style="color:red"> || </span>{{sell_detail.recharge_not_active}}<span style="color:red">|| </span>{{sell_detail.http_not_active}}<span style="color:red">|| </span>{{sell_detail.ros_not_active}}<span style="color:red">|| </span>{{sell_detail.jinqiao_not_active}}</p>
       </div>
       <p>
         {{sell_detail.sell_percent}}<span style="color:red">|| </span>
@@ -404,11 +404,11 @@ export default {
       product_type_list:[
         {
           value: 'other_order',
-          label: '其他IP产品订单'
+          label: '合营IP订单'
         },
         {
-          value: 'mogu_order',
+          value: 'self_order',
-          label: '蘑菇IP订单'
+          label: '自营IP订单'
         },
         {
           value: 'recharge',