Selaa lähdekoodia

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy

lilei 4 vuotta sitten
vanhempi
commit
66b2e5ccf7

+ 8 - 0
src/api/userInfo.js

@@ -63,3 +63,11 @@ export const updateGold = (params) => {
     method: 'post'
   })
 }
+// 修改手机号码
+export const updateMobile = (params) => {
+  return axios({
+    url: `customer/updateMobile`,
+    data: params,
+    method: 'post'
+  })
+}

+ 13 - 12
src/config/router.config.js

@@ -131,7 +131,7 @@ export const asyncRouterMap = [{
     meta: {
       title: '订单',
       icon: 'profile',
-      permission: 'M_order'
+      permission: 'M_orderManage_list'
     },
     children: [
       {
@@ -175,7 +175,7 @@ export const asyncRouterMap = [{
   // 用户
   {
     path: '/userInfo',
-    redirect: '/userInfo/userManageList',
+    redirect: '/userInfo/userManage',
     component: PageView,
     meta: {
       title: '用户',
@@ -186,18 +186,18 @@ export const asyncRouterMap = [{
       {
         path: '/userInfo/userManage',
         redirect: '/userInfo/userManageList/list',
-        name: 'userManageList',
+        name: 'userManageS',
         component: RouteView,
         meta: {
           title: '用户管理',
           icon: 'profile',
-          permission: 'M_user_userManage'
+          permission: 'M_user_userManage_list'
         },
         hideChildrenInMenu: true,
         children: [{
           path: '/userInfo/userManageList/list',
           name: 'userManageList',
-          component: () => import(/* webpackChunkName: "userInfo" */ '@/views/userInfo/userManageList.vue'),
+          component: () => import(/* webpackChunkName: "userManageList" */ '@/views/userInfo/userManageList.vue'),
           meta: {
             title: '用户列表',
             icon: 'team',
@@ -208,7 +208,7 @@ export const asyncRouterMap = [{
         {
           path: '/userInfo/userManageList_user/detail/:id',
           name: 'userManageDetail',
-          component: () => import(/* webpackChunkName: "userInfo" */ '@/views/userInfo/userDetails.vue'),
+          component: () => import(/* webpackChunkName: "userManageDetail" */ '@/views/userInfo/userDetails.vue'),
           meta: {
             title: '用户详情',
             icon: 'profile',
@@ -219,7 +219,7 @@ export const asyncRouterMap = [{
         {
           path: '/userInfo/userManageList_Ld/detail/:id',
           name: 'ledouDetail',
-          component: () => import(/* webpackChunkName: "userInfo" */ '@/views/userInfo/LdDetails.vue'),
+          component: () => import(/* webpackChunkName: "LdDetails" */ '@/views/userInfo/LdDetails.vue'),
           meta: {
             title: '乐豆详情',
             icon: 'profile',
@@ -232,13 +232,14 @@ export const asyncRouterMap = [{
       {
         path: '/userInfo/releaseRecord/list',
         name: 'releaseRecordList',
-        component: () => import(/* webpackChunkName: "userInfo" */ '@/views/releaseRecord/releaseRecordList.vue'),
+        component: () => import(/* webpackChunkName: "releaseRecord" */ '@/views/releaseRecord/releaseRecordList.vue'),
         meta: {
           title: '投放记录',
           icon: 'container',
           permission: 'M_user_releaseRecord'
         }
-      }]
+      }
+    ]
   },
   {
     path: '/shopSetting',
@@ -247,7 +248,7 @@ export const asyncRouterMap = [{
     meta: {
       title: '商城设置',
       icon: 'appstore',
-      permission: 'M_shopSetting'
+      permission: 'M_AdBanner_list'
     },
     children: [
       {
@@ -257,7 +258,7 @@ export const asyncRouterMap = [{
         meta: {
           title: '推广位设置',
           icon: 'picture',
-          permission: 'M_shopSetting_bannerSetting'
+          permission: 'M_AdBanner_list'
         }
       }
     ]
@@ -363,7 +364,7 @@ export const asyncRouterMap = [{
     meta: {
       title: '供货商',
       icon: 'user-add',
-      permission: 'M_shopSetting'
+      permission: 'M_supplier_list'
     },
     children: [
       {

+ 5 - 4
src/views/equipmentManage/boxSetting/AddBoxModal.vue

@@ -19,7 +19,7 @@
             placeholder="请输入箱体类型名称(最多30个字符)"
             allowClear
             :maxLength="30"
-            id="roleModal-name"
+            id="addBoxModal-name"
             v-model="formData.name"
           />
         </a-form-model-item>
@@ -60,6 +60,7 @@
               }"
             >
               <a-input-number
+                id="addBoxModal-maxWeight"
                 :min="1"
                 :max="1000"
                 :precision="0"
@@ -84,8 +85,8 @@
               }"
             >
               <v-select
-                ref="orderStatus"
                 id="addBoxModal-status"
+                ref="orderStatus"
                 code="RUBBISH_TYPE"
                 placeholder="请选择分类"
                 allowClear
@@ -96,10 +97,10 @@
           </a-col>
         </a-row>
         <a-form-model-item :wrapper-col="{ span: 24, offset: 10 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">
+          <a-button type="primary" @click="handleSubmit()" id="addBoxModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="roleModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="addBoxModal-handleCancel">
             取消
           </a-button>
         </a-form-model-item>

+ 15 - 3
src/views/equipmentManage/boxSetting/boxSetting.vue

@@ -16,7 +16,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_boxSetting_add'">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="boxSetting-add" v-hasPermission="'B_boxSetting_add'">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -27,8 +27,20 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_boxSetting_edit'" />
-        <a-icon type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" v-if="$hasPermissions('B_boxSetting_del') && !record.isEnable"/>
+        <a-icon
+          type="edit"
+          id="boxSetting-edit"
+          title="编辑"
+          class="actionBtn icon-blues"
+          @click="handleEdit(record)"
+          v-hasPermission="'B_boxSetting_edit'" />
+        <a-icon
+          type="delete"
+          id="boxSetting-del"
+          title="删除"
+          class="actionBtn icon-red"
+          @click="delect(record)"
+          v-if="$hasPermissions('B_boxSetting_del') && !record.isEnable"/>
         <span v-if="!$hasPermissions('B_boxSetting_edit') && (!$hasPermissions('B_boxSetting_del') && !record.isEnable)">--</span>
       </template>
     </s-table>

+ 10 - 1
src/views/equipmentManage/equipment/logModal.vue

@@ -141,7 +141,16 @@ export default {
       }
     },
     srcDeviceCode (newValue, oldValue) {
-      this.$refs.table.refresh(true)
+      this.queryParam.beginDate = getDate.getRecentday().starttime
+      this.queryParam.endDate = getDate.getRecentday().endtime
+      this.time = [
+        moment(getDate.getRecentday().starttime, this.dateFormat),
+        moment(getDate.getRecentday().endtime, this.dateFormat)
+      ]
+      const _this = this
+      setTimeout(() => {
+        _this.$refs.table.refresh(true)
+      }, 100)
     }
   }
 }

+ 5 - 3
src/views/equipmentManage/exchangeSetting/AddSetModal.vue

@@ -39,6 +39,7 @@
             <!-- 请输入投放重量 -->
             <a-form-item :label="item.dispName" :required="true" :label-col=" { span: 11 }" :wrapper-col=" { span: 13 }">
               <a-input-number
+                id="addSetModal-rubbishWeight"
                 :min="0"
                 :max="999999"
                 :precision="0"
@@ -65,6 +66,7 @@
             <!-- 请输入可兑乐豆数 -->
             <a-form-item :label="''" :required="false" :wrapper-col="{ span: 20 }">
               <a-input-number
+                id="addSetModal-goleNum"
                 :min="0"
                 :max="999999"
                 :precision="0"
@@ -88,17 +90,17 @@
           </a-col>
           <a-col span="3">
             <a-form-item :label="''" :required="false" :wrapper-col="{ span: 24 }">
-              <a-checkbox :checked="item.state==0" @change="handleStatusChange(item,index)">
+              <a-checkbox id="addSetModal-state" :checked="item.state==0" @change="handleStatusChange(item,index)">
                 不兑换
               </a-checkbox>
             </a-form-item>
           </a-col>
         </a-row>
         <a-form-item :wrapper-col="{ span: 24, offset: 10 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">
+          <a-button type="primary" @click="handleSubmit()" id="addSetModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '15px' }" @click="cancel()" id="roleModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="cancel()" id="addSetModal-handleCancel">
             取消
           </a-button>
         </a-form-item>

+ 15 - 3
src/views/equipmentManage/exchangeSetting/ExchangeSetting.vue

@@ -16,7 +16,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_exchangeSetting_add'">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="boxSetting-add" v-hasPermission="'B_exchangeSetting_add'">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -27,8 +27,20 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_exchangeSetting_edit'"/>
-        <a-icon type="delete" title="删除" class="actionBtn icon-red" v-if="$hasPermissions('B_exchangeSetting_del') && !record.isEnable" @click="delect(record)" />
+        <a-icon
+          id="boxSetting-edit"
+          type="edit"
+          title="编辑"
+          class="actionBtn icon-blues"
+          @click="handleEdit(record)"
+          v-hasPermission="'B_exchangeSetting_edit'"/>
+        <a-icon
+          id="boxSetting-del"
+          type="delete"
+          title="删除"
+          class="actionBtn icon-red"
+          v-if="$hasPermissions('B_exchangeSetting_del') && !record.isEnable"
+          @click="delect(record)" />
         <span v-if="!$hasPermissions('B_exchangeSetting_edit') && (!$hasPermissions('B_exchangeSetting_del') && !record.isEnable)">--</span>
       </template>
     </s-table>

+ 12 - 4
src/views/equipmentManage/openTimeSetting/AddTimeModal.vue

@@ -21,7 +21,7 @@
               placeholder="请输入投放时间段名称(最多30个字符)"
               allowClear
               :maxLength="30"
-              id="tftime-name"
+              id="addTimeModal-name"
               v-model="formData.name"
             />
           </a-form-model-item>
@@ -41,6 +41,7 @@
                 }"
               >
                 <a-time-picker
+                  id="addTimeModal-openTime"
                   placeholder="开始时间"
                   v-model="item.openTime"
                   format="HH:mm"
@@ -62,6 +63,7 @@
                 }"
               >
                 <a-time-picker
+                  id="addTimeModal-closeTime"
                   placeholder="结束时间"
                   v-model="item.closeTime"
                   format="HH:mm"
@@ -74,16 +76,22 @@
                 v-if="index > 0"
                 class="dynamic-delete-button"
                 type="minus-circle-o"
+                id="addTimeModal-del"
                 :disabled="formData.deliveryTimeRuleItemList.length === 1"
                 @click="() => remove(index)"
               />
-              <a-icon v-if="index === formData.deliveryTimeRuleItemList.length - 1" :style="{ fontSize: '18px' }" type="plus-circle" @click="add" />
+              <a-icon
+                id="addTimeModal-add"
+                v-if="index === formData.deliveryTimeRuleItemList.length - 1"
+                :style="{ fontSize: '18px' }"
+                type="plus-circle"
+                @click="add" />
             </a-form-model-item>
           </a-row>
         </div>
         <a-form-model-item :wrapper-col="{ span: 24, offset: 10 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">保存</a-button>
-          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="roleModal-handleCancel">取消</a-button>
+          <a-button id="addTimeModal-handleSubmit" type="primary" @click="handleSubmit()" :style="{ marginRight: '15px' }">保存</a-button>
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="addTimeModal-handleCancel">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-modal>

+ 9 - 2
src/views/equipmentManage/openTimeSetting/OpenTimeSetting.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
+      <a-button v-hasPermission="'B_openTimeSetting_add'" type="primary" icon="plus" @click="openModal" id="openTimeSetting-add">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -16,10 +16,17 @@
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_openTimeSetting_edit'"/>
+        <a-icon
+          id="openTimeSetting-edit"
+          type="edit"
+          title="编辑"
+          class="actionBtn icon-blues"
+          @click="handleEdit(record)"
+          v-hasPermission="'B_openTimeSetting_edit'"/>
         <a-icon
           type="delete"
           title="删除"
+          id="openTimeSetting-del"
           class="actionBtn icon-red"
           v-if="$hasPermissions('B_openTimeSetting_del') && !record.isEnable"
           @click="delect(record)" />

+ 3 - 2
src/views/power/menu/menu.vue

@@ -151,7 +151,7 @@
           <a-form-item label="排序值" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-input
               type="number"
-			  oninput="if(value.length>6)value=value.slice(0,6);if(value<0)value=0"
+              oninput="if(value.length>6)value=value.slice(0,6);if(value<0)value=0"
               placeholder="请输入(0~999999)之间的排序值"
               allowClear
               id="menu-sort"
@@ -249,6 +249,7 @@ export default {
 
     onSelect (selectedKeys, info) {
       console.log('onSelect', info)
+      this.clear()
       this.selectedKeys = selectedKeys
       if (info.selected) {
         const data = info.selectedNodes[0].data.props
@@ -408,7 +409,7 @@ export default {
             if (res.status + '' === '200') {
               this.$message.success(res.message ? res.message : '保存成功')
               _this.getMenuList()
-              _this.clear()
+              // _this.clear()
             } else {
               // this.$message.warning(res.message)
             }

+ 9 - 1
src/views/shop/GoodsOrder.vue

@@ -21,7 +21,7 @@
       v-if="dataSource.length>0"
       ref="table"
       size="default"
-      :row-selection="type=='orderGoods' ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null"
+      :row-selection="rowSelection"
       :columns="columns"
       :rowKey="(record) => record.orderGoodsNo"
       :data-source="dataSource"
@@ -59,6 +59,14 @@ export default {
       } else {
         return []
       }
+    },
+    rowSelection: function () {
+      // type=='orderGoods' ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null,
+      if (this.type == 'orderGoods' && this.$hasPermissions('B_order_sendGoods')) {
+        return { selectedRowKeys: this.selectedRowKeys, onChange: this.onSelectChange }
+      } else {
+        return null
+      }
     }
   },
   data () {

+ 6 - 6
src/views/userInfo/LdDetails.vue

@@ -14,18 +14,18 @@
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="类型" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-item label="变动类型" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.changeType"
                 ref="changeType"
                 id="LdDetails-status"
                 code="GOLD_CHANGE_TYPE"
-                placeholder="请选择订单状态"
+                placeholder="请选择"
                 allowClear></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="原因" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-item label="变动原因" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.operateType"
                 ref="operateType"
@@ -79,9 +79,9 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 200, align: 'center' },
-        { title: '类型', dataIndex: 'changeTypeDictValue', width: 200, align: 'center' },
-        { title: '原因', dataIndex: 'operateTypeDictValue', width: 200, align: 'center' },
-        { title: '乐豆变动', dataIndex: 'changeNum', width: 200, align: 'center' },
+        { title: '变动类型', dataIndex: 'changeTypeDictValue', width: 200, align: 'center' },
+        { title: '变动原因', dataIndex: 'operateTypeDictValue', width: 200, align: 'center' },
+        { title: '乐豆变动', dataIndex: 'changeNum', width: 200, align: 'center' },
         { title: '详情',
           dataIndex: 'remarks',
           width: 200,

+ 1 - 1
src/views/userInfo/editLdNumModal.vue

@@ -31,7 +31,7 @@
             allowClear />
           <span class="inp-unit">乐豆</span>
         </a-form-item>
-        <a-form-item label="修改原因" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+        <a-form-item label="变动原因" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
           <v-select
             v-decorator="[
               'formData.operateType',

+ 26 - 58
src/views/userInfo/editUserPhoneModal.vue

@@ -10,11 +10,11 @@
       <a-form id="components-form-demo-validate-other" ref="form" :form="form" @submit="handleSubmit">
         <a-form-item label="手机号码" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
           <a-input
-            id="editUserPhoneModal-contactPhone"
+            id="editUserPhoneModal-mobile"
             :maxLength="11"
             v-decorator="[
-              'formData.contactPhone',
-              { initialValue: formData.contactPhone, rules: [{ required: true, message: '请输入负责人手机号!' }, { pattern: /^\d{11}$/, message: '请输入正确的手机号' }] }
+              'formData.mobile',
+              { initialValue: formData.mobile, rules: [{ required: true, message: '请输入手机号码!' }, { pattern: /^\d{11}$/, message: '请输入正确的手机号' }] }
             ]"
             placeholder="请输入手机号码"
             allowClear />
@@ -29,10 +29,7 @@
 </template>
 
 <script>
-// import {
-//   supplierDetails,
-//   saveSupplier
-// } from '@/api/shopSetting.js'
+import { updateMobile } from '@/api/userInfo.js'
 export default {
   name: 'EditUserPhoneModal',
   props: {
@@ -40,63 +37,42 @@ export default {
       type: Boolean,
       default: false
     },
-    userPhone: {
+    userId: {
       type: String,
       default: ''
-    },
-    itemData: {
-	  type: Object,
-	  default: function () {
-	    return {}
-	  }
     }
+
   },
   data () {
     return {
       isShow: this.openUserPhoneMoadl,
       form: this.$form.createForm(this, { name: 'editUserPhoneModal' }),
       formData: {
-        contactPhone: '' // 手机号码
+        mobile: '' // 手机号码
       }
     }
   },
   methods: {
-    // 查看详情
-    // getPageInfo () {
-    //   supplierDetails({
-    //     id: this.itemId
-    //   }).then(res => {
-    //     if (res.status == 200) {
-    //       // this.form.setFieldsValue({ 'formData': res.data })
-    //       this.form.setFieldsValue({ 'formData.name': res.data.name })
-    //       this.form.setFieldsValue({ 'formData.contactName': res.data.contactName })
-    //       this.form.setFieldsValue({ 'formData.simpleName': res.data.simpleName })
-    //       this.form.setFieldsValue({ 'formData.contactPhone': res.data.contactPhone })
-    //       this.form.setFieldsValue({ 'formData.remarks': res.data.remarks })
-    //     }
-    //   })
-    // },
     // 点击保存;
     handleSubmit (e) {
-      this.$router.push({ path: `/userInfo/userManageList/list` })
-      // e.preventDefault()
-      // const _this = this
-      // this.form.validateFields((err, values) => {
-      //   if (!err) {
-      //     const formData = Object.assign({}, this.itemData, this.formData, values.formData)
-      //     formData.id = _this.itemId
-      //     saveSupplier(formData).then(res => {
-      //       console.log(res, 'rrrrrrrrr')
-      //       if (res.status == 200) {
-      //         _this.$message.success(res.message)
-      //         _this.$emit('refresh')
-      //         setTimeout(function () {
-      //           _this.isShow = false
-      //         }, 300)
-      //       }
-      //     })
-      //   }
-      // })
+      e.preventDefault()
+      const _this = this
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          const formData = Object.assign({}, { id: this.userId }, this.formData, values.formData)
+          updateMobile(formData).then(res => {
+            console.log(res, 'rrrrrrrrr')
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              // _this.$emit('refresh')
+   		  _this.$router.push({ path: `/userInfo/userManageList/list` })
+              setTimeout(function () {
+                _this.isShow = false
+              }, 300)
+            }
+          })
+        }
+      })
     }
   },
   watch: {
@@ -104,21 +80,13 @@ export default {
       this.isShow = newValue
     },
     isShow (val) {
+      console.log(this.userId)
       if (!val) {
         this.$emit('close')
       } else {
    	  this.form.resetFields()
       }
     }
-    // itemId (newValue, oldValue) {
-    //   console.log(newValue, '----------id')
-    //   if (newValue && this.isShow) {
-    //     this.titleText = '编辑'
-    //     this.getPageInfo(newValue)
-    //   } else {
-   	//   this.titleText = '新增'
-    //   }
-    // }
   }
 }
 </script>

+ 6 - 6
src/views/userInfo/userDetails.vue

@@ -9,7 +9,7 @@
       <a-col :span="24" class="item-cont">
         <p class="item-label">手机号码:</p>
         <p class="item-main">{{ page.mobile ? page.mobile : '--' }}</p>
-        <!-- <a-icon type="edit" title="修改手机号码" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editPhone" v-hasPermission="'B_user_userdetails_editPhone'"/> -->
+        <a-icon type="edit" title="修改手机号码" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editPhone(page)" v-hasPermission="'B_user_userdetails_editPhone'"/>
         <!-- <a style="margin-left: 100px; color: #2D8CF0;" @click="editPhone">修改手机号码</a> -->
       </a-col>
       <a-col :span="24" class="item-cont">
@@ -47,7 +47,7 @@
       <a @click="goBack">返回列表</a>
     </div>
     <!-- 修改用户手机号码弹窗 -->
-    <edit-user-phone-modal :userPhone="userPhone" :openUserPhoneMoadl="openUserPhoneMoadl" @close="openUserPhoneMoadl=false"></edit-user-phone-modal>
+    <edit-user-phone-modal :userId="userId" :openUserPhoneMoadl="openUserPhoneMoadl" @close="openUserPhoneMoadl=false"></edit-user-phone-modal>
     <!-- 修改乐豆余额弹窗 -->
     <edit-ldNum-modal :customerNo="customerNo" :openLdNumModal="openLdNumModal" @close="openLdNumModal=false"></edit-ldNum-modal>
   </a-card>
@@ -67,7 +67,7 @@ export default {
   },
   data () {
     return {
-      userPhone: '', // 用户手机号码
+      userId: '', // 用户id
       openUserPhoneMoadl: false, // 默认关闭手机号码弹窗
       customerNo: '', // 用户编号
       openLdNumModal: false, // 默认关闭乐豆余额弹窗
@@ -76,10 +76,10 @@ export default {
   },
   methods: {
     // 详情
-    editPhone () {
-      // this.userPhone = record.userPhone
+    editPhone (page) {
+      this.userId = this.page.id
       this.openUserPhoneMoadl = true
-      console.log('-----------修改手机号码')
+      console.log(this.userId,'-----------修改手机号码')
     },
     editLd (page) {
       this.customerNo = this.page.customerNo

+ 5 - 5
src/views/userInfo/userManageList.vue

@@ -64,8 +64,8 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button id="releaseRecordList-handleUser" type="link" @click="handleUser(record)" v-hasPermission="'B_user_userManage_userDetails'">用户详情</a-button>
-        <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)" v-hasPermission="'B_user_userManage_userDetails'">乐豆明细</a-button>
-        <span v-if="!$hasPermissions('B_user_userManage_userDetails') && !$hasPermissions('B_user_userManage_userDetails')">--</span>
+        <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)" v-hasPermission="'B_user_userManage_LdDetails'">乐豆明细</a-button>
+        <span v-if="!$hasPermissions('B_user_userManage_userDetails') && !$hasPermissions('B_user_userManage_LdDetails')">--</span>
       </template>
     </s-table>
   </a-card>
@@ -209,12 +209,12 @@ export default {
 
     },
     refresh () {
-      if ((this.queryParam.currentGoldMin && this.queryParam.currentGoldMax) && (this.queryParam.currentGoldMin >= this.queryParam
-        .currentGoldMax)) {
+      // const isVal = this.queryParam.currentGoldMin && this.queryParam.currentGoldMin != 0
+      if (((this.queryParam.currentGoldMin && this.queryParam.currentGoldMin != 0) && this.queryParam.currentGoldMax) && (this.queryParam.currentGoldMin > this.queryParam.currentGoldMax)) {
         this.$message.error('请输入正确的查询范围!')
         return
       }
-	  if ((!this.queryParam.currentGoldMin && this.queryParam.currentGoldMax) || (this.queryParam.currentGoldMin && !this.queryParam.currentGoldMax)) {
+	  if (((!this.queryParam.currentGoldMin && this.queryParam.currentGoldMin != 0) && this.queryParam.currentGoldMax) || (this.queryParam.currentGoldMin && !this.queryParam.currentGoldMax)) {
         this.$message.error('请输入正确的查询范围!')
         return
 	  } else {