Merge branch 'master' of http://git.izouma.com/panhui/card-wechat

.gitignore

@@ -21,4 +21,3 @@ yarn-error.log*
 *.lock
 
 *.lock
-.env.development

project.config.json

@@ -4,7 +4,7 @@
         "ignore": []
     },
     "setting": {
-        "urlCheck": false,
+        "urlCheck": true,
         "es6": true,
         "enhance": false,
         "postcss": true,
@@ -173,6 +173,18 @@
                     "name": "店铺申请",
                     "pathName": "/pages/store/apply",
                     "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "认证审核进度",
+                    "pathName": "/pages/store/review",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "店铺首页",
+                    "pathName": "/pages/store/homePage",
+                    "scene": null
                 }
             ]
         }

src/components/ImgUploader.vue

@@ -0,0 +1,75 @@
+<template>
+    <van-uploader :file-list="fileList" max-count="1" :after-read="afterRead" @delete="deleteImg" preview-size="160" />
+</template>
+
+<script>
+export default {
+    props: {
+        value: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            fileList: []
+        };
+    },
+    created() {
+        this.setFile(this.value);
+    },
+    methods: {
+        setFile(value) {
+            if (value) {
+                this.fileList = [{ url: value }];
+            } else {
+                this.fileList = [];
+            }
+        },
+        afterRead(file) {
+            this.$http.uploadFile(file.path).then(res => {
+                let fileList = [];
+                fileList.push({ ...file, url: res });
+                this.fileList = fileList;
+                this.$emit('input', res);
+            });
+        },
+        deleteImg() {
+            this.fileList = [];
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+/deep/ .van-uploader {
+    .van-uploader__upload,
+    .van-uploader__preview-image {
+        border-radius: 12px;
+    }
+
+    .van-uploader__wrapper {
+        padding-top: 10px;
+    }
+
+    .van-uploader__preview-delete {
+        width: 20px;
+        height: 20px;
+        border-radius: 100%;
+        background-color: @prim;
+        .flex();
+        justify-content: center;
+        right: -6px;
+        top: -8px;
+    }
+
+    .van-uploader__preview-delete-icon {
+        position: relative;
+        top: auto;
+        right: auto;
+        transform: none;
+        font-size: 14px;
+        font-weight: bold;
+    }
+}
+</style>

src/components/ReviewSuccess.vue

@@ -0,0 +1,72 @@
+<template>
+    <van-overlay :show="show">
+        <div class="box" @click="show = false">
+            <div class="content" @click.stop="">
+                <van-image width="100%" src="/native/imgs/img_tongguo.png" fit="widthFix" />
+
+                <div class="text">
+                    在个人中心点击“<span>查看我的店铺</span>” 即可管理店铺商品及交易
+                </div>
+
+                <van-button :radius="8" class="go" type="primary">立即进入</van-button>
+            </div>
+
+            <van-button type="info" icon="cross" plaint round> </van-button>
+        </div>
+    </van-overlay>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            show: false
+        };
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.box {
+    width: 100vw;
+    height: 100%;
+    .flex-col();
+    justify-content: center;
+    align-items: center;
+    padding: 0 43px;
+    box-sizing: border-box;
+}
+
+.content {
+    position: relative;
+    align-self: stretch;
+    .text {
+        position: absolute;
+        padding: 0 45px;
+        top: 132px;
+        left: 0;
+        right: 0;
+        font-size: 13px;
+        color: #939599;
+        line-height: 22px;
+        text-align: center;
+        span {
+            color: @prim;
+        }
+    }
+
+    .go {
+        position: absolute;
+        bottom: 22px;
+        left: 50%;
+        transform: translateX(-50%);
+    }
+}
+
+/deep/ .van-button--info {
+    --button-info-background-color: transparent;
+    --button-default-height: 40px;
+    width: 40px;
+    margin-top: 30px;
+}
+</style>

src/main.js

@@ -51,7 +51,9 @@ export default {
             'pages/mineFollow',
             'pages/changeText',
             'pages/chooseAddress',
-            'pages/store/apply'
+            'pages/store/apply',
+            'pages/store/review',
+            'pages/store/homePage'
         ],
         tabBar: {
             color: '#7E7E80',

src/native/svgs/icon_bianji.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="24px" viewBox="0 0 25 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_bianji</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="我的-已登录" transform="translate(-310.000000, -115.000000)" stroke="#C8C9CC" stroke-width="1.6">
+            <g id="路径-2" transform="translate(311.000000, 115.000000)">
+                <path d="M20.5355339,18.7781746 L5.97918472,18.7781746 C4.87461522,18.7781746 3.97918472,17.8827441 3.97918472,16.7781746 L3.97918472,13.9497475 C3.97918472,13.4193145 4.1898984,12.9106067 4.56497116,12.5355339 L12.4644661,4.63603897 C13.2455147,3.85499039 14.5118446,3.85499039 15.2928932,4.63603897 L18.1213203,7.46446609 C18.9023689,8.24551468 18.9023689,9.51184464 18.1213203,10.2928932 L13.5766899,14.8375237 L13.5766899,14.8375237"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/pages/Home.vue

@@ -2,14 +2,16 @@
 {
     "navigationBarTextStyle": "white",
     "backgroundTextStyle":"light",
-    "navigationStyle": "custom"
+    "navigationStyle": "custom",
+    "backgroundColorTop":'#FF6C00',
+    "backgroundColorBottom":'#ffffff'
 }
 </config>
 <template>
     <div class="container">
         <van-sticky>
             <div class="container-bg">
-                <div class="mytest"><img class="mytest" src="../static/imgs/home_top_bg@3x.png" alt="" /></div>
+                <div class="mytest"><img class="mytest" src="../static/imgs/home_top_bg3x.jpg" alt="" /></div>
                 <span>{{ seriesName }}</span>
                 <div class="box-top">
                     <div class="box-img" @click="showSeries('series')">
@@ -186,12 +188,12 @@ export default {
             }
 
             this.getData();
+        },
+        loginMethods() {
+            this.getSeries().then(() => {
+                this.getData();
+            });
         }
-    },
-    onLoad() {
-        this.getSeries().then(() => {
-            this.getData();
-        });
     }
 };
 </script>

src/pages/confirmorder.vue

@@ -378,6 +378,7 @@ export default {
                 font-weight: bold;
                 color: #000000;
                 line-height: 20px;
+                min-width: 70px;
             }
             .box-buttom-p {
                 height: 22px;

src/pages/details.vue

@@ -8,7 +8,7 @@
     <div class="container">
         <swiper style="height:335px;" :autoplay="true" :indicator-dots="true">
             <swiper-item>
-                <img src="../static/imgs/icon_lunbotu@3x..png" alt="" />
+                <img src="../static/imgs/icon_lunbotu3x..jpg" alt="" />
             </swiper-item>
             <swiper-item>
                 <img src="../static/imgs/1.jpeg" alt="" />

src/pages/mine.vue

@@ -1,11 +1,12 @@
 <config>
 {
     "navigationBarTitleText": "",
-    "disableScroll":true,
     "usingComponents": {
         "van-grid": "/vant/grid/index",
         "van-grid-item": "/vant/grid-item/index"
-    }
+    },
+    "backgroundColorTop":'#ffffff',
+    "backgroundColorBottom":'#f2f4f5'
 }
 </config>
 <template>
@@ -23,9 +24,11 @@
 
             <van-button type="primary" v-if="!userInfo" @click="login">点击授权登录</van-button>
 
-            <div class="info" v-else>
+            <div class="info" v-else @click="navigateTo('/pages/setting')">
                 <div class="text1">{{ userInfo.nickname }}</div>
                 <div class="text2" v-if="city">{{ city }}</div>
+
+                <img src="/native/svgs/icon_bianji.svg" class="edit" alt="" />
             </div>
 
             <van-image
@@ -83,12 +86,16 @@
             </div>
             <van-button type="default" size="small">立即邀请</van-button>
         </div> -->
+
+        <review-success></review-success>
     </div>
 </template>
 
 <script>
 import { mapState } from 'vuex';
+import ReviewSuccess from '../components/ReviewSuccess.vue';
 export default {
+    components: { ReviewSuccess },
     name: 'Mine',
     computed: {
         ...mapState(['userInfo']),
@@ -129,10 +136,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.page-scroll {
-    overflow: auto;
-    height: 100vh;
-}
+// .page-scroll {
+//     overflow: auto;
+//     height: 100vh;
+// }
 .top {
     padding: 0 20px 86px;
     background: #fff;
@@ -161,6 +168,8 @@ export default {
 
 .info {
     margin-left: 16px;
+    position: relative;
+    flex-grow: 1;
     .text1 {
         font-size: 24px;
         font-weight: bold;
@@ -172,6 +181,15 @@ export default {
         color: #c8c9cc;
         line-height: 22px;
     }
+
+    .edit {
+        position: absolute;
+        right: 0;
+        top: 50%;
+        width: 24px;
+        height: 24px;
+        transform: translateY(-12px);
+    }
 }
 
 .invitation {

src/pages/store/apply.vue

@@ -45,11 +45,11 @@
             />
 
             <van-cell title="身份证照片（正面照）">
-                <van-uploader :file-list="form.idimgs" />
+                <img-uploader v-model="form.idImg"></img-uploader>
             </van-cell>
 
             <van-cell title="营业执照" :border="false">
-                <van-uploader :file-list="form.icImgs" />
+                <img-uploader v-model="form.icImg"></img-uploader>
             </van-cell>
 
             <div class="btn">
@@ -60,12 +60,14 @@
 </template>
 
 <script>
+import ImgUploader from '../../components/ImgUploader.vue';
 export default {
+    components: { ImgUploader },
     data() {
         return {
             form: {
-                idimgs: [],
-                icImgs: []
+                idImg: '',
+                icImg: ''
             }
         };
     }
@@ -115,12 +117,6 @@ export default {
         text-align: left;
     }
 
-    .van-uploader__upload {
-        width: 160px !important;
-        height: 160px !important;
-        border-radius: 12px;
-    }
-
     &::after {
         left: 100px !important;
     }

src/pages/store/homePage.vue

@@ -0,0 +1,13 @@
+<config>
+{
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white",
+}
+</config>
+<template>
+    <div></div>
+</template>
+
+<script>
+export default {};
+</script>

src/pages/store/review.vue

@@ -0,0 +1,73 @@
+<config>
+{
+    "navigationBarTitleText": "认证审核进度",
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black"
+}
+</config>
+<template>
+    <div class="review">
+        <van-image width="100%" :src="img" fit="widthFix" />
+        <div class="content">
+            <div class="text1">{{ title }}</div>
+            <div class="text2">{{ desc }}</div>
+
+            <van-button type="primary" block>返回</van-button>
+            <van-button type="primary" plain block>取消申请</van-button>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    computed: {
+        img() {
+            const imgs = ['/native/imgs/kong_png_shenghezhong.png', '/native/imgs/kong_png_shengheshibai.png'];
+            return imgs[0];
+        },
+        title() {
+            const list = ['资料审核中！', '资料审核失败'];
+            return list[0];
+        },
+        desc() {
+            const list = [
+                '平台将于3日内完成资料审核，并将审核结果以短信的形式通知您',
+                '很遗憾，您的资料审核失败，请检查您填写的资料是否正确以及上传照片是否清晰'
+            ];
+            return list[0];
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.review {
+    .flex-col();
+    padding: 22px 26px 100px;
+    .content {
+        .flex-col();
+        padding: 0 15px;
+        text-align: center;
+
+        .text1 {
+            font-size: 22px;
+            color: #000000;
+            line-height: 32px;
+        }
+
+        .text2 {
+            font-size: 14px;
+            color: #939599;
+            line-height: 24px;
+            padding: 16px 0 60px;
+        }
+
+        ._van-button + ._van-button {
+            margin-top: 20px;
+        }
+    }
+}
+</style>