update

admin-update/src/App.vue

@@ -7,11 +7,11 @@
 <script>
 export default {
 	created() {
-		let source = this.$project == 'sass' ? 'sass' : 'admin';
-		if (source == 'admin') {
-			localStorage.setItem('source', source);
-			localStorage.setItem('account', 12358);
-		}
+		// let source = this.$project == 'sass' ? 'sass' : 'admin';
+		// if (source == 'admin') {
+		// 	localStorage.setItem('source', source);
+		// 	localStorage.setItem('account', 12358);
+		// }
 	}
 };
 </script>

admin-update/src/components/module/sel-member.vue

@@ -71,7 +71,8 @@ export default {
 			this.$emit('confirm', this.list[this.radio]);
 		},
 		resetForm() {
-			this.$refs['ruleForm'].resetFields();
+			// this.$refs['ruleForm'].resetFields();
+			this.$emit('update:show', false);
 			this.$emit('cancel');
 		}, // cl-crud 组件ad
 		onLoad({ ctx, app }) {

admin-update/src/pages/layout/slider/index.vue

@@ -151,6 +151,7 @@ export default {
 			padding-left: 10px;
 			font-size: 14px;
 			color: $fontColor2;
+			cursor: pointer;
 			&.active {
 				color: $mainColor;
 				background-color: #f0f2f6;

admin-update/src/store/modules/user.js

@@ -56,6 +56,9 @@ export default {
 			}
 			return host().then(res => {
 				commit('SET_USERINFO', res);
+				if (ProjectName == 'business') {
+					localStorage.setItem('account', res.merchantId);
+				}
 				return res;
 			});
 		},

admin-update/src/views/staff/list.vue

@@ -91,7 +91,7 @@
 									></cl-avatar>
 								</div>
 								<div class="member-det">
-									<div class="app-size-28">{{ memberData.realName }}</div>
+									<div class="app-size-28">{{ memberData.userName }}</div>
 									<div>{{ memberData.mobile }}</div>
 								</div>
 							</div>
@@ -270,6 +270,9 @@ export default {
 		// 选择会员
 		selGoods() {
 			this.selMemberModal = true;
+			setTimeout(() => {
+				console.log(this.memberData);
+			}, 6000);
 		},
 		selMemberConfirmFn(item) {
 			this.memberData = item;