From a82e712f7091ffbf3bfa025365361607f36dd8a5 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Thu, 11 Aug 2022 10:17:49 +0800
Subject: [PATCH] 2022-8-11

---
 .../Tinymce/components/EditorImage.vue           |  8 ++++----
 src/views/business/component/addMerchant.vue     |  4 ++--
 src/views/business/component/addStore.vue        |  2 +-
 src/views/finance/component/rechargeFine.vue     |  2 +-
 src/views/marketing/components/addAd.vue         |  6 +++---
 .../productService/components/addProduct.vue     |  6 +++---
 .../productService/productServiceManage.vue      | 16 +++++++++++++---
 src/views/userManage/component/addMember.vue     |  2 +-
 8 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue
index 07d48e6..854d1cf 100644
--- a/src/components/Tinymce/components/EditorImage.vue
+++ b/src/components/Tinymce/components/EditorImage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="upload-container">
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
-      upload
+      上传
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
       <el-upload
@@ -16,14 +16,14 @@
         list-type="picture-card"
       >
         <el-button size="small" type="primary">
-          Click upload
+          点击上传
         </el-button>
       </el-upload>
       <el-button @click="dialogVisible = false">
-        Cancel
+        取消
       </el-button>
       <el-button type="primary" @click="handleSubmit">
-        Confirm
+        确认
       </el-button>
     </el-dialog>
   </div>
diff --git a/src/views/business/component/addMerchant.vue b/src/views/business/component/addMerchant.vue
index 5ea7932..800f2bc 100644
--- a/src/views/business/component/addMerchant.vue
+++ b/src/views/business/component/addMerchant.vue
@@ -214,14 +214,14 @@ export default {
         ],
         boss_phone:[
           { required: true, message: '请填写法人/老板电话', trigger: 'blur' },
-          {pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'}
+          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
         ],
         contact:[
           { required: true, message: '请填写联系人', trigger: 'blur' }
         ],
         phone:[
           { required: true, message: '请填写联系人电话', trigger: 'blur' },
-          {pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'}
+          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
         ],
         username:[
           { required: true, message: '请填写简称/用户名', trigger: 'blur' }
diff --git a/src/views/business/component/addStore.vue b/src/views/business/component/addStore.vue
index c3ddb9a..461bfb0 100644
--- a/src/views/business/component/addStore.vue
+++ b/src/views/business/component/addStore.vue
@@ -147,7 +147,7 @@ export default {
         ],
         contactNumber:[
           {required:true,message:'请填写联系电话'},
-          {pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'}
+          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
         ],
         address:[
           {required:true,message:'请填写地址'}
diff --git a/src/views/finance/component/rechargeFine.vue b/src/views/finance/component/rechargeFine.vue
index 4ca52d4..4dc74c6 100644
--- a/src/views/finance/component/rechargeFine.vue
+++ b/src/views/finance/component/rechargeFine.vue
@@ -98,7 +98,7 @@ export default {
         ],
         money:[
           {required:true,message:"请填写金额"},
-          {pattern:/^[0-9]+/,message:"请填写数字"}
+          {pattern:/^[0-9]+/,message:"手机号格式错误"}
         ],
         payment:[
           {required:true,message:"请选择支付方式"}
diff --git a/src/views/marketing/components/addAd.vue b/src/views/marketing/components/addAd.vue
index 273769a..bf0c629 100644
--- a/src/views/marketing/components/addAd.vue
+++ b/src/views/marketing/components/addAd.vue
@@ -208,7 +208,7 @@ export default {
         ],
         sort:[
           {required:true,message:"请填写排序"},
-          {pattern:/^[0-9]+/,message:"请填写数字"}
+          {pattern:/^[0-9]+/,message:"手机号格式错误"}
         ],
         effectDate:[
           {required:true,message:"请选择日期"}
@@ -428,11 +428,11 @@ export default {
   border-radius: 6px;
 }
 .img__delete{
-  transform: scale(0.8,0.8);
+  transform: scale(0.7,0.7);
 
   position: absolute;
   top: 1px;
-  right: 12px;
+  left: 2%;
 }
 </style>
 
diff --git a/src/views/productService/components/addProduct.vue b/src/views/productService/components/addProduct.vue
index 2010693..b0d2003 100644
--- a/src/views/productService/components/addProduct.vue
+++ b/src/views/productService/components/addProduct.vue
@@ -467,7 +467,7 @@ export default {
             type:'success',
             message:'编辑商品成功'
           })
-          this.isShow = false
+            this.isShow = false
           this.$emit('refresh')
         })
       }
@@ -534,10 +534,10 @@ export default {
   border-radius: 6px;
 }
 .img__delete{
-  transform: scale(0.8,0.8);
+  transform: scale(0.7,0.7);
 
   position: absolute;
   top: 1px;
-  right: 12px;
+  left: 4%;
 }
 </style>
diff --git a/src/views/productService/productServiceManage.vue b/src/views/productService/productServiceManage.vue
index f12b859..f0bc1f8 100644
--- a/src/views/productService/productServiceManage.vue
+++ b/src/views/productService/productServiceManage.vue
@@ -6,10 +6,12 @@
         <slot>
           <div class="selector">
             <div class="selector-item">
+              <div class="selector-item__label">产品名称：</div>
               <Input v-model="select.name" style="width: 200px;" placeholder="产品名称搜索" />
             </div>
             <div class="selector-item">
-              <Select clearable v-model="select.merchantId" style="width: 200px;" placeholder="所属商户">
+              <div class="selector-item__label">所属商户：</div>
+              <Select clearable v-model="select.merchantId" style="width: 180px;" placeholder="所属商户">
                 <Scroll :on-reach-bottom="loadMoreMerchant">
                   <Option v-for="item in merchants" :value="item.id" :key="item.id">
                     {{item.name}}
@@ -18,15 +20,17 @@
               </Select>
             </div>
             <div class="selector-item">
-              <Select clearable style="width: 200px;" clearable placeholder="状态选择" v-model="select.state">
+              <div class="selector-item__label">状态选择：</div>
+              <Select clearable style="width: 140px;" clearable placeholder="状态选择" v-model="select.state">
                 <Option v-for="item in [{value:'active',label:'已上架'},{label:'已下架',value:'inactive'}]" :value="item.value">{{item.label}}</Option>
               </Select>
             </div>
             <div class="selector-item">
+              <div class="selector-item__label">类别选择：</div>
               <el-cascader
                 clearable
                 placeholder="类别选择"
-                style="width: 200px;"
+                style="width: 180px;"
                 size="small"
                 :options="types"
                 :show-all-levels="false"
@@ -256,9 +260,15 @@ export default {
   align-items: center;
   align-content: center;
   &-item{
+    display: flex;
+    align-items: center;
 
     margin-top: 6px;
     margin-right: 10px;
+
+    &__label{
+      word-break: keep-all;
+    }
   }
 }
 
diff --git a/src/views/userManage/component/addMember.vue b/src/views/userManage/component/addMember.vue
index 7021fd0..124051a 100644
--- a/src/views/userManage/component/addMember.vue
+++ b/src/views/userManage/component/addMember.vue
@@ -56,7 +56,7 @@ export default {
         ],
         phone:[
           {required:true,message:'请填写电话'},
-          {pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'}
+          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
         ]
       }
     }