Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/1.0

+<template>
+   结算页
+
+</template>
+
+<script>
+
+    import service from 'balance-service';
+
+    const _ = require('lodash');
+
+    export default {
+        created() {
+        },
+        data() {
+            return {
+
+            };
+        },
+        methods: {
+
+        }
+    };
+</script>
+
+<style lang="scss" scoped>
+
+
+</style>

+const page = r => require.ensure([], () => r(require('./balance')), 'finance.balance');
+
+export default {
+    path: '/balance.html',
+    name: 'balance',
+    component: page,
+    meta: {
+        pageName: '结算单'
+    }
+};
+

+import info from './balance';
+
+let routers = [info];
+
+routers.forEach(router => {
+    router.path = `/balance${router.path}`;
+    router.name = `balance.${router.name}`;
+});
+
+export default routers;
\ No newline at end of file

@@ -91,8 +91,7 @@
                 tableCols,
                 tableData,
                 pageData,
-                filters: filterFields,
-                initialFilters: '',
+                filters: '',
                 batchOnSale: [],
                 useFilterSign: false,
                 showSizeEdit: false,
@@ -101,7 +100,7 @@
         },
         created() {
             this.productList();
-            this.initialFilters = JSON.stringify(filterFields);
+            this.filters = JSON.parse(initialFields);
         },
         methods: {
             editSize(skn) {
@@ -133,7 +132,7 @@
                 this.pageData.current = 1;
             },
             clearFilter() {
-                this.filters = JSON.parse(this.initialFilters);
+                this.filters = JSON.parse(initialFields);
                 this.productList();
                 this.useFilterSign = false;
                 this.pageData.current = 1;
@@ -289,24 +288,7 @@
 </script>
 
 <style lang="scss">
-    .row-space {
-        margin-bottom: 20px;
-    }
-
     .btn-row-space {
         margin-top: 10px;
     }
-
-    .field-label {
-        line-height: 32px;
-    }
-
-    .hr {
-        border-top: 1px solid #eee;
-    }
-
-    .list-page {
-        float: right;
-    }
-
 </style>

@@ -137,7 +137,7 @@ let filterFields = {
     }
 };
 
-let initialFields = JSON.parse(JSON.stringify(filterFields));
+let initialFields = JSON.stringify(filterFields);
 
 let tableCols = [
     {

@@ -2,7 +2,7 @@
     <LayoutBody>
         <LayoutFilter>
             <FilterItem :label="filters.sknCode.label">
-                <Input v-model.trim="filters.sknCode.model"
+                <Input v-model.trim.trim="filters.sknCode.model"
                                 :placeholder="filters.sknCode.holder"></Input>
             </FilterItem>
             <FilterItem :label="filters.prodCode.label">
@@ -84,8 +84,7 @@
                 tableCols,
                 tableData,
                 pageData,
-                filters: filterFields,
-                initialFilters: '',
+                filters: '',
                 batchOffSale: [],
                 useFilterSign: false,
                 categoryValue: []
@@ -93,7 +92,7 @@
         },
         created() {
             this.productList();
-            this.initialFilters = JSON.stringify(filterFields);
+            this.filters = JSON.parse(initialFields);
         },
         methods: {
             editSize(skn) {
@@ -125,7 +124,7 @@
 
             },
             clearFilter() {
-                this.filters = JSON.parse(this.initialFilters);
+                this.filters = JSON.parse(initialFields);
                 this.productList();
                 this.useFilterSign = false;
                 this.pageData.current = 1;
@@ -280,7 +279,7 @@
 </script>
 
 <style lang="scss">
-    .list-page {
-        float: right;
+    .btn-row-space {
+        margin-top: 10px;
     }
 </style>

@@ -18,7 +18,6 @@ let filterFields = {
         holder: '',
         fieldSpan: 18
     },
-
     prodCode: {
         label: '商家编码',
         labelSpan: 6,
@@ -26,7 +25,6 @@ let filterFields = {
         holder: '',
         fieldSpan: 18
     },
-
     prodName: {
         label: '商品名称',
         labelSpan: 6,
@@ -41,7 +39,6 @@ let filterFields = {
         holder: '',
         fieldSpan: 18
     },
-
     sort: {
         first: {
             label: '选择类目',
@@ -65,14 +62,12 @@ let filterFields = {
             model: ''
         }
     },
-
     brand: {
         label: '选择品牌',
         labelSpan: 6,
         fieldSpan: 18,
         model: -1
     },
-
     verifyStatus: {
         label: '审核状态',
         labelSpan: 6,
@@ -93,7 +88,6 @@ let filterFields = {
             }
         ]
     },
-
     stockStatus: {
         label: '库存情况',
         labelSpan: 6,
@@ -116,7 +110,7 @@ let filterFields = {
     }
 };
 
-let initialFields = JSON.parse(JSON.stringify(filterFields));
+let initialFields = JSON.stringify(filterFields);
 
 let tableCols = [
     {

 <template>
-    <LayoutBody>
-        店铺基本信息
-    </LayoutBody>
+    <Form :label-width="100">
+        <Form-item label="店铺名称：">
+            <span>{{}}</span>
+        </Form-item>
+        <Form-item label="店铺类型：">
+            <span>{{}}</span>
+        </Form-item>
+        <Form-item label="店铺域名：">
+            <span>{{}}</span>
+        </Form-item>
+        <Form-item label="店铺LOGO：">
+            <div class="upload-item">
+                <div class="upload-item-img">
+                    <drag-file-upload
+                        :id="{goodIndex:1, imageIndex: 1}"
+                        @on-success="uploadImageSuccess"
+                        @on-remove="uploadImageRemove">
+                    </drag-file-upload>
+                </div>
+            </div>
+            <em class="upload-img-tip">尺寸要求150px＊150px&nbsp;&nbsp;不大于500KB</em>
+        </Form-item>
+        <Form-item label="店铺简介：">
+            <editor :content="content" @change="updateData"></editor>
+        </Form-item>
+        <Form-item label="品牌－供应商：">
+            <Table :columns="columns1" :data="data1"></Table>
+        </Form-item>
+        <Form-item>
+            <Button type="primary" @click="submit">提交</Button>
+        </Form-item>
+    </Form>
+
 </template>
 
 <script>
+
+import service from 'shop-service';
+
+const _ = require('lodash');
+
+const makeSubmitShop = () => {
+    return {
+    };
+};
+
 export default {
     created() {
     },
     data() {
         return {
+            //店铺简介
+            content: '',
+
+            //供应商
+            columns1: [
+                {
+                    title: '品牌',
+                    key: 'coupon'
+                },
+                {
+                    title: '供应商',
+                    key: 'supplier'
+                }
+            ],
+            data1: [
+                {
+                    coupon: 'hahahah',
+                    supplier: 'hhhhhhhh'
+                }
+            ]
         };
     },
     methods: {
+        updateData(c) {
+            this.content = c;
+        },
+
+        //上传图片
+        uploadImageSuccess: function(attach, file) {
+            let colorIndex = attach.goodIndex;
+            let imageIndex = attach.imageIndex;
+
+            this.product.goods[colorIndex].goodsImage[imageIndex].imageUrl = file.url;
+        },
+        uploadImageRemove: function(attach) {
+            let colorIndex = attach.goodIndex;
+            let imageIndex = attach.imageIndex;
+
+            this.product.goods[colorIndex].goodsImage[imageIndex].imageUrl = '';
+        },
+
+        //提交
+        beforeSubmit: function() {
+            let newShop = makeSubmitShop();
+
+//            newShop.expectSaleTimeStr = this.product.expectSaleTimeStr;
+//
+//            newShop.sellerGoodsInfoStr = JSON.stringify(this.handleColor());
+
+            return newShop;
+        },
+        submit: function() {
+            let newShop = this.beforeSubmit();
+
+            this.$Loading.start();
+            service.saveBaseShopInfo(newShop).then((result) => {
+                this.$Loading.finish();
+
+                if (result.code === 200) {
+                    this.$Notice.success({
+                        title: '修改成功',
+                        desc: '该店铺保存成功！'
+                    });
+
+                    this.$router.push({name: 'shop'});
+                } else {
+                    this.$Notice.error({
+                        title: '保存错误',
+                        desc: result.message
+                    });
+
+                }
+            });
+        }
+
     }
 };
 </script>
 
 <style lang="scss" scoped>
 
+    .upload-item {
+        float: left;
+    }
+
+    .upload-img-tip {
+        float: left;
+        margin-top: 112px;
+        padding-left: 20px;
+        color: #c90;
+        line-height: 1;
+        font-size: 12px;
+        font-style: normal;
+        font-weight: 500;
+    }
+
+    .upload-item-img {
+        display: inline-block;
+        height: 126px;
+        width: 124px;
+        border: 2px solid #e8e8e8;
+        box-sizing: border-box;
+    }
+
 </style>

+// import _ from 'lodash';
+// import axios from 'axios';
+
+const balanceService = {
+
+};
+
+export default balanceService;

-
-const userService = {
-
-};
-
-export default userService;

+import _ from 'lodash';
+import axios from 'axios';
+
+const apiUrl = {
+    shop: 'shop/info/detail',
+};
+
+const shopService = {
+    /**
+     *  保存店铺基本信息
+     * @param shop
+     */
+    saveBaseShopInfo(shop) {
+        return axios.post(apiUrl.shop, shop)
+            .then(result => result.data);
+    }
+};
+
+export default shopService;