update:1、更新了很多东西

src/views/mall/product/spu/index.vue

@@ -210,6 +210,9 @@ const hideSearchMore = () => {
 /** 查询列表 */
 const getList = async () => {
 	loading.value = true
+	if (props.merchantId) {
+		queryParams.value.merchantId = props.merchantId
+	}
 	try {
 		const data = await ProductSpuApi.getSpuPage(queryParams.value)
 		data.list.forEach(obj => {

src/views/mall/trade/order/index.vue

@@ -164,7 +164,7 @@
 	<!-- 各种操作的弹窗 -->
 	<OrderDeliveryForm ref="deliveryFormRef" @success="getList" />
 	<OrderUpdateRemarkForm ref="updateRemarkForm" @success="getList" />
-	<OrderUpdateAddressForm ref="updateAddressFormRef" @success="getDetail" />
+	<OrderUpdateAddressForm ref="updateAddressFormRef" @success="getList" />
 	<OrderIndex ref="formRef" @success="getList" />
 
 </template>
@@ -230,7 +230,6 @@ const props = defineProps({
 		default: false
 	}
 });
-console.log("当前的商户id是", props)
 const formRef = ref()
 const openDetail = (type: string, row: {}, no: string) => {
 	// console.log("当前是不是移动端", mobile.value)
@@ -292,6 +291,9 @@ const inputChangeSelect = (val: string) => {
 /** 查询列表 */
 const getList = async () => {
 	loading.value = true
+	if (props.merchantId) {
+		queryParams.value.merchantId = props.merchantId
+	}
 	try {
 		const data = await TradeOrderApi.getOrderPage(unref(queryParams))
 		data.list.forEach(obj => {

src/views/system/menu/MenuForm.vue

@@ -28,9 +28,9 @@
 				<el-col span="12">
 					<el-form-item label="用户类别" prop="categoryId">
 						<el-select v-model="formData.categoryId" placeholder="请选择">
-							<el-option label="平台用户" :value="1" />
-							<el-option label="店铺用户" :value="2" />
-							<el-option label="店铺用户" :value="3" />
+							<el-option label="平台角色" :value="1" />
+							<el-option label="商户角色" :value="2" />
+							<!-- <el-option label="店铺角色" :value="3" /> -->
 						</el-select>
 					</el-form-item>
 				</el-col>
@@ -141,8 +141,8 @@ const formRules = reactive({
 	sort: [{ required: true, message: '菜单顺序不能为空', trigger: 'blur' }],
 	path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }],
 	status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-		// categoryId: [{ required: false, message: '用户类别不能为空', trigger: 'blur' }]
-	})
+	categoryId: [{ required: true, message: '用户类别不能为空', trigger: 'blur' }]
+})
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */

src/views/system/menu/index.vue

@@ -65,9 +65,9 @@
     </el-form>
   </ContentWrap>
   <el-tabs v-model="queryParams.categoryId" @tab-click="handleTabClick" class="parent-tabs" >
-      <el-tab-pane label="平台用户"	:name="1" />
-      <el-tab-pane label="商户用户"	:name="2" />
-      <el-tab-pane label="店铺用户"	:name="3" />
+      <el-tab-pane label="平台角色"	:name="1" />
+      <el-tab-pane label="商户角色"	:name="2" />
+      <!-- <el-tab-pane label="店铺角色"	:name="3" /> -->
     </el-tabs>
   <!-- 列表 -->
   <ContentWrap>

src/views/system/role/RoleForm.vue

@@ -32,9 +32,9 @@
 				<el-col span="24">
 					<el-form-item label="用户类别" prop="categoryId">
 						<el-select v-model="formData.categoryId" placeholder="请选择">
-							<el-option label="平台用户" :value="1" />
-							<el-option label="店铺用户" :value="2" />
-							<el-option label="商户管理员" :value="3" />
+							<el-option label="平台角色" :value="1" />
+							<el-option label="商户角色" :value="2" />
+							<!-- <el-option label="店铺角色" :value="3" /> -->
 						</el-select>
 					</el-form-item>
 				</el-col>

src/views/system/role/index.vue

@@ -82,9 +82,9 @@
     </el-form>
   </ContentWrap>
   <el-tabs v-model="queryParams.categoryId" @tab-click="handleTabClick" class="parent-tabs" >
-      <el-tab-pane label="平台用户"	:name="1" />
-      <el-tab-pane label="店铺用户"	:name="2" />
-      <el-tab-pane label="商户管理员"	:name="3" />
+      <el-tab-pane label="平台角色"	:name="1" />
+      <el-tab-pane label="商户角色"	:name="2" />
+      <!-- <el-tab-pane label="店铺角色"	:name="3" /> -->
     </el-tabs>
   <!-- 列表 -->
   <ContentWrap>

src/views/system/sale/merchant/components/MerchantBaseInfo.vue

@@ -169,9 +169,9 @@ const formRules = reactive({
   // status: [{ required: true, message: '状态', trigger: 'blur' }],
   description: [{ required: true, message: '简介不能为空', trigger: 'blur' }],
   contact: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  address: [{ required: true, message: '办公地址不能为空', trigger: 'blur' }],
-  contactNumber: [{ required: true, message: '负责人电话不能为空', trigger: 'blur' }],
-  complaintsHotline: [{ required: true, message: '维权电话不能为空', trigger: 'blur' }],
+  // address: [{ required: true, message: '办公地址不能为空', trigger: 'blur' }],
+  contactNumber: [{ required: true, message: '负责人手机号不能为空', trigger: 'blur' }],
+  // complaintsHotline: [{ required: true, message: '维权电话不能为空', trigger: 'blur' }],
   areaId: [{ required: true, message: '所在地不能为空', trigger: 'blur' }],
   customerServiceHotline: [{ required: true, message: '客服电话不能为空', trigger: 'blur' }],
   email: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],

src/views/system/sale/merchant/components/MerchantProduct.vue

@@ -7,7 +7,6 @@
 
 <script setup>
 import spu from '@/views/mall/product/spu/index.vue';
-
   const props = defineProps({
     id: {
       type: Number,

src/views/system/sale/merchant/components/MerchantStore.vue

@@ -25,7 +25,7 @@
             style="width: 100%;height:250px;border:1px solid rgb(220 223 231);display: flex;align-items: center;justify-content: center;overflow: hidden;margin:10px 0 ;">
             <img :src="o.logoUrl" style="width: 100%;" />
           </div>
-          {{formatDate(o.createTime,"YYYY-MM-DD")}}
+          {{formatDate(o.updateTime,"YYYY-MM-DD")}}
 
         </div>
       </el-card>
@@ -87,8 +87,14 @@ const MerchantStoreFromRef = ref()
 const openForm = (type, obj,merchantId) => {
   if (type == 'view') {
     // 查看
-    // window.open(obj.url, '_blank')
-    window.open('https://www.baidu.com/', '_blank')
+
+    // 如果是外链，则直接打开新窗口
+    if (!obj.website) return
+
+    // 如果没有http则帮他加上
+    if (obj.website.indexOf('http') == -1) obj.website = 'http://' + obj.website
+    
+    window.open(obj.website, '_blank')
     return
   }
     

src/views/system/sale/merchant/components/MerchantStoreFrom.vue

@@ -9,8 +9,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="店铺域名" prop="name">
-            <el-input v-model="formData.name" placeholder="请输入店铺域名" />
+          <el-form-item label="店铺域名" prop="website">
+            <el-input v-model="formData.website" placeholder="请输入店铺域名" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -49,10 +49,12 @@ const formData = ref({
   id: undefined,
   status: 1,
   merchantId: 0,
-  logoUrl: ''
+  logoUrl: '',
+  website:''
 })
 const formRules = reactive<FormRules>({
   name: [{ required: true, message: '店铺名不能为空', trigger: 'blur' }],
+  logoUrl: [{ required: true, message: '店铺名不能为空', trigger: 'blur' }],
 })
 const isDetail = ref(false)
 const openType = ref('create')

src/views/system/user/index.vue

@@ -7,7 +7,7 @@
       </ContentWrap>
     </el-col>
     <el-col :span="20" :xs="24">
-
+      
       <!-- 搜索 -->
       <div class="search-one">
         <div style="text-align: right;" class="search-input">