1、form表单样式调整

2、oss上传图片增加类型校验MIME

src/api/ums/memberAddress.js

@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 查询会员收货地址列表
 export function listUmsMemberAddress(query, pageReq) {
@@ -7,7 +7,7 @@ export function listUmsMemberAddress(query, pageReq) {
     method: 'post',
     data: query,
     params: pageReq
-  })
+  });
 }
 
 // 查询会员收货地址详细
@@ -15,7 +15,7 @@ export function getUmsMemberAddress(id) {
   return request({
     url: '/ums/memberAddress/' + id,
     method: 'get'
-  })
+  });
 }
 
 // 新增会员收货地址
@@ -24,7 +24,7 @@ export function addUmsMemberAddress(data) {
     url: '/ums/memberAddress',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 修改会员收货地址
@@ -33,7 +33,7 @@ export function updateUmsMemberAddress(data) {
     url: '/ums/memberAddress',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 删除会员收货地址
@@ -41,7 +41,7 @@ export function delUmsMemberAddress(id) {
   return request({
     url: '/ums/memberAddress/' + id,
     method: 'delete'
-  })
+  });
 }
 
 // 导出会员收货地址
@@ -50,5 +50,5 @@ export function exportUmsMemberAddress(query) {
     url: '/ums/memberAddress/export',
     method: 'get',
     params: query
-  })
+  });
 }

src/components/OssImageUpload/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="component-upload-image">
     <el-upload
+      accept="image/png,image/jpeg,image/png"
       multiple
       :action="uploadImgUrl"
       list-type="picture-card"

src/views/oms/orderDeliveryHistory/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px" size="default" class="ry_form">
       <el-form-item label="订单id" prop="orderId">
         <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>
@@ -51,7 +51,7 @@
 
     <!-- 添加或修改订单发货记录对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+      <el-form ref="form" :model="form" :rules="rules" label-width="138px" inline class="dialog-form-two">
         <el-form-item label="订单id" prop="orderId">
           <el-input v-model="form.orderId" placeholder="请输入订单id" />
         </el-form-item>

src/views/oms/orderItem/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="130px" size="default" class="ry_form">
       <el-form-item label="订单id" prop="orderId">
         <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>

src/views/pms/sku/index.vue

@@ -44,7 +44,7 @@
 
     <!-- 添加或修改sku信息对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+      <el-form ref="form" :model="form" :rules="rules" label-width="138px" inline class="dialog-form-two">
         <el-form-item label="PRODUCT_ID" prop="productId">
           <el-input v-model="form.productId" placeholder="请输入PRODUCT_ID" />
         </el-form-item>

src/views/ums/memberWechat/index.vue

@@ -1,63 +1,33 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px" size="default" class="ry_form">
       <el-form-item label="MEMBER_ID" prop="memberId">
         <el-input v-model="queryParams.memberId" placeholder="请输入MEMBER_ID" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">
+      <el-form-item label="unionid" prop="unionid">
-        <el-input
+        <el-input v-model="queryParams.unionid" placeholder="请输入unionid" clearable size="small" @keyup.enter="handleQuery" />
-          v-model="queryParams.unionid"
-          placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段"
-          clearable
-          size="small"
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="用户的标识，对当前公众号唯一" prop="openid">
+      <el-form-item label="openid" prop="openid">
-        <el-input
+        <el-input v-model="queryParams.openid" placeholder="请输入openid" clearable size="small" @keyup.enter="handleQuery" />
-          v-model="queryParams.openid"
-          placeholder="请输入用户的标识，对当前公众号唯一"
-          clearable
-          size="small"
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="小程序唯一身份ID" prop="routineOpenid">
+      <el-form-item label="小程序唯一ID" prop="routineOpenid">
         <el-input v-model="queryParams.routineOpenid" placeholder="请输入小程序唯一身份ID" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="用户所在的分组ID" prop="groupid">
+      <el-form-item label="用户分组ID" prop="groupid">
         <el-input v-model="queryParams.groupid" placeholder="请输入用户所在的分组ID" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="用户被打上的标签ID列表" prop="tagidList">
+      <el-form-item label="用户标签ID" prop="tagidList">
-        <el-input
+        <el-input v-model="queryParams.tagidList" placeholder="请输入用户被打上的标签ID列表" clearable size="small" @keyup.enter="handleQuery" />
-          v-model="queryParams.tagidList"
-          placeholder="请输入用户被打上的标签ID列表"
-          clearable
-          size="small"
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="用户是否订阅该公众号标识" prop="subscribe">
+      <el-form-item label="用户是否关注" prop="subscribe">
-        <el-input
+        <el-input v-model="queryParams.subscribe" placeholder="请输入用户是否订阅该公众号" clearable size="small" @keyup.enter="handleQuery" />
-          v-model="queryParams.subscribe"
-          placeholder="请输入用户是否订阅该公众号标识"
-          clearable
-          size="small"
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <template v-if="showMoreCondition">
-        <el-form-item label="关注公众号时间" prop="subscribeTime">
+        <el-form-item label="用户订阅公众号时间" prop="subscribeTime">
           <el-input v-model="queryParams.subscribeTime" placeholder="请输入关注公众号时间" clearable size="small" @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="小程序用户会话密匙" prop="sessionKey">
-          <el-input
+          <el-input v-model="queryParams.sessionKey" placeholder="请输入小程序用户会话密匙" clearable size="small" @keyup.enter="handleQuery" />
-            v-model="queryParams.sessionKey"
-            placeholder="请输入小程序用户会话密匙"
-            clearable
-            size="small"
-            @keyup.enter="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="过期时间" prop="expiresIn">
           <el-input v-model="queryParams.expiresIn" placeholder="请输入过期时间" clearable size="small" @keyup.enter="handleQuery" />
@@ -95,12 +65,12 @@
     <el-table v-loading="loading" :data="umsMemberWechatList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
-      <el-table-column label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" align="center" prop="unionid" />
+      <el-table-column label="unionid" align="center" prop="unionid" />
-      <el-table-column label="用户的标识，对当前公众号唯一" align="center" prop="openid" />
+      <el-table-column label="openid" align="center" prop="openid" />
       <el-table-column label="小程序唯一身份ID" align="center" prop="routineOpenid" />
       <el-table-column label="用户所在的分组ID" align="center" prop="groupid" />
-      <el-table-column label="用户被打上的标签ID列表" align="center" prop="tagidList" />
+      <el-table-column label="用户标签ID列表" align="center" prop="tagidList" />
-      <el-table-column label="用户是否订阅该公众号标识" align="center" prop="subscribe" />
+      <el-table-column label="用户关注公众号" align="center" prop="subscribe" />
       <el-table-column label="关注公众号时间" align="center" prop="subscribeTime" />
       <el-table-column label="小程序用户会话密匙" align="center" prop="sessionKey" />
       <el-table-column label="token" align="center" prop="accessToken" />
@@ -113,12 +83,8 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button size="small" type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ums:memberWechat:edit']"
+          <el-button size="small" type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ums:memberWechat:edit']">修改</el-button>
-            >修改</el-button
+          <el-button size="small" type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ums:memberWechat:remove']">删除</el-button>
-          >
-          <el-button size="small" type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ums:memberWechat:remove']"
-            >删除</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -127,14 +93,14 @@
 
     <!-- 添加或修改用户微信信息对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+      <el-form ref="form" :model="form" :rules="rules" label-width="138px" inline class="dialog-form-two">
         <el-form-item label="MEMBER_ID" prop="memberId">
           <el-input v-model="form.memberId" placeholder="请输入MEMBER_ID" />
         </el-form-item>
-        <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">
+        <el-form-item label="unionid" prop="unionid">
           <el-input v-model="form.unionid" placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" />
         </el-form-item>
-        <el-form-item label="用户的标识，对当前公众号唯一" prop="openid">
+        <el-form-item label="openid" prop="openid">
           <el-input v-model="form.openid" placeholder="请输入用户的标识，对当前公众号唯一" />
         </el-form-item>
         <el-form-item label="小程序唯一身份ID" prop="routineOpenid">
@@ -143,10 +109,10 @@
         <el-form-item label="用户所在的分组ID" prop="groupid">
           <el-input v-model="form.groupid" placeholder="请输入用户所在的分组ID" />
         </el-form-item>
-        <el-form-item label="用户被打上的标签ID列表" prop="tagidList">
+        <el-form-item label="用户标签ID列表" prop="tagidList">
           <el-input v-model="form.tagidList" placeholder="请输入用户被打上的标签ID列表" />
         </el-form-item>
-        <el-form-item label="用户是否订阅该公众号标识" prop="subscribe">
+        <el-form-item label="用户是否订阅公众号" prop="subscribe">
           <el-input v-model="form.subscribe" placeholder="请输入用户是否订阅该公众号标识" />
         </el-form-item>
         <el-form-item label="关注公众号时间" prop="subscribeTime">

vite.config.ts

@@ -24,7 +24,7 @@ export default defineConfig(({ mode, command }) => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          // target: 'http://192.168.1.250:8080',
+          // target: 'http://192.168.224.1:8080',
           target: 'http://192.168.1.250:8080',
           changeOrigin: true,
           ws: true,