Browse Source

样式修改

zhangdan 4 years ago
parent
commit
6fff7bab3d

+ 22 - 17
src/views/businessManage/partnerManage/partnerManage.vue

@@ -1,9 +1,9 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" class="partnerManage-page-info">
     <!-- 搜索框 -->
-    <div class="table-page-search-wrapper" style="margin-bottom: 15px;">
+    <div class="partnerManage-search">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48">
+        <a-row :gutter="20">
           <a-col :md="6" :sm="24">
             <a-form-item label="商户名称"><a-input allowClear v-model.trim="queryParam.name" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
           </a-col>
@@ -270,19 +270,24 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.addBtn {
-  margin-bottom: 20px;
-}
-// 查看小程序码  弹框
-.qrCodeModal {
-	.qrCode {
-		display: block;
-		max-width: 100%;
-		margin: 0 auto;
-	}
-	.downQrCode {
-		display: block;
-		margin: 40px auto 30px;
+	.partnerManage-page-info{
+		.partnerManage-search{
+			margin-bottom: 15px;
+		}
+		.addBtn {
+		  margin-bottom: 15px;
+		}
 	}
-}
+	// 查看小程序码  弹框
+		.qrCodeModal {
+			.qrCode {
+				display: block;
+				max-width: 100%;
+				margin: 0 auto;
+			}
+			.downQrCode {
+				display: block;
+				margin: 40px auto 30px;
+			}
+		}
 </style>

+ 38 - 43
src/views/businessManage/userManage/userManage.vue

@@ -1,10 +1,10 @@
 <template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="用户名称" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
+  <a-card :bordered="false" class="userManage-page-info">
+    <div class="userManage-search">
+      <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="20">
+          <a-col :span="5">
+            <a-form-item label="用户名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input
                 allowClear
                 v-model.trim="queryParam.name"
@@ -14,9 +14,8 @@
               />
             </a-form-item>
           </a-col>
-
-          <a-col :md="6" :sm="24">
-            <a-form-item label="手机号码" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
+          <a-col :span="5">
+            <a-form-item label="手机号码" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input
                 allowClear
                 v-model.trim="queryParam.phone"
@@ -26,8 +25,8 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所属商户" :label-col="{ span:3 }" :wrapper-col="{ span:12}">
+          <a-col :span="5">
+            <a-form-item label="所属商户" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select
                 placeholder="请选择"
                 allowClear
@@ -42,24 +41,26 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" id="userList-handSubmit" style="margin-right: 10px;">查询</a-button>
-            <a-button type="" @click="reset" id="userList-reset">重置</a-button>
-          </a-col>
-
-        </a-row>
-        <a-row :gutter="48" style="margin-top: 25px;">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="用户状态" >
+          <a-col :span="5">
+            <a-form-item label="用户状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态" id="userList-check-enable-state"></v-select>
             </a-form-item>
           </a-col>
-
+          <a-col :span="4">
+            <a-button type="primary" @click="$refs.table.refresh(true)" id="userList-handSubmit" style="margin-right: 10px;">查询</a-button>
+            <a-button type="" @click="reset" id="userList-reset">重置</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="userList-openModal" v-hasPermission="'B_userManage_add'" style="margin-top: 18px;">新增</a-button>
+      <a-button
+        type="primary"
+        icon="plus"
+        @click="openModal"
+        id="userList-openModal"
+        v-hasPermission="'B_userManage_add'"
+        style="margin-top: 18px;">新增</a-button>
     </div>
 
     <s-table
@@ -122,6 +123,14 @@ export default {
   },
   data () {
     return {
+      formItemLayout: {
+		  labelCol: {
+		    span: 7
+		  },
+		  wrapperCol: {
+		    span: 17
+		  }
+      },
       // 查询参数
       queryParam: {
         name: '',
@@ -319,26 +328,12 @@ export default {
   }
 }
 </script>
-<style scoped>
-	.table-page-search-wrapper .ant-form-inline .ant-form-item {
-		margin-bottom: 0;
-	}
-
-	.action-button {
-		line-height: 40px;
-		white-space: nowrap;
-		padding: 5px 10px;
-		background-color: #1890ff;
-		border-radius: 4px;
-		color: #fff;
-		margin-right: 5px;
-	}
-
-	.red-text {
-		background-color: red;
-	}
-
-	.reset-text {
-		background-color: #31b50b;
+<style lang="less">
+	.userManage-page-info{
+		.userManage-search{
+			.ant-form-inline .ant-form-item {
+				width: 100%;
+			}
+		}
 	}
 </style>

+ 22 - 22
src/views/releaseRecord/releaseRecordList.vue

@@ -2,8 +2,8 @@
   <a-card :bordered="false" class="shopOrder-table-page-search-wrapper">
     <div class="shopOrder-searchForm">
       <a-form layout="inline" @keyup.enter.native="refresh">
-        <a-row :gutter="48">
-          <a-col :span="6">
+        <a-row :gutter="20">
+          <a-col :span="5">
             <a-form-item label="投放时间:" :label-col="{ span: 7 }" :wrapper-col="{ span: 17}">
               <a-range-picker
                 style="width:100%"
@@ -14,17 +14,17 @@
                 :placeholder="['开始时间', '结束时间']" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item label="设备编号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="releaseRecordList-srcDeviceCode" allowClear :maxLength="120" v-model=" queryParam.srcDeviceCode " placeholder="请输入设备编号" />
+          <a-col :span="5">
+            <a-form-item label="用户账号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="releaseRecordList-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="5">
             <a-form-item label="投递类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <v-select code="RUBBISH_TYPE" v-model="queryParam.rubbishType" allowClear placeholder="请选择投递类型" id="releaseRecordList-rubbishType"></v-select>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="5">
             <a-form-item label="兑换乐豆" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <div class="input-number">
                 <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.goldNumStart" :max="999999999" @change="onChange" />-
@@ -32,15 +32,18 @@
               </div>
             </a-form-item>
           </a-col>
-
+          <a-col :span="4">
+            <a-button class="handle-btn serach-btn" id="releaseRecordList-serach" type="primary" @click="refresh">查询</a-button>
+            <a-button class="handle-btn" type="" id="releaseRecordList-reset" @click="handleReset">重置</a-button>
+          </a-col>
         </a-row>
-        <a-row :gutter="48">
-          <a-col :span="6">
-            <a-form-item label="用户账号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="releaseRecordList-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
+        <a-row :gutter="20">
+          <a-col :span="5">
+            <a-form-item label="设备编号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="releaseRecordList-srcDeviceCode" allowClear :maxLength="120" v-model=" queryParam.srcDeviceCode " placeholder="请输入设备编号" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="5">
             <a-form-item label="网点名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-select
                 id="releaseRecordList-stationNo"
@@ -57,12 +60,12 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="5">
             <a-form-item label="投递方式" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择投递方式" id="releaseRecordList-loginFlag"></v-select>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="5">
             <a-form-item label="投放重量" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <div class="input-number">
                 <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.rubbishWeightStart" :max="999999999" @change="onChange" />-
@@ -71,11 +74,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="48">
-          <a-col :span="6">
-            <a-button class="handle-btn serach-btn" id="releaseRecordList-serach" type="primary" @click="refresh">查询</a-button>
-            <a-button class="handle-btn" type="" id="releaseRecordList-reset" @click="handleReset">重置</a-button>
-          </a-col>
+        <a-row :gutter="20">
+
         </a-row>
       </a-form>
     </div>
@@ -246,8 +246,8 @@ export default {
     },
     // 查询
     refresh () {
-      const isONull = this.queryParam.goldNumStart === null
-      const isOEmpty = this.queryParam.goldNumStart === ''
+      // const isONull = this.queryParam.goldNumStart === null
+      // const isOEmpty = this.queryParam.goldNumStart === ''
       // const isOZero = this.queryParam.goldNumStart === 0
       const isTNull = this.queryParam.goldNumEnd === null
       const isTEmpty = this.queryParam.goldNumEnd === ''

+ 0 - 2
src/views/shopSetting/addGoodsClassModal.vue

@@ -130,7 +130,6 @@ export default {
           const formData = Object.assign({}, this.itemData, this.formData, values.formData)
 		  formData.id = _this.itemId
           saveGoodsClass(formData).then(res => {
-            console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
               _this.$message.success(res.message)
 			  _this.$emit('refresh')
@@ -156,7 +155,6 @@ export default {
 	  }
     },
     itemId (newValue, oldValue) {
-      console.log(newValue, '----------id')
       if (newValue && this.isShow) {
         this.titleText = '编辑'
         this.getPageInfo(newValue)

+ 0 - 1
src/views/shopSetting/addSupplierModal.vue

@@ -131,7 +131,6 @@ export default {
           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')

+ 17 - 19
src/views/shopSetting/goodsClass.vue

@@ -1,11 +1,11 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" class="goodsClass-page-info">
     <!-- 搜索框 -->
-    <div class="table-page-search-wrapper" style="margin-bottom: 15px;">
+    <div class="goodsClass-search">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48">
+        <a-row :gutter="20">
           <a-col :md="6" :sm="24">
-            <a-form-item label="商品分类名称" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
+            <a-form-item label="商品分类名称" :label-col="{ span:8 }" :wrapper-col="{ span: 16 }">
               <a-input allowClear v-model="searchData.name" :maxLength="30" placeholder="请输入" id="goodsClass-name" />
             </a-form-item>
           </a-col>
@@ -35,7 +35,7 @@
       bordered>
       <span slot="action" slot-scope="text, record">
         <a-icon
-		v-hasPermission="'B_goodsClass_edit'"
+          v-hasPermission="'B_goodsClass_edit'"
           type="edit"
           id="goodsClass-handleEdit"
           title="编辑"
@@ -92,14 +92,6 @@ export default {
 	  itemData: {}, // 编辑行数据
       formLayout: 'horizontal',
       form: this.$form.createForm(this),
-      formItemLayout: {
-        labelCol: {
-          span: 6
-        },
-        wrapperCol: {
-          span: 14
-        }
-      },
       // 表头
       columns: [{
         title: '序号',
@@ -242,12 +234,18 @@ export default {
 }
 </script>
 
-<style>
-	.w-e-toolbar {
-		flex-wrap: wrap;
-	}
+<style lang="less">
+	.goodsClass-page-info{
+		.goodsClass-search{
+			margin-bottom: 15px;
+		}
+		.w-e-toolbar {
+			flex-wrap: wrap;
+		}
 
-	.addBtn {
-		margin-bottom: 20px;
+		.addBtn {
+			margin-bottom: 20px;
+		}
 	}
+
 </style>

+ 14 - 8
src/views/shopSetting/supplier.vue

@@ -1,11 +1,11 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" class="supplier-page-info">
     <!-- 搜索框 -->
-    <div class="table-page-search-wrapper" style="margin-bottom: 15px;">
+    <div class="supplier-search">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48" >
+        <a-row :gutter="20" >
           <a-col :md="6" :sm="24">
-            <a-form-item label="供应商名称" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }"><a-input allowClear v-model.trim="searchData.name" :maxLength="30" placeholder="请输入" id="supplier-name"/></a-form-item>
+            <a-form-item label="供应商名称" :label-col="{ span: 8}" :wrapper-col="{ span: 16 }"><a-input allowClear v-model.trim="searchData.name" :maxLength="30" placeholder="请输入" id="supplier-name"/></a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="supplier-refreshTable">查询</a-button>
@@ -224,8 +224,14 @@ export default {
 }
 </script>
 
-<style scoped>
-.addBtn {
-  margin-bottom: 20px;
-}
+<style lang="less">
+	.supplier-page-info{
+		.supplier-search{
+			margin-bottom: 15px;
+		}
+		.addBtn {
+		  margin-bottom: 20px;
+		}
+	}
+
 </style>

+ 4 - 36
src/views/userInfo/LdDetails.vue

@@ -1,11 +1,11 @@
 <template>
-  <a-card :bordered="false" class="shopOrder-table-page-search-wrapper">
+  <a-card :bordered="false" class="LdDetails-page-info">
     <div class="page-header">
       <a @click="goBack">返回列表</a>
       <span>手机号码:<span class="page-header-info">{{ this.page.mobile }}</span></span>
       <span>乐豆余额:<span class="page-header-info">{{ this.page.currentGold }}</span></span>
     </div>
-    <div class="shopOrder-searchForm">
+    <div class="LdDetails-searchForm">
       <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <a-col :span="6">
@@ -102,9 +102,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-		  console.log(this.customerNo)
 		  const searchData = Object.assign(parameter, this.queryParam)
-		  console.log(this.queryOrderDate, 'this.queryOrderDate')
 		  if (this.queryOrderDate && this.queryOrderDate.length) {
 		    searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
 		    searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
@@ -154,34 +152,22 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      console.log(111)
       const userInfo = vm.$route.query
-      console.log(userInfo, '-------------传参')
-	  // vm.mobile = vm.$route.params.mobile
-	  // vm.currentGold = vm.$route.params.currentGold
 	  if (userInfo) {
 	  	customerDetails({
 	  		id: userInfo.id
 	  	}).then(res => {
 	  		if (res.status == 200) {
 	  			vm.page = res.data
-            console.log(vm.page, '----')
 	  		}
 	  	})
 	  }
-      // if (userInfo.id) {
-      // 	console.log(userInfo.id)
-      //   vm.info = userInfo.id.split(',')
-      //   vm.customerNo = vm.info[0]
-      //   vm.$refs.table.refresh()
-      //   console.log(vm.info, '-----数组', vm.customerNo)
-      // }
     })
   }
 }
 </script>
 <style lang="less" scoped>
-  .shopOrder-table-page-search-wrapper{
+  .LdDetails-page-info{
 	  .page-header{
 		  margin-bottom: 15px;
 		  span{
@@ -192,7 +178,7 @@ export default {
 			 font-weight: bold;
 		  }
 	  }
-    .shopOrder-searchForm{
+    .LdDetails-searchForm{
       .ant-form-inline .ant-form-item{
         width: 100%;
       }
@@ -207,23 +193,5 @@ export default {
         margin-right: 10px;
       }
     }
-    .export-btn{
-      background-color: #ff9900;
-      border-color: #ff9900;
-      color: #fff;
-    }
-    .export-btn.ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger), .export-btn.ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger){
-      color: #fff;
-      border-color: #ff9900;
-    }
-    .blue {
-    	color: #1890FF;
-    }
-    .green {
-    	color: #16b50e;
-    }
-    .red {
-    	color: red;
-    }
   }
 </style>

+ 16 - 15
src/views/userInfo/editLdNumModal.vue

@@ -6,7 +6,8 @@
       @cancle="isShow=false"
       :footer="null"
       :centered="true"
-      title="修改乐豆金额">
+      title="修改乐豆金额"
+      class="ld-num-modal">
       <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: 17 }">
           <v-select
@@ -113,8 +114,7 @@ export default {
             console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
               _this.$message.success(res.message)
-              // _this.$emit('refresh')
-			  _this.$router.push({ path: `/userInfo/userManageList/list` })
+              _this.$router.push({ path: `/userInfo/userManageList/list` })
               setTimeout(function () {
                 _this.isShow = false
               }, 300)
@@ -141,17 +141,18 @@ export default {
 </script>
 
 <style lang="less">
-	.input-number{
-		display: flex;
-		width: 100%;
+	.ld-num-modal{
+		.input-number{
+			display: flex;
+			width: 100%;
+		}
+		//  input-number 框宽度
+		.inpNumber{
+		  width: 100%;
+		}
+		.inpNumber-unit{  //  有单位的
+		  width: 88%;
+		  margin-right: 8px;
+		}
 	}
-	//  input-number 框宽度
-	.inpNumber{
-	  width: 100%;
-	}
-	.inpNumber-unit{  //  有单位的
-	  width: 88%;
-	  margin-right: 8px;
-	}
-
 </style>

+ 97 - 0
src/views/userInfo/editUseridentityModal.vue

@@ -0,0 +1,97 @@
+<template>
+  <div>
+    <!-- 弹窗 -->
+    <a-modal
+      v-model="isShow"
+      @cancle="isShow=false"
+      :footer="null"
+      :centered="true"
+      title="修改用户身份">
+      <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 }">
+          <v-select
+            code="RUBBISH_TYPE"
+            allowClear
+            placeholder="请选择用户身份"
+            id="releaseRecordList-rubbishType"
+            v-decorator="[
+              'formData.rubbishType',
+              { initialValue: formData.rubbishType, rules: [{ required: true, message: '请选择用户身份!' }] }
+            ]"></v-select>
+        </a-form-item>
+        <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
+          <a-button type="primary" html-type="submit" id="editUserPhoneModal-submit" style="margin-right: 15px">保存</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="editUserPhoneModal-close">取消</a-button>
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { updateMobile } from '@/api/userInfo.js'
+import { VSelect } from '@/components'
+export default {
+  name: 'EditUseridentityModal',
+  components: { VSelect },
+  props: {
+    openUseridentityMoadl: {
+      type: Boolean,
+      default: false
+    },
+    userId: {
+      type: String,
+      default: ''
+    }
+
+  },
+  data () {
+    return {
+      isShow: this.openUseridentityMoadl,
+      form: this.$form.createForm(this, { name: 'editUseridentityModal' }),
+      formData: {
+        rubbishType: '' // 手机号码
+      }
+    }
+  },
+  methods: {
+    // 点击保存;
+    handleSubmit (e) {
+      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: {
+    openUseridentityMoadl (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    isShow (val) {
+      console.log(this.userId)
+      if (!val) {
+        this.$emit('close')
+      } else {
+   	  this.form.resetFields()
+      }
+    }
+  }
+}
+</script>
+
+<style>
+</style>

+ 146 - 123
src/views/userInfo/userDetails.vue

@@ -1,132 +1,155 @@
 <template>
-	<a-card :bordered="false" class="orderDetail-goods-info">
-		<a-row :gutter="48">
-			<a-col :span="24" class="item-cont item-img">
-				<p class="item-label" style="line-height: 37px;">头像:</p>
-				<img v-if="page.headImageUrl" :src="page.headImageUrl" alt="" class="img">
-				<p class="item-main" style="line-height: 37px;" v-else>--</p>
-			</a-col>
-			<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(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">
-				<p class="item-label">收货地址:</p>
-				<p class="item-main">{{ adderss  ? adderss : '--' }}</p>
-			</a-col>
-			<a-col :span="24" class="item-cont">
-				<p class="item-label">乐豆余额:</p>
-				<p class="item-main">{{ page.currentGold ? page.currentGold : 0 }}</p>
-				<a-icon type="edit" title="修改乐豆余额" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editLd(page)"
-				 v-hasPermission="'B_user_userDetails_editLdNum'" />
-				<!-- <a style="margin-left: 145px; color: #2D8CF0;" @click="editLd(page)">修改乐豆余额</a> -->
-			</a-col>
-			<a-col :span="24" class="item-cont">
-				<p class="item-label">累计乐豆:</p>
-				<p class="item-main">{{ page.totalGold ? page.totalGold :0 }}</p>
-			</a-col>
-			<a-col :span="24" class="item-cont">
-				<p class="item-label">账户状态:</p>
-				<p class="item-main">{{ page.state ==0 ? '禁用' : '启用' }}</p>
-			</a-col>
-			<a-col :span="24" class="item-cont">
-				<p class="item-label">注册时间:</p>
-				<p class="item-main">{{ page.registerTime ? page.registerTime : '--' }}</p>
-			</a-col>
-			<a-col :span="24" class="item-cont">
-				<p class="item-label">最后登录时间:</p>
-				<p class="item-main">{{ page.lastLoginTime ? page.lastLoginTime : '--' }}</p>
-			</a-col>
-			<a-col :span="24" class="item-cont">
-				<p class="item-label">最后投递时间:</p>
-				<p class="item-main">{{ page.lastDeliveryTime ? page.lastDeliveryTime : '--' }}</p>
-			</a-col>
-		</a-row>
-		<div class="page-header" style="margin-top: 50px; color: #2D8CF0; text-align: center;">
-			<a @click="goBack">返回列表</a>
-		</div>
-		<!-- 修改用户手机号码弹窗 -->
-		<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>
+  <a-card :bordered="false" class="userDetails-page-info">
+    <a-row :gutter="48">
+      <a-col :span="24" class="item-cont">
+        <p class="item-label" style="line-height: 37px;">头像:</p>
+        <img v-if="page.headImageUrl" :src="page.headImageUrl" alt="" class="img">
+        <p class="item-main" style="line-height: 37px;" v-else>--</p>
+      </a-col>
+      <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(page)"
+          v-hasPermission="'B_user_userdetails_editPhone'" />
+      </a-col>
+      <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="editUseridentity(page)"
+          v-hasPermission="'B_user_userdetails_editPhone'" />
+      </a-col>
+      <a-col :span="24" class="item-cont">
+        <p class="item-label">收货地址:</p>
+        <p class="item-main">{{ adderss ? adderss : '--' }}</p>
+      </a-col>
+      <a-col :span="24" class="item-cont">
+        <p class="item-label">乐豆余额:</p>
+        <p class="item-main">{{ page.currentGold ? page.currentGold : 0 }}</p>
+        <a-icon
+          type="edit"
+          title="修改乐豆余额"
+          style="font-size: 20px;color: #1890FF;padding: 0 10px;"
+          @click="editLd(page)"
+          v-hasPermission="'B_user_userDetails_editLdNum'" />
+      </a-col>
+      <a-col :span="24" class="item-cont">
+        <p class="item-label">累计乐豆:</p>
+        <p class="item-main">{{ page.totalGold ? page.totalGold :0 }}</p>
+      </a-col>
+      <a-col :span="24" class="item-cont">
+        <p class="item-label">账户状态:</p>
+        <p class="item-main">{{ page.state ==0 ? '禁用' : '启用' }}</p>
+      </a-col>
+      <a-col :span="24" class="item-cont">
+        <p class="item-label">注册时间:</p>
+        <p class="item-main">{{ page.registerTime ? page.registerTime : '--' }}</p>
+      </a-col>
+      <a-col :span="24" class="item-cont">
+        <p class="item-label">最后登录时间:</p>
+        <p class="item-main">{{ page.lastLoginTime ? page.lastLoginTime : '--' }}</p>
+      </a-col>
+      <a-col :span="24" class="item-cont">
+        <p class="item-label">最后投递时间:</p>
+        <p class="item-main">{{ page.lastDeliveryTime ? page.lastDeliveryTime : '--' }}</p>
+      </a-col>
+    </a-row>
+    <div class="page-header" style="margin-top: 50px; color: #2D8CF0; text-align: center;">
+      <a @click="goBack">返回列表</a>
+    </div>
+    <!-- 修改用户手机号码弹窗 -->
+    <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>
+    <!-- 修改用户身份 -->
+    <edit-useridentity-modal :openUseridentityMoadl="openUseridentityMoadl" @close="openUseridentityMoadl=false"></edit-useridentity-modal>
+  </a-card>
 </template>
 
 <script>
-	import editUserPhoneModal from './editUserPhoneModal.vue'
-	import editLdNumModal from './editLdNumModal.vue'
-	import {
-		customerDetails
-	} from '@/api/userInfo.js'
-	export default {
-		name: 'UserDetails',
-		components: {
-			editUserPhoneModal,
-			editLdNumModal
-		},
-		data() {
-			return {
-				userId: '', // 用户id
-				openUserPhoneMoadl: false, // 默认关闭手机号码弹窗
-				customerNo: '', // 用户编号
-				openLdNumModal: false, // 默认关闭乐豆余额弹窗
-				page: {}, // 详情数据
-				adderss: ""
-			}
-		},
-		methods: {
-			// 详情
-			editPhone(page) {
-				this.userId = this.page.id
-				this.openUserPhoneMoadl = true
-				console.log(this.userId, '-----------修改手机号码')
-			},
-			editLd(page) {
-				this.customerNo = this.page.customerNo
-				console.log(this.customerNo, '------用户编号')
-				this.openLdNumModal = true
-				console.log('-----修改乐豆余额')
-			},
-			// 返回列表
-			goBack() {
-				this.$router.push({
-					path: `/userInfo/userManageList/list`
-				})
-			}
-		},
-		beforeRouteEnter(to, from, next) {
-			next(vm => {
-				console.log(111)
-				const params = vm.$route.params
-				console.log(params)
-				if (params.id) {
-					customerDetails({
-						id: params.id
-					}).then(res => {
-						if (res.status == 200) {
-							vm.page = res.data
-							if (vm.page.receiveAddressList) {
-								vm.adderss = vm.page.receiveAddressList[0].receiveAreasName.replace(/\,/g, '-') + '-' + vm.page.receiveAddressList[
-									0].receiveAddress
-							}
-						}
-					})
-				}
-			})
-		}
-	}
+import editUserPhoneModal from './editUserPhoneModal.vue'
+import editLdNumModal from './editLdNumModal.vue'
+import editUseridentityModal from './editUseridentityModal.vue'
+import {
+  customerDetails
+} from '@/api/userInfo.js'
+export default {
+  name: 'UserDetails',
+  components: {
+    editUserPhoneModal,
+    editLdNumModal,
+    editUseridentityModal
+  },
+  data () {
+    return {
+      userId: '', // 用户id
+      openUserPhoneMoadl: false, // 默认关闭手机号码弹窗
+      customerNo: '', // 用户编号
+      openLdNumModal: false, // 默认关闭乐豆余额弹窗
+      openUseridentityMoadl: false, // 默认关闭用户身份弹窗
+      page: {}, // 详情数据
+      adderss: ''
+    }
+  },
+  methods: {
+    // 修改手机号码
+    editPhone (page) {
+      this.userId = this.page.id
+      this.openUserPhoneMoadl = true
+    },
+    // 修改乐豆余额
+    editLd (page) {
+      this.customerNo = this.page.customerNo
+      this.openLdNumModal = true
+    },
+    // 修改用户身份
+    editUseridentity (page) {
+      this.openUseridentityMoadl = true
+    },
+    // 返回列表
+    goBack () {
+      this.$router.push({
+        path: `/userInfo/userManageList/list`
+      })
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      const params = vm.$route.params
+      if (params.id) {
+        customerDetails({
+          id: params.id
+        }).then(res => {
+          if (res.status == 200) {
+            vm.page = res.data
+            if (vm.page.receiveAddressList) {
+              vm.adderss = vm.page.receiveAddressList[0].receiveAreasName.replace(/\,/g, '-') + '-' + vm.page.receiveAddressList[
+                0].receiveAddress
+            }
+          }
+        })
+      }
+    })
+  }
+}
 </script>
 <style lang="less">
-	.item-cont {
-		display: flex;
-		margin: 10px 10px 10px 50px;
+	.userDetails-page-info{
+		.item-cont {
+			display: flex;
+			margin: 10px 10px 10px 50px;
+		}
+		.img {
+			width: 50px;
+			border-radius: 50%;
+		}
 	}
 
-	.img {
-		width: 50px;
-		border-radius: 50%;
-	}
 </style>

+ 27 - 24
src/views/userInfo/userManageList.vue

@@ -1,14 +1,14 @@
 <template>
-  <a-card :bordered="false" class="shopOrder-table-page-search-wrapper">
-    <div class="shopOrder-searchForm">
+  <a-card :bordered="false" class="userManageList-table-page-search-wrapper">
+    <div class="userManageList-searchForm">
       <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="refresh">
         <a-row :gutter="20">
-          <a-col :span="6">
+          <a-col :span="5">
             <a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input id="releaseRecordList-mobile" allowClear :maxLength="11" v-model="queryParam.mobile" placeholder="请输入用户手机" />
             </a-form-item>
           </a-col>
-          <a-col :span="4">
+          <a-col :span="5">
             <a-form-item label="乐豆余额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <div class="input-number">
                 <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.currentGoldMin" :max="999999999" @change="onChange" />-
@@ -16,25 +16,35 @@
               </div>
             </a-form-item>
           </a-col>
-          <a-col :span="4">
+          <a-col :span="5">
             <a-form-item label="账户状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.state"
                 id="releaseRecordList-state"
                 code="ENABLE_FLAG"
-                placeholder="请选择订单状态"
+                placeholder="请选择账户状态"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="5">
+            <a-form-item label="用户身份" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+              <v-select
+                v-model="queryParam.state"
+                id="releaseRecordList-state"
+                code="ENABLE_FLAG"
+                placeholder="请选择用户身份"
                 allowClear></v-select>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-button class="handle-btn serach-btn" id="releaseRecordList-btn-serach" type="primary" @click="refresh">查询</a-button>
+            <a-button class="handle-btn" type="" id="releaseRecordList-btn-reset" @click="handleReset">重置</a-button>
             <a-button
               class="export-btn"
               id="releaseRecordList-btn-export"
               :loading="loading"
               @click="handleExport"
               v-hasPermission="'B_user_userManage_export'">导出</a-button>
-            <a-button class="handle-btn" type="" id="releaseRecordList-btn-reset" @click="handleReset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -115,6 +125,12 @@ export default {
         width: 100,
         align: 'center'
       },
+	  {
+	    title: '用户身份',
+	    dataIndex: 'mobile',
+	    width: 100,
+	    align: 'center'
+	  },
       {
         title: '乐豆余额',
         dataIndex: 'currentGold',
@@ -252,7 +268,6 @@ export default {
     // 启用禁用
     // 更改启用禁用状态
     changeFlagHandle (text, record) {
-      console.log(text)
       const _this = this
       const _data = {
         id: record.id,
@@ -307,8 +322,8 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-	.shopOrder-table-page-search-wrapper {
-		.shopOrder-searchForm {
+	.userManageList-table-page-search-wrapper {
+		.userManageList-searchForm {
 			.ant-form-inline .ant-form-item {
 				width: 100%;
 			}
@@ -336,7 +351,7 @@ export default {
 			background-color: #ff9900;
 			border-color: #ff9900;
 			color: #fff;
-      margin-right: 10px;
+			margin-left: 10px;
 		}
 
 		.export-btn.ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger),
@@ -344,17 +359,5 @@ export default {
 			color: #fff;
 			border-color: #ff9900;
 		}
-
-		.blue {
-			color: #1890FF;
-		}
-
-		.green {
-			color: #16b50e;
-		}
-
-		.red {
-			color: red;
-		}
 	}
 </style>