diff --git a/package-lock.json b/package-lock.json
index 447eb3f..2c3536d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13706,5 +13706,6 @@
}
}
}
+
}
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index b7d40e9..e538147 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,8 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
+ "@wangeditor/editor": "^5.1.23",
+ "@wangeditor/editor-for-vue": "^1.0.2",
"ant-design-vue": "^1.7.8",
"axios": "^0.25.0",
"babel-plugin-transform-remove-console": "^6.9.4",
diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue
index 1f4a413..cdae9e0 100644
--- a/src/components/Login/login.vue
+++ b/src/components/Login/login.vue
@@ -12,19 +12,10 @@
验证码登录
-
+
登录
@@ -122,9 +113,9 @@
-
+
-
+
@@ -167,7 +158,24 @@ export default {
// 计算属性
computed: {},
// 侦听器
- watch: {},
+ watch: {
+ loginway(val) {
+ console.log(val)
+ setTimeout(() => {
+ console.log(this.form.getFieldsValue().tel);
+ if (val == 2 && this.form.getFieldsValue().tel != undefined) {
+ console.log(this.form.getFieldsValue().tel);
+ this.form1.setFieldsValue({
+ tel: this.form.getFieldsValue().tel,
+ })
+ } else if (val == 1 && this.form1.getFieldsValue().tel) {
+ this.form.setFieldsValue({
+ tel: this.form1.getFieldsValue().tel,
+ })
+ }
+ }, 10)
+ },
+ },
// 生命周期钩子 注:没用到的钩子请自行删除
/**
* 组件实例创建完成,属性已绑定,但DOM还未生成,$ el属性还不存在
@@ -270,6 +278,8 @@ export default {
*/
handleCancel() {
this.loginShow = false
+ console.log(123
+ );
},
/**
* 提交更改密码信息
diff --git a/src/components/Login/updatepsw.vue b/src/components/Login/updatepsw.vue
index 6a2431f..58c9e03 100644
--- a/src/components/Login/updatepsw.vue
+++ b/src/components/Login/updatepsw.vue
@@ -82,7 +82,7 @@
- 取消
+ 取消
确定
@@ -108,7 +108,12 @@ export default {
timmer,
},
// 组件参数 接收来自父组件的数据
- props: {},
+ props: {
+ loginShow: {
+ type: Boolean,
+ default: false,
+ },
+ },
// 组件状态值
data() {
return {
@@ -140,6 +145,9 @@ export default {
mounted() {},
// 组件方法
methods: {
+ cancel() {
+ this.$emit('update:loginShow', false)
+ },
phonehandleSubmit(e) {
e.preventDefault()
this.btnLoading = true
diff --git a/src/components/merchantManagement/components/wangEditor.vue b/src/components/merchantManagement/components/wangEditor.vue
new file mode 100644
index 0000000..97a7cb8
--- /dev/null
+++ b/src/components/merchantManagement/components/wangEditor.vue
@@ -0,0 +1,307 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/merchantManagement/notificationCenter.vue b/src/components/merchantManagement/notificationCenter.vue
index 6d622f7..47e24bc 100644
--- a/src/components/merchantManagement/notificationCenter.vue
+++ b/src/components/merchantManagement/notificationCenter.vue
@@ -13,43 +13,52 @@
{{secondBreadcrumb}}
-
-
-
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index ce54727..cbcaa73 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -2,7 +2,7 @@