消息修改

src/layout/components/Navbar.vue

@@ -93,9 +93,13 @@
 				</el-radio-group>
 				<div class="flex_asb">
 					<el-radio-group size="mini" v-model="readFlag" @change="getList">
-					  <el-radio-button label="">全部</el-radio-button>
-					  <el-radio-button label="NO">未读</el-radio-button>
-					  <el-radio-button label="YES">已读</el-radio-button>
+						<el-radio-button label="">全部</el-radio-button>
+						<el-badge :value="count" class="item" style="margin: 0 10px">
+							<el-radio-button label="NO">未读</el-radio-button>
+						</el-badge>
+						<el-badge :value="count" :hidden="true" class="item" >
+							<el-radio-button label="YES">已读</el-radio-button>
+						</el-badge>
 					</el-radio-group>
 					<div style="color: #409EFF;cursor: pointer;" @click="confirmRead">
 						<i class="el-icon-message-solid"></i>
@@ -104,7 +108,7 @@
 				</div>
 			</div>
 			<el-card class="box-card" v-for="(item,index) in messageData" style="margin-top: 10px;">
-				<div @click="isShow = false;toDetail(item.adminNoticeType,item.paidType,(item.adminNoticeType=='NOTICE'?item.noticeId:item.orderId))">
+				<div @click="isShow = false;toDetail(item.adminNoticeType,item.paidType,(item.adminNoticeType=='NOTICE'?item.noticeId:item.orderId),item.id)">
 					<div class="flex_asb item">
 						<div v-if="messageType == ['NOTICE']">
 							<span>公告类型：</span>
@@ -212,6 +216,7 @@ export default {
 	  listTotal: 0,
 	  currentPage: 1, // 当前页码
 	  pageSize: 10, // 每页数量
+		count: 0
     }
   },
   computed: {
@@ -257,7 +262,7 @@ export default {
 				CRE_ORDER: '创建工单',
 				SEND_MALL: '商城订单发货',
 				RP_MALL: '商城订单维权',
-				CR_SALES: '支付订单'
+				CR_SALES: '订单支付成功'
 			}
 			return MAP[val]
 		}
@@ -358,7 +363,7 @@ export default {
 						{
 							style: 'cursor: pointer;',
 							on: {
-								click: that.toDetail.bind(that,item.adminNoticeType,item.paidType,item.orderId)
+								click: that.toDetail.bind(that,item.adminNoticeType,item.paidType,item.orderId,item.id)
 							},
 						},[
 							that.$createElement(
@@ -391,6 +396,18 @@ export default {
 			})
 		})
 	},
+	getCount(){
+		request({
+		  url: `/notice/list/count`,
+		  method: 'get',
+		  params: {
+			  noticeType: this.messageType.join(','),
+			  readFlag: 'NO'
+		  }
+		}).then(res=>{
+			this.count = res.data
+		})
+	},
 	getUserInfo(){
 		request({
 		  url: `/admin/user/detail`,
@@ -461,6 +478,7 @@ export default {
 			  params: [{param: "nr.read_flag", compare: "=", value: this.readFlag},{param: 'nr.admin_notice_type', compare: "=", value: this.messageType},{param: 'nr.issue_time', compare: ">=", value: this.filterTime[0]},{param: 'nr.issue_time', compare: "<=", value: this.filterTime[1]}]
 		  }
 		}).then(res=>{
+			this.getCount()
 			this.messageData = res.data.records
 		})
 	},
@@ -469,8 +487,9 @@ export default {
 		this.currentPage = val;
 		this.getList();
 	},
-	toDetail(type,paidType,id){
+	toDetail(type,paidType,id,noticeId){
 		console.log(type,id)
+		this.read(noticeId)
 		this.$router.push({
 			name: this.typeFilter(type,paidType),
 			query: {
@@ -478,6 +497,17 @@ export default {
 				activeName: "workOrderInfo",
 			}
 		})
+	},
+	read(id){
+		request({
+		  url: `/notice/mark/read`,
+		  method: 'post',
+		  params: {
+			  noticeIds: id,
+		  }
+		}).then(res=>{
+			
+		})
 	}
   }
 }
@@ -661,4 +691,7 @@ export default {
     }
   }
 }
+::v-deep .el-badge__content.is-fixed{
+	z-index: 99;
+}
 </style>

src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -177,7 +177,7 @@
 					<el-table-column label="操作" align="right" width="140">
 						<template slot-scope="scope" v-if="formType != 2">
 							<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="isEdit = scope.$index">编辑</el-button>
-							<el-button size="mini" type="danger" @click="dataList.splice(scope.$index,1)">删除</el-button>
+							<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -375,6 +375,10 @@
 				})
 				this.getGoods()
 			},
+			del(index){
+				if(this.dataList.length == 1){this.isEdit == 0}else{this.isEdit -= 1}
+				this.dataList.splice(index,1)
+			},
 			submit(){
 				this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {
 					confirmButtonText: '确定',

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -202,7 +202,7 @@
 					<el-table-column label="操作" align="right" width="140">
 						<template slot-scope="scope" v-if="formType != 2">
 							<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="isEdit = scope.$index">编辑</el-button>
-							<el-button size="mini" type="danger" @click="dataList.splice(scope.$index,1)">删除</el-button>
+							<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -450,6 +450,10 @@
 					goodsType: 'M'
 				})
 			},
+			del(index){
+				if(this.dataList.length == 1){this.isEdit == 0}else{this.isEdit -= 1}
+				this.dataList.splice(index,1)
+			},
 			submit(){
 				this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {
 					confirmButtonText: '确定',

src/views/setting/thirdPartyAddressLogin/index.vue

@@ -124,7 +124,18 @@ export default {
   },
   methods: {
     // 列表请求函数
-    getList: listPageV2,
+		getList(p, cb) {
+			try {
+				var pam = JSON.parse(JSON.stringify(p))
+				if(JSON.parse(localStorage.getItem('greemall_user')).userName != 'admin'){
+					pam.params.push({ 'param': 'a.status', "compare": "=", "value": 'ON' })
+				}
+				cb && cb(pam)
+				return listPageV2(pam)
+			} catch (error) {
+				console.log(error)
+			}
+		},
     // 列表导出函数
     exportList: pageExport,
     // 表格列解析渲染数据更改

src/views/userManagement/customerManagement/index.vue

@@ -32,6 +32,16 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :span="24">
+						<el-form-item label="身份证号码" :required="true">
+							<el-input v-model="workerForm.idCard" placeholder="请输入"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="身份证正面照" :required="true">
+							<ImageUpload :fileList="fileList" :limit="1" :isEdit="true" />
+						</el-form-item>
+					</el-col>
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -49,12 +59,13 @@
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
+import ImageUpload from '@/components/file-upload'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
 import { memberListPageV2,memberPageExport, memberAudit, memberInner, getWebsit } from "@/api/customerManagement";
 import MemberDetail from "@/components/Mall/Member/member-detail";
 import operation_mixin from '@/components/template/operation_mixin.js'
 export default {
-  components: { TemplatePage, MemberDetail },
+  components: { TemplatePage, MemberDetail, ImageUpload },
   mixins: [import_mixin,operation_mixin],
   data() {
     return {
@@ -83,10 +94,12 @@ export default {
 	  	},
 	  websitList: [],
 	  workerForm: {
-	  			websitId: '',
-	  			userId: '',
+	  		websitId: '',
+	  		userId: '',
+			idCard: ''
 	  },
 	  queryUser: {}, // 查询
+	  fileList: []
     }
   },
   computed: {
@@ -171,12 +184,20 @@ export default {
     },
 	memberInner(){
 		if(!this.workerForm.websitId){
-			return this.$message({ type: 'danger', message: '请选择入驻网点!' })
+			return this.$message({ type: 'error', message: '请选择入驻网点!'})
+		}else if(!this.workerForm.idCard){
+			return this.$message({ type: 'error', message: '请输入身份证号码!' })
+		}else if(!/^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}[\dXx]$/g.test(this.workerForm.idCard)){
+			return this.$message({ type: 'error', message: '请输入正确的身份证号码!' })
+		}else if(this.fileList.length == 0){
+			return this.$message({ type: 'error', message: '请上传身份证正面照!' })
 		}
 		memberInner({
 			type: 'WORKER',
 			userIds: this.workerForm.userId,
-			websitId: this.workerForm.websitId
+			websitId: this.workerForm.websitId,
+			idCard: this.workerForm.idCard,
+			idCardImg: this.fileList.map(item => item.url).join(",")
 		}).then(res => {
 			this.dialogVisible = false
 			this.$message({ type: 'success', message: '设置工程师成功!' })

src/views/userManagement/distributorManagement/index.vue

@@ -326,7 +326,7 @@ export default {
 	},
 	memberInner(){
 		if(!this.workerForm.websitId){
-			return this.$message({ type: 'danger', message: '请选择入驻网点!' })
+			return this.$message({ type: 'error', message: '请选择入驻网点!' })
 		}
 		memberInner({
 			type: 'WORKER',