功能测试与修改

seller/src/views/goods/goods-seller/goods.vue

@@ -181,7 +181,7 @@
       </div>
     </Modal>
     <Modal title="导入商品信息" v-model="importModal" :mask-closable="false">
-      <div>
+      <div style="text-align: center">
         <Upload :before-upload="handleUpload" name="files" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
                 multiple type="drag" :action="action" :headers="accessToken">
           <div style="padding: 50px 0">
@@ -189,6 +189,7 @@
             <h2>选择或拖拽文件上传</h2>
           </div>
         </Upload>
+        <Button @click="exportGoods" type="text" style="color: red">下载导入模板</Button>
       </div>
       <div slot="footer">
         <Button type="text" @click="importModal = false">确定</Button>
@@ -206,9 +207,12 @@ import {
   lowGoods,
   deleteGoods,
   batchShipTemplate,
+  downLoadGoods
 } from "@/api/goods";
 import { baseUrl } from "@/libs/axios.js";
 import * as API_Shop from "@/api/shops";
+import Cookies from "js-cookie";
+import {uploadGoodsExcel} from "../../../api/goods";
 
 export default {
   name: "goods",
@@ -511,9 +515,51 @@ export default {
       this.upload();
       return false;
     },
+    /**
+     * 上传文件
+     */
+    async upload() {
+      let fd = new FormData();
+      fd.append("files", this.file);
+      let res = await uploadGoodsExcel(fd);
+      if (res.success) {
+        this.stepList.map((item) => {
+          item.checked = false;
+        });
+
+        this.stepList[2].checked = true;
+      }
+    },
     openImportGoods(){
       this.importModal = true
     },
+    async exportGoods(){
+      downLoadGoods()
+        .then((res) => {
+          console.log(res)
+          const blob = new Blob([res], {
+            type: "application/vnd.ms-excel;charset=utf-8",
+          });
+          //对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+          //IE10以上支持blob但是依然不支持download
+          if ("download" in document.createElement("a")) {
+            //支持a标签download的浏览器
+            const link = document.createElement("a"); //创建a标签
+            link.download = "商品批量导入模板.xls"; //a标签添加属性
+            link.style.display = "none";
+            link.href = URL.createObjectURL(blob);
+            document.body.appendChild(link);
+            link.click(); //执行下载
+            URL.revokeObjectURL(link.href); //释放url
+            document.body.removeChild(link); //释放标签
+          } else {
+            navigator.msSaveBlob(blob, fileName);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
     // 更新库存
     updateStock() {
       let updateStockList = this.stockList.map((i) => {

seller/src/views/lili-dialog/wap.js

@@ -11,6 +11,17 @@ export default [
   //   name: "category"
   // },
 
+  // {
+  //   title: "活动",
+  //   url: "3",
+  //   name: "marketing"
+  // },
+  // {
+  //   title: "页面",
+  //   url: "3",
+  //   name: "pages"
+  // },
+
   // {
   //   title: "活动",
   //   url: "3",

seller/src/views/shop/floorList.vue

@@ -126,7 +126,7 @@ export default {
           const data = this.formData;
           data.status ? (data.pageShow = "OPEN") : (data.pageShow = "CLOSE");
           delete data.status;
-          (data.pageType = "INDEX"), (data.pageClientType = "PC");
+          (data.pageType = "STORE"), (data.pageClientType = "PC");
           if (data.id) {
             API_floor.updateHome(data.id, data).then((res) => {
               this.$Message.success("编辑模板成功");

seller/src/views/shop/modelConfig.js

@@ -1,98 +1,5 @@
-export const modelData = [{
-    type: 'carousel',
-    name: '图片轮播',
-    icon: 'md-image',
-    showName: '',
-    size: "790*340",
-    options: {
-      list: [{
-          img: require('@/assets/nav/1.jpg'),
-          url: ''
-        },
-        {
-          img: require('@/assets/nav/2.jpg'),
-          url: ''
-        },
-        {
-          img: require('@/assets/nav/3.jpg'),
-          url: ''
-        }
-      ],
-    },
-  },
-//   {
-//     type: 'carousel1',
-//     name: '图片轮播1',
-//     icon: 'md-image',
-//     size: "1200*470",
-//     options: {
-//       list: [{
-//           img: require('@/assets/nav/1.jpg'),
-//           url: '',
-//           bgColor: 'yellow'
-//         },
-//         {
-//           img: require('@/assets/nav/2.jpg'),
-//           url: '',
-//           bgColor: 'purple'
-//         },
-//         {
-//           img: require('@/assets/nav/3.jpg'),
-//           url: '',
-//           bgColor: 'blue'
-//         }
-//       ],
-//     },
-//   },
-//   {
-//     type: 'carousel2',
-//     name: '图片轮播2',
-//     icon: 'md-image',
-//     size: "590*470",
-//     options: {
-//       list: [{
-//           img: require('@/assets/nav/1.jpg'),
-//           url: ''
-//         },
-//         {
-//           img: require('@/assets/nav/2.jpg'),
-//           url: ''
-//         },
-//         {
-//           img: require('@/assets/nav/3.jpg'),
-//           url: ''
-//         }
-//       ],
-//       listRight: [
-//         [{
-//             img: require('@/assets/nav/1.jpg'),
-//             url: ''
-//           },
-//           {
-//             img: require('@/assets/nav/2.jpg'),
-//             url: ''
-//           },
-//           {
-//             img: require('@/assets/nav/3.jpg'),
-//             url: ''
-//           }
-//         ],
-//         [{
-//             img: require('@/assets/nav/1.jpg'),
-//             url: ''
-//           },
-//           {
-//             img: require('@/assets/nav/2.jpg'),
-//             url: ''
-//           },
-//           {
-//             img: require('@/assets/nav/3.jpg'),
-//             url: ''
-//           }
-//         ],
-//       ]
-//     },
-//   },
+
+export const modelData = [
   {
     type: 'hotAdvert',
     name: '热门广告',

seller/src/views/shop/modelList/carousel2.vue

@@ -61,7 +61,7 @@
             </ul>
           </div>
         </div>
-      </div>
+      </div>)
     </div>
     <!-- 左侧轮播装修 -->
     <Modal
@@ -166,14 +166,12 @@
             </table>
           </TabPane>
         </Tabs>
-        
       </div>
     </Modal>
     <!-- 选择商品。链接 -->
     <liliDialog
       ref="liliDialog"
       @selectedLink="selectedLink"
-     
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>

seller/src/views/shop/shopSetting.vue

@@ -459,10 +459,9 @@ export default {
         }
       });
     },
-<<<<<<< HEAD
-    pageShow(type){
+    pageShow(type) {
       this.form.pageShow = type
-=======
+    },
     getDeliverAddress(){
       API_Shop.getDeliverAddress().then(res=>{
         if(res.success){
@@ -474,7 +473,6 @@ export default {
           }
         }
       })
->>>>>>> 4ea142ea086a3f534419a31b595de80497e16d90
     },
     //修改售后地址
     regionClick() {

seller/src/views/shop/wap/navbar.vue

@@ -116,7 +116,7 @@ export default {
         : (this.submitWay.pageShow = "CLOSE");
 
       this.submitWay.pageData = JSON.stringify(this.$store.state.styleStore);
-      this.submitWay.pageType = "INDEX";
+      this.submitWay.pageType = "STORE";
 
       this.$route.query.id ? this.update() : this.submit(this.submitWay);
     },
@@ -128,7 +128,7 @@ export default {
         pageData: JSON.stringify(this.$store.state.styleStore),
         name: this.submitWay.name,
         pageShow: this.submitWay.pageShow,
-        pageType: "INDEX",
+        pageType: "STORE",
         pageClientType: "H5",
       })
         .then((res) => {

seller/src/views/shop/wap/wapList.vue

@@ -63,7 +63,7 @@ export default {
         pageSize: 10,
         sort: "createTime",
         order: "desc",
-        pageType: "INDEX",
+        pageType: "STORE",
         pageClientType: "H5",
       },
       total: 0, // 页面数量

seller/src/views/sys/oss-manage/ossManage.vue

@@ -26,7 +26,7 @@
                 style="width: 200px"
               />
             </Form-item>
-           
+
             <Form-item label="上传时间">
               <DatePicker
                 v-model="selectDate"
@@ -189,7 +189,7 @@
       </Row>
     </Card>
 
-      
+
 
     <Modal
       :title="modalTitle"
@@ -815,6 +815,6 @@ export default {
       this.init();
     }
   },
- 
+
 };
 </script>