优化代码

yshop-drink-vue3/src/views/mall/coupon/index.vue

@@ -32,15 +32,6 @@
         <el-button type="primary" @click="openForm('create')" v-hasPermi="['coupon::create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['coupon::export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/mall/member/user/UserDetail.vue

@@ -129,10 +129,6 @@ const open = async (type: string, id?: number) => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-  console.log(tab.paneName, event)
-  // queryParams.pageNo = 1
-  // queryParams.type = tab.paneName
-  //getList()
 }
 /** 查询列表 */
 const getList = async () => {

yshop-drink-vue3/src/views/mall/member/user/index.vue

@@ -49,15 +49,6 @@
         <el-button type="primary" @click="openForm('create')" v-hasPermi="['member:user:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['member:user:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/mall/member/userAddress/UserAddressForm.vue

@@ -16,12 +16,6 @@
       <el-form-item label="收货人地址" prop="address">
         <el-input v-model="formData.address" placeholder="请输入收货人所在省" />
       </el-form-item>
-      <!-- <el-form-item label="收货人所在市" prop="city">
-        <el-input v-model="formData.city" placeholder="请输入收货人所在市" />
-      </el-form-item>
-      <el-form-item label="收货人所在区" prop="district">
-        <el-input v-model="formData.district" placeholder="请输入收货人所在区" />
-      </el-form-item> -->
       <el-form-item label="收货人详细地址" prop="detail">
         <el-input v-model="formData.detail" placeholder="请输入收货人详细地址" />
       </el-form-item>

yshop-drink-vue3/src/views/mall/order/storeOrder/OrderDetail.vue

@@ -62,10 +62,6 @@
         <el-descriptions-item label="支付时间">{{ formatDate(DetailData.payTime) }}</el-descriptions-item>
         <el-descriptions-item label="支付方式">{{ DetailData.payType }}</el-descriptions-item>
       </el-descriptions>
-      <!-- <el-descriptions title="物流信息" :column="2">
-        <el-descriptions-item label="快递公司">{{ DetailData.deliveryName }}</el-descriptions-item>
-        <el-descriptions-item label="快递单号">{{ DetailData.deliveryId }} <el-button type="primary" @click="getLogistic(DetailData.deliverySn,DetailData.deliveryId)">物流追踪</el-button></el-descriptions-item>
-      </el-descriptions> -->
       <el-timeline>
         <el-timeline-item
           v-for="(activity, index) in logisticResult"
@@ -75,25 +71,14 @@
           {{ activity.acceptStation }}
         </el-timeline-item>
       </el-timeline>
-      <!-- <el-button @click="innerDrawer = true">Click me!</el-button>
-      <el-drawer
-        v-model="innerDrawer"
-        title="I'm inner Drawer"
-        :append-to-body="true"
-        :before-close="handleClose"
-      >
-        <p>_(:зゝ∠)_</p>
-      </el-drawer> -->
     </div>
   </el-drawer>
 </template>
 <script setup lang="ts">
 import * as StoreOrderApi from '@/api/mall/order/storeOrder'
 import { formatDate } from '@/utils/formatTime'
-//const message = useMessage() // 消息弹窗
 
 const { t } = useI18n() // 国际化
-// const message = useMessage() // 消息弹窗
 const dialogTitle = ref('') // 弹窗的标题
 const drawer = ref(false)
 const DetailData = ref({})
@@ -108,20 +93,9 @@ const open = async (type: string, id?: number) => {
   DetailData.value = await StoreOrderApi.getStoreOrder(id)
   nickname.value = DetailData.value.userRespVO.nickname
   product.value = DetailData.value.storeOrderCartInfoDOList
-  //获取加餐数量
-  //addProductMark.value = DetailData.value.storeOrderCartInfoDOList[DetailData.value.storeOrderCartInfoDOList.length - 1].addProductMark
-
-  console.log('addProductMark.value:',addProductMark.value )
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-//const getLogistic = async(deliverySn,deliveryId) => {
-//   const res  = await StoreOrderApi.getLogistic(deliverySn, deliveryId)
-//   if (res.success == "false") {
-//     message.error(res.reason)
-//   }
-//   logisticResult.value = res.traces
-// }
 </script>
 <style scoped>
 </style>

yshop-drink-vue3/src/views/mall/order/storeOrder/OrderRecord.vue

@@ -13,7 +13,6 @@ import * as StoreOrderApi from '@/api/mall/order/storeOrder'
 import { dateFormatter } from '@/utils/formatTime'
 
 const { t } = useI18n() // 国际化
-// const message = useMessage() // 消息弹窗
 const dialogTitle = ref('') // 弹窗的标题
 const drawer = ref(false)
 const tableData = ref([])

yshop-drink-vue3/src/views/mall/order/storeOrder/OrderSend.vue

@@ -91,7 +91,6 @@ const formData = ref({
     isSystemDel: undefined
 })
 const formRules = reactive({
-  //deliveryId: [{ required: true, message: '快递单号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 

yshop-drink-vue3/src/views/mall/order/storeOrder/OrderSendInfo.vue

@@ -110,7 +110,6 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  //express.value = await ExpressApi.getExpressList()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true

yshop-drink-vue3/src/views/mall/order/storeOrder/index.vue

@@ -78,15 +78,6 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['order:store-order:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
     

yshop-drink-vue3/src/views/mall/order/storeOrder/work.vue

@@ -204,31 +204,6 @@ const handleDelete = async (id: number) => {
  } catch {}
 }
 
-/** 确认付款按钮操作 */
-// const handlePay = async (id: number) => {
-//   try {
-//     // 删除的二次确认
-//     await message.confirm('修改为支付状态')
-//     // 发起删除
-//     await StoreOrderApi.payStoreOrder(id)
-//     message.success(t('common.updateSuccess'))
-//     // 刷新列表
-//     await getList()
-//   } catch {}
-// }
-
-// /** 确认收货按钮操作 */
-// const handleTake = async (id: number) => {
-//   try {
-//     // 删除的二次确认
-//     await message.confirm('修改收货状态')
-//     // 发起删除
-//     await StoreOrderApi.takeStoreOrder(id)
-//     message.success(t('common.updateSuccess'))
-//     // 刷新列表
-//     await getList()
-//   } catch {}
-// }
 
 /** 导出按钮操作 */
 const handleExport = async () => {

yshop-drink-vue3/src/views/mall/product/category/CategoryForm.vue

@@ -20,17 +20,6 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="上级分类" prop="parentId">
-        <el-tree-select
-          v-model="formData.parentId"
-          :data="categoryTree"
-          :props="{ label: 'name', value: 'id' }"
-          :render-after-expand="false"
-          placeholder="请选择上级分类"
-          check-strictly
-          default-expand-all
-        />
-      </el-form-item> -->
       <el-form-item label="分类名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入分类名称" />
       </el-form-item>
@@ -162,11 +151,5 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-// /** 获得分类树 */
+
-// const getTree = async () => {
-//   const data = await ProductCategoryApi.getCategoryList({})
-//   const tree = handleTree(data, 'id', 'parentId')
-//   const menu = { id: 0, name: '顶级分类', children: tree }
-//   categoryTree.value = [menu]
-// }
 </script>

yshop-drink-vue3/src/views/mall/product/storeProduct/StoreProductForm.vue

@@ -39,15 +39,6 @@
               :value="item.id"
             />
           </el-select>
-            <!-- <el-tree-select
-              v-model="formValidate.cate_id"
-              :data="categoryTree"
-              :props="{ label: 'name', value: 'id' }"
-              :render-after-expand="false"
-              placeholder="请选择商品分类"
-              check-strictly
-              default-expand-all
-            /> -->
         </el-form-item>
          <el-form-item label="关键字" prop="keyword">
           <el-input v-model="formValidate.keyword" class="input-width" placeholder="请输入关键字" />
@@ -228,33 +219,10 @@
            <vue-ueditor-wrap v-model="formValidate.description" :config="myConfig" @before-init="addCustomDialog"    style="width: 90%;" />
         </el-form-item>
       </el-tab-pane>
-      <!-- <el-tab-pane label="物流设置" name="four">
-        <el-form-item label="运费设置">
-          <el-radio-group v-model="postageSet">
-            <el-radio :label="false">规定邮费</el-radio>
-            <el-radio :label="true">运费模板</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="邮费" prop="postage" v-show="!postageSet">
-          <el-input class="input-width" v-model="formValidate.postage" placeholder="请输入邮费" />
-        </el-form-item>
-        <el-form-item label="运费模板" prop="temp_id" v-show="postageSet">
-          <el-select v-model="formValidate.temp_id"  class="mr20">
-            <el-option :value="0" label="选择运费模板" />
-            <el-option v-for="(item,index) in templateList" :value="item.id" :key="index" :label="item.name"/>
-          </el-select>
-        </el-form-item>
-      </el-tab-pane> -->
       <el-tab-pane label="营销设置" name="four">
         <el-form-item label="获得积分" prop="give_integral">
           <el-input v-model="formValidate.give_integral" class="input-width" placeholder="请输入获得积分" />
         </el-form-item>
-        <!-- <el-form-item label="是否新品" prop="is_new">
-          <el-radio-group v-model="formValidate.is_new">
-            <el-radio :label="0">否</el-radio>
-            <el-radio :label="1">是</el-radio>
-          </el-radio-group>
-        </el-form-item> -->
       </el-tab-pane>
     </el-tabs>
     </el-form>
@@ -269,7 +237,6 @@
 <script setup lang="ts">
 import * as StoreProductApi from '@/api/mall/product/product'
 import * as ProductCategoryApi from '@/api/mall/product/category'
-// import { handleTree3 } from '@/utils/tree'
 import type { TabsPaneContext } from 'element-plus'
 import * as ShopApi from '@/api/mall/store/shop'
 
@@ -507,8 +474,7 @@ const open = async (type: string, id?: number) => {
     id = 0
   }
   getInfo(id)
-   // 获得分类树
+
- // await getTree()
  
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -534,13 +500,11 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
 const submitForm = async () => {
   // 校验表单
   if (!formRef) return 
- // const valid = await formRef.value.validate()
   formRef.value.validate((valid, fields) => {
   if (valid) {
     console.log(fields)
   } else {
     return message.warning('请添加基本信息')
-    // console.log('error submit!', fields)
   }
   })
 
@@ -585,10 +549,7 @@ const upTab = () => {
     activeName.value = 'three'
     return
   }
-  // if (activeName.value == 'five') {
+
-  //   activeName.value = 'four'
-  //   return
-  // }
 
 }
 const downTab = () => {
@@ -604,10 +565,7 @@ if (activeName.value == 'one') {
     activeName.value = 'four'
     return
   }
-  // if (activeName.value == 'four') {
+
-  //   activeName.value = 'five'
-  //   return
-  // }
 }
 
   

yshop-drink-vue3/src/views/mall/product/storeProduct/index.vue

@@ -46,16 +46,6 @@
           >
             <Icon icon="ep:plus" class="mr-5px" /> 新增
           </el-button>
-        <!-- </router-link> -->
-          <!-- <el-button
-            type="success"
-            plain
-            @click="handleExport"
-            :loading="exportLoading"
-            v-hasPermi="['shop:store-product:export']"
-          >
-            <Icon icon="ep:download" class="mr-5px" /> 导出
-          </el-button> -->
         </el-form-item>
       </el-form>
     </ContentWrap>

yshop-drink-vue3/src/views/mall/shop/ads/index.vue

@@ -23,15 +23,6 @@
         <el-button type="primary" @click="openForm('create')" v-hasPermi="['shop:ads:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['shop:ads:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/mall/shop/recharge/index.vue

@@ -28,15 +28,6 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['shop:recharge:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/mall/shop/service/index.vue

@@ -23,15 +23,6 @@
         <el-button type="primary" @click="openForm('create')" v-hasPermi="['shop:service:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['shop:service:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/mall/shop/storeProductRule/StoreProductRuleForm.vue

@@ -8,7 +8,6 @@
       v-loading="formLoading"
       :inline="true"
     >
-      <!-- <el-row :gutter="20"  > -->
         <el-row :gutter="20">
           <el-col class="mb15">
             <el-form-item label="规格名称" prop="ruleName">
@@ -35,7 +34,6 @@
           </el-form-item>
         </el-row>
         <el-row :gutter="20" v-if="isBtn" >
-        <!-- <el-col :span="24" v-if="isBtn" style="background-color: gray;"> -->
            <el-col :span="9" class="mr15">
             <el-form-item label="规格：">
               <el-input placeholder="请输入规格" v-model="attrsName"/>
@@ -52,9 +50,7 @@
           <el-col :span="2">
             <el-button @click="offAttrName">取消</el-button>
           </el-col>
-        <!-- </el-col> -->
         </el-row>
-      <!-- </el-row> -->
     <el-button type="primary"  @click="addBtn" v-if="!isBtn" class="ml95 mt10">添加新规格</el-button>
     </el-form>
     <template #footer>

yshop-drink-vue3/src/views/mall/shop/storeProductRule/index.vue

@@ -28,15 +28,6 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['shop:store-product-rule:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/mall/store/shop/ShopForm.vue

@@ -133,7 +133,6 @@ const formRules = reactive({
   notice: [{ required: true, message: '公告不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '是否营业:0=否,1=是不能为空', trigger: 'blur' }],
   adminId: [{ required: true, message: '管理员id不能为空', trigger: 'blur' }],
-  //uniprintId: [{ required: true, message: '打印机id不能为空', trigger: 'blur' }],
   startTime: [{ required: true, message: '营业开始时间不能为空', trigger: 'blur' }],
   endTime: [{ required: true, message: '营业结束时间不能为空', trigger: 'blur' }]
 })
@@ -146,7 +145,6 @@ const isShow = ref(true)
 const open = async (type: string, id?: number) => {
   const user = wsCache.get(CACHE_KEY.USER)
 
-  //console.log('user:',user.user.shopId)
   if(user.user.shopId > 0) {
     isShow.value = false
   }
@@ -155,7 +153,6 @@ const open = async (type: string, id?: number) => {
   formType.value = type
   resetForm()
   getList()
-  //getPrintList()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true

yshop-drink-vue3/src/views/mall/store/shop/index.vue

@@ -32,15 +32,6 @@
         <el-button type="primary" @click="openForm('create')" v-hasPermi="['store:shop:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['store:shop:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/message/wechatTemplate/index.vue

@@ -28,15 +28,6 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['message:wechat-template:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/score/order/OrderDetail.vue

@@ -13,7 +13,6 @@
         </el-descriptions-item>
         <el-descriptions-item label="商品名称">{{ product.title }}</el-descriptions-item>
         <el-descriptions-item label="商品价格">{{ product.score }}积分</el-descriptions-item>
-        <!-- <el-descriptions-item label="收货地址">1111</el-descriptions-item> -->
       </el-descriptions>
       <el-descriptions title="订单信息" :column="2">
         <el-descriptions-item label="订单号">{{ DetailData.orderId }}</el-descriptions-item>
@@ -56,10 +55,8 @@
 <script setup lang="ts">
 import * as OrderApi from '@/api/score/order'
 import { formatDate } from '@/utils/formatTime'
-//const message = useMessage() // 消息弹窗
 
 const { t } = useI18n() // 国际化
-// const message = useMessage() // 消息弹窗
 const dialogTitle = ref('') // 弹窗的标题
 const drawer = ref(false)
 const DetailData = ref({})

yshop-drink-vue3/src/views/score/order/index.vue

@@ -41,15 +41,6 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['score:order:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>

yshop-drink-vue3/src/views/score/product/index.vue

@@ -28,15 +28,6 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <!-- <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['score:product:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>