DESKTOP-SVI9JE1\muzen 1 rok pred
rodič
commit
20422add9e

+ 0 - 20
LICENSE

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 RuoYi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ruoyi",
+  "name": "maoking",
   "version": "3.8.8",
   "description": "猫王售后",
   "author": "猫王售后",

+ 1 - 1
src/hooks/index.js

@@ -31,7 +31,7 @@ export function useStore() {
 export function useGoods() {
   const goodsForm = ref({
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 10
   });
   const goodsOptions = ref([]);
   const getGoods = () => {

+ 1 - 1
src/views/login.vue

@@ -35,7 +35,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
+      
     </div>
   </div>
 </template>

+ 1 - 1
src/views/mobile/repair.vue

@@ -115,6 +115,7 @@ const areaOptions = computed(() => {
 // 搜索产品型号
 const remoteMethod = (e) => {
   goodsForm.value.goodsName = e
+  goodsForm.value.goodsType = 2
   getGoods()
 }
 
@@ -153,7 +154,6 @@ const getSubmit = () => {
 }
 
 getAddress()
-getGoods()
 getStore()
 </script>
 

+ 1 - 0
src/views/mobile/replace.vue

@@ -118,6 +118,7 @@ const areaOptions = computed(() => {
 // 搜索产品型号
 const remoteMethod = (e) => {
   goodsForm.value.goodsName = e
+  goodsForm.value.goodsType = 2
   getGoods()
 }
 

+ 0 - 1
src/views/register.vue

@@ -40,7 +40,6 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>

+ 18 - 6
src/views/service/resend/index.vue

@@ -52,13 +52,18 @@
         <el-form-item label="手机号码:" prop="receiverInfo.mobile">
           <el-input v-model="data.dialogForm.receiverInfo.mobile" placeholder="请输入手机号码" />
         </el-form-item>
+        <el-form-item label="产品型号" prop="specCode">
+          <el-select v-model="data.dialogForm.specCode" filterable remote :remote-method="remoteMethod" placeholder="请选择产品型号">
+            <el-option v-for="item in goodsOptions" :key="item.goodsId" :value="item.goodsId" :label="item.goodsName" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="数量:" prop="planQty">
           <el-input-number v-model="data.dialogForm.planQty" :min="1" />
         </el-form-item>
-        <el-form-item label="物流公司:" prop="logisticsName">
+        <el-form-item label="物流公司:">
           <el-input v-model="data.dialogForm.logisticsName" placeholder="请输入物流公司" />
         </el-form-item>
-        <el-form-item label="快递单号:" prop="logisticsCode">
+        <el-form-item label="快递单号:">
           <el-input v-model="data.dialogForm.logisticsCode" placeholder="请输入快递单号" />
         </el-form-item>
         <el-form-item class="address" label="收货地址:" required>
@@ -93,9 +98,10 @@
 <script setup>
 import { list, submit, push } from '@/api/service/resend.js'
 
-import { useAddress, useStore, useCommon } from '@/hooks/index'
+import { useAddress, useStore, useGoods, useCommon } from '@/hooks/index'
 const { addressOptions, getAddress } = useAddress()
 const { storeOptions, getStore } = useStore()
+const { goodsForm, goodsOptions, getGoods } = useGoods()
 const { pushStatusOptions } = useCommon()
 
 const { proxy } = getCurrentInstance()
@@ -119,15 +125,14 @@ const data = reactive({
     shopCode: [{ required: true, message: '请选择购买渠道', trigger: 'change' }],
     buyerNick: [{ required: true, message: '请输入会员昵称', trigger: 'blur' }],
     planQty: [{ required: true, message: '请输入数量', trigger: 'blur' }],
-    logisticsName: [{ required: true, message: '请输入物流公司', trigger: 'blur' }],
-    logisticsCode: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
     receiverInfo: {
       name: [{ required: true, message: '请输入收货人名称', trigger: 'blur' }],
-      mobile: [{ required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+      mobile: [{ required: true, message: "请输入正确的手机号码", trigger: "blur" }],
       province: [{ required: true, message: '请输入省', trigger: 'blur' }],
       city: [{ required: true, message: '请输入区', trigger: 'blur' }],
       detailAddress: [{ required: true, message: '请输入详细地址', trigger: 'blur' }],
     },
+    specCode: [{ required: true, message: '请选择产品型号', trigger: 'change' }],
     buyerMessage: [{ required: true, message: '请输入备注', trigger: 'blur' }],
   },
   // 推送
@@ -163,6 +168,13 @@ const handleChangeShopCode = (e) => {
   data.dialogForm.shopNick = storeOptions.value.find(i => i.storeCode == e).storeName
 }
 
+// 搜索产品型号
+const remoteMethod = (e) => {
+  goodsForm.value.goodsName = e
+  goodsForm.value.goodsType = 2
+  getGoods()
+}
+
 // 提交
 const getSubmit = () => {
   proxy.$refs.dialogForm.validate((valid) => {