Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API: '"http://10.1.37.246:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+  BASE_API: '"http://10.1.37.244:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

package-lock.json

@@ -3978,6 +3978,7 @@
           "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
           "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
           "dev": true,
+          "optional": true,
           "requires": {
             "inherits": "~2.0.0"
           }
@@ -3987,6 +3988,7 @@
           "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
           "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "hoek": "2.x.x"
           }
@@ -4005,7 +4007,8 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
           "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "caseless": {
           "version": "0.12.0",
@@ -4025,7 +4028,8 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "combined-stream": {
           "version": "1.0.5",
@@ -4047,13 +4051,15 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "cryptiles": {
           "version": "2.0.5",
@@ -4136,7 +4142,8 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
           "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "forever-agent": {
           "version": "0.6.1",
@@ -4327,6 +4334,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "1.0.1"
           }
@@ -4342,7 +4350,8 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "isstream": {
           "version": "0.1.2",
@@ -4583,7 +4592,8 @@
           "version": "1.0.7",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
           "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "punycode": {
           "version": "1.4.1",
@@ -4626,6 +4636,7 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
           "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
           "dev": true,
+          "optional": true,
           "requires": {
             "buffer-shims": "~1.0.0",
             "core-util-is": "~1.0.0",
@@ -4680,7 +4691,8 @@
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
           "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "semver": {
           "version": "5.3.0",
@@ -4745,6 +4757,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4756,6 +4769,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
           "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.0.1"
           }
@@ -4788,6 +4802,7 @@
           "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
           "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
           "dev": true,
+          "optional": true,
           "requires": {
             "block-stream": "*",
             "fstream": "^1.0.2",
@@ -4849,7 +4864,8 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "uuid": {
           "version": "3.0.1",

src/api/purseManage.js

@@ -6,8 +6,44 @@ import fetch from 'utils/fetch';
  */
 export function incomList(query) {
   return fetch({
-    url: '/vehicle/vehicleModel/app/unauth/findVehicleModelPage',
-    method: 'post',
+    url: '/api/admin/wallet/admin/page',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 获取收益流水列表
+ * @param query
+ */
+export function rewardList(query) {
+  return fetch({
+    url: '/api/admin/walletdetail/admin/page',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 佣金比例查询
+ * @param query
+ */
+export function getrewardSetting(query) {
+  return fetch({
+    url: '/api/admin/postion/admin/postions',
+    method: 'get',
+    params: query
+  });
+}
+
+/**
+ * 佣金比例设置
+ * @param query
+ */
+export function rewardSetting(query) {
+  return fetch({
+    url: '/api/admin/postion/admin',
+    method: 'put',
     data: query
   });
 }

src/views/baseInfo/generalSetting.vue

@@ -37,7 +37,7 @@
             </div>
           </el-popover>
 
-          <el-button type="danger" size="small" v-popover:popover5>删除</el-button>
+          <el-button type="danger" v-if="scope.row.type!=88" size="small" v-popover:popover5>删除</el-button>
           <!--<el-button size="small" type="danger" @click="deleteHandler(scope.row)">删除-->
           <!--</el-button>-->
         </template>
@@ -57,6 +57,23 @@
         <el-form-item label="标识" prop="type">
           <el-input type="number" v-model.number="dialogFrom.type" placeholder="1,2,3……"></el-input>
         </el-form-item>
+        <el-row v-if="dialogFrom.type==88">
+          <el-col :span="12">
+            <el-form-item label="提现金额" prop="amount">
+              <el-input v-model="dialogFrom.amount" placeholder="请输入提现金额" ></el-input>
+              <span  style="color:#bfcbd9;">钱包余额，最低提现额度，达到此金额后才能提现</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="dialogFrom.type==88" >
+          <el-col :span="12">
+            <el-form-item label="提现手续费"  prop="proceduReates">
+              <el-input v-model="dialogFrom.proceduReates" placeholder="请输入提现手续费" ></el-input>
+              <span  style="color:#bfcbd9;">提现收取的手续费</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-tabs v-model="activeName2" type="card">
           <el-tab-pane label="详情" name="first">
             <!--<Editor  v-if="activeName2=='first'" @input="handelContentIncrease" :value="form.content" :myQuillEditor="'myQuillEditorContent'" :activeName2="activeName2"></Editor>-->
@@ -160,7 +177,9 @@
         dialogFrom:{
           title: "",
           type: undefined,
-          value:""
+          value:"",
+          amount: 100,
+          proceduReates:0.001
         },
         rules: {
           title: {
@@ -173,6 +192,14 @@
             required: true,
             message: '请输入数字标识',
           },
+          proceduReates: {
+            required: true,
+            message: '请输入提现手续费',
+          },
+          amount: {
+            required: true,
+            message: '请输入最低提现金额',
+          }
         },
         list: null,
         total: null,
@@ -196,6 +223,7 @@
       handleCreate() {
         this.cleanDialogFrom();
         this.modalTitle = '创建';
+        this.activeName2 = "first";
         this.dialogVisible = true;
       },
       /**
@@ -254,7 +282,9 @@
         this.dialogFrom = {
           title: "",
           type: undefined,
-          value:""
+          value:"",
+          amount: 100,
+          proceduReates:0.001
         };
         this.activeName2 = "";
       },
@@ -277,10 +307,17 @@
           if (!this.$utils.isEmpty(response.data.rows) && this.$utils.isInteger(response.data.total)) {
             response.data.rows.map(function(item){
               item.visible2 = false;
+              if(item.type == 88){
+                //提现规则
+                item.params = JSON.parse(item.params);
+                item.amount = item.params.amount;
+                item.proceduReates = item.params.proceduReates;
+              }
             });
             listRs = response.data.rows;
             totalCountRs = response.data.total;
-          }
+          }debugger
+//          "{"amount":"11","proceduReates":"0.02"}"
           this.listLoading = false;
           this.list = listRs;
           this.total = totalCountRs;
@@ -295,8 +332,17 @@
             let params = {
               title: this.dialogFrom.title,
               type: this.dialogFrom.type,
-              value: this.dialogFrom.value
+              value: this.dialogFrom.value,
+
             };
+            if(this.dialogFrom.type == 88){
+              //提现规则
+              let p = {
+                amount: this.dialogFrom.amount,
+                proceduReates:this.dialogFrom.proceduReates
+              };
+              params.params = JSON.stringify(p);
+            }
             addGeneral(params).then(response => {
               if (response.status === 200) {
                 this.cleanDialogFrom();
@@ -334,6 +380,14 @@
               type: this.dialogFrom.type,
               value: this.dialogFrom.value
             };
+            if(this.dialogFrom.type == 88){
+              //提现规则
+              let p = {
+                amount: this.dialogFrom.amount,
+                proceduReates:this.dialogFrom.proceduReates
+              };
+              params.params = JSON.stringify(p);
+            }
             editGeneral(params).then(response => {
               if (response.status === 200) {
                 this.cleanDialogFrom();

src/views/purseManage/gainRecord.vue

@@ -6,7 +6,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="姓名">
-                <el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input>
+                <el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -14,68 +14,73 @@
                 <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="流水类型" prop="type">
+                <el-select class="filter-item" v-model="listQuery.source" placeholder="请输入资源类型">
+                  <el-option v-for="item in typeOptions" :key="item" :label="item.name" :value="item.val"> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
       </div>
       <el-table :key='tableKey' :data="list" border fit highlight-current-row
                 style="width: 100%;">
-        <el-table-column
-          type="index"
-          align="center" label="序号" width="65">
+        <el-table-column type="index" width="150" align="center" label="流水类型">
+          <template scope="scope">
+            <span v-if="scope.row.source==0">活动奖励</span>
+            <span v-if="scope.row.source==1">一级提成</span>
+            <span v-if="scope.row.source==2">会员充值</span>
+            <span v-if="scope.row.source==10">成功提现</span>
+            <span v-if="scope.row.source==11">转账</span>
+            <span v-if="scope.row.source==12">消费使用</span>
+          </template>
         </el-table-column>
+
         <el-table-column width="150" align="center" label="姓名">
           <template scope="scope">
-            <img :src="scope.row.cover" style="width: 30px;"/>
-            <span>{{scope.row.name}}</span>
+            <span>{{scope.row.username}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="手机号">
           <template scope="scope">
-            <span>{{scope.row.storeTypeName}}</span>
+            <span>{{scope.row.phone}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="来源">
           <template scope="scope">
-            <span>{{scope.row.hot}}</span>
+            <span>{{scope.row.sourceName}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="订单号">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column width="200" align="center" label="总消费">
-          <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column width="100" align="center" label="类型">
-          <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.cono}}</span>
           </template>
         </el-table-column>
-        <el-table-column width="200" align="center" label="状态">
+        <el-table-column width="100" align="center" label="订单金额">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.price}}</span>
           </template>
         </el-table-column>
-        <el-table-column width="200" align="center" label="订单金额">
+        <el-table-column width="100" align="center" label="提成比例">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.extract}}%</span>
           </template>
         </el-table-column>
-        <el-table-column width="100" align="center" label="提成比例">
+        <el-table-column width="100" align="center" label="金额变动">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span v-if="scope.row.itype==0">+{{scope.row.amount}}</span>
+            <span v-if="scope.row.itype==1">-{{scope.row.amount}}</span>
           </template>
         </el-table-column>
-        <el-table-column width="100" align="center" label="提成金额">
+        <el-table-column width="100" align="center" label="状态">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span v-if="scope.row.source==12">已消费</span>
+            <span v-if="scope.row.source==1">已到账</span>
           </template>
         </el-table-column>
         <el-table-column width="200" align="center" label="时间">
@@ -86,7 +91,7 @@
       </el-table>
       <div v-show="!listLoading" class="pagination-container">
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                       :current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit"
+                       :current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit"
                        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
       </div>
     </div>
@@ -115,7 +120,7 @@
     getToken
   } from 'utils/auth';
   import {
-    incomList
+    rewardList
   } from 'api/purseManage';
   import Element1 from "../admin/menu/components/element";
   import ElRow from "element-ui/packages/row/src/row";
@@ -130,6 +135,28 @@
     },
     data() {
       return {
+        typeOptions: [
+          {
+            "name":'全部',
+            "val":''
+          },
+          {
+            "name":'一级提成',
+            "val":'1'
+          },
+          {
+            "name":'活动奖励',
+            "val":'0'
+          },
+          {
+            "name":'消费使用',
+            "val":'12'
+          },
+          {
+            "name":'成功提现',
+            "val":'10'
+          }
+        ],
         BASE_API: process.env.BASE_API,
         showLoadingBody: false,
         list: null,
@@ -139,7 +166,8 @@
           page: 1,
           limit: 20,
           phone: '',//手机号
-          name: '',//姓名
+          username: '',//姓名
+          source:'',//来源
         },
         inline: true,
         tableKey: 0
@@ -159,24 +187,14 @@
        * */
       getList() {
         this.listLoading = true;
-        if(this.listQuery.startTime){
-          this.listQuery.startTime = this.listQuery.startTime.getTime();
-        }
-        if(this.listQuery.endTime){
-          this.listQuery.endTime = this.listQuery.endTime.getTime();
-        }
-        incomList(this.listQuery).then(response => {
+        rewardList(this.listQuery).then(response => {
           let totalCountRs = undefined;
           let listRs = undefined;
           if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
             listRs = response.data.data;
             totalCountRs = response.data.totalCount;
             listRs.map(function(item){
-              item.visible2 = false;
               item.crtTimeStr = timestamp2Date(item.crtTime);
-              if(item.storeTypeName){
-                item.storeTypeName = item.storeTypeName.join("|");
-              }
             });
           }
           this.listLoading = false;

src/views/purseManage/incomeOverview.vue

 <template>
   <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
-    <div v-if="!oneCampsiteDialogVisible">
+    <div>
       <div class="filter-container" ref="filter-container">
         <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
           <el-row>
             <el-col :span="8">
               <el-form-item label="姓名">
-                <el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input>
+                <el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -16,62 +16,57 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
+        <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">筛选</el-button>
       </div>
       <el-table :key='tableKey' :data="list" border fit highlight-current-row
                 style="width: 100%;">
-        <el-table-column
-          type="index"
-          align="center" label="序号" width="65">
-        </el-table-column>
-        <el-table-column width="150" align="center" label="姓名">
+        <el-table-column width="150" align="center" label="姓名" type="index">
           <template scope="scope">
-            <img :src="scope.row.cover" style="width: 30px;"/>
-            <span>{{scope.row.name}}</span>
+            <span>{{scope.row.username}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="手机号">
           <template scope="scope">
-            <span>{{scope.row.storeTypeName}}</span>
+            <span>{{scope.row.phone}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="总收益">
           <template scope="scope">
-            <span>{{scope.row.hot}}</span>
+            <span>{{scope.row.totalAmount}}</span>
           </template>
         </el-table-column>
 
         <el-table-column width="200" align="center" label="总提现">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.withdrawals}}</span>
           </template>
         </el-table-column>
         <el-table-column width="200" align="center" label="总消费">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.totalConsumption}}</span>
           </template>
         </el-table-column>
         <el-table-column width="200" align="center" label="提现中">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.withdrawaling}}</span>
           </template>
         </el-table-column>
         <el-table-column width="200" align="center" label="未入账">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.unbooked}}</span>
           </template>
         </el-table-column>
         <el-table-column width="200" align="center" label="当前余额">
           <template scope="scope">
-            <span>{{scope.row.crtTimeStr}}</span>
+            <span>{{scope.row.balance}}</span>
           </template>
         </el-table-column>
       </el-table>
       <div v-show="!listLoading" class="pagination-container">
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                       :current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit"
+                       :current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit"
                        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
       </div>
     </div>
@@ -124,7 +119,7 @@
           page: 1,
           limit: 20,
           phone: '',//手机号
-          name: '',//姓名
+          username: '',//姓名
         },
         inline: true,
         tableKey: 0
@@ -144,25 +139,19 @@
        * */
       getList() {
         this.listLoading = true;
-        if(this.listQuery.startTime){
-          this.listQuery.startTime = this.listQuery.startTime.getTime();
-        }
-        if(this.listQuery.endTime){
-          this.listQuery.endTime = this.listQuery.endTime.getTime();
-        }
         incomList(this.listQuery).then(response => {
           let totalCountRs = undefined;
           let listRs = undefined;
           if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
             listRs = response.data.data;
             totalCountRs = response.data.totalCount;
-            listRs.map(function(item){
-              item.visible2 = false;
-              item.crtTimeStr = timestamp2Date(item.crtTime);
-              if(item.storeTypeName){
-                item.storeTypeName = item.storeTypeName.join("|");
-              }
-            });
+            // listRs.map(function(item){
+            //   item.visible2 = false;
+            //   item.crtTimeStr = timestamp2Date(item.crtTime);
+            //   if(item.storeTypeName){
+            //     item.storeTypeName = item.storeTypeName.join("|");
+            //   }
+            // });
           }
           this.listLoading = false;
           this.list = listRs;