成长值,奖励金,用户列表字段增加

.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API =''
+VUE_APP_BASE_API ='https://api.tropjoin.com'
 # socket 连接地址
-VUE_APP_WS_URL =''
+VUE_APP_WS_URL ='wss://api.tropjoin.com'

.env.test

@@ -0,0 +1,11 @@
+NODE_ENV = production
+
+# just a flag
+ENV = 'test'
+
+# base api
+VUE_APP_BASE_API = ''
+
+VUE_APP_WS_URL = ''
+
+# VUE_APP_OPEN_HTTP_URL = 'http://test.tropjoin.com'

package.json

@@ -8,6 +8,7 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:test": "vue-cli-service build --mode test",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",

src/views/marketing/lottery/create.vue

@@ -956,6 +956,9 @@ export default {
         if (res.status == 200) {
           lotteryFactor_info(this.formValidate.factor).then((item) => {
             this.specsData = item.data.prize;
+            this.$nextTick((e) => {
+              this.getProbability();
+            });
           });
           this.$message.success(res.message);
           this.addGoodsModel = false;

src/views/promoter/bonusLog/index.vue

@@ -63,6 +63,9 @@
       <el-table v-loading="listLoading" :data="tableData.data" size="small">
         <el-table-column prop="bill_id" label="ID" min-width="50" />
         <el-table-column label="用户昵称" prop="nickname" min-width="150" />
+        <el-table-column prop="user.phone" label="手机号" min-width="120" />
+        <el-table-column prop="user.real_name" label="真实姓名" min-width="120" />
+        <el-table-column prop="user.card_id" label="身份证号码" min-width="120" />
         <el-table-column label="标题" prop="title" min-width="120" />
         <el-table-column label="变动值" prop="number" min-width="90">
           <template slot-scope="scope">

src/views/promoter/brokerage/index.vue

@@ -46,6 +46,9 @@
       <el-table v-loading="listLoading" :data="tableData.data" size="small">
         <el-table-column prop="bill_id" label="ID" min-width="50" />
         <el-table-column label="用户昵称" prop="nickname" min-width="150" />
+        <el-table-column prop="user.phone" label="手机号" min-width="120" />
+        <el-table-column prop="user.real_name" label="真实姓名" min-width="120" />
+        <el-table-column prop="user.card_id" label="身份证号码" min-width="120" />
         <el-table-column label="成长值标题" prop="title" min-width="120" />
         <el-table-column label="成长值变动" prop="number" min-width="90">
           <template slot-scope="scope">

src/views/user/list/index.vue

@@ -207,7 +207,7 @@
                         <el-checkbox :disabled="scope.row.cancel_time" :value="!scope.row.cancel_time && (checkedIds.indexOf(scope.row.uid) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.uid) === -1))" @change="(v)=>changeOne(v,scope.row)" />
                     </template>
             </el-table-column>
-
+            <el-table-column prop="uid" label="ID" min-width="60" />
             <el-table-column label="头像" min-width="50">
                 <template slot-scope="scope">
                     <div class="demo-image__preview">

vue.config.js

@@ -14,7 +14,6 @@ const name = defaultSettings.title || 'vue Element Admin' // page title
 // You can change the port by the following method:
 // port = 9527 npm run dev OR npm run dev --port = 9527
 const port = process.env.port || process.env.npm_config_port || 9527 // dev port
-
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**