Merge remote-tracking branch 'yudao/dev' into dev-to-dev

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

@@ -101,7 +101,7 @@ const getDetail = async () => {
   if ('ProductSpuDetail' === name) {
     isDetail.value = true
   }
-  const id = params.spuId as number
+  const id = params.spuId as unknown as number
   if (id) {
     formLoading.value = true
     try {
@@ -155,15 +155,15 @@ const submitForm = async () => {
       item.subCommissionSecondPrice = convertToInteger(item.subCommissionSecondPrice)
     })
     // 处理轮播图列表
-    const newSliderPicUrls = []
-    deepCopyFormData.sliderPicUrls.forEach((item) => {
+    const newSliderPicUrls: any[] = []
+    deepCopyFormData.sliderPicUrls.forEach((item: any) => {
       // 如果是前端选的图
       typeof item === 'object' ? newSliderPicUrls.push(item.url) : newSliderPicUrls.push(item)
     })
     deepCopyFormData.sliderPicUrls = newSliderPicUrls
     // 校验都通过后提交表单
     const data = deepCopyFormData as ProductSpuApi.Spu
-    const id = params.spuId as number
+    const id = params.spuId as unknown as number
     if (!id) {
       await ProductSpuApi.createSpu(data)
       message.success(t('common.createSuccess'))

src/views/mall/promotion/couponTemplate/index.vue

@@ -336,7 +336,7 @@
         >
           <el-option v-for="item in productSpus" :key="item.id" :label="item.name" :value="item.id">
             <span style="float: left">{{ item.name }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px"
+            <span style="float: right; font-size: 13px; color: #8492a6"
               >￥{{ (item.minPrice / 100.0).toFixed(2) }}</span
             >
           </el-option>

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

@@ -341,12 +341,12 @@ const clipboardSuccess = () => {
     align-items: center;
 
     &::before {
-      content: '';
       display: inline-block;
-      margin-right: 10px;
       width: 3px;
       height: 20px;
+      margin-right: 10px;
       background-color: #409eff;
+      content: '';
     }
   }