功能测试与修改

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, // 页面数量