diff --git a/.env.development b/.env.development
index d8a7846..f1ab67d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://192.168.0.114:8091'
+VUE_APP_BASE_API  = 'http://192.168.0.114:8094'
 VUE_APP_WS_API = 'ws://localhost:8088'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
diff --git a/.env.production b/.env.production
index c4402c8..39b7707 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
 ENV = 'production'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://www.cyjyyjy.com:8091'
+VUE_APP_BASE_API  = 'http://www.cyjyyjy.com:8094'
 VUE_APP_WS_API = 'ws:///127.0.0.1:8001'
 
diff --git a/dist.rar b/dist.rar
index f75bee9..5b6aad0 100644
Binary files a/dist.rar and b/dist.rar differ
diff --git a/src/api/RechargeWays.js b/src/api/RechargeWays.js
new file mode 100644
index 0000000..bd41bbc
--- /dev/null
+++ b/src/api/RechargeWays.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/RechargeWays',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/RechargeWays/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/RechargeWays',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/views/shop/user/index.vue b/src/views/shop/user/index.vue
index 8ae05ba..fb44a4b 100644
--- a/src/views/shop/user/index.vue
+++ b/src/views/shop/user/index.vue
@@ -15,6 +15,14 @@
           :value="item.value"
         />
       </el-select> -->
+      <el-select v-model="query.isRecharge" clearable placeholder="付款状态" class="filter-item" style="width: 130px">
+        <el-option
+          v-for="item in recharges"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <el-button
@@ -40,23 +48,34 @@
           <a :href="scope.row.avatar" style="color: #42b983" target="_blank"><img :src="scope.row.avatar" alt="点击打开" class="el-avatar"></a>
         </template>
       </el-table-column>
-      <el-table-column prop="phone" label="手机号码" />
+      <el-table-column prop="phone" label="手机号码" width="150" />
       <el-table-column label="性别">
         <template slot-scope="scope">
           <span>{{scope.row.gender == 0 ? '女' : '男'}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="integral" label="用户积分" />
-      <el-table-column prop="idCard" label="身份证号码" />
-      <el-table-column prop="city" label="区域" />
-      <el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="215" align="center" fixed="right">
+      <el-table-column prop="idCard" label="身份证号码" width="200" />
+      <el-table-column prop="city" label="区域"  width="150" />
+      <el-table-column prop="industry" label="所在行业" width="150" />
+      <el-table-column prop="position" label="所在职位" />
+      <el-table-column prop="createTime" label="授权时间" width="150" />
+      <el-table-column prop="isRecharge" label="是否缴费">
         <template slot-scope="scope">
-          <!-- <el-button
+          <span>{{scope.row.isRecharge == 0 ? '未缴费' : '已缴费'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="payTime" label="缴费时间" width="150" />
+      <el-table-column prop="inviterCount" label="缴费人数" />
+      <el-table-column prop="brokeragePrice" label="总收益" />
+      <!-- <el-table-column prop="city" label="是否体现" /> -->
+      <!-- <el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="215" align="center" fixed="right">
+        <template slot-scope="scope">
+          <el-button
             v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
             size="mini"
             type="danger"
             @click="editD(scope.row)"
-          >查看下级</el-button> -->
+          >查看下级</el-button>
           <el-button
             v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
             size="mini"
@@ -70,7 +89,7 @@
             @click="editP(scope.row)"
           >修改余额</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <el-dialog
       title="选择转移到的服务老师"
@@ -126,6 +145,10 @@ export default {
         { value: 'wechat', label: '公众号' },
         { value: 'H5', label: 'H5' }
       ],
+      recharges:[
+        { value: '0', label: '未付款' },
+        { value: '1', label: '已付款' },
+      ],
       checkMasterDialog: false,
       master:'',
       masterList: []
diff --git a/src/views/shop/user/rechageManage.vue b/src/views/shop/user/rechageManage.vue
new file mode 100644
index 0000000..3fd3d3c
--- /dev/null
+++ b/src/views/shop/user/rechageManage.vue
@@ -0,0 +1,111 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="最小规格">
+            <el-input v-model="form.sizeMin" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="最大规格">
+            <el-input v-model="form.sizeMax" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="价格">
+            <el-input v-model="form.price" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="columns.visible('sizeMin')" prop="sizeMin" label="最小规格" />
+        <el-table-column v-if="columns.visible('sizeMax')" prop="sizeMax" label="最大规格" />
+        <el-table-column v-if="columns.visible('price')" prop="price" label="价格（元）" />
+        <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建时间">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-permission="['admin','RechargeWays:edit','RechargeWays:del']" label="操作" width="150px" align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudRechargeWays from '@/api/RechargeWays'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import MaterialList from "@/components/material";
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '充值规格', url: 'api/RechargeWays', sort: 'id,desc', crudMethod: { ...crudRechargeWays }})
+const defaultForm = { id: null, sizeMin: null, sizeMax: null, price: null, createTime: null, updateTime: null, isDel: null }
+export default {
+  name: 'RechargeWays',
+  components: { pagination, crudOperation, rrOperation, udOperation ,MaterialList},
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      
+      permission: {
+        add: ['admin', 'RechargeWays:add'],
+        edit: ['admin', 'RechargeWays:edit'],
+        del: ['admin', 'RechargeWays:del']
+      },
+      rules: {
+        id: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
+      }    }
+  },
+  watch: {
+  },
+  methods: {
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }, // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+    },
+  }
+}
+
+
+
+</script>
+
+<style scoped>
+  .table-img {
+    display: inline-block;
+    text-align: center;
+    background: #ccc;
+    color: #fff;
+    white-space: nowrap;
+    position: relative;
+    overflow: hidden;
+    vertical-align: middle;
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
+  }
+</style>
diff --git a/src/views/shop/user/setMiniApp.vue b/src/views/shop/user/setMiniApp.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/system/configManage/index.vue b/src/views/system/configManage/index.vue
index 82131b3..0c2ed4c 100644
--- a/src/views/system/configManage/index.vue
+++ b/src/views/system/configManage/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="title-box">小程序基础设置</div>
     <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="190px">
-      <el-form-item label="服务老师注册口令" prop="sellerActivityCode">
+      <!-- <el-form-item label="服务老师注册口令" prop="sellerActivityCode">
         <el-input v-model="form.sellerActivityCode" style="width: 35%" />
       </el-form-item>
       <el-form-item label="文章全部解锁金额" prop="articlePrice">
@@ -10,21 +10,21 @@
       </el-form-item>
       <el-form-item label="服务人员电话" prop="serviceStaffPhone">
         <el-input v-model="form.serviceStaffPhone" style="width: 35%" />
-      </el-form-item>
-      <el-form-item label="点灯祈福">
-        <el-radio v-model="form.flag" :label="0">不显示</el-radio>
-        <el-radio v-model="form.flag" :label="1">显示</el-radio>
+      </el-form-item> -->
+      <el-form-item label="是否可以分享">
+        <el-radio v-model="form.shareFlag" label="0">不可以</el-radio>
+        <el-radio v-model="form.shareFlag" label="1">可以</el-radio>
       </el-form-item>
       <!-- <el-form-item label="能量大师的会员等级" prop="userHighestLevel">
         <el-input v-model="form.userHighestLevel" style="width: 35%" />
       </el-form-item> -->
-      <div class="title-box">积分规则设置</div>
-      <el-form-item :label="'积分签到'+item.day+'所得积分'" prop="userHighestLevel" v-for="(item,index) in form.signInfos" :key="index">
+      <!-- <div class="title-box">积分规则设置</div> -->
+      <!-- <el-form-item :label="'积分签到'+item.day+'所得积分'" prop="userHighestLevel" v-for="(item,index) in form.signInfos" :key="index">
         <el-input v-model="item.signNum" style="width: 35%" />
       </el-form-item>
       <el-form-item label="完善个人信息所得积分" prop="completedNum">
         <el-input v-model="form.completedNum" style="width: 35%" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button :loading="loading" size="medium" type="primary" @click="doSubmit">保存</el-button>
       </el-form-item>
@@ -54,10 +54,7 @@ export default {
         ],
       },
       queryArr: [
-        "seller_activity_code",
-        "blessing_flag",
-        "unlock_all_article_price",
-        "service_staff_phone","completed_num"
+        "share_flag",
       ]
     }
   },