zerp 4 年 前
コミット
524a34c878

+ 11 - 0
src/api/orderList.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+//订单查询
+export function ordersearch(data) {
+  return request({
+    url: '/orderManagement/search',
+    method: 'post',
+    data: data
+  })
+}
+

+ 0 - 0
src/api/userList.js


+ 1 - 1
src/views/layout/components/Navbar.vue

@@ -16,7 +16,7 @@
       <!--个人-->
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img src="../../../assets/avatar/gaOngJwsRYRaVAuXXcmB.png" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">

+ 3 - 3
src/views/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
+        <img v-if="logo" src="../../../../assets/avatar/cnrhVkzwxjPwAaCfPbdc.png" class="sidebar-logo">
         <h1 v-else class="sidebar-title">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
+        <img v-if="logo" src="../../../../assets/avatar/cnrhVkzwxjPwAaCfPbdc.png" class="sidebar-logo">
         <h1 class="sidebar-title">{{ title }} </h1>
       </router-link>
     </transition>
@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      title: 'Pre权限管理系统',
+      title: '营销运营管理平台',
       logo: 'https://gitee.com/li_haodong/picture_management/raw/master/pic/WechatIMG9.png'
     }
   }

+ 10 - 7
src/views/login/index.vue

@@ -27,6 +27,7 @@
                 placeholder="账号"
                 name="username"
                 type="text"
+                @keyup.enter.native="handleLogin"
                 autocomplete="off"
               >
                 <i slot="prefix" class="">
@@ -41,6 +42,7 @@
                 placeholder="密码"
                 name="password"
                 type="password"
+                @keyup.enter.native="handleLogin"
               >
                 <i slot="prefix" class="">
                   <svg-icon icon-class="密码" />
@@ -80,6 +82,7 @@
               type="primary"
               style="width:100%;"
               @click.native.prevent="handleLogin"
+              @keyup.enter.native="handleLogin"
             >
               登录
             </el-button>
@@ -166,7 +169,7 @@
           </span>
 
           <span class="other-icon" @click="handleSocial('gitee')">
-            <a href='http://localhost:8081/auth/gitee'>
+            <!--<a href='http://localhost:8081/auth/gitee'>
             <svg
               t="1563366479009"
               class="fa-icon"
@@ -183,10 +186,10 @@
                 p-id="1419"
               />
             </svg>
-            </a>
+            <!--</a>
           </span>
           <span class="other-icon" @click="handleSocial('weixin')">
-            <a href='http://localhost:8081/auth/gitee'
+            <!--<a href='http://localhost:8081/auth/gitee'
             <svg
               t="1566549849419"
               class="icon"
@@ -209,7 +212,7 @@
               fill="#FFFFFF"
               p-id="2081"
             /></svg>
-            </a>
+            <!--</a>
           </span>
         </div>
         <div class="register">
@@ -291,9 +294,9 @@ export default {
   created() {
     // this.refreshCaptcha()
     // this.socialLogin()
-    const array = [{ a: 1 }, { a: 2 }, { a: 3 }, { a: 4 }, { a: 5 }]
-    const ary = array.map(res => {
-      return res.a
+    let array=[{a:1},{a:2},{a:3},{a:4},{a:5}]
+    let ary=array.map(res=>{
+       return res.a
     })
     // console.log(Math.max(ary))
   },

+ 222 - 26
src/views/orderList/Distribute.vue

@@ -6,43 +6,49 @@
       <el-table v-loading="loading" :data="tableData" border style="width: 100%">
         <el-table-column type="selection" />
 
-        <el-table-column label="订单号" width="100" align="center">
+        <el-table-column label="订单号" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.orderId }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="分发订单号" width="100" align="center">
+        <el-table-column label="分发订单号" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.recId }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="手机号" width="100" align="center">
+        <el-table-column label="手机号" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.mobileNo }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="流量包ID号" width="100" align="center">
+        <el-table-column label="流量产品包(参照运营商规格)" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.packageId }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="面额" width="50" align="center">
+        <el-table-column label="流量产品包(foss平台)" width="200" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.fossPackageId }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="流量大小(面额)导数据注意转换" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.flowAmount }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="通道名称" width="200" align="center">
+        <el-table-column label="下发次数" width="200" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.channelName }}</span>
+            <span>{{ scope.row.sendCount }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="创建时间" width="200" align="center">
+        <el-table-column label="创建日期" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createDate }}</span>
           </template>
@@ -54,16 +60,13 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="发送状态" width="200" align="center">
+        <el-table-column label="发送状态:0-待发 1-已发 2-成功 3-重发 4-失败" width="200" align="center">
           <template slot-scope="scope">
-            <!-- #发送状态:1、成功2、失败3、已发 -->
-            <span v-if="scope.row.sendStatus==1">成功</span>
-            <span v-if="scope.row.sendStatus==2">失败</span>
-            <span v-if="scope.row.sendStatus==3">已发</span>
+            <span>{{ scope.row.sendStatus }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="供应商订单号" width="200" align="center">
+        <el-table-column label="网关订单号(供应商订单号" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.gwSeqNo }}</span>
           </template>
@@ -105,7 +108,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="运营商结算价格" width="200" align="center">
+        <el-table-column label="运营商结算价格 导数据注意转换" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.operatorBalancePrice }}</span>
           </template>
@@ -117,12 +120,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="分发组次数" width="200" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.sendCount }}</span>
-          </template>
-        </el-table-column>
-
         <el-table-column label="客户产品" width="200" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.customerProducts }}</span>
@@ -161,13 +158,113 @@ export default {
           recId: '123456789',
           orderId: '123456789',
           mobileNo: '123456789',
-          packageId: 'YDHF100',
-          fossPackageId: '????',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
+          sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
+          sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
+          sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
+          sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
           flowAmount: 100,
-          channelName: 'test',
+          sendCount: 5,
           createDate: '2021-05-17 00:00:00',
           modifyDate: '2021-05-17 00:00:00',
-          sendStatus: 1,
+          sendStatus: 0,
           gwSeqNo: '123456789',
           gwStatus: 'PASS',
           gwErrorCode: '???',
@@ -175,9 +272,108 @@ export default {
           mobileHome: '四川',
           appId: '123',
           lastCallbackMsg: 'CALL OK',
-          operatorBalancePrice: 100.55,
+          operatorBalancePprice: 100.55,
           batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
           sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
+          sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
+          sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
+          customerProducts: '???',
+          channelProducts: '??',
+          operatorId: '123456789',
+          recordLog: 'SOURCE'
+        },
+        {
+          recId: '123456789',
+          orderId: '123456789',
+          mobileNo: '123456789',
+          packageNd: 'YDHF100',
+          fossPackageNd: '????',
+          flowAmount: 100,
+          sendCount: 5,
+          createDate: '2021-05-17 00:00:00',
+          modifyDate: '2021-05-17 00:00:00',
+          sendStatus: 0,
+          gwSeqNo: '123456789',
+          gwStatus: 'PASS',
+          gwErrorCode: '???',
+          gwErrorMsg: 'NOT FIND',
+          mobileHome: '四川',
+          appId: '123',
+          lastCallbackMsg: 'CALL OK',
+          operatorBalancePprice: 100.55,
+          batchCount: 5,
           customerProducts: '???',
           channelProducts: '??',
           operatorId: '123456789',

+ 562 - 358
src/views/orderList/index.vue

@@ -1,420 +1,624 @@
 <template>
-  <div class="MaxKing_Test">
+  <div class="app-container">
     <div class="filter-container" style="margin: 10px 0 10px 0">
-      <el-row :gutter="10">
-        <el-col :span="6">
-          <div class="grid-content bg-purple">
-            <el-input
-              v-model="Name"
-              clearable
-              class="filter-item"
-              style="width: 200px"
-              size="small"
-              placeholder="请输入角色名称"
-              @keyup.enter.native="handleFind"
-            />
-          </div>
-        </el-col>
-        <el-col :span="9">
-          <div class="grid-content bg-purple">
-            <el-button
-              class="filter-item"
-              size="small"
-              type="primary"
-              icon="el-icon-search"
-              @click="handleFind"
-            >搜索
+      <!-- <el-row :gutter="20" style="marginBottom:20px">
+          <el-col :span="8"  :xs="12"  :lg="8">
+              <div>
+                  <span class="textSpan">
+                     订单号: 
+                  </span>
+                <el-input
+                        v-model="body.orderId"
+                        style="width: 70%;"
+                        placeholder="请输入订单号"
+                        size="small"
+                        clearable
+                    />
+              </div>
+          </el-col>
+          <el-col :span="8"  :xs="12"  :lg="8">
+              <div>
+                  <span class="textSpan">
+                     商户订单号: 
+                  </span>
+                <el-input
+                        v-model="body.extorderId"
+                        style="width: 70%;"
+                        placeholder="请输入商户订单号"
+                        size="small"
+                        clearable
+                    />
+              </div>
+          </el-col>
+          <el-col :span="8"  :xs="12"  :lg="8">
+              <div>
+                  <span class="textSpan">
+                     手机号码: 
+                  </span>
+                <el-input
+                        v-model="body.usedMobile"
+                        style="width: 70%;"
+                        placeholder="请输入手机号码"
+                        size="small"
+                        clearable
+                    />
+              </div>
+          </el-col>
+      </el-row> -->
+        <div class="flex">
+            <div class="w_input">
+                <span class="textSpan"> 订单号:</span>
+                 <el-input
+                        v-model="body.orderId"
+                        style="width:65%;"
+                        placeholder="请输入订单号"
+                        size="small"
+                        clearable
+                    />
+            </div>
+             <div class="w_input">
+                <span class="textSpan">商户订单号:</span>
+                 <el-input
+                        v-model="body.extorderId"
+                        style="width: 65%;"
+                        placeholder="请输入商户订单号"
+                        size="small"
+                        clearable
+                    />
+            </div>
+             <div class="w_input stylephone">
+                <div class="textSpan marginphone"> 手机号:</div>
+                 <!-- <el-input
+                        v-model="body.usedMobile"
+                        style="width:65%;"
+                        v-if="phone"
+                        placeholder="请输入手机号"
+                        size="small"
+                        clearable
+                    /> -->
+                    <el-input
+                      type="textarea"
+                      v-model="body.usedMobile"
+                      :autosize="{ minRows: 1.1, maxRows: 5}"
+                      class="phone"
+                      size="small"
+                      placeholder="请输入内容"
+                      clearable
+                      >
+                    </el-input>
+
+            </div>
+        </div>
+        <div class="flex">
+            <div class="w_date">
+                <span class="textSpan">回调时间:</span>
+                <el-date-picker
+                v-model="checkTimeStart"
+                size="small"
+                type="datetimerange"
+                range-separator="至"
+                style="width:76%"
+                 @change="oncheckTimeStart"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time='["00:00:00","23:59:59"]'
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                >
+                </el-date-picker>
+
+            </div>
+            <div class="w_date">
+                <span class="textSpan">发送时间:</span>
+                <el-date-picker
+                v-model="applyDateStart"
+                size="small"
+                type="datetimerange"
+                style="width:77%"
+                range-separator="至"
+                 @change="oncustom"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time='["00:00:00","23:59:59"]'
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                >
+                </el-date-picker>
+
+            </div>
+            
+        </div>
+          <div class="flex">
+            <div class="w_input">
+                <span class="textSpan">通道名称:</span>
+                 <el-input
+                        v-model="body.channelIdDesc"
+                        style="width:65%;"
+                        placeholder="请输入通道名称"
+                        size="small"
+                        clearable
+                    />
+            </div>
+             <div class="w_input">
+                <span class="textSpan"> 订单状态:</span>
+                <el-select size="small" v-model="body.status" clearable placeholder="请选择订单状态" style="width: 65%" @change="changeScope">
+                <el-option
+                v-for="item in status"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                />
+            </el-select>
+            </div>
+             <div class="w_input">
+                <span class="textSpan"> 运营商:</span>
+                <el-select size="small" v-model="body.mobileOperator" clearable placeholder="请选择运营商" style="width: 65%" @change="changeoperator">
+                <el-option
+                v-for="item in mobileOperator"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                />
+            </el-select>
+            </div>
+        </div>
+         <div class="flex">
+            <div class="w_input">
+                <span class="textSpan">  面额:</span>
+                 <el-input
+                        v-model="flowAmount"
+                         @change="changeflow"
+                        style="width:65%;"
+                        placeholder="请输入订单号"
+                        size="small"
+                        clearable
+                    />
+            </div>
+             <div class="w_input">
+                <span class="textSpan"> 客户名称:</span>
+                 <el-input
+                        v-model="body.enterpriseIdDesc"
+                        style="width: 65%;"
+                        placeholder="请输入客户名称"
+                        size="small"
+                        clearable
+                    />
+            </div>
+             <div class="w_input">
+                <span class="textSpan"> 归属地:</span>
+                 <el-input
+                        v-model="body.mobileHome"
+                        style="width: 65%;"
+                        placeholder="请选择归属地"
+                        size="small"
+                        clearable
+                    />
+            </div>
+        </div>
+        <div class="flex">
+          <div class="w_input">
+                <span class="textSpan">回调状态:</span>
+                <el-select size="small" v-model="body.dealFlag" clearable placeholder="请选择订单状态" style="width: 65%" @change="changeScope">
+                <el-option
+                v-for="item in dealFlag"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                />
+            </el-select>
+            </div>
+        </div>
+          <div class="flexend">
+            <el-button class="filter-item" type="info" icon="el-icon-edit"  plain @click="handleReset">至重发
+            </el-button>
+            <el-button class="filter-item" type="warning" icon="el-icon-message" plain @click="handleReset">至回调
             </el-button>
-            <el-button
-              class="filter-item"
-              size="small"
-              type="primary"
-              icon="el-icon-refresh"
-              @click="handleReset"
-            >重置
+           
+            <el-button class="filter-item" icon="el-icon-delete" type="danger" plain @click="handleReset">至失败
             </el-button>
-            <el-button
-              class="filter-item"
-              size="small"
-              type="primary"
-              icon="el-icon-plus"
-              @click="handleAdd"
-            >添加
+            <el-button class="filter-item" type="success" icon="el-icon-check" plain @click="handleReset">至成功
             </el-button>
+            
+             <el-button class="classitem" style="marginRight:50px"  type="primary" plain  icon="el-icon-star-off"  @click="handleReset">导出
+            </el-button>
+            <el-button class="filter-item" icon="el-icon-search" type="primary" plain @click="handleSearch">搜索</el-button>
           </div>
-        </el-col>
-      </el-row>
     </div>
     <el-table v-loading="loading" :data="tableData" border style="width: 100%">
-      <el-table-column type="selection" />
-      <el-table-column label="分发订单号" width="200" align="center">
+      <el-table-column type="selection" width="40"/>
+
+      <el-table-column label="订单号" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.orderId }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="应用ID" width="200" align="center">
+      <el-table-column
+        label="客户名称"
+        width="100"
+        align="center"
+        prop="createTime"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.appId }}</span>
         </template>
+         </el-table-column>
+      <el-table-column
+       label="产品ID"
+        width="100"
+        align="center"
+        prop="createTime"
+        show-overflow-tooltip
+      >
+         <template slot-scope="scope">
+           <span>{{scope.row.packageId}}</span>
+         </template>
       </el-table-column>
 
-      <el-table-column label="订单类型" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.orderType }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="产品ID" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.productId }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="手机号码" width="160" align="center">
+       <el-table-column label="手机号码" width="110" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.usedMobile }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="运营商" width="160" align="center">
+       <el-table-column
+        label="运营商"
+        width="70"
+        align="center"
+        prop="createTime"
+        show-overflow-tooltip
+       >
         <template slot-scope="scope">
           <span>{{ scope.row.mobileOperator }}</span>
         </template>
       </el-table-column>
-
-      <el-table-column label="归属地" width="160" align="center">
+      <el-table-column
+        label="归属地"
+        width="100"
+        align="center"
+        prop="createTime"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.mobileHome }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="发送日期" width="160" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.limitedDate }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="回调日期" width="160" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ scope.row.lastModifyDate }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="订单状态" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.status }}</span>
-        </template>
+      <el-table-column label="发送时间" width="160" align="center">
+         <template slot-scope="scope">
+           <span>{{ scope.row.limitedDate }}</span>
+         </template>
       </el-table-column>
-
-      <el-table-column label="订单状态中文" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.statusDesc }}</span>
-        </template>
+      <el-table-column label="回调时间" width="160" align="center">
+         <template slot-scope="scope">
+           <span>{{ scope.row.lastModifyDate }}</span>
+         </template>
       </el-table-column>
+        <el-table-column
+          label="订单状态"
+          width="90"
+          align="center"
+          prop="createTime"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status === 1" size="small">充值中</el-tag>
+            <el-tag v-if="scope.row.status === 2" size="small">待充值</el-tag>
+            <el-tag v-if="scope.row.status === 3" size="small">重发</el-tag>
+            <el-tag v-if="scope.row.status === 4" size="small" >充值成功</el-tag>
+            <el-tag v-if="scope.row.status === 5" size="small">回调</el-tag>
+            <el-tag v-if="scope.row.status === 6" size="small">充值失败</el-tag>
+          </template> 
+        </el-table-column>
 
-      <el-table-column label="用时" width="160" align="center">
+          <el-table-column
+        label="用时"
+        width="90"
+        align="center"
+        prop="createTime"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.usedTime }}</span>
         </template>
       </el-table-column>
-
-      <el-table-column label="回调状态" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.dealFlag }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="回调状态中文" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.dealFlagDesc }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="通道" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.channelName }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="通道订单" width="160" align="center">
+           <el-table-column
+        label="回调状态"
+        width="90"
+        align="center"
+        prop="createTime"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
-          <span>{{ scope.row.gwSeqNo }}</span>
-        </template>
+          <!-- <span>{{ scope.row.dealFlag }}</span> -->
+          <el-tag v-if="scope.row.dealFlag === '1'" size="small">成功</el-tag>
+          <el-tag v-if="scope.row.dealFlag === '2'" size="small">失败</el-tag>
+        </template> 
       </el-table-column>
-
-      <el-table-column label="错误原因" width="160" align="center">
+       
+      <el-table-column
+        label="通道名称"
+        width="90"
+        align="center"
+        prop="createTime"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
-          <span>{{ scope.row.gwStatus }}</span>
+          <span>{{ scope.row.channelIdDesc }}</span>
         </template>
-      </el-table-column>
-
-      <el-table-column label="错误代码" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.gwErrorCode }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="客服单号" width="160" align="center">
+         </el-table-column>
+      <el-table-column label="商户订单号" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.extorderId }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="属性1" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.attr1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="运营商价格" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.operatorBalancePrice }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="客户价格" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.price }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="充值面额" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.faceValue }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="合作伙伴面额" width="160" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.partnerBalancePrice }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="操作" fixed="right" min-width="150" align="center">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            icon="el-icon-edit"
-            @click="handleEdit(scope.row)"
-          >编辑</el-button>
-          <el-button
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+      </el-table-column>   
+        
     </el-table>
+
+     <!--分页-->
+    <div class="pagination">
+          <el-pagination
+          current-page.sync="body.page"
+          @size-change="handleSizeChange"
+          :current-page="body.page"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="body.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          background
+          :total="total">
+        </el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
+import { ordersearch } from '@/api/orderList'
 export default {
   data() {
     return {
       Name: '',
-      tableData: [
-        {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }, {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }, {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }, {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }, {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }, {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }, {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }, {
-          orderId: '1215451',
-          appId: '15484',
-          orderType: '话费',
-          productId: '1215',
-          usedMobile: '135158',
-          mobileOperator: '移动',
-          mobileHome: '四川',
-          limitedDate: '2021-05-14 13:08:00',
-          lastModifyDate: '2021-05-14 13:08:00',
-          status: 1,
-          statusDesc: 'PASS',
-          usedTime: '999',
-          dealFlag: 1,
-          dealFlagDesc: 'PASS',
-          channelName: 'TEST',
-          gwSeqNo: 'a',
-          gwStatus: 'ERROR',
-          gwErrorCode: 1,
-          extorderId: '2358954',
-          attr1: 'attr',
-          operatorBalancePrice: 10.23,
-          price: 10.99,
-          faceValue: 10,
-          partnerBalancePrice: 10.00
-        }
+      // phone:true,    //控制批量手机号
+      tableData:[],
+      // tableData: [
+      //   { orderId: '1618675202869450462',
+      //     userName: 'test',
+      //     extorderId: 'CD2104253953427952',
+      //     usedMobile: '18820454014',
+      //     applyDateStart: '2021-04-26 00:00:00',
+      //     applyDateEnd: '2021-04-26 23:59:59',
+      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
+      //     channelIdDesc: 'BF移动',
+      //     status: '充值成功',
+      //     mobileOperator: '移动',
+      //     flowAmount: '10',
+      //     checkTimeStart: '2021-04-25 00:39:53',
+      //     checkTimeEnd: '2021-04-25 23:39:53',
+      //     dealFlag: '已回调',
+      //     mobileHome: '广东-茂名-移动' },
+      //   { orderId: '1618675202869450462',
+      //     userName: 'test',
+      //     extorderId: 'CD2104253953427952',
+      //     usedMobile: '18820454014',
+      //     applyDateStart: '2021-04-26 00:00:00',
+      //     applyDateEnd: '2021-04-26 23:59:59',
+      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
+      //     channelIdDesc: 'BF移动',
+      //     status: '充值成功',
+      //     mobileOperator: '移动',
+      //     flowAmount: '10',
+      //     checkTimeStart: '2021-04-25 00:39:53',
+      //     checkTimeEnd: '2021-04-25 23:39:53',
+      //     dealFlag: '已回调',
+      //     mobileHome: '广东-茂名-移动' },
+      //   { orderId: '1618675202869450462',
+      //     userName: 'test',
+      //     extorderId: 'CD2104253953427952',
+      //     usedMobile: '18820454014',
+      //     applyDateStart: '2021-04-26 00:00:00',
+      //     applyDateEnd: '2021-04-26 23:59:59',
+      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
+      //     channelIdDesc: 'BF移动',
+      //     status: '充值成功',
+      //     mobileOperator: '移动',
+      //     flowAmount: '10',
+      //     checkTimeStart: '2021-04-25 00:39:53',
+      //     checkTimeEnd: '2021-04-25 23:39:53',
+      //     dealFlag: '已回调',
+      //     mobileHome: '广东-茂名-移动' },
+      //   { orderId: '1618675202869450462',
+      //     userName: 'test',
+      //     extorderId: 'CD2104253953427952',
+      //     usedMobile: '18820454014',
+      //     applyDateStart: '2021-04-26 00:00:00',
+      //     applyDateEnd: '2021-04-26 23:59:59',
+      //     enterpriseIdDesc: '山东茶蛋信息技术有限公司',
+      //     channelIdDesc: 'BF移动',
+      //     status: '充值成功',
+      //     mobileOperator: '移动',
+      //     flowAmount: '10',
+      //     checkTimeStart: '2021-04-25 00:39:53',
+      //     checkTimeEnd: '2021-04-25 23:39:53',
+      //     dealFlag: '已回调',
+      //     mobileHome: '广东-茂名-移动' }
+      // ],
+     applyDateStart:"",  //发送时间
+     checkTimeStart:"",  //回调时间
+     flowAmount:"",   //面额乘以10000
+     body:{
+          orderId:"",
+          extorderId:"",
+          usedMobile:"",
+          applyDateStart:"",
+          applyDateEnd:"",
+          enterpriseIdDesc:"",
+          channelIdDesc:"",
+          status:"",
+          mobileOperator:"",
+          flowAmount:"",
+          checkTimeStart:"",
+          checkTimeEnd:"",
+          dealFlag:"",
+          mobileHome:"",
+          page:1,
+          size:10,
+      },
+      total:0,   //总数据
+      loading:false,
+      status:[
+        {id:1,name:"待发"},
+        {id:2,name:"已发"},
+        {id:6,name:"成功"},
+        {id:4,name:"失败"},
+        {id:5,name:"风控"},
+      ],
+      mobileOperator:[
+          {id:"YD",name:"移动"},
+          {id:"LT",name:"联通"},
+          {id:"DX",name:"电信"},
+      ],
+      dealFlag:[
+        {id:"0",name:"运营商处理中"},
+        {id:"1",name:"待回调"},
+        {id:"3",name:"以回调"},
+        {id:"2",name:"无需回调"},
       ]
     }
+  },
+  created(){
+      let nowDate = new Date()
+  let date = {
+    year: nowDate.getFullYear(),
+    month: nowDate.getMonth() + 1,
+    date: nowDate.getDate()
   }
+  let systemTime = date.year + '-' + date.month + '-' + date.date
+  // this.body.applyDateStart = "2021-05-14 + " 00:00:00"
+  this.applyDateStart = [systemTime + " 00:00:00",systemTime + " 23:59:59"]
+  this.body.applyDateStart = systemTime + " 00:00:00"
+  this.body.applyDateEnd = systemTime + " 23:59:59"
+  // this.body.applyDateEnd = systemTime + " 23:59:59"
+  // this.
+  this.getTenantList()
+  },
+  methods: {
+    //获取数据
+    getTenantList(){
+      this.loading=true
+        ordersearch(this.body).then(res=>{
+          this.loading=false
+          this.tableData=res.data.data.records
+          this.total=res.data.data.total
+          console.log(res.data.data.records)
+        })
+    },
+    //搜索手机号
+    onphon(){
+      console.log(this.phone)
+    },
+      //搜索面额
+      changeflow(){
+        let flow=this.flowAmount;
+        // let body=this.body.flowAmount;
+        this.body.flowAmount=flow * 10000;
+      },
+      //搜索发送时间
+     oncustom(){
+          let applyDateStart = this.applyDateStart;
+          this.body.applyDateStart = applyDateStart[0]
+          this.body.applyDateEnd = applyDateStart[1]
+          // console.log(applyDateStart)
+          // console.log(this.body.applyDateStart)
+      },
+      //搜索回调时间
+      oncheckTimeStart(){
+        // checkTimeStart:"",
+        //   checkTimeEnd:"",
+        let checkTimeStart =this.checkTimeStart
+        this.body.checkTimeStart= checkTimeStart[0]
+          this.body.checkTimeEnd=checkTimeStart[1]
+      },
+      //搜索状态
+      changeScope(){
+          console.log(this.body.status)
+      },
+      //运营商
+      changeoperator(){
+          console.log(this.body.mobileOperator)
+      },
+      //搜索
+      handleSearch(){
+        console.log(this.applyDateStart)
+        this.body.page = 1
+        if(this.applyDateStart == null){ //发送时间为空时清空 body 里的发送时间
+          this.body.applyDateEnd = ""
+          this.body.applyDateStart = ""
+        }
+        if(this.checkTimeStart == null){ //回调时间
+          this.body.checkTimeStart = ""
+          this.body.checkTimeEnd = ""
+        }
+        if(this.flowAmount == null || this.flowAmount == 0){   //面额
+          this.body.flowAmount = ""
+        }
+        this.currentPage="1"
+        this.getTenantList()
+      },
+      //
+      handleReset(){
+
+      },
+      //分页
+      handleSizeChange:function(val){
+        this.body.size=val
+        this.getTenantList()
+      },
+       // 换页
+    handleCurrentChange: function(val) {
+      this.body.page = val
+      this.getTenantList()
+    },
+  },
 }
 </script>
 
-<style>
+<style scoped>
+ .textSpan{
+   position: relative;
+   top: 0;
+     font-size: 14px;
+     font-weight: 600;
+     color:rgb(87, 86, 86)
+ }
+ .stylephone{
+    display: flex;   
+ }
+ .marginphone{
+   padding-top: 9px;
+ }
+ .flex{
+     width: 100%;
+     display: flex;
+     flex-direction: row;
+     margin-bottom: 10px;
+     /* flex-wrap: wrap; */
+     /* justify-content: space-evenly; */
+ }
+ .w_date{
+     width: 66%;
+ }
+ .w_input{
+     width:33.33%;
+ }
+ .flexend{
+   display: flex;
+   justify-content: flex-end;
+   padding-right: 40px;
+ }
+ .phone{
+   width:66.5% !important ;
+   z-index: 100;
+ }
+ /* .classitem{
+   background: salmon;
+ } */
 </style>

+ 425 - 19
src/views/userList/index.vue

@@ -9,13 +9,13 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="代理商提成" width="200" align="center">
+      <el-table-column label="代理商提成(按照面额提成,默认0)" width="200" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.partnerCommission }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="代理商ID" width="200" align="center">
+      <el-table-column label="代理商ID(中间人)" width="200" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.partnerId }}</span>
         </template>
@@ -27,10 +27,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="合作伙伴类型" width="200" align="center">
+      <el-table-column label="合作伙伴类型;1:流量营销 2:渠道直充" width="200" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.partnerType==1">流量营销</span>
-          <span v-if="scope.row.partnerType==2">渠道直充</span>
+          <span>{{ scope.row.partnerType }}</span>
         </template>
       </el-table-column>
 
@@ -72,9 +71,81 @@
 
       <el-table-column label="状态" width="200" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.status==1">有效</span>
-          <span v-if="scope.row.status==2">无效</span>
-          <span v-if="scope.row.status==3">暂停</span>
+           <el-tag v-if="scope.row.status === 0" size="small">待提交</el-tag>
+           <el-tag v-if="scope.row.status === 1" size="small">商用</el-tag>
+            <el-tag v-if="scope.row.status === 2" size="small">暂停</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="登录帐号" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.account }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="登录密码,md5加密字符串" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.passwd }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="服务密码,有APP终端客户自行修改;初始密码为“888888" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.svrPasswd }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="支付密码,渠道营销客户无此字段内容" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.payPasswd }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="Logo图片组ID" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.logoGroupId }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="Logo图片URL" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.logoUrl }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="二维码组ID" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.twoCode }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="二维码图片URL" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.twoCodeUrl }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="Logo图片组ID" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.logoGroupId }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="Logo图片组ID" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.logoGroupId }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="微信号" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.wechatNo }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="终端结算价格,默认为产品定价,可以由直充渠道合作伙伴统一进行设置" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.settlePrice }}</span>
         </template>
       </el-table-column>
 
@@ -84,6 +155,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column label="Logo图片组ID" width="200" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.logoGroupId }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column label="授信额度" width="200" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.creditAmount }}</span>
@@ -96,21 +173,19 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="是否第一次登录" width="200" align="center">
+      <el-table-column label="是否第一次登录,1:不是0:是" width="200" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.isFirstLogin==0">是</span>
-          <span v-if="scope.row.isFirstLogin==1">不是</span>
+          <span>{{ scope.row.isFirstLogin }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="删除标识" width="100" align="center">
+      <el-table-column label="删除标识,1:已删除0:未删除" width="200" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.isDeleted==0">未删除</span>
-          <span v-if="scope.row.isDeleted==1">已删除</span>
+          <span>{{ scope.row.isDeleted }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="创建者" width="100" align="center">
+      <el-table-column label="创建者" width="200" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.creator }}</span>
         </template>
@@ -122,7 +197,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="修改者" width="100" align="center">
+      <el-table-column label="修改者" width="200" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.updator }}</span>
         </template>
@@ -134,11 +209,11 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column label="客户等级" width="200" align="center">
+      <el-table-column label="客户等级" width="200" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.customerLevel }}</span>
         </template>
-      </el-table-column> -->
+      </el-table-column>
 
       <el-table-column label="客户登录账户id" width="200" align="center">
         <template slot-scope="scope">
@@ -151,6 +226,7 @@
 </template>
 
 <script>
+import { Search } from '@/api/userList'
 export default {
   data() {
     return {
@@ -177,7 +253,337 @@ export default {
           twoCode: 'xxx',
           twoCodeUrl: 'xxx',
           settlePrice: '10.11',
-          balance: '15452218554',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
+          creditAmount: '10000',
+          currentAmount: '154842',
+          isFirstLogin: '1',
+          isDeleted: 1,
+          creator: 'Admin',
+          createTime: '2021-05-17 00:00:00',
+          updator: 'Admin',
+          updateTime: '2021-05-17 00:00:00',
+          customerLevel: 0,
+          userId: '123'
+        }, {
+          customerId: '123456789',
+          partnerCommission: 0,
+          partnerId: '123456789',
+          identityId: '客户身份ID',
+          partnerType: 1,
+          customerName: 'TEST',
+          shorterName: 'test',
+          linkmanName: '张**',
+          linkmanMobile: '1518512885',
+          linkmanEmail: 'xxx@xxx',
+          address: '四川 成都',
+          status: 1,
+          account: 'TEST',
+          passwd: 'xxxxx',
+          svrPasswd: 'xxxxx',
+          payPasswd: 'xxxxx',
+          logoGroupId: 'xxxxx',
+          logoUrl: 'xxx',
+          twoCode: 'xxx',
+          twoCodeUrl: 'xxx',
+          settlePrice: '10.11',
+          balance: '',
           creditAmount: '10000',
           currentAmount: '154842',
           isFirstLogin: '1',